diff --git a/apps/schools/domains/common/components/bubbleFilter/index.tsx b/apps/schools/domains/common/components/bubbleFilter/index.tsx index 840641e1..a25c9beb 100644 --- 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 = React.memo(({ text, items }) => { - const listItems = items.map((item: BubbleFilterListItem) => - item.count && item.count > 0 ? ( +export const BubbleFilter: React.FC = React.memo(({ text, items, statuses }) => { + const listItems = items.map((item: BubbleFilterListItem) => { + const isSelected = statuses?.includes(item.key) ?? false + return item.count && item.count > 0 ? ( {} : 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 = React.memo(({ text, ite
{item.text}
{item.isSelected && }
- ) : null, - ) + ) : null + }) return ( diff --git a/apps/schools/domains/common/components/bubbleFilter/interface.ts b/apps/schools/domains/common/components/bubbleFilter/interface.ts index 8f348b3c..c6f83405 100644 --- 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 index e140c8b8..e8153aff 100644 --- 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() { Заявки - + loading={isTableLoading} customType={'tableWithoutSearch'} diff --git a/apps/schools/domains/ticket/components/ticketList/index.tsx b/apps/schools/domains/ticket/components/ticketList/index.tsx index 7245b37a..c8fbfc49 100644 --- 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() { Обращения - +
loading={isTableLoading}