Minor UI fixes

rsconcept/frontend/src/components/Common/MiniButton.tsx

@@ -2,13 +2,14 @@ interface MiniButtonProps
 extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'className' | 'title' > {
   icon?: React.ReactNode
   tooltip?: string
+  noHover?: boolean
 }
 
-function MiniButton({ icon, tooltip, children, ...props }: MiniButtonProps) {
+function MiniButton({ icon, tooltip, children, noHover, ...props }: MiniButtonProps) {
   return (
     <button type='button'
       title={tooltip}
-      className='px-1 py-1 font-bold rounded-full cursor-pointer whitespace-nowrap disabled:cursor-not-allowed clr-btn-clear'
+      className={`px-1 py-1 font-bold rounded-full cursor-pointer whitespace-nowrap disabled:cursor-not-allowed clr-btn-clear ${noHover ? '' : 'clr-hover'}`}
       {...props}
     >
       {icon && <span>{icon}</span>}

rsconcept/frontend/src/index.css

@@ -79,7 +79,7 @@
   }
 
   .clr-hover {
-    @apply hover:bg-gray-50 hover:text-gray-700 dark:hover:text-white dark:hover:bg-gray-500
+    @apply hover:bg-gray-200 hover:text-gray-700 dark:hover:text-white dark:hover:bg-gray-500
   }
 
   .clr-btn-primary {
@@ -99,7 +99,7 @@
 
   /* Transparent button */
   .clr-btn-clear {
-    @apply hover:bg-gray-300 dark:hover:bg-gray-400 dark:disabled:text-zinc-400 disabled:text-gray-400 text-gray-500 dark:text-zinc-200
+    @apply dark:disabled:text-zinc-400 disabled:text-gray-400 text-gray-500 dark:text-zinc-200
   }
 
   .clr-checkbox {

rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx

@@ -0,0 +1,74 @@
+import { useEffect, useState } from 'react';
+
+import ConceptSelect from '../../components/Common/ConceptSelect';
+import Modal from '../../components/Common/Modal';
+import TextInput from '../../components/Common/TextInput';
+import { CstType, ICstRenameData } from '../../utils/models';
+import { CstTypeSelector, getCstTypeLabel } from '../../utils/staticUI';
+
+interface DlgRenameCstProps {
+  hideWindow: () => void
+  initial: ICstRenameData
+  onRename: (data: ICstRenameData) => void
+}
+
+function DlgRenameCst({ hideWindow, initial, onRename }: DlgRenameCstProps) {
+  const [validated, setValidated] = useState(false);
+  const [cstType, setCstType] = useState<CstType>(CstType.BASE);
+  const [cstID, setCstID] = useState(0)
+  const [alias, setAlias] = useState('');
+
+  function getData(): ICstRenameData {
+    return {
+      cst_type: cstType,
+      alias: alias,
+      id: cstID
+    }
+  }
+
+  const handleSubmit = () => {
+    onRename(getData());
+  };
+
+  useEffect(() => {
+    if (initial) {
+      setCstType(initial.cst_type);
+      setAlias(initial.alias);
+      setCstID(initial.id);
+    }
+  }, [initial]);
+
+  useEffect(() => {
+    // setValidated(selectedType !== undefined);
+    setValidated(true)
+  }, [cstType, alias]
+  );
+
+  return (
+    <Modal
+      title='Создание конституенты'
+      hideWindow={hideWindow}
+      canSubmit={validated}
+      onSubmit={handleSubmit}
+    >
+      <div className='h-fit w-[20rem] px-2 mb-2 flex flex-col justify-stretch'>
+      <div className='flex justify-center w-full'>
+      <ConceptSelect
+        className='my-2 min-w-[15rem] self-center'
+        options={CstTypeSelector}
+        placeholder='Выберите тип'
+        values={cstType ? [{ value: cstType, label: getCstTypeLabel(cstType) }] : []}
+        onChange={data => { setCstType(data.length > 0 ? data[0].value : CstType.BASE); }}
+      />
+      </div>
+      <TextInput id='alias'
+        label='Имя конституенты'
+        value={alias}
+        onChange={event => setAlias(event.target.value)}
+      />
+      </div>
+    </Modal>
+  );
+}
+
+export default DlgRenameCst;

rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx

@@ -7,10 +7,10 @@ import MiniButton from '../../components/Common/MiniButton';
 import SubmitButton from '../../components/Common/SubmitButton';
 import TextArea from '../../components/Common/TextArea';
 import CstStatusInfo from '../../components/Help/InfoCstStatus';
-import { DumpBinIcon, HelpIcon, SaveIcon, SmallPlusIcon } from '../../components/Icons';
+import { DumpBinIcon, HelpIcon, PenIcon, SaveIcon, SmallPlusIcon } from '../../components/Icons';
 import { useRSForm } from '../../context/RSFormContext';
 import { CstType, EditMode, ICstCreateData, ICstUpdateData, SyntaxTree } from '../../utils/models';
-import { getCstTypeLabel, getCstTypificationLabel } from '../../utils/staticUI';
+import { getCstTypificationLabel } from '../../utils/staticUI';
 import EditorRSExpression from './EditorRSExpression';
 import ViewSideConstituents from './elements/ViewSideConstituents';
 
@@ -36,7 +36,6 @@ function EditorConstituenta({ activeID, onShowAST, onCreateCst, onOpenEdit, onDe
   const [editMode, setEditMode] = useState(EditMode.TEXT);
 
   const [alias, setAlias] = useState('');
-  const [type, setType] = useState('');
   const [term, setTerm] = useState('');
   const [textDefinition, setTextDefinition] = useState('');
   const [expression, setExpression] = useState('');
@@ -63,7 +62,6 @@ function EditorConstituenta({ activeID, onShowAST, onCreateCst, onOpenEdit, onDe
   useLayoutEffect(() => {
     if (activeCst) {
       setAlias(activeCst.alias);
-      setType(getCstTypeLabel(activeCst.cstType));
       setConvention(activeCst.convention ?? '');
       setTerm(activeCst.term?.raw ?? '');
       setTextDefinition(activeCst.definition?.text?.raw ?? '');
@@ -117,44 +115,21 @@ function EditorConstituenta({ activeID, onShowAST, onCreateCst, onOpenEdit, onDe
     toast.info('Переименование в разработке');
   }
 
-  function handleChangeType() {
-    toast.info('Изменение типа в разработке');
-  }
-
   return (
     <div className='flex items-stretch w-full gap-2 mb-2 justify-stretch'>
       <form onSubmit={handleSubmit} className='min-w-[50rem] max-w-min px-4 py-2 border'>
-        <div className='flex items-start justify-between'>
+        <div className='relative'>
-            <button type='submit'
+          <div className='absolute top-0 left-0'>
-              title='Сохранить изменения'
+        <MiniButton 
-              className='px-1 py-1 font-bold border rounded whitespace-nowrap disabled:cursor-not-allowed clr-btn-primary'
+          tooltip='Сохранить изменения'
           disabled={!isModified || !isEnabled}
+          icon={<SaveIcon size={6} color={isModified && isEnabled ? 'text-primary' : ''}/>}
         >
-              <SaveIcon size={5} />
+        </MiniButton>
-            </button>
-          <div className='flex items-start justify-center w-full gap-4'>
-            <span className='mr-12'>
-              <label
-                title='Переименовать конституенту'
-                className='font-semibold underline cursor-pointer'
-                onClick={handleRename}
-              >
-                ID
-              </label>
-              <b className='ml-2'>{alias}</b>
-            </span>
-            <span>
-              <label
-                title='Изменить тип конституенты'
-                className='font-semibold underline cursor-pointer'
-                onClick={handleChangeType}
-              >
-                Тип
-              </label>
-              <span className='ml-2'>{type}</span>
-            </span>
         </div>
-          <div className='flex justify-end'>
+        </div>
+        <div className='relative'>
+        <div className='absolute top-0 right-0 flex justify-end'>
           <MiniButton
             tooltip='Удалить редактируемую конституенту'
             disabled={!isEnabled}
@@ -188,6 +163,19 @@ function EditorConstituenta({ activeID, onShowAST, onCreateCst, onOpenEdit, onDe
           </ConceptTooltip>
         </div>
         </div>
+        <div className='flex items-center justify-center w-full pr-10'>
+          <div className='font-semibold w-fit'>
+            <span className=''>Конституента </span>
+            <span className='ml-4'>{alias}</span>
+          </div>
+          <MiniButton
+            tooltip='Переименовать конституету'
+            disabled={!isEnabled}
+            noHover
+            onClick={handleRename}
+            icon={<PenIcon size={4} color={isEnabled ? 'text-primary' : ''} />}
+          />
+        </div>
         <TextArea id='term' label='Термин'
           placeholder='Схемный или предметный термин, обозначающий данное понятие или утверждение'
           rows={2}

rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx

@@ -305,13 +305,15 @@ function EditorItems({ onOpenEdit, onCreateCst, onDeleteCst }: EditorItemsProps)
           {(Object.values(CstType)).map(
             (typeStr) => {
               const type = typeStr as CstType;
-              return <Button key={type}
+              return (
+              <Button key={type}
                 text={`${getCstTypePrefix(type)}`}
                 tooltip={getCstTypeShortcut(type)}
                 dense
+                widthClass='w-[1.4rem]'
                 disabled={!isEditable}
                 onClick={() => handleCreateCst(type)}
-              />;
+              />);
           })}
           <div id='items-table-help'>
             <HelpIcon color='text-primary' size={6} />

rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx

@@ -187,7 +187,7 @@ function EditorRSExpression({
   return (
     <div className='flex flex-col items-start [&:not(:first-child)]:mt-3 w-full min-h-[15.75rem]'>
       <div className='relative w-full'>
-      <div className='absolute top-[-0.3rem] right-0'>
+      <div className='absolute top-[-0.1rem] right-0'>
       <StatusBar
         isModified={isModified}
         constituenta={activeCst}