From 67eff6c9fc198823c6baa18d4d5f31aea5d237c9 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 11 Sep 2023 17:56:32 +0300
Subject: [PATCH] Small fixes

---
 README.md                                              |  1 -
 .../backend/apps/rsform/migrations/0001_initial.py     |  2 +-
 rsconcept/backend/apps/rsform/models.py                |  2 +-
 rsconcept/frontend/src/components/Common/Modal.tsx     |  4 ++--
 rsconcept/frontend/src/components/RSInput/index.tsx    |  4 +++-
 rsconcept/frontend/src/index.css                       |  8 +++++---
 .../frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx   |  7 +++----
 .../frontend/src/pages/RSFormPage/DlgCreateCst.tsx     |  8 ++++----
 .../frontend/src/pages/RSFormPage/DlgDeleteCst.tsx     |  6 +++---
 .../frontend/src/pages/RSFormPage/DlgGraphOptions.tsx  |  6 +++---
 .../frontend/src/pages/RSFormPage/DlgRenameCst.tsx     | 10 +++++-----
 rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx |  6 +++---
 scripts/dev/RunLint.ps1                                |  1 +
 13 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 89174466..efbd4bc8 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,6 @@ This readme file is used mostly to document project dependencies
 - Install Python 3.9, NodeJS, VSCode, Docker Desktop
 - copy import wheels from ConceptCore to rsconcept/backend/import
 - run rsconcept/backend/LocalEnvSetup.ps1
-- run 'npm install' in rsconcept/frontend
 - use VSCode configs in root folder to start developement
 
 ## Developement build
diff --git a/rsconcept/backend/apps/rsform/migrations/0001_initial.py b/rsconcept/backend/apps/rsform/migrations/0001_initial.py
index 1aff9c2f..8bc733a7 100644
--- a/rsconcept/backend/apps/rsform/migrations/0001_initial.py
+++ b/rsconcept/backend/apps/rsform/migrations/0001_initial.py
@@ -52,7 +52,7 @@ class Migration(migrations.Migration):
                 ('schema', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rsform.libraryitem', verbose_name='Концептуальная схема')),
             ],
             options={
-                'verbose_name': 'Конституета',
+                'verbose_name': 'Конституента',
                 'verbose_name_plural': 'Конституенты',
             },
         ),
diff --git a/rsconcept/backend/apps/rsform/models.py b/rsconcept/backend/apps/rsform/models.py
index ff6ff3f4..af1f4609 100644
--- a/rsconcept/backend/apps/rsform/models.py
+++ b/rsconcept/backend/apps/rsform/models.py
@@ -236,7 +236,7 @@ class Constituenta(Model):
 
     class Meta:
         ''' Model metadata. '''
-        verbose_name = 'Конституета'
+        verbose_name = 'Конституента'
         verbose_name_plural = 'Конституенты'
 
     def get_absolute_url(self):
diff --git a/rsconcept/frontend/src/components/Common/Modal.tsx b/rsconcept/frontend/src/components/Common/Modal.tsx
index 209064f3..37d0f675 100644
--- a/rsconcept/frontend/src/components/Common/Modal.tsx
+++ b/rsconcept/frontend/src/components/Common/Modal.tsx
@@ -3,7 +3,7 @@ import { useRef } from 'react';
 import useEscapeKey from '../../hooks/useEscapeKey';
 import Button from './Button';
 
