Merge pull request #147 from open-schools/fix/SCHOOL-840/saving-setti…

…ngs-when-page-reloaded saving-settings-when-page-reloaded
open-schools · Jul 1, 2024 · 18d54cd · 18d54cd
2 parents 5f99fef + 88c1747
commit 18d54cd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/apps/schools/domains/common/components/bubbleFilter/index.tsx b/apps/schools/domains/common/components/bubbleFilter/index.tsx
@@ -4,12 +4,13 @@ import styles from './styles/styles.module.scss'
 import { BubbleFilterProps, BubbleFilterListItem } from '@domains/common/components/bubbleFilter/interface'
 import { CloseOutlined } from '@ant-design/icons'
 
-export const BubbleFilter: React.FC<BubbleFilterProps> = React.memo(({ text, items }) => {
-    const listItems = items.map((item: BubbleFilterListItem) =>
-        item.count && item.count > 0 ? (
+export const BubbleFilter: React.FC<BubbleFilterProps> = React.memo(({ text, items, statuses }) => {
+    const listItems = items.map((item: BubbleFilterListItem) => {
+        const isSelected = statuses?.includes(item.key) ?? false
+        return item.count && item.count > 0 ? (
             <Row
-                className={item.isSelected ? styles.bubbleContainerSelected : styles.bubbleContainer}
-                onClick={item.isSelected ? () => {} : item.onClick}
+                className={isSelected ? styles.bubbleContainerSelected : styles.bubbleContainer}
+                onClick={isSelected ? () => {} : item.onClick}
                 style={{ backgroundColor: item.isSelected ? item.color : '' }}
                 key={item.key}
             >
@@ -21,8 +22,8 @@ export const BubbleFilter: React.FC<BubbleFilterProps> = React.memo(({ text, ite
                 <div className={styles.bubbleText}>{item.text}</div>
                 {item.isSelected && <CloseOutlined onClick={item.onExit} className={styles.closeIcon} />}
             </Row>
-        ) : null,
-    )
+        ) : null
+    })
 
     return (
         <Row className={styles.container}>

diff --git a/apps/schools/domains/common/components/bubbleFilter/interface.ts b/apps/schools/domains/common/components/bubbleFilter/interface.ts
@@ -11,4 +11,5 @@ export interface BubbleFilterListItem {
 export interface BubbleFilterProps {
     items: BubbleFilterListItem[]
     text?: string
+    statuses?: string[] | null
 }
diff --git a/apps/schools/domains/query/components/queryList/index.tsx b/apps/schools/domains/query/components/queryList/index.tsx
@@ -113,7 +113,11 @@ export function QueryList() {
                 <Typography.Title level={1}>Заявки</Typography.Title>
             </div>
             <SearchInput onSearchChange={handleSearchChange} />
-            <BubbleFilter items={Object.values(bubbleFilterItems)} text={`${countAllQueries} заявок`} />
+            <BubbleFilter
+                text={`${countAllQueries} заявок`}
+                items={Object.values(bubbleFilterItems)}
+                statuses={statuses}
+            />
             <Table<RowType, TableType>
                 loading={isTableLoading}
                 customType={'tableWithoutSearch'}

diff --git a/apps/schools/domains/ticket/components/ticketList/index.tsx b/apps/schools/domains/ticket/components/ticketList/index.tsx
@@ -128,7 +128,7 @@ export function TicketList() {
                 <Typography.Title level={1}>Обращения</Typography.Title>
             </div>
             <SearchInput onSearchChange={handleInputChange} />
-            <BubbleFilter items={Object.values(bubbleFilterItems)} text={`Статусы обращений`} />
+            <BubbleFilter items={Object.values(bubbleFilterItems)} text={`Статусы обращений`} statuses={statuses} />
             <div className={styles.tableTicketList}>
                 <Table<RowType, TableType>
                     loading={isTableLoading}