From 082768f679fe92ea9bed27501b29551d6a87d27b Mon Sep 17 00:00:00 2001 From: Grog Date: Tue, 27 Oct 2026 17:14:54 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/layouts/CatalogueGroups.tsx | 2 +- web/src/services/api/directories/company_groups.ts | 2 +- web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts | 2 +- web/src/store/slices/companyGroupsSlice/thunks.ts | 2 +- web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx | 4 ++-- web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx | 2 +- web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/src/layouts/CatalogueGroups.tsx b/web/src/layouts/CatalogueGroups.tsx index 94bf644..a4f39bf 100644 --- a/web/src/layouts/CatalogueGroups.tsx +++ b/web/src/layouts/CatalogueGroups.tsx @@ -21,6 +21,7 @@ import type { CatalogueJurFormProps } from '../types/catalogueJur/catalogueJur'; import type { CompanyGroupFormProps } from '../types/companyGroups/companyGroups'; import type { CreateEntityKind, RelatedGroupFormType } from '../types/relatedGroup/relatedGroup'; import { useNotificationApi } from '../utils/useNotification'; +import { ArchiveCompanyGroupModal } from '../widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal'; import { CataloguGroupTabs, type CatalogueGroupTabKey } from '../widgets/CataloguGroupTabs/CataloguGroupTabs'; import { CompanyGroupHeader } from '../widgets/CatalogueGroupHeader/CatalogueGroupHeader'; import { CatalogueJurForm } from '../widgets/CatalogueJurForm/CatalogueJurForm'; @@ -30,7 +31,6 @@ import { CompanyGroupsList } from '../widgets/CompanyGroupsList/CompanyGroupsLis import { CreateEntityPickerModal } from '../widgets/CreateEntityPickerModal/CreateEntityPickerModal'; import { RelatedGroupForm } from '../widgets/RelatedGroupForm/RelatedGroupForm'; import { RelatedGroupTable } from '../widgets/RelatedGroupTable/RelatedGroupTable'; -import { ArchiveCompanyGroupModal } from '../widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal'; export function CatalogueGroup() { const dispatch = useAppDispatch(); diff --git a/web/src/services/api/directories/company_groups.ts b/web/src/services/api/directories/company_groups.ts index 75df33c..de847e3 100644 --- a/web/src/services/api/directories/company_groups.ts +++ b/web/src/services/api/directories/company_groups.ts @@ -1,5 +1,5 @@ import { api } from '../../../api/client'; -import { GetCompanyGroupsPropsI } from '../../../store/slices/companyGroupsSlice/types'; +import type { GetCompanyGroupsPropsI } from '../../../store/slices/companyGroupsSlice/types'; import type { LegalEntityBrief, Page, RelatedGroupDetail, RelatedGroupOut } from '../../../types/api'; import type { CompanyGroupFormProps, ICompanyGroupOut } from '../../../types/companyGroups/companyGroups'; diff --git a/web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts b/web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts index 0529e70..eb5fe97 100644 --- a/web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts +++ b/web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts @@ -1,4 +1,4 @@ -import { createSlice, PayloadAction } from '@reduxjs/toolkit'; +import { type PayloadAction, createSlice } from '@reduxjs/toolkit'; import { getCompanyGroupsThunk } from './thunks'; import type { CompanyGroupSliceType } from './types'; diff --git a/web/src/store/slices/companyGroupsSlice/thunks.ts b/web/src/store/slices/companyGroupsSlice/thunks.ts index 042e5e0..ff8779b 100644 --- a/web/src/store/slices/companyGroupsSlice/thunks.ts +++ b/web/src/store/slices/companyGroupsSlice/thunks.ts @@ -1,7 +1,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import { fetchCompanyGroups } from '../../../services/api/directories/company_groups'; import { type ICompanyGroup, toCompanyGroupRow } from '../../../types/companyGroups/companyGroups'; -import { GetCompanyGroupsPropsI } from './types'; +import type { GetCompanyGroupsPropsI } from './types'; export const getCompanyGroupsThunk = createAsyncThunk( 'company_groups/getAll', diff --git a/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx b/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx index 6e9e50d..3e80a24 100644 --- a/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx +++ b/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx @@ -1,10 +1,10 @@ +import { CheckCircleOutlined, DeleteOutlined, EditOutlined, EllipsisOutlined, HistoryOutlined } from '@ant-design/icons'; import { Button, Dropdown, Space } from 'antd'; import Text from 'antd/es/typography/Text'; import Title from 'antd/es/typography/Title'; +import { useNavigate } from 'react-router-dom'; import { useAppSelector } from '../../store/store'; import { pluralRu } from '../../utils/labels'; -import { CheckCircleOutlined, DeleteOutlined, EditOutlined, EllipsisOutlined, HistoryOutlined } from '@ant-design/icons'; -import { useNavigate } from 'react-router-dom'; interface CompanyGroupHeaderI { setDeleteConfirmOpen: (el: boolean) => void; diff --git a/web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx b/web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx index b25529f..e7df042 100644 --- a/web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx +++ b/web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx @@ -3,10 +3,10 @@ import type React from 'react'; import { useEffect, useState } from 'react'; import { ApiError } from '../../api/client'; import { useMe } from '../../auth/useMe'; +import { fetchOneCompanyGroup } from '../../services/api/directories/company_groups'; import type { CompanyGroupFormProps } from '../../types/companyGroups/companyGroups'; import { useNotificationApi } from '../../utils/useNotification'; import { loadOffices } from '../Admin/UsersTable'; -import { fetchOneCompanyGroup } from '../../services/api/directories/company_groups'; type Props = { open: boolean; diff --git a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx b/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx index c723ad1..91a30f3 100644 --- a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx +++ b/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx @@ -3,9 +3,9 @@ import { Checkbox, Empty, Input, List, Space, Spin, Tag, Typography } from 'antd import { useEffect, useMemo, useState } from 'react'; import { useVirtualList } from '../../hooks/useVirtualList'; import { setActiveCompanyGroup } from '../../store/slices/catalogueJurSlice/catalogueJurSlice'; +import { setIsGettingArchive } from '../../store/slices/companyGroupsSlice/companyGroupsSlice'; import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; import { useAppDispatch, useAppSelector } from '../../store/store'; -import { setIsGettingArchive } from '../../store/slices/companyGroupsSlice/companyGroupsSlice'; const { Text } = Typography;