From ce1cd7f6ca01441edb0d681e0f69e4be05c4d518 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:47:49 +0300 Subject: [PATCH] Refactor dialogs source location --- .../src/components/RefsInput/index.tsx | 2 +- .../RSFormPage => dialogs}/DlgCloneRSForm.tsx | 18 +++++----- .../RSFormPage => dialogs}/DlgCreateCst.tsx | 18 +++++----- .../RSFormPage => dialogs}/DlgDeleteCst.tsx | 8 ++--- .../DlgEditReference.tsx | 36 +++++++++---------- .../DlgEditWordForms.tsx | 30 ++++++++-------- .../DlgGraphOptions.tsx | 10 +++--- .../RSFormPage => dialogs}/DlgRenameCst.tsx | 16 ++++----- .../RSFormPage => dialogs}/DlgShowAST.tsx | 14 ++++---- .../RSFormPage => dialogs}/DlgTemplates.tsx | 26 +++++++------- .../DlgUploadRSForm.tsx | 12 +++---- .../src/pages/RSFormPage/EditorTermGraph.tsx | 6 ++-- .../frontend/src/pages/RSFormPage/RSTabs.tsx | 16 ++++----- 13 files changed, 106 insertions(+), 106 deletions(-) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgCloneRSForm.tsx (81%) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgCreateCst.tsx (88%) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgDeleteCst.tsx (88%) rename rsconcept/frontend/src/{components/RefsInput => dialogs}/DlgEditReference.tsx (90%) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgEditWordForms.tsx (91%) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgGraphOptions.tsx (94%) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgRenameCst.tsx (83%) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgShowAST.tsx (85%) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgTemplates.tsx (86%) rename rsconcept/frontend/src/{pages/RSFormPage => dialogs}/DlgUploadRSForm.tsx (82%) diff --git a/rsconcept/frontend/src/components/RefsInput/index.tsx b/rsconcept/frontend/src/components/RefsInput/index.tsx index b1ce8303..711d0399 100644 --- a/rsconcept/frontend/src/components/RefsInput/index.tsx +++ b/rsconcept/frontend/src/components/RefsInput/index.tsx @@ -8,6 +8,7 @@ import { RefObject, useCallback, useMemo, useRef, useState } from 'react'; import { useRSForm } from '../../context/RSFormContext'; import { useConceptTheme } from '../../context/ThemeContext'; +import DlgEditReference from '../../dialogs/DlgEditReference'; import useResolveText from '../../hooks/useResolveText'; import { ReferenceType } from '../../models/language'; import { IConstituenta } from '../../models/rsform'; @@ -15,7 +16,6 @@ import { CodeMirrorWrapper } from '../../utils/codemirror'; import Label from '../Common/Label'; import Modal from '../Common/Modal'; import PrettyJson from '../Common/PrettyJSON'; -import DlgEditReference from './DlgEditReference'; import { NaturalLanguage, ReferenceTokens } from './parse'; import { RefEntity } from './parse/parser.terms'; import { refsHoverTooltip } from './tooltip'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx b/rsconcept/frontend/src/dialogs/DlgCloneRSForm.tsx similarity index 81% rename from rsconcept/frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx rename to rsconcept/frontend/src/dialogs/DlgCloneRSForm.tsx index 75654ec7..9f40e161 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx +++ b/rsconcept/frontend/src/dialogs/DlgCloneRSForm.tsx @@ -1,15 +1,15 @@ import { useEffect, useState } from 'react'; import { toast } from 'react-toastify'; -import Checkbox from '../../components/Common/Checkbox'; -import Modal, { ModalProps } from '../../components/Common/Modal'; -import TextArea from '../../components/Common/TextArea'; -import TextInput from '../../components/Common/TextInput'; -import { useLibrary } from '../../context/LibraryContext'; -import { useConceptNavigation } from '../../context/NagivationContext'; -import { useRSForm } from '../../context/RSFormContext'; -import { IRSFormCreateData } from '../../models/rsform'; -import { cloneTitle } from '../../utils/misc'; +import Checkbox from '../components/Common/Checkbox'; +import Modal, { ModalProps } from '../components/Common/Modal'; +import TextArea from '../components/Common/TextArea'; +import TextInput from '../components/Common/TextInput'; +import { useLibrary } from '../context/LibraryContext'; +import { useConceptNavigation } from '../context/NagivationContext'; +import { useRSForm } from '../context/RSFormContext'; +import { IRSFormCreateData } from '../models/rsform'; +import { cloneTitle } from '../utils/misc'; interface DlgCloneRSFormProps extends Pick {} diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgCreateCst.tsx b/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx similarity index 88% rename from rsconcept/frontend/src/pages/RSFormPage/DlgCreateCst.tsx rename to rsconcept/frontend/src/dialogs/DlgCreateCst.tsx index 4a54032d..02db34b7 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgCreateCst.tsx +++ b/rsconcept/frontend/src/dialogs/DlgCreateCst.tsx @@ -1,14 +1,14 @@ import { useEffect, useLayoutEffect, useState } from 'react'; -import Modal, { ModalProps } from '../../components/Common/Modal'; -import SelectSingle from '../../components/Common/SelectSingle'; -import TextArea from '../../components/Common/TextArea'; -import TextInput from '../../components/Common/TextInput'; -import RSInput from '../../components/RSInput'; -import { CstType,ICstCreateData, IRSForm } from '../../models/rsform'; -import { labelCstType } from '../../utils/labels'; -import { createAliasFor, getCstTypePrefix } from '../../utils/misc'; -import { SelectorCstType } from '../../utils/selectors'; +import Modal, { ModalProps } from '../components/Common/Modal'; +import SelectSingle from '../components/Common/SelectSingle'; +import TextArea from '../components/Common/TextArea'; +import TextInput from '../components/Common/TextInput'; +import RSInput from '../components/RSInput'; +import { CstType,ICstCreateData, IRSForm } from '../models/rsform'; +import { labelCstType } from '../utils/labels'; +import { createAliasFor, getCstTypePrefix } from '../utils/misc'; +import { SelectorCstType } from '../utils/selectors'; interface DlgCreateCstProps extends Pick { diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgDeleteCst.tsx b/rsconcept/frontend/src/dialogs/DlgDeleteCst.tsx similarity index 88% rename from rsconcept/frontend/src/pages/RSFormPage/DlgDeleteCst.tsx rename to rsconcept/frontend/src/dialogs/DlgDeleteCst.tsx index 0c89c796..c0988b24 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgDeleteCst.tsx +++ b/rsconcept/frontend/src/dialogs/DlgDeleteCst.tsx @@ -1,9 +1,9 @@ import { useMemo, useState } from 'react'; -import Checkbox from '../../components/Common/Checkbox'; -import Modal, { ModalProps } from '../../components/Common/Modal'; -import { useRSForm } from '../../context/RSFormContext'; -import { labelConstituenta } from '../../utils/labels'; +import Checkbox from '../components/Common/Checkbox'; +import Modal, { ModalProps } from '../components/Common/Modal'; +import { useRSForm } from '../context/RSFormContext'; +import { labelConstituenta } from '../utils/labels'; interface DlgDeleteCstProps extends Pick { diff --git a/rsconcept/frontend/src/components/RefsInput/DlgEditReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference.tsx similarity index 90% rename from rsconcept/frontend/src/components/RefsInput/DlgEditReference.tsx rename to rsconcept/frontend/src/dialogs/DlgEditReference.tsx index f3b05bc9..d396ffb1 100644 --- a/rsconcept/frontend/src/components/RefsInput/DlgEditReference.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference.tsx @@ -1,28 +1,28 @@ import { createColumnHelper } from '@tanstack/react-table'; import { useCallback, useEffect, useLayoutEffect, useMemo, useState } from 'react'; -import { useConceptTheme } from '../../context/ThemeContext'; +import ConceptTooltip from '../components/Common/ConceptTooltip'; +import Label from '../components/Common/Label'; +import Modal from '../components/Common/Modal'; +import SelectMulti from '../components/Common/SelectMulti'; +import TextInput from '../components/Common/TextInput'; +import DataTable, { IConditionalStyle } from '../components/DataTable'; +import HelpTerminologyControl from '../components/Help/HelpTerminologyControl'; +import { HelpIcon, MagnifyingGlassIcon } from '../components/Icons'; +import ReferenceTypeButton from '../components/RefsInput/ReferenceTypeButton'; +import WordformButton from '../components/RefsInput/WordformButton'; +import { useConceptTheme } from '../context/ThemeContext'; import { getCompatibleGrams, Grammeme, parseEntityReference, parseGrammemes, parseSyntacticReference, ReferenceType -} from '../../models/language'; -import { CstMatchMode } from '../../models/miscelanious'; -import { IConstituenta, matchConstituenta } from '../../models/rsform'; -import ConstituentaTooltip from '../../pages/RSFormPage/elements/ConstituentaTooltip'; -import { colorfgCstStatus } from '../../utils/color'; -import { prefixes } from '../../utils/constants'; -import { compareGrammemeOptions, IGrammemeOption, PremadeWordForms, SelectorGrammems } from '../../utils/selectors'; -import ConceptTooltip from '../Common/ConceptTooltip'; -import Label from '../Common/Label'; -import Modal from '../Common/Modal'; -import SelectMulti from '../Common/SelectMulti'; -import TextInput from '../Common/TextInput'; -import DataTable, { IConditionalStyle } from '../DataTable'; -import HelpTerminologyControl from '../Help/HelpTerminologyControl'; -import { HelpIcon, MagnifyingGlassIcon } from '../Icons'; -import ReferenceTypeButton from './ReferenceTypeButton'; -import WordformButton from './WordformButton'; +} from '../models/language'; +import { CstMatchMode } from '../models/miscelanious'; +import { IConstituenta, matchConstituenta } from '../models/rsform'; +import ConstituentaTooltip from '../pages/RSFormPage/elements/ConstituentaTooltip'; +import { colorfgCstStatus } from '../utils/color'; +import { prefixes } from '../utils/constants'; +import { compareGrammemeOptions, IGrammemeOption, PremadeWordForms, SelectorGrammems } from '../utils/selectors'; export interface IReferenceInputState { type: ReferenceType diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms.tsx similarity index 91% rename from rsconcept/frontend/src/pages/RSFormPage/DlgEditWordForms.tsx rename to rsconcept/frontend/src/dialogs/DlgEditWordForms.tsx index 50a38beb..f6185d90 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgEditWordForms.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms.tsx @@ -1,23 +1,23 @@ import { useEffect, useLayoutEffect, useMemo, useState } from 'react'; -import ConceptTooltip from '../../components/Common/ConceptTooltip'; -import MiniButton from '../../components/Common/MiniButton'; -import Modal from '../../components/Common/Modal'; -import SelectMulti from '../../components/Common/SelectMulti'; -import TextArea from '../../components/Common/TextArea'; -import DataTable, { createColumnHelper } from '../../components/DataTable'; -import HelpTerminologyControl from '../../components/Help/HelpTerminologyControl'; -import { ArrowLeftIcon, ArrowRightIcon, CheckIcon, ChevronDoubleDownIcon, CrossIcon, HelpIcon } from '../../components/Icons'; -import { useConceptTheme } from '../../context/ThemeContext'; -import useConceptText from '../../hooks/useConceptText'; +import ConceptTooltip from '../components/Common/ConceptTooltip'; +import MiniButton from '../components/Common/MiniButton'; +import Modal from '../components/Common/Modal'; +import SelectMulti from '../components/Common/SelectMulti'; +import TextArea from '../components/Common/TextArea'; +import DataTable, { createColumnHelper } from '../components/DataTable'; +import HelpTerminologyControl from '../components/Help/HelpTerminologyControl'; +import { ArrowLeftIcon, ArrowRightIcon, CheckIcon, ChevronDoubleDownIcon, CrossIcon, HelpIcon } from '../components/Icons'; +import { useConceptTheme } from '../context/ThemeContext'; +import useConceptText from '../hooks/useConceptText'; import { getCompatibleGrams, Grammeme, ITextRequest, IWordForm, IWordFormPlain, matchWordForm, parseGrammemes -} from '../../models/language'; -import { IConstituenta, TermForm } from '../../models/rsform'; -import { colorfgGrammeme } from '../../utils/color'; -import { labelGrammeme } from '../../utils/labels'; -import { compareGrammemeOptions,IGrammemeOption, SelectorGrammemesList, SelectorGrammems } from '../../utils/selectors'; +} from '../models/language'; +import { IConstituenta, TermForm } from '../models/rsform'; +import { colorfgGrammeme } from '../utils/color'; +import { labelGrammeme } from '../utils/labels'; +import { compareGrammemeOptions,IGrammemeOption, SelectorGrammemesList, SelectorGrammems } from '../utils/selectors'; interface DlgEditWordFormsProps { hideWindow: () => void diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx b/rsconcept/frontend/src/dialogs/DlgGraphOptions.tsx similarity index 94% rename from rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx rename to rsconcept/frontend/src/dialogs/DlgGraphOptions.tsx index 274aab38..026ab6c4 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx +++ b/rsconcept/frontend/src/dialogs/DlgGraphOptions.tsx @@ -1,10 +1,10 @@ import { useLayoutEffect, useState } from 'react'; -import Checkbox from '../../components/Common/Checkbox'; -import Modal, { ModalProps } from '../../components/Common/Modal'; -import { CstType } from '../../models/rsform'; -import { labelCstType } from '../../utils/labels'; -import { GraphEditorParams } from './EditorTermGraph'; +import Checkbox from '../components/Common/Checkbox'; +import Modal, { ModalProps } from '../components/Common/Modal'; +import { CstType } from '../models/rsform'; +import { GraphEditorParams } from '../pages/RSFormPage/EditorTermGraph'; +import { labelCstType } from '../utils/labels'; interface DlgGraphOptionsProps extends Pick { diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx b/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx similarity index 83% rename from rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx rename to rsconcept/frontend/src/dialogs/DlgRenameCst.tsx index b633f4b4..f9505f97 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx +++ b/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx @@ -1,13 +1,13 @@ import { useLayoutEffect, useState } from 'react'; -import Modal, { ModalProps } from '../../components/Common/Modal'; -import SelectSingle from '../../components/Common/SelectSingle'; -import TextInput from '../../components/Common/TextInput'; -import { useRSForm } from '../../context/RSFormContext'; -import { CstType, ICstRenameData } from '../../models/rsform'; -import { labelCstType } from '../../utils/labels'; -import { createAliasFor, getCstTypePrefix } from '../../utils/misc'; -import { SelectorCstType } from '../../utils/selectors'; +import Modal, { ModalProps } from '../components/Common/Modal'; +import SelectSingle from '../components/Common/SelectSingle'; +import TextInput from '../components/Common/TextInput'; +import { useRSForm } from '../context/RSFormContext'; +import { CstType, ICstRenameData } from '../models/rsform'; +import { labelCstType } from '../utils/labels'; +import { createAliasFor, getCstTypePrefix } from '../utils/misc'; +import { SelectorCstType } from '../utils/selectors'; interface DlgRenameCstProps extends Pick { diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx similarity index 85% rename from rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx rename to rsconcept/frontend/src/dialogs/DlgShowAST.tsx index ac460f0d..56a8123b 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx +++ b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx @@ -1,13 +1,13 @@ import { useCallback, useMemo, useState } from 'react'; import { GraphCanvas,GraphEdge, GraphNode } from 'reagraph'; -import Modal, { ModalProps } from '../../components/Common/Modal'; -import { useConceptTheme } from '../../context/ThemeContext'; -import { SyntaxTree } from '../../models/rslang'; -import { graphDarkT, graphLightT } from '../../utils/color'; -import { colorbgSyntaxTree } from '../../utils/color'; -import { resources } from '../../utils/constants'; -import { labelSyntaxTree } from '../../utils/labels'; +import Modal, { ModalProps } from '../components/Common/Modal'; +import { useConceptTheme } from '../context/ThemeContext'; +import { SyntaxTree } from '../models/rslang'; +import { graphDarkT, graphLightT } from '../utils/color'; +import { colorbgSyntaxTree } from '../utils/color'; +import { resources } from '../utils/constants'; +import { labelSyntaxTree } from '../utils/labels'; interface DlgShowASTProps extends Pick { diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgTemplates.tsx b/rsconcept/frontend/src/dialogs/DlgTemplates.tsx similarity index 86% rename from rsconcept/frontend/src/pages/RSFormPage/DlgTemplates.tsx rename to rsconcept/frontend/src/dialogs/DlgTemplates.tsx index 8c10ad08..4547304d 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgTemplates.tsx +++ b/rsconcept/frontend/src/dialogs/DlgTemplates.tsx @@ -1,18 +1,18 @@ import { useEffect, useLayoutEffect, useState } from 'react'; -import ConceptTooltip from '../../components/Common/ConceptTooltip'; -import Modal, { ModalProps } from '../../components/Common/Modal'; -import SelectSingle from '../../components/Common/SelectSingle'; -import SwitchButton from '../../components/Common/SwitchButton'; -import TextArea from '../../components/Common/TextArea'; -import TextInput from '../../components/Common/TextInput'; -import HelpRSTemplates from '../../components/Help/HelpRSTemplates'; -import { HelpIcon } from '../../components/Icons'; -import RSInput from '../../components/RSInput'; -import { CstType,ICstCreateData, IRSForm } from '../../models/rsform'; -import { labelCstType } from '../../utils/labels'; -import { createAliasFor, getCstTypePrefix } from '../../utils/misc'; -import { SelectorCstType } from '../../utils/selectors'; +import ConceptTooltip from '../components/Common/ConceptTooltip'; +import Modal, { ModalProps } from '../components/Common/Modal'; +import SelectSingle from '../components/Common/SelectSingle'; +import SwitchButton from '../components/Common/SwitchButton'; +import TextArea from '../components/Common/TextArea'; +import TextInput from '../components/Common/TextInput'; +import HelpRSTemplates from '../components/Help/HelpRSTemplates'; +import { HelpIcon } from '../components/Icons'; +import RSInput from '../components/RSInput'; +import { CstType,ICstCreateData, IRSForm } from '../models/rsform'; +import { labelCstType } from '../utils/labels'; +import { createAliasFor, getCstTypePrefix } from '../utils/misc'; +import { SelectorCstType } from '../utils/selectors'; interface DlgTemplatesProps extends Pick { diff --git a/rsconcept/frontend/src/pages/RSFormPage/DlgUploadRSForm.tsx b/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx similarity index 82% rename from rsconcept/frontend/src/pages/RSFormPage/DlgUploadRSForm.tsx rename to rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx index ee9e376e..80f422ce 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/DlgUploadRSForm.tsx +++ b/rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx @@ -1,12 +1,12 @@ import { useState } from 'react'; import { toast } from 'react-toastify'; -import Checkbox from '../../components/Common/Checkbox'; -import FileInput from '../../components/Common/FileInput'; -import Modal from '../../components/Common/Modal'; -import { useRSForm } from '../../context/RSFormContext'; -import { IRSFormUploadData } from '../../models/rsform'; -import { EXTEOR_TRS_FILE } from '../../utils/constants'; +import Checkbox from '../components/Common/Checkbox'; +import FileInput from '../components/Common/FileInput'; +import Modal from '../components/Common/Modal'; +import { useRSForm } from '../context/RSFormContext'; +import { IRSFormUploadData } from '../models/rsform'; +import { EXTEOR_TRS_FILE } from '../utils/constants'; interface DlgUploadRSFormProps { hideWindow: () => void diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx index 2ec6efbf..2ca8ca3a 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx @@ -11,6 +11,7 @@ import InfoConstituenta from '../../components/Help/InfoConstituenta'; import { ArrowsFocusIcon, DumpBinIcon, FilterIcon, HelpIcon, LetterAIcon, LetterALinesIcon, PlanetIcon, SmallPlusIcon } from '../../components/Icons'; import { useRSForm } from '../../context/RSFormContext'; import { useConceptTheme } from '../../context/ThemeContext'; +import DlgGraphOptions from '../../dialogs/DlgGraphOptions'; import useLocalStorage from '../../hooks/useLocalStorage'; import { CstType, IConstituenta, ICstCreateData } from '../../models/rsform'; import { graphDarkT, graphLightT, IColorTheme } from '../../utils/color'; @@ -22,7 +23,6 @@ import { mapLabelColoring } from '../../utils/labels'; import { mapLableLayout } from '../../utils/labels'; import { SelectorGraphLayout } from '../../utils/selectors'; import { SelectorGraphColoring } from '../../utils/selectors'; -import DlgGraphOptions from './DlgGraphOptions'; import ConstituentaTooltip from './elements/ConstituentaTooltip'; export type ColoringScheme = 'none' | 'status' | 'type'; @@ -374,7 +374,7 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra { allSelected.length > 0 &&
-
+
Выбор {allSelected.length} из {schema?.stats?.count_all ?? 0}
} @@ -486,7 +486,7 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
-
+