From 02afd444885d6544b38688e04cc7bca9d366e4bb Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 19 Aug 2024 18:32:21 +0300
Subject: [PATCH] M: Minor UI fixes and coverage fix

---
 rsconcept/frontend/src/components/select/PickSubstitutions.tsx | 2 +-
 rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx          | 3 ++-
 .../frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx      | 2 +-
 .../pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx   | 2 +-
 scripts/dev/RunCoverage.ps1                                    | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx b/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
index 0540bca7..f802febe 100644
--- a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
+++ b/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
@@ -159,7 +159,7 @@ function PickSubstitutions({
         id: 'right_alias',
         size: 65,
         cell: props => (
-          <BadgeConstituenta theme={colors} value={props.row.original.original} prefixID={`${prefixID}_1_`} />
+          <BadgeConstituenta theme={colors} value={props.row.original.original} prefixID={`${prefixID}_2_`} />
         )
       }),
       columnHelper.accessor(item => item.original_source.alias, {
diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx b/rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx
index 2f8f09de..c4ee051c 100644
--- a/rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx
@@ -45,6 +45,7 @@ function DlgDeleteOperation({ hideWindow, target, onSubmit }: DlgDeleteOperation
         titleHtml='Наследованные конституенты <br/>превратятся в дописанные'
         value={keepConstituents}
         setValue={setKeepConstituents}
+        disabled={target.result === null}
       />
       <Checkbox
         label='Удалить схему'
@@ -55,7 +56,7 @@ function DlgDeleteOperation({ hideWindow, target, onSubmit }: DlgDeleteOperation
         }
         value={deleteSchema}
         setValue={setDeleteSchema}
-        disabled={!target.is_owned || target.result === undefined}
+        disabled={!target.is_owned || target.result === null}
       />
     </Modal>
   );
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
index 0ffdf3c5..e315ce16 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
@@ -357,7 +357,7 @@ function OssFlow({ isModified, setIsModified }: OssFlowProps) {
         fitView
         nodeTypes={OssNodeTypes}
         maxZoom={2}
-        minZoom={0.75}
+        minZoom={0.5}
         nodesConnectable={false}
         snapToGrid={true}
         snapGrid={[PARAMETER.ossGridSize, PARAMETER.ossGridSize]}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 3c977fb4..2d1ebc14 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -220,7 +220,7 @@ function FormConstituenta({
               label={isBasic ? 'Конвенция' : 'Комментарий'}
               placeholder={isBasic ? 'Договоренность об интерпретации' : 'Пояснение разработчика'}
               value={convention}
-              disabled={disabled}
+              disabled={disabled || (isBasic && state?.is_inherited)}
               rows={convention.length > 2 * ROW_SIZE_IN_CHARACTERS || convention.includes('\n') ? 4 : 2}
               onChange={event => setConvention(event.target.value)}
             />
diff --git a/scripts/dev/RunCoverage.ps1 b/scripts/dev/RunCoverage.ps1
index 724670ba..573762a7 100644
--- a/scripts/dev/RunCoverage.ps1
+++ b/scripts/dev/RunCoverage.ps1
@@ -11,7 +11,7 @@ function BackendCoverage() {
 
   $coverageExec = "$backend\venv\Scripts\coverage.exe"
   $djangoSrc = "$backend\manage.py"
-  $exclude = '*/venv/*,*/tests/*,*/migrations/*,*__init__.py,manage.py,apps.py,urls.py,settings.py'
+  $exclude = '*/venv/*,*/tests/*,*/migrations/*,*__init__.py,shared/*,manage.py,apps.py,urls.py,settings.py,admin.py'
 
   & $coverageExec run --omit=$exclude $djangoSrc test
   & $coverageExec report