ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-08-15 05:10:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor dialogs source location

Browse Source
This commit is contained in:
IRBorisov 2023-11-01 13:47:49 +03:00
parent 639d274714
commit ce1cd7f6ca
13 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsconcept/frontend/src/components/RefsInput/index.tsx
View File

@ -8,6 +8,7 @@ import { RefObject, useCallback, useMemo, useRef, useState } from 'react';
import { useRSForm } from '../../context/RSFormContext'; import { useRSForm } from '../../context/RSFormContext';
import { useConceptTheme } from '../../context/ThemeContext'; import { useConceptTheme } from '../../context/ThemeContext';
import DlgEditReference from '../../dialogs/DlgEditReference';
import useResolveText from '../../hooks/useResolveText'; import useResolveText from '../../hooks/useResolveText';
import { ReferenceType } from '../../models/language'; import { ReferenceType } from '../../models/language';
import { IConstituenta } from '../../models/rsform'; import { IConstituenta } from '../../models/rsform';
@ -15,7 +16,6 @@ import { CodeMirrorWrapper } from '../../utils/codemirror';
import Label from '../Common/Label'; import Label from '../Common/Label';
import Modal from '../Common/Modal'; import Modal from '../Common/Modal';
import PrettyJson from '../Common/PrettyJSON'; import PrettyJson from '../Common/PrettyJSON';
import DlgEditReference from './DlgEditReference';
import { NaturalLanguage, ReferenceTokens } from './parse'; import { NaturalLanguage, ReferenceTokens } from './parse';
import { RefEntity } from './parse/parser.terms'; import { RefEntity } from './parse/parser.terms';
import { refsHoverTooltip } from './tooltip'; import { refsHoverTooltip } from './tooltip';

18
rsconcept/frontend/src/pages/RSFormPage/DlgCloneRSForm.tsx → rsconcept/frontend/src/dialogs/DlgCloneRSForm.tsx
View File

@ -1,15 +1,15 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
import Checkbox from '../../components/Common/Checkbox'; import Checkbox from '../components/Common/Checkbox';
import Modal, { ModalProps } from '../../components/Common/Modal'; import Modal, { ModalProps } from '../components/Common/Modal';
import TextArea from '../../components/Common/TextArea'; import TextArea from '../components/Common/TextArea';
import TextInput from '../../components/Common/TextInput'; import TextInput from '../components/Common/TextInput';
import { useLibrary } from '../../context/LibraryContext'; import { useLibrary } from '../context/LibraryContext';
import { useConceptNavigation } from '../../context/NagivationContext'; import { useConceptNavigation } from '../context/NagivationContext';
import { useRSForm } from '../../context/RSFormContext'; import { useRSForm } from '../context/RSFormContext';
import { IRSFormCreateData } from '../../models/rsform'; import { IRSFormCreateData } from '../models/rsform';
import { cloneTitle } from '../../utils/misc'; import { cloneTitle } from '../utils/misc';
interface DlgCloneRSFormProps interface DlgCloneRSFormProps
extends Pick<ModalProps, 'hideWindow'> {} extends Pick<ModalProps, 'hideWindow'> {}

18
rsconcept/frontend/src/pages/RSFormPage/DlgCreateCst.tsx → rsconcept/frontend/src/dialogs/DlgCreateCst.tsx
View File

