From c97dae223b0f6abce65f0311c1a8d21903993d43 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 21 Aug 2024 17:06:32 +0300
Subject: [PATCH] B: Fix empty constituenta tooltip bug

---
 .../EditorConstituenta/ControlsOverlay.tsx    |  4 +-
 .../EditorConstituenta/FormConstituenta.tsx   | 50 ++++++++++---------
 .../frontend/src/pages/RSFormPage/RSTabs.tsx  |  2 -
 .../TableSideConstituents.tsx                 |  4 +-
 4 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
index b9ed14bc..85cc3bd5 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
@@ -7,7 +7,7 @@ import { IConstituenta } from '@/models/rsform';
 import { tooltips } from '@/utils/labels';
 
 interface ControlsOverlayProps {
-  constituenta?: IConstituenta;
+  constituenta: IConstituenta;
   disabled: boolean;
   modified: boolean;
   processing: boolean;
@@ -37,7 +37,7 @@ function ControlsOverlay({ constituenta, disabled, modified, processing, onRenam
         )}
       >
         <span>Имя </span>
-        <span className='ml-1'>{constituenta?.alias ?? ''}</span>
+        <span className='ml-1'>{constituenta.alias}</span>
       </div>
       {!disabled || processing ? (
         <MiniButton
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 2d1ebc14..3821b570 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -134,14 +134,16 @@ function FormConstituenta({
 
   return (
     <AnimateFade className='mx-0 md:mx-auto'>
-      <ControlsOverlay
-        disabled={disabled}
-        modified={isModified}
-        processing={processing}
-        constituenta={state}
-        onEditTerm={onEditTerm}
-        onRename={onRename}
-      />
+      {state ? (
+        <ControlsOverlay
+          disabled={disabled}
+          modified={isModified}
+          processing={processing}
+          constituenta={state}
+          onEditTerm={onEditTerm}
+          onRename={onRename}
+        />
+      ) : null}
       <form
         id={id}
         className={clsx('cc-column', 'mt-1 w-full md:w-[48.8rem] shrink-0', 'px-6 py-1')}
@@ -157,23 +159,25 @@ function FormConstituenta({
           onOpenEdit={onOpenEdit}
           value={term}
           initialValue={state?.term_raw ?? ''}
-          resolved={state?.term_resolved ?? ''}
+          resolved={state?.term_resolved ?? 'Конституента не выбрана'}
           disabled={disabled}
           onChange={newValue => setTerm(newValue)}
         />
-        <TextArea
-          id='cst_typification'
-          rows={typification.length > ROW_SIZE_IN_CHARACTERS ? 2 : 1}
-          dense
-          noResize
-          noBorder
-          disabled={true}
-          label='Типизация'
-          value={typification}
-          colors='clr-app clr-text-default'
-        />
+        {state ? (
+          <TextArea
+            id='cst_typification'
+            rows={typification.length > ROW_SIZE_IN_CHARACTERS ? 2 : 1}
+            dense
+            noResize
+            noBorder
+            disabled={true}
+            label='Типизация'
+            value={typification}
+            colors='clr-app clr-text-default'
+          />
+        ) : null}
         <AnimatePresence>
-          <AnimateFade key='cst_expression_fade' hideContent={!!state && !state?.definition_formal && isElementary}>
+          <AnimateFade key='cst_expression_fade' hideContent={!state || (!state?.definition_formal && isElementary)}>
             <EditorRSExpression
               id='cst_expression'
               label={
@@ -197,7 +201,7 @@ function FormConstituenta({
               onOpenEdit={onOpenEdit}
             />
           </AnimateFade>
-          <AnimateFade key='cst_definition_fade' hideContent={!!state && !state?.definition_raw && isElementary}>
+          <AnimateFade key='cst_definition_fade' hideContent={!state || (!state?.definition_raw && isElementary)}>
             <RefsInput
               id='cst_definition'
               label='Текстовое определение'
@@ -213,7 +217,7 @@ function FormConstituenta({
               onChange={newValue => setTextDefinition(newValue)}
             />
           </AnimateFade>
-          <AnimateFade key='cst_convention_fade' hideContent={!showConvention}>
+          <AnimateFade key='cst_convention_fade' hideContent={!showConvention || !state}>
             <TextArea
               id='cst_convention'
               spellCheck
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
index d51d4b42..146bdee5 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
@@ -79,8 +79,6 @@ function RSTabs() {
       const cstID = Number(cstQuery);
       if (cstID && schema?.cstByID.has(cstID)) {
         setSelected([cstID]);
-      } else if (schema && schema?.items.length > 0) {
-        setSelected([schema.items[0].id]);
       } else {
         setSelected([]);
       }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
index ddd01e97..65615f7d 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
@@ -126,13 +126,13 @@ function TableSideConstituents({
   const conditionalRowStyles = useMemo(
     (): IConditionalStyle<IConstituenta>[] => [
       {
-        when: (cst: IConstituenta) => cst.id === activeCst?.id,
+        when: (cst: IConstituenta) => !!activeCst && cst.id === activeCst?.id,
         style: {
           backgroundColor: colors.bgSelected
         }
       },
       {
-        when: (cst: IConstituenta) => cst.parent === activeCst?.id && cst.id !== activeCst?.id,
+        when: (cst: IConstituenta) => !!activeCst && cst.parent === activeCst?.id && cst.id !== activeCst?.id,
         style: {
           backgroundColor: colors.bgOrange50
         }