From 4ed6975d845e08edacf4743db18015ed3e4cfae8 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 30 Aug 2024 20:18:04 +0300
Subject: [PATCH] M: Small UI fixes

---
 .../src/components/info/InfoConstituenta.tsx      |  4 ++--
 .../src/components/select/PickConstituenta.tsx    |  1 +
 rsconcept/frontend/src/components/ui/Modal.tsx    |  7 ++++++-
 .../DlgConstituentaTemplate.tsx                   | 15 ++++++++++++++-
 .../RSFormPage/EditorRSList/EditorRSList.tsx      |  2 +-
 .../frontend/src/pages/RSFormPage/MenuRSTabs.tsx  |  2 +-
 rsconcept/frontend/src/utils/labels.ts            |  1 +
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/rsconcept/frontend/src/components/info/InfoConstituenta.tsx b/rsconcept/frontend/src/components/info/InfoConstituenta.tsx
index 4ab13c7a..2b4b8c83 100644
--- a/rsconcept/frontend/src/components/info/InfoConstituenta.tsx
+++ b/rsconcept/frontend/src/components/info/InfoConstituenta.tsx
@@ -12,7 +12,7 @@ interface InfoConstituentaProps extends CProps.Div {
 
 function InfoConstituenta({ data, className, ...restProps }: InfoConstituentaProps) {
   return (
-    <div className={clsx('dense min-w-[15rem]', className)} {...restProps}>
+    <div className={clsx('dense min-w-[15rem] break-words', className)} {...restProps}>
       <h2>
         {data.alias}
         {data.is_inherited ? ' (наследуется)' : ''}
@@ -28,7 +28,7 @@ function InfoConstituenta({ data, className, ...restProps }: InfoConstituentaPro
         <span className='font-math'>{labelCstTypification(data)}</span>
       </p>
       {data.definition_formal ? (
-        <p>
+        <p className='break-all'>
           <b>Выражение: </b>
           <span className='font-math'>{data.definition_formal}</span>
         </p>
diff --git a/rsconcept/frontend/src/components/select/PickConstituenta.tsx b/rsconcept/frontend/src/components/select/PickConstituenta.tsx
index 976c2f3b..c380d9e2 100644
--- a/rsconcept/frontend/src/components/select/PickConstituenta.tsx
+++ b/rsconcept/frontend/src/components/select/PickConstituenta.tsx
@@ -90,6 +90,7 @@ function PickConstituenta({
     <div className='border divide-y'>
       <SearchBar
         id={id ? `${id}__search` : undefined}
+        className='clr-input'
         noBorder
         value={filterText}
         onChange={newValue => setFilterText(newValue)}
diff --git a/rsconcept/frontend/src/components/ui/Modal.tsx b/rsconcept/frontend/src/components/ui/Modal.tsx
index a6aaa2b3..4e8ced08 100644
--- a/rsconcept/frontend/src/components/ui/Modal.tsx
+++ b/rsconcept/frontend/src/components/ui/Modal.tsx
@@ -24,6 +24,7 @@ export interface ModalProps extends CProps.Styling {
   overflowVisible?: boolean;
 
   hideWindow: () => void;
+  beforeSubmit?: () => boolean;
   onSubmit?: () => void;
   onCancel?: () => void;
 
@@ -33,6 +34,7 @@ export interface ModalProps extends CProps.Styling {
 function Modal({
   header,
   hideWindow,
+  beforeSubmit,
   onSubmit,
   readonly,
   onCancel,
@@ -53,8 +55,11 @@ function Modal({
   };
 
   const handleSubmit = () => {
-    hideWindow();
+    if (beforeSubmit && !beforeSubmit()) {
+      return;
+    }
     if (onSubmit) onSubmit();
+    hideWindow();
   };
 
   return (
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
index 57eb6ea3..e4841eac 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
@@ -16,6 +16,7 @@ import { CstType, ICstCreateData, IRSForm } from '@/models/rsform';
 import { generateAlias, validateNewAlias } from '@/models/rsformAPI';
 import { inferTemplatedType, substituteTemplateArgs } from '@/models/rslangAPI';
 import { PARAMETER } from '@/utils/constants';
+import { prompts } from '@/utils/labels';
 
 import FormCreateCst from '../DlgCreateCst/FormCreateCst';
 import TabArguments, { IArgumentsState } from './TabArguments';
@@ -55,7 +56,18 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }:
   });
 
   const [validated, setValidated] = useState(false);
-  const handleSubmit = () => onCreate(constituenta);
+
+  function handleSubmit() {
+    onCreate(constituenta);
+  }
+
+  function handlePrompt(): boolean {
+    const definedSomeArgs = substitutes.arguments.some(arg => !!arg.value);
+    if (!definedSomeArgs && !window.confirm(prompts.templateUndefined)) {
+      return false;
+    }
+    return true;
+  }
 
   useLayoutEffect(() => {
     if (!template.templateID) {
@@ -151,6 +163,7 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }:
       className='w-[43rem] h-[36.5rem] px-6'
       hideWindow={hideWindow}
       canSubmit={validated}
+      beforeSubmit={handlePrompt}
       onSubmit={handleSubmit}
     >
       <Overlay position='top-0 right-[6rem]'>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx
index 739cb45a..23f73fc6 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/EditorRSList.tsx
@@ -158,7 +158,7 @@ function EditorRSList({ onOpenEdit }: EditorRSListProps) {
           </div>
         ) : null}
 
-        <Overlay position='top-[0.25rem] right-[1rem]' layer='z-navigation'>
+        <Overlay position='top-[0.25rem] right-[1rem]' layer='z-tooltip'>
           <MiniButton
             title='Выгрузить в формате CSV'
             icon={<IconCSV size='1.25rem' className='icon-green' />}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx
index 1f85ca3b..688c490f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx
@@ -254,7 +254,7 @@ function MenuRSTabs({ onDestroy }: MenuRSTabsProps) {
               text='Порождение структуры'
               titleHtml='Раскрыть структуру типизации <br/>выделенной конституенты'
               icon={<IconGenerateStructure size='1rem' className='icon-primary' />}
-              disabled={!controller.isContentEditable || !controller.canProduceStructure}
+              disabled={!controller.isContentEditable || !controller.canProduceStructure || controller.isProcessing}
               onClick={handleProduceStructure}
             />
             <DropdownButton
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index 3000c859..87370027 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -1013,6 +1013,7 @@ export const prompts = {
     'Внимание!!\nУдаление операционной схемы приведет к удалению всех операций и собственных концептуальных схем.\nДанное действие нельзя отменить.\nВы уверены, что хотите удалить данную ОСС?',
   generateWordforms: 'Данное действие приведет к перезаписи словоформ при совпадении граммем. Продолжить?',
   restoreArchive: 'При восстановлении архивной версии актуальная схему будет заменена. Продолжить?',
+  templateUndefined: 'Вы уверены, что хотите создать шаблонную конституенту не фиксируя аргументы?',
   ownerChange:
     'Вы уверены, что хотите изменить владельца? Вы потеряете право управления данной схемой. Данное действие отменить нельзя'
 };