@ -1,14 +1,14 @@
import { useEffect, useLayoutEffect, useState } from 'react'; import { useEffect, useLayoutEffect, useState } from 'react';
import Modal, { ModalProps } from '../../components/Common/Modal'; import Modal, { ModalProps } from '../components/Common/Modal';
import SelectSingle from '../../components/Common/SelectSingle'; import SelectSingle from '../components/Common/SelectSingle';
import TextArea from '../../components/Common/TextArea'; import TextArea from '../components/Common/TextArea';
import TextInput from '../../components/Common/TextInput'; import TextInput from '../components/Common/TextInput';
import RSInput from '../../components/RSInput'; import RSInput from '../components/RSInput';
import { CstType,ICstCreateData, IRSForm } from '../../models/rsform'; import { CstType,ICstCreateData, IRSForm } from '../models/rsform';
import { labelCstType } from '../../utils/labels'; import { labelCstType } from '../utils/labels';
import { createAliasFor, getCstTypePrefix } from '../../utils/misc'; import { createAliasFor, getCstTypePrefix } from '../utils/misc';
import { SelectorCstType } from '../../utils/selectors'; import { SelectorCstType } from '../utils/selectors';
interface DlgCreateCstProps interface DlgCreateCstProps
extends Pick<ModalProps, 'hideWindow'> { extends Pick<ModalProps, 'hideWindow'> {

8
rsconcept/frontend/src/pages/RSFormPage/DlgDeleteCst.tsx → rsconcept/frontend/src/dialogs/DlgDeleteCst.tsx
View File

@ -1,9 +1,9 @@
import { useMemo, useState } from 'react'; import { useMemo, useState } from 'react';
import Checkbox from '../../components/Common/Checkbox'; import Checkbox from '../components/Common/Checkbox';
import Modal, { ModalProps } from '../../components/Common/Modal'; import Modal, { ModalProps } from '../components/Common/Modal';
import { useRSForm } from '../../context/RSFormContext'; import { useRSForm } from '../context/RSFormContext';
import { labelConstituenta } from '../../utils/labels'; import { labelConstituenta } from '../utils/labels';
interface DlgDeleteCstProps interface DlgDeleteCstProps
extends Pick<ModalProps, 'hideWindow'> { extends Pick<ModalProps, 'hideWindow'> {

36
rsconcept/frontend/src/components/RefsInput/DlgEditReference.tsx → rsconcept/frontend/src/dialogs/DlgEditReference.tsx
View File

@ -1,28 +1,28 @@
import { createColumnHelper } from '@tanstack/react-table'; import { createColumnHelper } from '@tanstack/react-table';
import { useCallback, useEffect, useLayoutEffect, useMemo, useState } from 'react'; 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 { import {
getCompatibleGrams, Grammeme, getCompatibleGrams, Grammeme,
parseEntityReference, parseGrammemes, parseEntityReference, parseGrammemes,
parseSyntacticReference, ReferenceType parseSyntacticReference, ReferenceType
} from '../../models/language'; } from '../models/language';
import { CstMatchMode } from '../../models/miscelanious'; import { CstMatchMode } from '../models/miscelanious';
import { IConstituenta, matchConstituenta } from '../../models/rsform'; import { IConstituenta, matchConstituenta } from '../models/rsform';
import ConstituentaTooltip from '../../pages/RSFormPage/elements/ConstituentaTooltip'; import ConstituentaTooltip from '../pages/RSFormPage/elements/ConstituentaTooltip';
import { colorfgCstStatus } from '../../utils/color'; import { colorfgCstStatus } from '../utils/color';
import { prefixes } from '../../utils/constants'; import { prefixes } from '../utils/constants';
import { compareGrammemeOptions, IGrammemeOption, PremadeWordForms, SelectorGrammems } from '../../utils/selectors'; 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';
export interface IReferenceInputState { export interface IReferenceInputState {
type: ReferenceType type: ReferenceType

30
rsconcept/frontend/src/pages/RSFormPage/DlgEditWordForms.tsx → rsconcept/frontend/src/dialogs/DlgEditWordForms.tsx
View File

@ -1,23 +1,23 @@
import { useEffect, useLayoutEffect, useMemo, useState } from 'react'; import { useEffect, useLayoutEffect, useMemo, useState } from 'react';
import ConceptTooltip from '../../components/Common/ConceptTooltip'; import ConceptTooltip from '../components/Common/ConceptTooltip';
import MiniButton from '../../components/Common/MiniButton'; import MiniButton from '../components/Common/MiniButton';
import Modal from '../../components/Common/Modal'; import Modal from '../components/Common/Modal';
import SelectMulti from '../../components/Common/SelectMulti'; import SelectMulti from '../components/Common/SelectMulti';
import TextArea from '../../components/Common/TextArea'; import TextArea from '../components/Common/TextArea';
import DataTable, { createColumnHelper } from '../../components/DataTable'; import DataTable, { createColumnHelper } from '../components/DataTable';
import HelpTerminologyControl from '../../components/Help/HelpTerminologyControl'; import HelpTerminologyControl from '../components/Help/HelpTerminologyControl';
import { ArrowLeftIcon, ArrowRightIcon, CheckIcon, ChevronDoubleDownIcon, CrossIcon, HelpIcon } from '../../components/Icons'; import { ArrowLeftIcon, ArrowRightIcon, CheckIcon, ChevronDoubleDownIcon, CrossIcon, HelpIcon } from '../components/Icons';
import { useConceptTheme } from '../../context/ThemeContext'; import { useConceptTheme } from '../context/ThemeContext';
import useConceptText from '../../hooks/useConceptText'; import useConceptText from '../hooks/useConceptText';
import { import {
getCompatibleGrams, Grammeme, ITextRequest, IWordForm, getCompatibleGrams, Grammeme, ITextRequest, IWordForm,
IWordFormPlain, matchWordForm, parseGrammemes IWordFormPlain, matchWordForm, parseGrammemes
} from '../../models/language'; } from '../models/language';
import { IConstituenta, TermForm } from '../../models/rsform'; import { IConstituenta, TermForm } from '../models/rsform';
import { colorfgGrammeme } from '../../utils/color'; import { colorfgGrammeme } from '../utils/color';
import { labelGrammeme } from '../../utils/labels'; import { labelGrammeme } from '../utils/labels';
import { compareGrammemeOptions,IGrammemeOption, SelectorGrammemesList, SelectorGrammems } from '../../utils/selectors'; import { compareGrammemeOptions,IGrammemeOption, SelectorGrammemesList, SelectorGrammems } from '../utils/selectors';
interface DlgEditWordFormsProps { interface DlgEditWordFormsProps {
hideWindow: () => void hideWindow: () => void

10
rsconcept/frontend/src/pages/RSFormPage/DlgGraphOptions.tsx → rsconcept/frontend/src/dialogs/DlgGraphOptions.tsx
View File

@ -1,10 +1,10 @@
import { useLayoutEffect, useState } from 'react'; import { useLayoutEffect, useState } from 'react';
import Checkbox from '../../components/Common/Checkbox'; import Checkbox from '../components/Common/Checkbox';
import Modal, { ModalProps } from '../../components/Common/Modal'; import Modal, { ModalProps } from '../components/Common/Modal';
import { CstType } from '../../models/rsform'; import { CstType } from '../models/rsform';
import { labelCstType } from '../../utils/labels'; import { GraphEditorParams } from '../pages/RSFormPage/EditorTermGraph';
import { GraphEditorParams } from './EditorTermGraph'; import { labelCstType } from '../utils/labels';
interface DlgGraphOptionsProps interface DlgGraphOptionsProps
extends Pick<ModalProps, 'hideWindow'> { extends Pick<ModalProps, 'hideWindow'> {

16
rsconcept/frontend/src/pages/RSFormPage/DlgRenameCst.tsx → rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
View File

@ -1,13 +1,13 @@
import { useLayoutEffect, useState } from 'react'; import { useLayoutEffect, useState } from 'react';
import Modal, { ModalProps } from '../../components/Common/Modal'; import Modal, { ModalProps } from '../components/Common/Modal';
import SelectSingle from '../../components/Common/SelectSingle'; import SelectSingle from '../components/Common/SelectSingle';
import TextInput from '../../components/Common/TextInput'; import TextInput from '../components/Common/TextInput';
import { useRSForm } from '../../context/RSFormContext'; import { useRSForm } from '../context/RSFormContext';
import { CstType, ICstRenameData } from '../../models/rsform'; import { CstType, ICstRenameData } from '../models/rsform';
import { labelCstType } from '../../utils/labels'; import { labelCstType } from '../utils/labels';
import { createAliasFor, getCstTypePrefix } from '../../utils/misc'; import { createAliasFor, getCstTypePrefix } from '../utils/misc';
import { SelectorCstType } from '../../utils/selectors'; import { SelectorCstType } from '../utils/selectors';
interface DlgRenameCstProps interface DlgRenameCstProps
extends Pick<ModalProps, 'hideWindow'> { extends Pick<ModalProps, 'hideWindow'> {

14
rsconcept/frontend/src/pages/RSFormPage/DlgShowAST.tsx → rsconcept/frontend/src/dialogs/DlgShowAST.tsx
View File

@ -1,13 +1,13 @@
import { useCallback, useMemo, useState } from 'react'; import { useCallback, useMemo, useState } from 'react';
import { GraphCanvas,GraphEdge, GraphNode } from 'reagraph'; import { GraphCanvas,GraphEdge, GraphNode } from 'reagraph';
import Modal, { ModalProps } from '../../components/Common/Modal'; import Modal, { ModalProps } from '../components/Common/Modal';
import { useConceptTheme } from '../../context/ThemeContext'; import { useConceptTheme } from '../context/ThemeContext';
import { SyntaxTree } from '../../models/rslang'; import { SyntaxTree } from '../models/rslang';
import { graphDarkT, graphLightT } from '../../utils/color'; import { graphDarkT, graphLightT } from '../utils/color';
import { colorbgSyntaxTree } from '../../utils/color'; import { colorbgSyntaxTree } from '../utils/color';
import { resources } from '../../utils/constants'; import { resources } from '../utils/constants';
import { labelSyntaxTree } from '../../utils/labels'; import { labelSyntaxTree } from '../utils/labels';
interface DlgShowASTProps interface DlgShowASTProps
extends Pick<ModalProps, 'hideWindow'> { extends Pick<ModalProps, 'hideWindow'> {

26
rsconcept/frontend/src/pages/RSFormPage/DlgTemplates.tsx → rsconcept/frontend/src/dialogs/DlgTemplates.tsx
View File

@ -1,18 +1,18 @@
import { useEffect, useLayoutEffect, useState } from 'react'; import { useEffect, useLayoutEffect, useState } from 'react';
import ConceptTooltip from '../../components/Common/ConceptTooltip'; import ConceptTooltip from '../components/Common/ConceptTooltip';
import Modal, { ModalProps } from '../../components/Common/Modal'; import Modal, { ModalProps } from '../components/Common/Modal';
import SelectSingle from '../../components/Common/SelectSingle'; import SelectSingle from '../components/Common/SelectSingle';
import SwitchButton from '../../components/Common/SwitchButton'; import SwitchButton from '../components/Common/SwitchButton';
import TextArea from '../../components/Common/TextArea'; import TextArea from '../components/Common/TextArea';
import TextInput from '../../components/Common/TextInput'; import TextInput from '../components/Common/TextInput';
import HelpRSTemplates from '../../components/Help/HelpRSTemplates'; import HelpRSTemplates from '../components/Help/HelpRSTemplates';
import { HelpIcon } from '../../components/Icons'; import { HelpIcon } from '../components/Icons';
import RSInput from '../../components/RSInput'; import RSInput from '../components/RSInput';
import { CstType,ICstCreateData, IRSForm } from '../../models/rsform'; import { CstType,ICstCreateData, IRSForm } from '../models/rsform';
import { labelCstType } from '../../utils/labels'; import { labelCstType } from '../utils/labels';
import { createAliasFor, getCstTypePrefix } from '../../utils/misc'; import { createAliasFor, getCstTypePrefix } from '../utils/misc';
import { SelectorCstType } from '../../utils/selectors'; import { SelectorCstType } from '../utils/selectors';
interface DlgTemplatesProps interface DlgTemplatesProps
extends Pick<ModalProps, 'hideWindow'> { extends Pick<ModalProps, 'hideWindow'> {

12
rsconcept/frontend/src/pages/RSFormPage/DlgUploadRSForm.tsx → rsconcept/frontend/src/dialogs/DlgUploadRSForm.tsx
View File

@ -1,12 +1,12 @@
import { useState } from 'react'; import { useState } from 'react';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
import Checkbox from '../../components/Common/Checkbox'; import Checkbox from '../components/Common/Checkbox';
import FileInput from '../../components/Common/FileInput'; import FileInput from '../components/Common/FileInput';
import Modal from '../../components/Common/Modal'; import Modal from '../components/Common/Modal';
import { useRSForm } from '../../context/RSFormContext'; import { useRSForm } from '../context/RSFormContext';
import { IRSFormUploadData } from '../../models/rsform'; import { IRSFormUploadData } from '../models/rsform';
import { EXTEOR_TRS_FILE } from '../../utils/constants'; import { EXTEOR_TRS_FILE } from '../utils/constants';
interface DlgUploadRSFormProps { interface DlgUploadRSFormProps {
hideWindow: () => void hideWindow: () => void

6
rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
View File

@ -11,6 +11,7 @@ import InfoConstituenta from '../../components/Help/InfoConstituenta';
import { ArrowsFocusIcon, DumpBinIcon, FilterIcon, HelpIcon, LetterAIcon, LetterALinesIcon, PlanetIcon, SmallPlusIcon } from '../../components/Icons'; import { ArrowsFocusIcon, DumpBinIcon, FilterIcon, HelpIcon, LetterAIcon, LetterALinesIcon, PlanetIcon, SmallPlusIcon } from '../../components/Icons';
import { useRSForm } from '../../context/RSFormContext'; import { useRSForm } from '../../context/RSFormContext';
import { useConceptTheme } from '../../context/ThemeContext'; import { useConceptTheme } from '../../context/ThemeContext';
import DlgGraphOptions from '../../dialogs/DlgGraphOptions';
import useLocalStorage from '../../hooks/useLocalStorage'; import useLocalStorage from '../../hooks/useLocalStorage';
import { CstType, IConstituenta, ICstCreateData } from '../../models/rsform'; import { CstType, IConstituenta, ICstCreateData } from '../../models/rsform';
import { graphDarkT, graphLightT, IColorTheme } from '../../utils/color'; import { graphDarkT, graphLightT, IColorTheme } from '../../utils/color';
@ -22,7 +23,6 @@ import { mapLabelColoring } from '../../utils/labels';
import { mapLableLayout } from '../../utils/labels'; import { mapLableLayout } from '../../utils/labels';
import { SelectorGraphLayout } from '../../utils/selectors'; import { SelectorGraphLayout } from '../../utils/selectors';
import { SelectorGraphColoring } from '../../utils/selectors'; import { SelectorGraphColoring } from '../../utils/selectors';
import DlgGraphOptions from './DlgGraphOptions';
import ConstituentaTooltip from './elements/ConstituentaTooltip'; import ConstituentaTooltip from './elements/ConstituentaTooltip';
export type ColoringScheme = 'none' | 'status' | 'type'; export type ColoringScheme = 'none' | 'status' | 'type';
@ -374,7 +374,7 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
{ allSelected.length > 0 && { allSelected.length > 0 &&
<div className='relative w-full z-pop'> <div className='relative w-full z-pop'>
<div className='absolute left-0 top-0 px-2 whitespace-nowrap small-caps clr-app select-none'> <div className='absolute top-0 left-0 px-2 select-none whitespace-nowrap small-caps clr-app'>
Выбор {allSelected.length} из {schema?.stats?.count_all ?? 0} Выбор {allSelected.length} из {schema?.stats?.count_all ?? 0}
</div> </div>
</div>} </div>}
@ -486,7 +486,7 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
</div> </div>
</div> </div>
<div className='h-full overflow-auto w-full outline-none' tabIndex={0} onKeyDown={handleKeyDown}> <div className='w-full h-full overflow-auto outline-none' tabIndex={0} onKeyDown={handleKeyDown}>
<div <div
className='relative' className='relative'
style={{width: canvasWidth, height: canvasHeight}} style={{width: canvasWidth, height: canvasHeight}}

16
rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
View File

@ -13,19 +13,19 @@ import { useLibrary } from '../../context/LibraryContext';
import { useConceptNavigation } from '../../context/NagivationContext'; import { useConceptNavigation } from '../../context/NagivationContext';
import { useRSForm } from '../../context/RSFormContext'; import { useRSForm } from '../../context/RSFormContext';
import { useConceptTheme } from '../../context/ThemeContext'; import { useConceptTheme } from '../../context/ThemeContext';
import DlgCloneRSForm from '../../dialogs/DlgCloneRSForm';
import DlgCreateCst from '../../dialogs/DlgCreateCst';
import DlgDeleteCst from '../../dialogs/DlgDeleteCst';
import DlgEditWordForms from '../../dialogs/DlgEditWordForms';
import DlgRenameCst from '../../dialogs/DlgRenameCst';
import DlgShowAST from '../../dialogs/DlgShowAST';
import DlgTemplates from '../../dialogs/DlgTemplates';
import DlgUploadRSForm from '../../dialogs/DlgUploadRSForm';
import useModificationPrompt from '../../hooks/useModificationPrompt'; import useModificationPrompt from '../../hooks/useModificationPrompt';
import { ICstCreateData, ICstRenameData, ICstUpdateData, TermForm } from '../../models/rsform'; import { ICstCreateData, ICstRenameData, ICstUpdateData, TermForm } from '../../models/rsform';
import { SyntaxTree } from '../../models/rslang'; import { SyntaxTree } from '../../models/rslang';
import { EXTEOR_TRS_FILE, prefixes, TIMEOUT_UI_REFRESH } from '../../utils/constants'; import { EXTEOR_TRS_FILE, prefixes, TIMEOUT_UI_REFRESH } from '../../utils/constants';
import { createAliasFor } from '../../utils/misc'; import { createAliasFor } from '../../utils/misc';
import DlgCloneRSForm from './DlgCloneRSForm';
import DlgCreateCst from './DlgCreateCst';
import DlgDeleteCst from './DlgDeleteCst';
import DlgEditWordForms from './DlgEditWordForms';
import DlgRenameCst from './DlgRenameCst';
import DlgShowAST from './DlgShowAST';
import DlgTemplates from './DlgTemplates';
import DlgUploadRSForm from './DlgUploadRSForm';
import EditorConstituenta from './EditorConstituenta'; import EditorConstituenta from './EditorConstituenta';
import EditorItems from './EditorItems'; import EditorItems from './EditorItems';
import EditorRSForm from './EditorRSForm'; import EditorRSForm from './EditorRSForm';