From 4e657925f858f5758b6738d42c6c4e0cf1651458 Mon Sep 17 00:00:00 2001 From: Grog Date: Fri, 30 Oct 2026 10:27:43 +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/App.css | 29 +++++++++---------- web/src/layouts/ConsolidationsList.tsx | 4 +-- web/src/widgets/Admin/CreateUserModal.tsx | 2 +- .../ArchiveCompanyGroupModal.tsx | 2 +- .../CompanyGroupForm/CompanyGroupForm.tsx | 4 +-- .../CatalogueJurForm/CatalogueJurForm.tsx | 4 +-- .../CatalogueJurMoveForm.tsx | 4 +-- .../CatalogueJurWithdrawForm.tsx | 5 ++-- .../ConsoleLegalEntities/ChecklistModal.tsx | 2 +- .../ConsoleLegalEntities.tsx | 2 +- web/src/widgets/ConsoleTable/LockModal.tsx | 2 +- .../ConsolidatedOsv/CounterpartyMapModal.tsx | 2 +- web/src/widgets/ConsolidatedOsv/OsvTabs.tsx | 2 +- .../widgets/DocumentReview/ChecksPanel.tsx | 5 ++-- web/src/widgets/FilesDrawer/DeleteModal.tsx | 2 +- .../widgets/FilesDrawer/ReplaceDocModal.tsx | 3 +- .../FilesDrawer/UploadDocumentsModal.tsx | 5 ++-- .../NewConsoleModal/NewConsoleModal.tsx | 5 ++-- .../DeleteRelatedGroupModal.tsx | 3 +- .../RelatedGroupForm/RelatedGroupForm.tsx | 8 ++--- .../StatusChangeModal/ChangeStatusModal.tsx | 4 +-- 21 files changed, 46 insertions(+), 53 deletions(-) diff --git a/web/src/App.css b/web/src/App.css index e729c53..a1afa57 100644 --- a/web/src/App.css +++ b/web/src/App.css @@ -6,42 +6,41 @@ border-radius: 999px !important; } - /* кастомные стили для модального окна */ -.ant-modal-container{ +.ant-modal-container { padding: 0 !important; - } -.ant-modal-header, .ant-modal-body, .ant-modal-footer{ +.ant-modal-header, +.ant-modal-body, +.ant-modal-footer { padding: 16px !important; } -.ant-modal-header{ - border-bottom: 1px solid #f0f0f0 !important; +.ant-modal-header { + border-bottom: 1px solid #f0f0f0 !important; } -.ant-modal-close{ +.ant-modal-close { padding: 4px !important; - } /* */ /* стили кастомного сегмента */ -.customSegment .ant-segmented-item{ +.customSegment .ant-segmented-item { margin-right: 8px; padding: 5px 8px; } .customSegment .ant-segmented-item-selected { - background-color: #ecfdf3 !important; - color: #1f5f35 !important; - box-shadow: inset 0 0 0 1px #2ea64b38 !important; + background-color: #ecfdf3 !important; + color: #1f5f35 !important; + box-shadow: inset 0 0 0 1px #2ea64b38 !important; } .customSegment .ant-segmented-thumb { - background-color: #ecfdf3 !important; - box-shadow: inset 0 0 0 1px #2ea64b38 !important; + background-color: #ecfdf3 !important; + box-shadow: inset 0 0 0 1px #2ea64b38 !important; } .customSegment .ant-segmented-item:focus-visible { - outline: none !important; + outline: none !important; } /* */ diff --git a/web/src/layouts/ConsolidationsList.tsx b/web/src/layouts/ConsolidationsList.tsx index f6da044..9ea8fe4 100644 --- a/web/src/layouts/ConsolidationsList.tsx +++ b/web/src/layouts/ConsolidationsList.tsx @@ -92,7 +92,7 @@ export function ConsolidationPage() { display: 'flex', flexDirection: 'column', minHeight: 0, - borderRadius:12 + borderRadius: 12, }}> {/* после «Взять в работу» перечитываем и панель «Организации»: в ней «Ответственный» */} setReloadKey((k) => k + 1)} /> @@ -107,7 +107,7 @@ export function ConsolidationPage() { display: 'flex', flexDirection: 'column', minHeight: 0, - borderRadius:12 + borderRadius: 12, }}> diff --git a/web/src/widgets/Admin/CreateUserModal.tsx b/web/src/widgets/Admin/CreateUserModal.tsx index f281e68..b43f991 100644 --- a/web/src/widgets/Admin/CreateUserModal.tsx +++ b/web/src/widgets/Admin/CreateUserModal.tsx @@ -2,8 +2,8 @@ import { Form, Input, Modal, Select } from 'antd'; import { useRef, useState } from 'react'; import { ApiError, api } from '../../api/client'; import type { AdminUser, BusinessSegment, RegionalOffice, Role, UserCreate } from '../../api/types'; -import { useMountedRef, useNotifyError } from './hooks'; import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; +import { useMountedRef, useNotifyError } from './hooks'; type Props = { open: boolean; diff --git a/web/src/widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx b/web/src/widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx index 899ecbf..055a580 100644 --- a/web/src/widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx +++ b/web/src/widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx @@ -21,7 +21,7 @@ export const ArchiveCompanyGroupModal: React.FC = ({ open, onCancel, onOk okButtonProps={isArchived ? undefined : { danger: true }} confirmLoading={loading} centered - closeIcon={}> + closeIcon={}>

{isArchived ? 'Группа компаний вернётся из архива в список действующих.' : 'Группа компаний будет перенесена в архив.'}

diff --git a/web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx b/web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx index 481be85..88791ee 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 CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; 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 CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; type Props = { open: boolean; @@ -112,7 +112,7 @@ export const CompanyGroupForm: React.FC = ({ open, onCancel, onOk, compan confirmLoading={confirmLoading} width={720} centered - closeIcon={}> + closeIcon={}>
diff --git a/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx index f6af4d0..42104c5 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, Modal, Row, Select } from 'antd'; import type React from 'react'; import { useEffect, useMemo, useState } from 'react'; import { ApiError } from '../../../api/client'; +import CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; 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 CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; type Props = { open: boolean; @@ -166,7 +166,7 @@ export const CatalogueJurForm: React.FC = ({ open, onCancel, onOk, jurId confirmLoading={confirmLoading} loading={initialDataLoading} centered - closeIcon={}> + closeIcon={}> diff --git a/web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx index 412cb0e..c9c6cb7 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 CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; 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 CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; type FormValues = { name: string; @@ -97,7 +97,7 @@ export const MoveCatalogueJurForm: React.FC = ({ open, onCancel, onOk, ju loading={initialDataLoading} confirmLoading={confirmLoading} centered - closeIcon={}> + closeIcon={}> diff --git a/web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx index 5f606cd..9960a1f 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 CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur'; import type { WithdrawCatalogueJurProps } from '../../../types/catalogueJur/catalogueJur'; import { useNotificationApi } from '../../../utils/useNotification'; -import CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; interface FormValues extends WithdrawCatalogueJurProps { name: string; @@ -89,7 +89,8 @@ export const WithdrawCatalogueJurForm: React.FC = ({ open, onCancel, onOk loading={initialDataLoading} confirmLoading={confirmLoading} okButtonProps={{ danger: true }} - centered closeIcon={}> + centered + closeIcon={}> diff --git a/web/src/widgets/ConsoleLegalEntities/ChecklistModal.tsx b/web/src/widgets/ConsoleLegalEntities/ChecklistModal.tsx index 848088d..72e9ecc 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 { Modal, Table, message } from 'antd'; import { useEffect, useMemo, useState } from 'react'; import { ApiError } from '../../api/client'; +import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; import { getChecklist } from '../../services/api/consolidations'; import type { ChecklistBackendShape, IVersionCard } from '../../types/consolidations/version_members'; import { buildChecklistColumns, buildChecklistRows, getMarksItems } from './checklist_utils'; -import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; type ChecklistProps = { open: boolean; diff --git a/web/src/widgets/ConsoleLegalEntities/ConsoleLegalEntities.tsx b/web/src/widgets/ConsoleLegalEntities/ConsoleLegalEntities.tsx index 0e68c84..39ae782 100644 --- a/web/src/widgets/ConsoleLegalEntities/ConsoleLegalEntities.tsx +++ b/web/src/widgets/ConsoleLegalEntities/ConsoleLegalEntities.tsx @@ -98,7 +98,7 @@ export function ConsoleLegalEntitiesTable({ onDrawerOpen, reloadKey }: { onDrawe color: '#667085', justifyContent: 'center', borderTop: '1px solid #f1f5f9', - borderRadius:12, + borderRadius: 12, }}> Выберите консолидацию выше diff --git a/web/src/widgets/ConsoleTable/LockModal.tsx b/web/src/widgets/ConsoleTable/LockModal.tsx index 8273717..81b78db 100644 --- a/web/src/widgets/ConsoleTable/LockModal.tsx +++ b/web/src/widgets/ConsoleTable/LockModal.tsx @@ -1,12 +1,12 @@ import { Alert, Button, Input, Modal, Skeleton, message } from 'antd'; import { useCallback, useEffect, useRef, useState } from 'react'; import { ApiError } from '../../api/client'; +import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; 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 CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; type LockModalProps = { versionId: string | null; diff --git a/web/src/widgets/ConsolidatedOsv/CounterpartyMapModal.tsx b/web/src/widgets/ConsolidatedOsv/CounterpartyMapModal.tsx index f3651e3..8366be1 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 CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; 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 CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; const SEARCH_DELAY_MS = 300; diff --git a/web/src/widgets/ConsolidatedOsv/OsvTabs.tsx b/web/src/widgets/ConsolidatedOsv/OsvTabs.tsx index 6024b66..24e5a17 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, Modal, Segmented, Tooltip } from 'antd'; import { useEffect, useRef, useState } from 'react'; import { useLocation, useNavigate, useParams } from 'react-router-dom'; +import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; 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 CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; const TAB_CONFIG = [ { key: 'osv', label: 'ОСВ' }, diff --git a/web/src/widgets/DocumentReview/ChecksPanel.tsx b/web/src/widgets/DocumentReview/ChecksPanel.tsx index 25b2dd5..0b9a536 100644 --- a/web/src/widgets/DocumentReview/ChecksPanel.tsx +++ b/web/src/widgets/DocumentReview/ChecksPanel.tsx @@ -1,8 +1,8 @@ import { Alert, Button, Input, Modal, Space, Tooltip, Typography } from 'antd'; import { useState } from 'react'; +import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; import type { ChecksOut, FailedCheckOut } from '../../types/api'; import { expectedActualText, failureKey, failureText } from './checkText'; -import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; type Props = { checks: ChecksOut; @@ -95,8 +95,7 @@ export function ChecksPanel({ checks, editable, dirty, onAccept, onShow }: Props cancelText='Отмена' confirmLoading={saving} centered - closeIcon={} - + closeIcon={} okButtonProps={{ disabled: comment.trim().length === 0 }} onOk={submit} onCancel={() => setOpen(false)}> diff --git a/web/src/widgets/FilesDrawer/DeleteModal.tsx b/web/src/widgets/FilesDrawer/DeleteModal.tsx index d24008c..34c0d31 100644 --- a/web/src/widgets/FilesDrawer/DeleteModal.tsx +++ b/web/src/widgets/FilesDrawer/DeleteModal.tsx @@ -1,9 +1,9 @@ import { Button, Modal, Tooltip, Typography, message, theme } from 'antd'; import { type ReactNode, useState } from 'react'; import { ApiError } from '../../api/client'; +import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; import { removeFile } from '../../services/api/files'; import type { DocumentRow } from './documentRows'; -import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; const { Text } = Typography; diff --git a/web/src/widgets/FilesDrawer/ReplaceDocModal.tsx b/web/src/widgets/FilesDrawer/ReplaceDocModal.tsx index 5fc87b0..55ea20d 100644 --- a/web/src/widgets/FilesDrawer/ReplaceDocModal.tsx +++ b/web/src/widgets/FilesDrawer/ReplaceDocModal.tsx @@ -37,8 +37,7 @@ export default function ReplaceDocModal({ open, docName, organizationName, submi icon: , disabled: file === null || reason.trim().length === 0, }} - closeIcon={} - + closeIcon={} centered confirmLoading={submitting}>
diff --git a/web/src/widgets/FilesDrawer/UploadDocumentsModal.tsx b/web/src/widgets/FilesDrawer/UploadDocumentsModal.tsx index dd18f61..7b69950 100644 --- a/web/src/widgets/FilesDrawer/UploadDocumentsModal.tsx +++ b/web/src/widgets/FilesDrawer/UploadDocumentsModal.tsx @@ -3,8 +3,8 @@ import { Alert, Button, Modal, Typography, Upload, message } from 'antd'; import type { UploadFile } from 'antd/es/upload/interface'; import { useState } from 'react'; import { ApiError } from '../../api/client'; -import { summarizeUpload, uploadFiles } from '../../services/api/files'; import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; +import { summarizeUpload, uploadFiles } from '../../services/api/files'; type Props = { legalEntityId: string; @@ -60,8 +60,7 @@ export function UploadDocumentsModal({ legalEntityId, consolidationId, organizat disabled: !summary && fileList.length === 0, style: { background: summary || fileList.length > 0 ? '#237804' : undefined }, }} - closeIcon={} - + closeIcon={} centered cancelText='Отмена' confirmLoading={uploading} diff --git a/web/src/widgets/NewConsoleModal/NewConsoleModal.tsx b/web/src/widgets/NewConsoleModal/NewConsoleModal.tsx index bfd18f5..e046ea1 100644 --- a/web/src/widgets/NewConsoleModal/NewConsoleModal.tsx +++ b/web/src/widgets/NewConsoleModal/NewConsoleModal.tsx @@ -3,6 +3,7 @@ import { Col, Form, Modal, Row, Select, message } from 'antd'; import type React from 'react'; import { useEffect, useMemo, useRef, useState } from 'react'; import { ApiError } from '../../api/client'; +import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; import { useBeforeUnload } from '../../hooks/useBeforeUnload'; import { fetchAllLegalEntities, fetchRelatedGroup, fetchRelatedGroups } from '../../services/api/directories/company_groups'; import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; @@ -11,7 +12,6 @@ import type { ConsolidationCreate, LegalEntityBrief, Quarter, RelatedGroupOut } import { MIN_PERIMETER } from '../../utils/consolidations'; import { CompanyMultiSelect } from './CompanyOptionRow'; import { membersFirst, preselectMembers } from './preselect'; -import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; type Props = { open: boolean; @@ -159,8 +159,7 @@ export const NewConsolidationModal: React.FC = ({ open, onCancel, onOk }) destroyOnHidden width={640} centered - closeIcon={} -> + closeIcon={}> diff --git a/web/src/widgets/RelatedGroup/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx b/web/src/widgets/RelatedGroup/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx index 7357f0d..4cd1892 100644 --- a/web/src/widgets/RelatedGroup/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx +++ b/web/src/widgets/RelatedGroup/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx @@ -20,8 +20,7 @@ export const DeleteRelatedGroupModal: React.FC = ({ open, onCancel, onOk, cancelText='Отмена' okButtonProps={{ danger: true }} confirmLoading={loading} - closeIcon={} - + closeIcon={} centered>

Группа связанных {kind === 'gsk' ? 'компаний' : 'заёмщиков'} будет удалена.

diff --git a/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx b/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx index 9f068f0..aa2c30c 100644 --- a/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx +++ b/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx @@ -4,12 +4,12 @@ import dayjs from 'dayjs'; import type React from 'react'; import { useEffect, useMemo, useState } from 'react'; import { ApiError } from '../../../api/client'; +import CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; 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 CustomModalCloseIcon from '../../../components/CustomModalCloseIcon'; type Props = { open: boolean; @@ -110,10 +110,8 @@ export const RelatedGroupForm: React.FC = ({ open, onCancel, onOk, relate destroyOnHidden loading={initialDataLoading} confirmLoading={confirmLoading} - closeIcon={} - - centered - > + closeIcon={} + centered> diff --git a/web/src/widgets/StatusChangeModal/ChangeStatusModal.tsx b/web/src/widgets/StatusChangeModal/ChangeStatusModal.tsx index a01052a..09ad582 100644 --- a/web/src/widgets/StatusChangeModal/ChangeStatusModal.tsx +++ b/web/src/widgets/StatusChangeModal/ChangeStatusModal.tsx @@ -1,6 +1,7 @@ import { Form, Input, Modal, Select, message } from 'antd'; import { useState } from 'react'; import { ApiError } from '../../api/client'; +import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; import { TableTag } from '../../components/TableTag/TableTag'; import { useBeforeUnload } from '../../hooks/useBeforeUnload'; import { updateStatus } from '../../services/api/consolidations'; @@ -9,7 +10,6 @@ import type { ConsStatus } from '../../types/consolidations/common_types'; import type { VersionCard } from '../../types/consolidations/version_members'; import { CONS_STATUS_LABEL, MAX_REASON_LENGTH, canSubmitStatusChange, manualTransitions } from '../../utils/consolidations'; import { statusColorMapping } from '../ConsoleTable/consts'; -import CustomModalCloseIcon from '../../components/CustomModalCloseIcon'; type StatusModalProps = { open: boolean; @@ -66,7 +66,7 @@ export default function ChangeStatusModal({ open, card, onClose, onSuccess }: St onCancel={() => !submitting && onClose()} destroyOnHidden centered - closeIcon={}> + closeIcon={}>
Текущий этап