-interface ModalProps {
+export interface ModalProps {
   title?: string
   submitText?: string
   submitInvalidTooltip?: string
@@ -46,7 +46,7 @@ function Modal({
       <div className='max-h-[calc(100vh-8rem)]'>
         {children}
       </div>
-      <div className='flex justify-center w-full gap-4 pt-4 mt-2 border-t-2 z-modal-top'>
+      <div className='flex justify-center w-full gap-4 pt-4 mt-2 border-t-2 z-modal-controls'>
         {!readonly && 
         <Button
           text={submitText}
diff --git a/rsconcept/frontend/src/components/RSInput/index.tsx b/rsconcept/frontend/src/components/RSInput/index.tsx
index 85333ac8..f8dfef1b 100644
--- a/rsconcept/frontend/src/components/RSInput/index.tsx
+++ b/rsconcept/frontend/src/components/RSInput/index.tsx
@@ -44,7 +44,9 @@ const editorSetup: BasicSetupOptions = {
 };
 
 interface RSInputProps 
-extends Omit<ReactCodeMirrorProps, 'onChange'| 'onKeyDown'> {
+extends Pick<ReactCodeMirrorProps, 
+  'id'| 'editable' | 'height' | 'value' | 'className' | 'onFocus' | 'onBlur'
+> {
   label?: string
   innerref?: RefObject<ReactCodeMirrorRef> | undefined
   onChange?: (newValue: string) => void
diff --git a/rsconcept/frontend/src/index.css b/rsconcept/frontend/src/index.css
index 697e52db..fd8f148f 100644
--- a/rsconcept/frontend/src/index.css
+++ b/rsconcept/frontend/src/index.css
@@ -74,9 +74,12 @@
 .z-modal {
   z-index: 60;
 }
-.z-modal-top {
+.z-modal-controls {
   z-index: 70;
 }
+.z-modal-top {
+  z-index: 80;
+}
 
 
 :root {
@@ -199,8 +202,7 @@
   :is(.clr-hover,
     .clr-tab,
     .clr-btn-nav,
-    .clr-btn-default,
-    .clr-btn-clear
+    .clr-btn-default
   ):hover:not(:disabled) {
     color: var(--cl-fg-100);
     background-color: var(--cl-prim-bg-60);
diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx
index 4d81ee33..dbfe369e 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 
 import Checkbox from '../../components/Common/Checkbox';
-import Modal from '../../components/Common/Modal';
+import Modal, { ModalProps } from '../../components/Common/Modal';
 import TextArea from '../../components/Common/TextArea';
 import TextInput from '../../components/Common/TextInput';
 import { useLibrary } from '../../context/LibraryContext';
@@ -11,9 +11,8 @@ import { useRSForm } from '../../context/RSFormContext';
 import { IRSFormCreateData } from '../../utils/models';
 import { getCloneTitle } from '../../utils/staticUI';
 
-interface DlgCloneRSFormProps {
-  hideWindow: () => void
-}
+interface DlgCloneRSFormProps
+extends Pick<ModalProps, 'hideWindow'> {}
 
 function DlgCloneRSForm({ hideWindow }: DlgCloneRSFormProps) {
   const { navigateTo } = useConceptNavigation();
diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgCreateCst.tsx b/rsconcept/frontend/src/pages/RSFormPage/DlgCreateCst.tsx
index 54b4d7c3..ffa6d5df 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/DlgCreateCst.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/DlgCreateCst.tsx
@@ -1,14 +1,14 @@
 import { useEffect, useState } from 'react';
 
 import ConceptSelectSingle from '../../components/Common/ConceptSelectSingle';
-import Modal from '../../components/Common/Modal';
+import Modal, { ModalProps } from '../../components/Common/Modal';
 import TextArea from '../../components/Common/TextArea';
 import RSInput from '../../components/RSInput';
 import { CstType,ICstCreateData } from '../../utils/models';
 import { CstTypeSelector, getCstTypeLabel } from '../../utils/staticUI';
 
-interface DlgCreateCstProps {
-  hideWindow: () => void
+interface DlgCreateCstProps
+extends Pick<ModalProps, 'hideWindow'> {
   initial?: ICstCreateData
   onCreate: (data: ICstCreateData) => void
 }
@@ -31,7 +31,7 @@ function DlgCreateCst({ hideWindow, initial, onCreate }: DlgCreateCstProps) {
       definition_formal: expression,
       definition_raw: textDefinition,
       term_raw: term
-    }
+    };
   }
 
   const handleSubmit = () => onCreate(getData());
diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgDeleteCst.tsx b/rsconcept/frontend/src/pages/RSFormPage/DlgDeleteCst.tsx
index e80a20df..ce3dc383 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/DlgDeleteCst.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/DlgDeleteCst.tsx
@@ -1,12 +1,12 @@
 import { useMemo, useState } from 'react';
 
 import Checkbox from '../../components/Common/Checkbox';
-import Modal from '../../components/Common/Modal';
+import Modal, { ModalProps } from '../../components/Common/Modal';
 import { useRSForm } from '../../context/RSFormContext';
 import { getCstLabel } from '../../utils/staticUI';
 
-interface DlgDeleteCstProps {
-  hideWindow: () => void
+interface DlgDeleteCstProps
+extends Pick<ModalProps, 'hideWindow'> {
   selected: number[]
   onDelete: (items: number[]) => void
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx b/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx
index 96142bd9..cfc8db61 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx
@@ -1,13 +1,13 @@
 import { useLayoutEffect, useState } from 'react';
 
 import Checkbox from '../../components/Common/Checkbox';
-import Modal from '../../components/Common/Modal';
+import Modal, { ModalProps } from '../../components/Common/Modal';
 import { CstType } from '../../utils/models';
 import { getCstTypeLabel } from '../../utils/staticUI';
 import { GraphEditorParams } from './EditorTermGraph';
 
-interface DlgGraphOptionsProps {
-  hideWindow: () => void
+interface DlgGraphOptionsProps
+extends Pick<ModalProps, 'hideWindow'> {
   initial: GraphEditorParams
   onConfirm: (params: GraphEditorParams) => void
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx b/rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx
index 3edde7a1..4296d919 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx
@@ -1,14 +1,14 @@
 import { useLayoutEffect, useState } from 'react';
 
 import ConceptSelectSingle from '../../components/Common/ConceptSelectSingle';
-import Modal from '../../components/Common/Modal';
+import Modal, { ModalProps } from '../../components/Common/Modal';
 import TextInput from '../../components/Common/TextInput';
 import { useRSForm } from '../../context/RSFormContext';
 import { CstType, ICstRenameData } from '../../utils/models';
 import { createAliasFor, CstTypeSelector, getCstTypeLabel, getCstTypePrefix } from '../../utils/staticUI';
 
-interface DlgRenameCstProps {
-  hideWindow: () => void
+interface DlgRenameCstProps
+extends Pick<ModalProps, 'hideWindow'> {
   initial?: ICstRenameData
   onRename: (data: ICstRenameData) => void
 }
@@ -63,12 +63,12 @@ function DlgRenameCst({ hideWindow, initial, onRename }: DlgRenameCstProps) {
       hideWindow={hideWindow}
       canSubmit={validated}
       onSubmit={handleSubmit}
-      submitInvalidTooltip={'Введите имя, соответствующее типу и отсутствующее в схеме'}
+      submitInvalidTooltip={'Введите незанятое имя, соответствующее типу'}
       submitText='Переименовать'
     >
       <div className='flex items-center gap-4 px-2 my-2 h-fit min-w-[25rem]'>
         <ConceptSelectSingle
-          className='min-w-[14rem] self-center'
+          className='min-w-[14rem] self-center z-modal-top'
           options={CstTypeSelector}
           placeholder='Выберите тип'
           value={cstType ? { value: cstType, label: getCstTypeLabel(cstType) } : null}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx b/rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx
index 091c4779..50eab3ea 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx
@@ -1,15 +1,15 @@
 import { useCallback, useMemo, useState } from 'react';
 import { GraphCanvas,GraphEdge, GraphNode } from 'reagraph';
 
-import Modal from '../../components/Common/Modal';
+import Modal, { ModalProps } from '../../components/Common/Modal';
 import { useConceptTheme } from '../../context/ThemeContext';
 import { graphDarkT, graphLightT } from '../../utils/color';
 import { resources } from '../../utils/constants';
 import { SyntaxTree } from '../../utils/models';
 import { getASTNodeColor, getASTNodeLabel } from '../../utils/staticUI';
 
-interface DlgShowASTProps {
-  hideWindow: () => void
+interface DlgShowASTProps
+extends Pick<ModalProps, 'hideWindow'> {
   syntaxTree: SyntaxTree
   expression: string
 }
diff --git a/scripts/dev/RunLint.ps1 b/scripts/dev/RunLint.ps1
index 2126cf1a..68e8268f 100644
--- a/scripts/dev/RunLint.ps1
+++ b/scripts/dev/RunLint.ps1
@@ -10,6 +10,7 @@ function BackendLint() {
   $mypy = "$backend\venv\Scripts\mypy.exe"
 
   Set-Location $backend
+  $env:DJANGO_SETTINGS_MODULE = "project.settings"
   & $pylint cctext project apps
   & $mypy cctext project apps
 }