diff --git a/web/src/layouts/CatalogueGroups.tsx b/web/src/layouts/CatalogueGroups.tsx index a4f39bf..e9d8d20 100644 --- a/web/src/layouts/CatalogueGroups.tsx +++ b/web/src/layouts/CatalogueGroups.tsx @@ -21,16 +21,19 @@ 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'; -import { CatalogueJurTable } from '../widgets/CatalogueJurTable/CatalogueJurTable'; -import { CompanyGroupForm } from '../widgets/CompanyGroupForm/CompanyGroupForm'; -import { CompanyGroupsList } from '../widgets/CompanyGroupsList/CompanyGroupsList'; +import { ArchiveCompanyGroupModal } from '../widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal'; +import { CompanyGroupHeader } from '../widgets/CatalogueCompanyGroup/CatalogueCompanyGroupHeader/CatalogueCompanyGroupHeader'; +import { + type CatalogueCompanyGroupTabKey, + CatalogueCompanyGroupTabs, +} from '../widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs'; +import { CompanyGroupForm } from '../widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm'; +import { CompanyGroupsList } from '../widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList'; +import { CatalogueJurForm } from '../widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm'; +import { CatalogueJurTable } from '../widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable'; import { CreateEntityPickerModal } from '../widgets/CreateEntityPickerModal/CreateEntityPickerModal'; -import { RelatedGroupForm } from '../widgets/RelatedGroupForm/RelatedGroupForm'; -import { RelatedGroupTable } from '../widgets/RelatedGroupTable/RelatedGroupTable'; +import { RelatedGroupForm } from '../widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm'; +import { RelatedGroupTable } from '../widgets/RelatedGroup/RelatedGroupTable/RelatedGroupTable'; export function CatalogueGroup() { const dispatch = useAppDispatch(); @@ -44,7 +47,7 @@ export function CatalogueGroup() { const [companyGroupEditFormOpen, setCompanyGroupEditFormOpen] = useState(false); const [companyGroupDeleteOpen, setCompanyGroupDeleteOpen] = useState(false); const [companyGroupDeleteLoading, setCompanyGroupDeleteLoading] = useState(false); - const [activeTab, setActiveTab] = useState('legal_entities'); + const [activeTab, setActiveTab] = useState('legal_entities'); const [gskData, setGskData] = useState([]); const [gszData, setGszData] = useState([]); const activeCompanyGroup = useAppSelector((state) => state.catalogue_jur.activeCompanyGroup); @@ -186,7 +189,12 @@ export function CatalogueGroup() { setActiveTab(val)} gskData={gskData} gszData={gszData} /> + setActiveTab(val)} + gskData={gskData} + gszData={gszData} + /> } /> )} @@ -196,7 +204,12 @@ export function CatalogueGroup() { data={activeTab === 'gsz' ? gszData : gskData} getData={() => getRelatedGroupsHandler()} tabsComponent={ - setActiveTab(val)} gskData={gskData} gszData={gszData} /> + setActiveTab(val)} + gskData={gskData} + gszData={gszData} + /> } loading={relatedGroupLoading} /> diff --git a/web/src/layouts/CatalogueJur.tsx b/web/src/layouts/CatalogueJur.tsx index 8919f11..537dd33 100644 --- a/web/src/layouts/CatalogueJur.tsx +++ b/web/src/layouts/CatalogueJur.tsx @@ -6,8 +6,8 @@ import { createCatalogueJur } from '../services/api/directories/catalogue_jur'; import { getCatalogueJurThunk } from '../store/slices/catalogueJurSlice/thunks'; import { useAppDispatch, useAppSelector } from '../store/store'; import type { CatalogueJurFormProps } from '../types/catalogueJur/catalogueJur'; -import { CatalogueJurForm } from '../widgets/CatalogueJurForm/CatalogueJurForm'; -import { CatalogueJurTable } from '../widgets/CatalogueJurTable/CatalogueJurTable'; +import { CatalogueJurForm } from '../widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm'; +import { CatalogueJurTable } from '../widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable'; export function CatalogueJur() { const dispatch = useAppDispatch(); diff --git a/web/src/layouts/ConsolidationReportPage.tsx b/web/src/layouts/ConsolidationReportPage.tsx index 187a12a..fb5a054 100644 --- a/web/src/layouts/ConsolidationReportPage.tsx +++ b/web/src/layouts/ConsolidationReportPage.tsx @@ -12,9 +12,9 @@ import type { VersionCard } from '../types/consolidations/version_members'; import { CONS_STATUS_LABEL, canChangeStatus, consStatusDescription, isLockedBy } from '../utils/consolidations'; import { quarterShortLabel } from '../utils/labels'; import { statusColorMapping } from '../widgets/ConsoleTable/consts'; -import { ChessContent } from '../widgets/ConsolidatedChessContent/ConsolidatedChessContent'; import { OsvTabs } from '../widgets/ConsolidatedOsv/OsvTabs'; import { OsvContent } from '../widgets/ConsolidatedOsvContent/ConsolidatedOsvContent'; +import { ChessContent } from '../widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent'; import ChangeStatusModal from '../widgets/StatusChangeModal/ChangeStatusModal'; function ReportContent() { diff --git a/web/src/layouts/Groups.tsx b/web/src/layouts/Groups.tsx index 16e7e70..c13c8ef 100644 --- a/web/src/layouts/Groups.tsx +++ b/web/src/layouts/Groups.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react'; import PageTitle from '../components/PageTitle'; import { useAppSelector } from '../store/store'; -import { CompanyGroupsTable } from '../widgets/CompanyGroupsTable/CompanyGroupsTable'; +import { CompanyGroupsTable } from '../widgets/CatalogueCompanyGroup/CompanyGroupsTable/CompanyGroupsTable'; export function GroupsLayout() { const totalGroupsNum = useAppSelector((state) => state.company_groups.total_groups); diff --git a/web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx b/web/src/widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx similarity index 100% rename from web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx rename to web/src/widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx diff --git a/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupHeader/CatalogueCompanyGroupHeader.tsx similarity index 93% rename from web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx rename to web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupHeader/CatalogueCompanyGroupHeader.tsx index b7c1bf4..f7cbb6e 100644 --- a/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx +++ b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupHeader/CatalogueCompanyGroupHeader.tsx @@ -3,8 +3,8 @@ 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 { useAppSelector } from '../../../store/store'; +import { pluralRu } from '../../../utils/labels'; interface CompanyGroupHeaderI { setDeleteConfirmOpen: (el: boolean) => void; @@ -36,7 +36,7 @@ export const CompanyGroupHeader = ({ setEditFormOpen, setDeleteConfirmOpen }: Co key: 'delete', icon: activeCompanyGroup?.is_archived ? : , label: activeCompanyGroup?.is_archived ? 'Разархивировать' : 'Архивировать', - danger: activeCompanyGroup?.is_archived, + danger: !activeCompanyGroup?.is_archived, onClick: () => { setDeleteConfirmOpen(true); }, diff --git a/web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.css b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.css similarity index 100% rename from web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.css rename to web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.css diff --git a/web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.tsx b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.tsx similarity index 53% rename from web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.tsx rename to web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.tsx index 679e474..4593d85 100644 --- a/web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.tsx +++ b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.tsx @@ -1,23 +1,23 @@ import { Tabs } from 'antd'; -import { useAppSelector } from '../../store/store'; -import type { RelatedGroupOut } from '../../types/api'; -import './CataloguGroupTabs.css'; +import { useAppSelector } from '../../../store/store'; +import type { RelatedGroupOut } from '../../../types/api'; +import './CatalogueCompanyGroupTabs.css'; interface CataloguGroupTabsI { - activeTab: CatalogueGroupTabKey; - setActiveTab: (val: CatalogueGroupTabKey) => void; + activeTab: CatalogueCompanyGroupTabKey; + setActiveTab: (val: CatalogueCompanyGroupTabKey) => void; gskData: RelatedGroupOut[]; gszData: RelatedGroupOut[]; } -export type CatalogueGroupTabKey = 'legal_entities' | 'gsk' | 'gsz'; +export type CatalogueCompanyGroupTabKey = 'legal_entities' | 'gsk' | 'gsz'; -export const CataloguGroupTabs = ({ activeTab, setActiveTab, gskData, gszData }: CataloguGroupTabsI) => { +export const CatalogueCompanyGroupTabs = ({ activeTab, setActiveTab, gskData, gszData }: CataloguGroupTabsI) => { const activeCompanyGroup = useAppSelector((state) => state.catalogue_jur.activeCompanyGroup); return ( setActiveTab(key as CatalogueGroupTabKey)} + onChange={(key) => setActiveTab(key as CatalogueCompanyGroupTabKey)} tabBarStyle={{ margin: 0, marginBottom: 0 }} style={{ marginBottom: 0 }} items={[ diff --git a/web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx similarity index 90% rename from web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx rename to web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx index e7df042..5f39795 100644 --- a/web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx +++ b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx @@ -1,12 +1,12 @@ import { Col, Form, Input, Modal, Row, Select } from 'antd'; 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 { 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'; type Props = { open: boolean; diff --git a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.css b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList.css similarity index 100% rename from web/src/widgets/CompanyGroupsList/CompanyGroupsList.css rename to web/src/widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList.css diff --git a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList.tsx similarity index 92% rename from web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx rename to web/src/widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList.tsx index 68d136f..5155763 100644 --- a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx +++ b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList.tsx @@ -1,11 +1,11 @@ import { FolderOpenOutlined, SearchOutlined } from '@ant-design/icons'; 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 { 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'; const { Text } = Typography; diff --git a/web/src/widgets/CompanyGroupsTable/CompanyGroupsTable.tsx b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupsTable/CompanyGroupsTable.tsx similarity index 87% rename from web/src/widgets/CompanyGroupsTable/CompanyGroupsTable.tsx rename to web/src/widgets/CatalogueCompanyGroup/CompanyGroupsTable/CompanyGroupsTable.tsx index a43905e..3865e48 100644 --- a/web/src/widgets/CompanyGroupsTable/CompanyGroupsTable.tsx +++ b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupsTable/CompanyGroupsTable.tsx @@ -3,11 +3,11 @@ import { Button, Input, Space, Tooltip } from 'antd'; import type { ColumnsType } from 'antd/es/table'; import { useEffect, useMemo } from 'react'; import { useNavigate } from 'react-router-dom'; -import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../components/GenericTable'; -import { useTableFilters } from '../../components/GenericTable/useTableFilters'; -import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; -import { useAppDispatch, useAppSelector } from '../../store/store'; -import type { ICompanyGroup } from '../../types/companyGroups/companyGroups'; +import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../../components/GenericTable'; +import { useTableFilters } from '../../../components/GenericTable/useTableFilters'; +import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks'; +import { useAppDispatch, useAppSelector } from '../../../store/store'; +import type { ICompanyGroup } from '../../../types/companyGroups/companyGroups'; import { groupsConfig } from './config'; export function CompanyGroupsTable() { diff --git a/web/src/widgets/CompanyGroupsTable/config.tsx b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupsTable/config.tsx similarity index 81% rename from web/src/widgets/CompanyGroupsTable/config.tsx rename to web/src/widgets/CatalogueCompanyGroup/CompanyGroupsTable/config.tsx index e7494ec..db4aa4b 100644 --- a/web/src/widgets/CompanyGroupsTable/config.tsx +++ b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupsTable/config.tsx @@ -1,5 +1,5 @@ -import type { TableConfig } from '../../components/GenericTable'; -import type { ICompanyGroup } from '../../types/companyGroups/companyGroups'; +import type { TableConfig } from '../../../components/GenericTable'; +import type { ICompanyGroup } from '../../../types/companyGroups/companyGroups'; export const groupsConfig: TableConfig = { rowKey: 'id', diff --git a/web/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx similarity index 94% rename from web/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx rename to web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx index 2a78176..bb98ed5 100644 --- a/web/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx +++ b/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx @@ -1,14 +1,14 @@ import { Col, Form, Input, Modal, Row, Select } from 'antd'; import type React from 'react'; import { useEffect, useMemo, useState } from 'react'; -import { ApiError } from '../../api/client'; -import { fetchOneCatalogueJur } from '../../services/api/directories/catalogue_jur'; -import { fetchRelatedGroups } from '../../services/api/directories/company_groups'; -import { useAppSelector } from '../../store/store'; -import type { RelatedGroupOut } from '../../types/api'; -import type { CatalogueJurFormProps } from '../../types/catalogueJur/catalogueJur'; -import { useNotificationApi } from '../../utils/useNotification'; -import { loadOffices } from '../Admin/UsersTable'; +import { ApiError } from '../../../api/client'; +import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur'; +import { fetchRelatedGroups } from '../../../services/api/directories/company_groups'; +import { useAppSelector } from '../../../store/store'; +import type { RelatedGroupOut } from '../../../types/api'; +import type { CatalogueJurFormProps } from '../../../types/catalogueJur/catalogueJur'; +import { useNotificationApi } from '../../../utils/useNotification'; +import { loadOffices } from '../../Admin/UsersTable'; type Props = { open: boolean; diff --git a/web/src/widgets/MoveCatalogueJurForm/MoveCatalogueJurForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx similarity index 89% rename from web/src/widgets/MoveCatalogueJurForm/MoveCatalogueJurForm.tsx rename to web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx index 4e68770..f7b16a5 100644 --- a/web/src/widgets/MoveCatalogueJurForm/MoveCatalogueJurForm.tsx +++ b/web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx @@ -3,12 +3,12 @@ import FormItem from 'antd/es/form/FormItem'; import dayjs from 'dayjs'; import type React from 'react'; import { useEffect, useState } from 'react'; -import { ApiError } from '../../api/client'; -import { fetchOneCatalogueJur } from '../../services/api/directories/catalogue_jur'; -import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; -import { useAppDispatch, useAppSelector } from '../../store/store'; -import type { MoveCatalogueJurProps } from '../../types/catalogueJur/catalogueJur'; -import { useNotificationApi } from '../../utils/useNotification'; +import { ApiError } from '../../../api/client'; +import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur'; +import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks'; +import { useAppDispatch, useAppSelector } from '../../../store/store'; +import type { MoveCatalogueJurProps } from '../../../types/catalogueJur/catalogueJur'; +import { useNotificationApi } from '../../../utils/useNotification'; type FormValues = { name: string; diff --git a/web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx b/web/src/widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable.tsx similarity index 90% rename from web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx rename to web/src/widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable.tsx index 0f1bfc2..90b0b94 100644 --- a/web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx +++ b/web/src/widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable.tsx @@ -11,25 +11,24 @@ import { Button, Checkbox, Dropdown, Input, Space } from 'antd'; import type { ColumnsType } from 'antd/es/table'; import { type ReactNode, useEffect, useMemo, useState } from 'react'; import { useNavigate } from 'react-router-dom'; -import { ApiError } from '../../api/client'; -import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../components/GenericTable'; -import { useTableFilters } from '../../components/GenericTable/useTableFilters'; -import { editCatalogueJur, moveCatalogueJur, withdrawCatalogueJur } from '../../services/api/directories/catalogue_jur'; -import { setIsGettingArchive, setRelatedGroupFilter } from '../../store/slices/catalogueJurSlice/catalogueJurSlice'; -import { getCatalogueJurThunk } from '../../store/slices/catalogueJurSlice/thunks'; -import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; -import { useAppDispatch, useAppSelector } from '../../store/store'; +import { ApiError } from '../../../api/client'; +import { ColumnSettings, DataTable, useFilteredRows, useTableFilters, useVisibleColumns } from '../../../components/GenericTable'; +import { editCatalogueJur, moveCatalogueJur, withdrawCatalogueJur } from '../../../services/api/directories/catalogue_jur'; +import { setIsGettingArchive, setRelatedGroupFilter } from '../../../store/slices/catalogueJurSlice/catalogueJurSlice'; +import { getCatalogueJurThunk } from '../../../store/slices/catalogueJurSlice/thunks'; +import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks'; +import { useAppDispatch, useAppSelector } from '../../../store/store'; import type { CatalogueJurFormProps, ICatalogueJur, MoveCatalogueJurProps, WithdrawCatalogueJurProps, -} from '../../types/catalogueJur/catalogueJur'; -import { pluralRu } from '../../utils/labels'; -import { useNotificationApi } from '../../utils/useNotification'; +} from '../../../types/catalogueJur/catalogueJur'; +import { pluralRu } from '../../../utils/labels'; +import { useNotificationApi } from '../../../utils/useNotification'; import { CatalogueJurForm } from '../CatalogueJurForm/CatalogueJurForm'; -import { MoveCatalogueJurForm } from '../MoveCatalogueJurForm/MoveCatalogueJurForm'; -import { WithdrawCatalogueJurForm } from '../WithdrawCatalogueJurForm/WithdrawCatalogueJurForm'; +import { MoveCatalogueJurForm } from '../CatalogueJurMoveForm/CatalogueJurMoveForm'; +import { WithdrawCatalogueJurForm } from '../CatalogueJurWithdrawForm/CatalogueJurWithdrawForm'; import { catalogueJurConfig } from './config'; interface CatalogueJurTableI { diff --git a/web/src/widgets/CatalogueJurTable/config.tsx b/web/src/widgets/CatalogueJur/CatalogueJurTable/config.tsx similarity index 87% rename from web/src/widgets/CatalogueJurTable/config.tsx rename to web/src/widgets/CatalogueJur/CatalogueJurTable/config.tsx index 4edc4bf..6b35a1e 100644 --- a/web/src/widgets/CatalogueJurTable/config.tsx +++ b/web/src/widgets/CatalogueJur/CatalogueJurTable/config.tsx @@ -1,7 +1,7 @@ -import type { TableConfig } from '../../components/GenericTable'; -import { TableTag } from '../../components/TableTag/TableTag'; -import { TAG_PRESETS } from '../../components/TableTag/presets'; -import type { ICatalogueJur } from '../../types/catalogueJur/catalogueJur'; +import type { TableConfig } from '../../../components/GenericTable'; +import { TableTag } from '../../../components/TableTag/TableTag'; +import { TAG_PRESETS } from '../../../components/TableTag/presets'; +import type { ICatalogueJur } from '../../../types/catalogueJur/catalogueJur'; export const catalogueJurConfig: TableConfig = { rowKey: 'id', diff --git a/web/src/widgets/WithdrawCatalogueJurForm/WithdrawCatalogueJurForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx similarity index 91% rename from web/src/widgets/WithdrawCatalogueJurForm/WithdrawCatalogueJurForm.tsx rename to web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx index 966f02d..bd776da 100644 --- a/web/src/widgets/WithdrawCatalogueJurForm/WithdrawCatalogueJurForm.tsx +++ b/web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx @@ -4,10 +4,10 @@ import TextArea from 'antd/es/input/TextArea'; import dayjs from 'dayjs'; import type React from 'react'; import { useEffect, useState } from 'react'; -import { ApiError } from '../../api/client'; -import { fetchOneCatalogueJur } from '../../services/api/directories/catalogue_jur'; -import type { WithdrawCatalogueJurProps } from '../../types/catalogueJur/catalogueJur'; -import { useNotificationApi } from '../../utils/useNotification'; +import { ApiError } from '../../../api/client'; +import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur'; +import type { WithdrawCatalogueJurProps } from '../../../types/catalogueJur/catalogueJur'; +import { useNotificationApi } from '../../../utils/useNotification'; interface FormValues extends WithdrawCatalogueJurProps { name: string; diff --git a/web/src/widgets/ConsolidatedChessContent/ConsolidatedChessContent.tsx b/web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx similarity index 96% rename from web/src/widgets/ConsolidatedChessContent/ConsolidatedChessContent.tsx rename to web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx index 8e38d37..e235781 100644 --- a/web/src/widgets/ConsolidatedChessContent/ConsolidatedChessContent.tsx +++ b/web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx @@ -2,7 +2,7 @@ import { DownloadOutlined, FullscreenExitOutlined, FullscreenOutlined } from '@a import { Button, ConfigProvider } from 'antd'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useParams } from 'react-router-dom'; -import { ApiError } from '../../api/client'; +import { ApiError } from '../../../api/client'; import { exportChessConsolidationsResult, exportChessTableAll, @@ -10,11 +10,11 @@ import { fetchChessConsolidations, fetchChessConsolidationsManual, fetchChessConsolidationsResult, -} from '../../services/api/intercompanyMatrix'; -import type { IntercompanyMatrixResponse, IntercompanyMatrixResultResponse } from '../../types/api'; -import type { VersionCard } from '../../types/consolidations/version_members'; -import { saveBlob, xlsxFilename } from '../../utils/download'; -import { useNotificationApi } from '../../utils/useNotification'; +} from '../../../services/api/intercompanyMatrix'; +import type { IntercompanyMatrixResponse, IntercompanyMatrixResultResponse } from '../../../types/api'; +import type { VersionCard } from '../../../types/consolidations/version_members'; +import { saveBlob, xlsxFilename } from '../../../utils/download'; +import { useNotificationApi } from '../../../utils/useNotification'; import { ConsolidationChessFormatTableFilter } from '../ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter'; import { ConsolidationChessResTable } from '../ConsolidationChessResTable/ConsolidationChessResTable'; import { ConsolidationChessTable } from '../ConsolidationChessTable/ConsolidationChessTable'; diff --git a/web/src/widgets/ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter.tsx b/web/src/widgets/ConsolidationChess/ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter.tsx similarity index 100% rename from web/src/widgets/ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter.tsx rename to web/src/widgets/ConsolidationChess/ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter.tsx diff --git a/web/src/widgets/ConsolidationChessResTable/ConsolidatedChessResTable.css b/web/src/widgets/ConsolidationChess/ConsolidationChessResTable/ConsolidatedChessResTable.css similarity index 100% rename from web/src/widgets/ConsolidationChessResTable/ConsolidatedChessResTable.css rename to web/src/widgets/ConsolidationChess/ConsolidationChessResTable/ConsolidatedChessResTable.css diff --git a/web/src/widgets/ConsolidationChessResTable/ConsolidationChessResTable.tsx b/web/src/widgets/ConsolidationChess/ConsolidationChessResTable/ConsolidationChessResTable.tsx similarity index 95% rename from web/src/widgets/ConsolidationChessResTable/ConsolidationChessResTable.tsx rename to web/src/widgets/ConsolidationChess/ConsolidationChessResTable/ConsolidationChessResTable.tsx index a8440de..b46eeac 100644 --- a/web/src/widgets/ConsolidationChessResTable/ConsolidationChessResTable.tsx +++ b/web/src/widgets/ConsolidationChess/ConsolidationChessResTable/ConsolidationChessResTable.tsx @@ -2,10 +2,10 @@ import { Table, Typography } from 'antd'; import type { ColumnsType } from 'antd/es/table'; import type React from 'react'; import { useMemo } from 'react'; -import type { IntercompanyMatrixResultResponse, MatrixResCell } from '../../types/api'; +import type { IntercompanyMatrixResultResponse, MatrixResCell } from '../../../types/api'; import './ConsolidatedChessResTable.css'; -import { chessTableCellFormatValue } from '../../utils/chessTableCellFormatValue'; -import { sumAmounts } from '../../utils/money'; +import { chessTableCellFormatValue } from '../../../utils/chessTableCellFormatValue'; +import { sumAmounts } from '../../../utils/money'; const { Text } = Typography; diff --git a/web/src/widgets/ConsolidationChessTable/ConsolidatedChessTable.css b/web/src/widgets/ConsolidationChess/ConsolidationChessTable/ConsolidatedChessTable.css similarity index 100% rename from web/src/widgets/ConsolidationChessTable/ConsolidatedChessTable.css rename to web/src/widgets/ConsolidationChess/ConsolidationChessTable/ConsolidatedChessTable.css diff --git a/web/src/widgets/ConsolidationChessTable/ConsolidationChessTable.tsx b/web/src/widgets/ConsolidationChess/ConsolidationChessTable/ConsolidationChessTable.tsx similarity index 96% rename from web/src/widgets/ConsolidationChessTable/ConsolidationChessTable.tsx rename to web/src/widgets/ConsolidationChess/ConsolidationChessTable/ConsolidationChessTable.tsx index a9d1cc4..7f8a8db 100644 --- a/web/src/widgets/ConsolidationChessTable/ConsolidationChessTable.tsx +++ b/web/src/widgets/ConsolidationChess/ConsolidationChessTable/ConsolidationChessTable.tsx @@ -3,10 +3,10 @@ import { Table, Tooltip, Typography } from 'antd'; import type { ColumnsType } from 'antd/es/table'; import type React from 'react'; import { useMemo } from 'react'; -import type { IntercompanyMatrixResponse, MatrixCell, MatrixCompany } from '../../types/api'; +import type { IntercompanyMatrixResponse, MatrixCell, MatrixCompany } from '../../../types/api'; import './ConsolidatedChessTable.css'; -import { chessTableCellFormatValue } from '../../utils/chessTableCellFormatValue'; -import { sumAmounts } from '../../utils/money'; +import { chessTableCellFormatValue } from '../../../utils/chessTableCellFormatValue'; +import { sumAmounts } from '../../../utils/money'; const { Text } = Typography; diff --git a/web/src/widgets/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx b/web/src/widgets/ConsolidationChess/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx similarity index 94% rename from web/src/widgets/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx rename to web/src/widgets/ConsolidationChess/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx index d9ab17b..fe3ff96 100644 --- a/web/src/widgets/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx +++ b/web/src/widgets/ConsolidationChess/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx @@ -1,11 +1,11 @@ import { Button, Select, Space } from 'antd'; import type React from 'react'; import { useEffect, useState } from 'react'; -import { ApiError, api } from '../../api/client'; -import { type OptionType, TreeFilterDropdown } from '../../components/TreeFilterDropdown/TreeFilterDropdown'; -import type { Account, MatrixCompany, Quarter } from '../../types/api'; -import { quarterShortLabel } from '../../utils/labels'; -import { useNotificationApi } from '../../utils/useNotification'; +import { ApiError, api } from '../../../api/client'; +import { type OptionType, TreeFilterDropdown } from '../../../components/TreeFilterDropdown/TreeFilterDropdown'; +import type { Account, MatrixCompany, Quarter } from '../../../types/api'; +import { quarterShortLabel } from '../../../utils/labels'; +import { useNotificationApi } from '../../../utils/useNotification'; interface ConsolidationChessTableFilterI { companies: string[]; diff --git a/web/src/widgets/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx b/web/src/widgets/RelatedGroup/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx similarity index 100% rename from web/src/widgets/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx rename to web/src/widgets/RelatedGroup/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx diff --git a/web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx b/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx similarity index 90% rename from web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx rename to web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx index b60cfea..7dc817e 100644 --- a/web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx +++ b/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx @@ -3,12 +3,12 @@ import FormItem from 'antd/es/form/FormItem'; import dayjs from 'dayjs'; import type React from 'react'; import { useEffect, useMemo, useState } from 'react'; -import { ApiError } from '../../api/client'; -import { fetchRelatedGroup } from '../../services/api/directories/company_groups'; -import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; -import { useAppDispatch, useAppSelector } from '../../store/store'; -import type { RelatedGroupFormType } from '../../types/relatedGroup/relatedGroup'; -import { useNotificationApi } from '../../utils/useNotification'; +import { ApiError } from '../../../api/client'; +import { fetchRelatedGroup } from '../../../services/api/directories/company_groups'; +import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks'; +import { useAppDispatch, useAppSelector } from '../../../store/store'; +import type { RelatedGroupFormType } from '../../../types/relatedGroup/relatedGroup'; +import { useNotificationApi } from '../../../utils/useNotification'; type Props = { open: boolean; diff --git a/web/src/widgets/RelatedGroupTable/RelatedGroupTable.tsx b/web/src/widgets/RelatedGroup/RelatedGroupTable/RelatedGroupTable.tsx similarity index 89% rename from web/src/widgets/RelatedGroupTable/RelatedGroupTable.tsx rename to web/src/widgets/RelatedGroup/RelatedGroupTable/RelatedGroupTable.tsx index d5819a4..1c45a40 100644 --- a/web/src/widgets/RelatedGroupTable/RelatedGroupTable.tsx +++ b/web/src/widgets/RelatedGroup/RelatedGroupTable/RelatedGroupTable.tsx @@ -2,13 +2,13 @@ import { DeleteOutlined, EditOutlined, EllipsisOutlined } from '@ant-design/icon import { Button, Dropdown, Space } from 'antd'; import type { ColumnsType } from 'antd/es/table'; import { type ReactNode, useMemo, useState } from 'react'; -import { ApiError } from '../../api/client'; -import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../components/GenericTable'; -import { useTableFilters } from '../../components/GenericTable/useTableFilters'; -import { deleteRelatedGroup, editRelatedGroup } from '../../services/api/directories/related-groups'; -import type { RelatedGroupOut } from '../../types/api'; -import type { RelatedGroupFormType } from '../../types/relatedGroup/relatedGroup'; -import { useNotificationApi } from '../../utils/useNotification'; +import { ApiError } from '../../../api/client'; +import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../../components/GenericTable'; +import { useTableFilters } from '../../../components/GenericTable/useTableFilters'; +import { deleteRelatedGroup, editRelatedGroup } from '../../../services/api/directories/related-groups'; +import type { RelatedGroupOut } from '../../../types/api'; +import type { RelatedGroupFormType } from '../../../types/relatedGroup/relatedGroup'; +import { useNotificationApi } from '../../../utils/useNotification'; import { DeleteRelatedGroupModal } from '../DeleteRelatedGroupModal/DeleteRelatedGroupModal'; import { RelatedGroupForm } from '../RelatedGroupForm/RelatedGroupForm'; import { relateGroupConfig } from './config'; diff --git a/web/src/widgets/RelatedGroupTable/config.tsx b/web/src/widgets/RelatedGroup/RelatedGroupTable/config.tsx similarity index 80% rename from web/src/widgets/RelatedGroupTable/config.tsx rename to web/src/widgets/RelatedGroup/RelatedGroupTable/config.tsx index fe4f8cb..4557126 100644 --- a/web/src/widgets/RelatedGroupTable/config.tsx +++ b/web/src/widgets/RelatedGroup/RelatedGroupTable/config.tsx @@ -1,9 +1,9 @@ import { VerticalAlignTopOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import type { TableConfig } from '../../components/GenericTable'; -import { setRelatedGroupFilter } from '../../store/slices/catalogueJurSlice/catalogueJurSlice'; -import { store } from '../../store/store'; -import type { RelatedGroupOut } from '../../types/api'; +import type { TableConfig } from '../../../components/GenericTable'; +import { setRelatedGroupFilter } from '../../../store/slices/catalogueJurSlice/catalogueJurSlice'; +import { store } from '../../../store/store'; +import type { RelatedGroupOut } from '../../../types/api'; export const relateGroupConfig: TableConfig = { rowKey: 'id', searchableKeys: ['code', 'crm_id', 'name', 'members_count', 'created_date'],