From 6e8801628d64d8bf9b934fa52df21e131cc19157 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sat, 6 Apr 2024 22:36:37 +0300
Subject: [PATCH] Small UI fixes

---
 .../src/components/info/InfoConstituenta.tsx  | 35 ++++++++++---------
 .../src/pages/RSFormPage/RSTabsMenu.tsx       |  2 +-
 rsconcept/frontend/src/utils/codemirror.ts    | 19 +++++++++-
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/rsconcept/frontend/src/components/info/InfoConstituenta.tsx b/rsconcept/frontend/src/components/info/InfoConstituenta.tsx
index a6c5d14c..c2559a56 100644
--- a/rsconcept/frontend/src/components/info/InfoConstituenta.tsx
+++ b/rsconcept/frontend/src/components/info/InfoConstituenta.tsx
@@ -1,6 +1,7 @@
 import clsx from 'clsx';
 
 import { IConstituenta } from '@/models/rsform';
+import { isBasicConcept } from '@/models/rsformAPI';
 import { labelCstTypification } from '@/utils/labels';
 
 import { CProps } from '../props';
@@ -13,26 +14,14 @@ function InfoConstituenta({ data, className, ...restProps }: InfoConstituentaPro
   return (
     <div className={clsx('dense min-w-[15rem]', className)} {...restProps}>
       <h2>Конституента {data.alias}</h2>
-      {data.derived_from_alias ? (
-        <p>
-          <b>Основание: </b>
-          {data.derived_from_alias}
-        </p>
-      ) : null}
-      {data.derived_children_alias.length > 0 ? (
-        <p>
-          <b>Порождает: </b>
-          {data.derived_children_alias.join(', ')}
-        </p>
-      ) : null}
-      <p>
-        <b>Типизация: </b>
-        {labelCstTypification(data)}
-      </p>
       <p>
         <b>Термин: </b>
         {data.term_resolved || data.term_raw}
       </p>
+      <p>
+        <b>Типизация: </b>
+        {labelCstTypification(data)}
+      </p>
       {data.definition_formal ? (
         <p>
           <b>Выражение: </b>
@@ -45,9 +34,21 @@ function InfoConstituenta({ data, className, ...restProps }: InfoConstituentaPro
           {data.definition_resolved}
         </p>
       ) : null}
+      {data.derived_from_alias ? (
+        <p>
+          <b>Основание: </b>
+          {data.derived_from_alias}
+        </p>
+      ) : null}
+      {data.derived_children_alias.length > 0 ? (
+        <p>
+          <b>Порождает: </b>
+          {data.derived_children_alias.join(', ')}
+        </p>
+      ) : null}
       {data.convention ? (
         <p>
-          <b>Конвенция: </b>
+          <b>{isBasicConcept(data.cst_type) ? 'Конвенция' : 'Комментарий'}: </b>
           {data.convention}
         </p>
       ) : null}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
index 37a1c2d4..a4dfcf8a 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
@@ -249,7 +249,7 @@ function RSTabsMenu({ onDestroy }: RSTabsMenuProps) {
           tabIndex={-1}
           titleHtml='<b>Архив</b>: Редактирование запрещено<br />Перейти к актуальной версии'
           hideTitle={accessMenu.isOpen}
-          className='h-full'
+          className='h-full px-2'
           icon={<LuArchive size='1.25rem' className='icon-primary' />}
           onClick={() => controller.viewVersion(undefined)}
         />
diff --git a/rsconcept/frontend/src/utils/codemirror.ts b/rsconcept/frontend/src/utils/codemirror.ts
index 643cee2e..671966b1 100644
--- a/rsconcept/frontend/src/utils/codemirror.ts
+++ b/rsconcept/frontend/src/utils/codemirror.ts
@@ -9,6 +9,7 @@ import clsx from 'clsx';
 import { IEntityReference, ISyntacticReference } from '@/models/language';
 import { parseGrammemes } from '@/models/languageAPI';
 import { IConstituenta } from '@/models/rsform';
+import { isBasicConcept } from '@/models/rsformAPI';
 
 import { colorFgGrammeme, IColorTheme } from '../styling/color';
 import { describeConstituentaTerm, labelCstTypification, labelGrammeme } from './labels';
@@ -161,9 +162,25 @@ export function domTooltipConstituenta(cst?: IConstituenta) {
 
     if (cst.convention) {
       const convention = document.createElement('p');
-      convention.innerHTML = `<b>Конвенция:</b> ${cst.convention}`;
+      if (isBasicConcept(cst.cst_type)) {
+        convention.innerHTML = `<b>Конвенция:</b> ${cst.convention}`;
+      } else {
+        convention.innerHTML = `<b>Комментарий:</b> ${cst.convention}`;
+      }
       dom.appendChild(convention);
     }
+
+    if (cst.derived_from_alias) {
+      const derived = document.createElement('p');
+      derived.innerHTML = `<b>Основание:</b> ${cst.derived_from_alias}`;
+      dom.appendChild(derived);
+    }
+
+    if (cst.derived_children_alias.length > 0) {
+      const children = document.createElement('p');
+      children.innerHTML = `<b>Порождает:</b> ${cst.derived_children_alias.join(', ')}`;
+      dom.appendChild(children);
+    }
   } else {
     const text = document.createElement('p');
     text.innerText = 'Конституента не определена';