From dee49b789a865c35441047000dc1f26a57e40134 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Sat, 17 Aug 2024 23:43:15 +0300
Subject: [PATCH] M: Minor OSS UI fixes
---
rsconcept/frontend/src/components/Icons.tsx | 1 +
.../src/pages/OssPage/EditorOssGraph/OperationNode.tsx | 6 +++---
rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx | 6 +++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/rsconcept/frontend/src/components/Icons.tsx b/rsconcept/frontend/src/components/Icons.tsx
index 790bfbe5..e03267c2 100644
--- a/rsconcept/frontend/src/components/Icons.tsx
+++ b/rsconcept/frontend/src/components/Icons.tsx
@@ -64,6 +64,7 @@ export { IoLibrary as IconLibrary2 } from 'react-icons/io5';
export { BiDiamond as IconTemplates } from 'react-icons/bi';
export { TbHexagons as IconOSS } from 'react-icons/tb';
export { TbHexagon as IconRSForm } from 'react-icons/tb';
+export { TbTopologyRing as IconConsolidation } from 'react-icons/tb';
export { GrInherit as IconChild } from 'react-icons/gr';
export { RiParentLine as IconParent } from 'react-icons/ri';
export { BiSpa as IconPredecessor } from 'react-icons/bi';
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OperationNode.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OperationNode.tsx
index 1e5c8b14..e8055e89 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OperationNode.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OperationNode.tsx
@@ -1,6 +1,6 @@
import { Handle, Position } from 'reactflow';
-import { IconAlert, IconRSForm } from '@/components/Icons';
+import { IconConsolidation, IconRSForm } from '@/components/Icons';
import TooltipOperation from '@/components/info/TooltipOperation';
import MiniButton from '@/components/ui/MiniButton.tsx';
import Overlay from '@/components/ui/Overlay';
@@ -39,11 +39,11 @@ function OperationNode(node: OssNodeInternal) {
/>
{node.data.operation.is_consolidation ? (
}
+ icon={}
disabled
noPadding
noHover
- title='Внимание! Ромбовидный синтез'
+ titleHtml='Внимание!
Ромбовидный синтезВозможны дубликаты конституент'
hideTitle={!controller.showTooltip}
/>
) : null}
diff --git a/rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx b/rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx
index 201dabef..9726611b 100644
--- a/rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx
@@ -124,7 +124,11 @@ function MenuOssTabs({ onDestroy }: MenuOssTabsProps) {
onClick={editMenu.toggle}
/>
- операции над ОСС
+
) : null}