From 9338f7bd7386f5fb3175357046e502cc07705033 Mon Sep 17 00:00:00 2001 From: Grog Date: Tue, 27 Oct 2026 17:11:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B0=D1=80=D1=85=D0=B8=D0=B2?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B7=D0=B0=D1=80=D1=85?= =?UTF-8?q?=D0=B8=D0=B2=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B3=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx | 2 +- .../widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx b/web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx index 150f608..786aff1 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={{ danger: true }} + okButtonProps={isArchived ? undefined : { danger: true }} confirmLoading={loading} centered>

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

diff --git a/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx b/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx index c1e6eb3..6e9e50d 100644 --- a/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx +++ b/web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx @@ -3,7 +3,7 @@ import Text from 'antd/es/typography/Text'; import Title from 'antd/es/typography/Title'; import { useAppSelector } from '../../store/store'; import { pluralRu } from '../../utils/labels'; -import { DeleteOutlined, EditOutlined, EllipsisOutlined, HistoryOutlined } from '@ant-design/icons'; +import { CheckCircleOutlined, DeleteOutlined, EditOutlined, EllipsisOutlined, HistoryOutlined } from '@ant-design/icons'; import { useNavigate } from 'react-router-dom'; interface CompanyGroupHeaderI { @@ -34,9 +34,9 @@ export const CompanyGroupHeader = ({ setEditFormOpen, setDeleteConfirmOpen }: Co }, { key: 'delete', - icon: , + icon: activeCompanyGroup?.is_archived ? : , label: activeCompanyGroup?.is_archived ? 'Разархивировать' : 'Архивировать', - danger: true, + danger: activeCompanyGroup?.is_archived ? false : true, onClick: () => { setDeleteConfirmOpen(true); },