diff --git a/web/src/services/api/directories/company_groups.ts b/web/src/services/api/directories/company_groups.ts index 5ac3cdc..33464e6 100644 --- a/web/src/services/api/directories/company_groups.ts +++ b/web/src/services/api/directories/company_groups.ts @@ -13,7 +13,7 @@ export async function fetchCompanyGroups(params: GetCompanyGroupsPropsI): Promis const page = await api.get>('/directories/company-groups', { limit: CG_PAGE, offset: offset, - ...params, + ...params, }); all.push(...page.items); if (all.length >= page.total || page.items.length === 0) { diff --git a/web/src/types/catalogueJur/catalogueJur.ts b/web/src/types/catalogueJur/catalogueJur.ts index 68369bb..f53ffa0 100644 --- a/web/src/types/catalogueJur/catalogueJur.ts +++ b/web/src/types/catalogueJur/catalogueJur.ts @@ -21,7 +21,7 @@ export interface ICatalogueJur { name: string; is_head_office: boolean; }; - regional_name?:string; + regional_name?: string; } export type KindType = 'gsk' | 'gsz'; diff --git a/web/src/types/companyGroups/companyGroups.ts b/web/src/types/companyGroups/companyGroups.ts index 9b7bed3..4def26d 100644 --- a/web/src/types/companyGroups/companyGroups.ts +++ b/web/src/types/companyGroups/companyGroups.ts @@ -6,7 +6,7 @@ export interface ICompanyGroupOut { base_regional_office_id: string | null; base_regional_office: { id: string; name: string; is_head_office: boolean } | null; legal_entities_count: number; - is_archived:boolean; + is_archived: boolean; } /** Строка таблицы ГК: имя филиала плоским полем — по нему работают поиск и фильтры GenericTable. */ diff --git a/web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx b/web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx index 786aff1..b4bc6ca 100644 --- a/web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx +++ b/web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx @@ -17,7 +17,7 @@ export const ArchiveCompanyGroupModal: React.FC = ({ open, onCancel, onOk onOk={onOk} okText='Подтвердить' cancelText='Отмена' - okButtonProps={isArchived ? undefined : { danger: true }} + okButtonProps={isArchived ? undefined : { danger: true }} confirmLoading={loading} centered>

Группа компании будет {isArchived ? 'разархивированна' : 'архивированна'}

diff --git a/web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx b/web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx index 52af6cf..0f1bfc2 100644 --- a/web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx +++ b/web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx @@ -55,7 +55,7 @@ export function CatalogueJurTable({ outside_group, tabsComponent }: CatalogueJur const isGettingArchiveCompany = useAppSelector((state) => state.company_groups.isGettingArchive); const filterdData = useMemo(() => { - let newData = rawRows + let newData = rawRows; if (relatedGroupFilter?.id && !outside_group) { newData = rawRows?.filter((row) => { return row?.memberships?.some((member) => member.related_group_id === relatedGroupFilter.id); @@ -69,7 +69,7 @@ export function CatalogueJurTable({ outside_group, tabsComponent }: CatalogueJur useTableFilters(); // single filtered array — title count and table share it const { rows } = useFilteredRows(filterdData, catalogueJurConfig, rawQuery, columnFilters, sort); - + function getCatalogueJur() { dispatch( getCatalogueJurThunk({ diff --git a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx b/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx index 91a30f3..68d136f 100644 --- a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx +++ b/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx @@ -31,7 +31,7 @@ export const CompanyGroupsList = () => { }); useEffect(() => { - dispatch(getCompanyGroupsThunk({is_archived:isGettingArchiveCompany})); + dispatch(getCompanyGroupsThunk({ is_archived: isGettingArchiveCompany })); }, [dispatch, isGettingArchiveCompany]); useEffect(() => { @@ -66,7 +66,7 @@ export const CompanyGroupsList = () => { value={query} onChange={(e) => setQuery(e.target.value)} /> - dispatch(setIsGettingArchive(e.target.checked))}> + dispatch(setIsGettingArchive(e.target.checked))}> Архив