{isArchived ? 'Группа компаний вернётся из архива в список действующих.' : 'Группа компаний будет перенесена в архив.'}
diff --git a/web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx index 7399fb8..fe8520a 100644 --- a/web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx +++ b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx @@ -3,11 +3,11 @@ import type React from 'react'; import { useEffect, useState } from 'react'; import { ApiError } from '../../../api/client'; import { useMe } from '../../../auth/useMe'; +import { AppModal } from '../../../components/AppModal/AppModal'; 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 { AppModal } from '../../../components/AppModal/AppModal'; type Props = { open: boolean; diff --git a/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx index 6b98f34..afce0b8 100644 --- a/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx +++ b/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx @@ -2,6 +2,7 @@ import { Col, Form, Input, Row, Select } from 'antd'; import type React from 'react'; import { useEffect, useMemo, useState } from 'react'; import { ApiError } from '../../../api/client'; +import { AppModal } from '../../../components/AppModal/AppModal'; import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur'; import { fetchRelatedGroups } from '../../../services/api/directories/company_groups'; import { useAppSelector } from '../../../store/store'; @@ -9,7 +10,6 @@ import type { RelatedGroupOut } from '../../../types/api'; import type { CatalogueJurFormProps } from '../../../types/catalogueJur/catalogueJur'; import { useNotificationApi } from '../../../utils/useNotification'; import { loadOffices } from '../../Admin/UsersTable'; -import { AppModal } from '../../../components/AppModal/AppModal'; type Props = { open: boolean; diff --git a/web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx index 1ce0136..cf1b1c6 100644 --- a/web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx +++ b/web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx @@ -4,12 +4,12 @@ import dayjs from 'dayjs'; import type React from 'react'; import { useEffect, useState } from 'react'; import { ApiError } from '../../../api/client'; +import { AppModal } from '../../../components/AppModal/AppModal'; 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 { AppModal } from '../../../components/AppModal/AppModal'; type FormValues = { name: string; diff --git a/web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx index 82480a7..c43430f 100644 --- a/web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx +++ b/web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx @@ -5,10 +5,10 @@ import dayjs from 'dayjs'; import type React from 'react'; import { useEffect, useState } from 'react'; import { ApiError } from '../../../api/client'; +import { AppModal } from '../../../components/AppModal/AppModal'; import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur'; import type { WithdrawCatalogueJurProps } from '../../../types/catalogueJur/catalogueJur'; import { useNotificationApi } from '../../../utils/useNotification'; -import { AppModal } from '../../../components/AppModal/AppModal'; interface FormValues extends WithdrawCatalogueJurProps { name: string; diff --git a/web/src/widgets/ConsoleLegalEntities/ChecklistModal.tsx b/web/src/widgets/ConsoleLegalEntities/ChecklistModal.tsx index 13b5911..cf6c7f5 100644 --- a/web/src/widgets/ConsoleLegalEntities/ChecklistModal.tsx +++ b/web/src/widgets/ConsoleLegalEntities/ChecklistModal.tsx @@ -2,10 +2,10 @@ import { DownloadOutlined } from '@ant-design/icons'; import { Table, message } from 'antd'; import { useEffect, useMemo, useState } from 'react'; import { ApiError } from '../../api/client'; +import { AppModal } from '../../components/AppModal/AppModal'; import { getChecklist } from '../../services/api/consolidations'; import type { ChecklistBackendShape, IVersionCard } from '../../types/consolidations/version_members'; import { buildChecklistColumns, buildChecklistRows, getMarksItems } from './checklist_utils'; -import { AppModal } from '../../components/AppModal/AppModal'; type ChecklistProps = { open: boolean; diff --git a/web/src/widgets/ConsoleTable/LockModal.tsx b/web/src/widgets/ConsoleTable/LockModal.tsx index 9fd18c8..d65b122 100644 --- a/web/src/widgets/ConsoleTable/LockModal.tsx +++ b/web/src/widgets/ConsoleTable/LockModal.tsx @@ -1,12 +1,12 @@ import { Alert, Button, Input, Skeleton, message } from 'antd'; import { useCallback, useEffect, useRef, useState } from 'react'; import { ApiError } from '../../api/client'; +import { AppModal } from '../../components/AppModal/AppModal'; import { useBeforeUnload } from '../../hooks/useBeforeUnload'; import { getVersionCard, lockVersion } from '../../services/api/consolidations'; import type { LockOut } from '../../types/consolidations/common_types'; import { MAX_REASON_LENGTH, endSentence, isValidReason } from '../../utils/consolidations'; import { quarterShortLabel } from '../../utils/labels'; -import { AppModal } from '../../components/AppModal/AppModal'; type LockModalProps = { versionId: string | null; diff --git a/web/src/widgets/ConsolidatedOsv/CounterpartyMapModal.tsx b/web/src/widgets/ConsolidatedOsv/CounterpartyMapModal.tsx index 9ad6b38..712aceb 100644 --- a/web/src/widgets/ConsolidatedOsv/CounterpartyMapModal.tsx +++ b/web/src/widgets/ConsolidatedOsv/CounterpartyMapModal.tsx @@ -3,6 +3,7 @@ import { Button, Checkbox, Input, Modal, Table, message } from 'antd'; import type { TableColumnsType } from 'antd'; import { useEffect, useRef, useState } from 'react'; import { ApiError } from '../../api/client'; +import { AppModal } from '../../components/AppModal/AppModal'; import { getVersionCard, lockVersion } from '../../services/api/consolidations'; import { getCounterpartyCandidates, mapCounterparty } from '../../services/api/osv'; import type { CandidateOut, CandidateScope, ConsolidatedRowOut, RefOut } from '../../types/api'; @@ -19,7 +20,6 @@ import { mapResultText, pairCandidateRows, } from './counterpartyMapping'; -import { AppModal } from '../../components/AppModal/AppModal'; const SEARCH_DELAY_MS = 300; diff --git a/web/src/widgets/ConsolidatedOsv/OsvTabs.tsx b/web/src/widgets/ConsolidatedOsv/OsvTabs.tsx index 649be2d..2a810cb 100644 --- a/web/src/widgets/ConsolidatedOsv/OsvTabs.tsx +++ b/web/src/widgets/ConsolidatedOsv/OsvTabs.tsx @@ -2,6 +2,7 @@ import { WarningOutlined } from '@ant-design/icons'; import { Button, Segmented, Tooltip } from 'antd'; import { useEffect, useRef, useState } from 'react'; import { useLocation, useNavigate, useParams } from 'react-router-dom'; +import { AppModal } from '../../components/AppModal/AppModal'; import { getOsvSummary } from '../../services/api/osv'; import type { CounterPairOut, OsvSummaryOut } from '../../types/api'; import type { ConsStatus } from '../../types/consolidations/common_types'; @@ -13,7 +14,6 @@ import { resolveLeaveAfterFetch, } from '../../utils/consolidations'; import { pairsViewSearch } from './counterPairs'; -import { AppModal } from '../../components/AppModal/AppModal'; const TAB_CONFIG = [ { key: 'osv', label: 'ОСВ' }, diff --git a/web/src/widgets/CreateEntityPickerModal/CreateEntityPickerModal.tsx b/web/src/widgets/CreateEntityPickerModal/CreateEntityPickerModal.tsx index dcfdfa1..fff1635 100644 --- a/web/src/widgets/CreateEntityPickerModal/CreateEntityPickerModal.tsx +++ b/web/src/widgets/CreateEntityPickerModal/CreateEntityPickerModal.tsx @@ -45,12 +45,7 @@ type Props = { export const CreateEntityPickerModal: React.FC