From 3ea22f3080e1b2dc057356903e0a800439ef9c7f Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Wed, 26 Jun 2024 19:47:31 +0300 Subject: [PATCH] Refactoring: UI elements naming convention --- .../frontend/src/app/ApplicationLayout.tsx | 2 +- rsconcept/frontend/src/app/ConceptToaster.tsx | 2 +- rsconcept/frontend/src/app/Footer.tsx | 2 +- .../frontend/src/app/GlobalProviders.tsx | 2 +- .../frontend/src/app/Navigation/Logo.tsx | 2 +- .../src/app/Navigation/Navigation.tsx | 6 +- ...igationButton.tsx => ToggleNavigation.tsx} | 6 +- .../src/app/Navigation/UserDropdown.tsx | 2 +- .../frontend/src/app/Navigation/UserMenu.tsx | 2 +- rsconcept/frontend/src/app/backendAPI.ts | 9 +-- .../src/components/RSInput/RSInput.tsx | 2 +- .../src/components/RefsInput/RefsInput.tsx | 2 +- .../src/components/info/BadgeConstituenta.tsx | 5 +- .../src/components/info/BadgeGrammeme.tsx | 2 +- .../src/components/info/BadgeHelp.tsx | 2 +- .../src/components/info/InfoCstClass.tsx | 2 +- .../src/components/info/InfoCstStatus.tsx | 2 +- ...ntaTooltip.tsx => TooltipConstituenta.tsx} | 6 +- .../components/select/PickConstituenta.tsx | 2 +- .../select/PickMultiConstituenta.tsx | 6 +- .../src/components/select/PickSchema.tsx | 2 +- .../components/select/PickSubstitutions.tsx | 2 +- .../select}/SelectWordForm.tsx | 2 +- ...nToolbar.tsx => ToolbarGraphSelection.tsx} | 8 +-- .../frontend/src/components/ui/Loader.tsx | 2 +- .../src/components/ui/SelectMulti.tsx | 2 +- .../src/components/ui/SelectSingle.tsx | 2 +- .../frontend/src/components/ui/Tooltip.tsx | 2 +- ...sContext.tsx => ConceptOptionsContext.tsx} | 0 .../frontend/src/context/LibraryContext.tsx | 2 +- .../DlgConstituentaTemplate.tsx | 8 +-- .../{ArgumentsTab.tsx => TabArguments.tsx} | 8 +-- .../{TemplateTab.tsx => TabTemplate.tsx} | 6 +- .../src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx | 6 +- ...stituentsList.tsx => ListConstituents.tsx} | 6 +- .../dialogs/DlgEditEditors/DlgEditEditors.tsx | 4 +- .../{UsersTable.tsx => TableUsers.tsx} | 6 +- .../DlgEditReference/DlgEditReference.tsx | 8 +-- .../{EntityTab.tsx => TabEntityReference.tsx} | 8 +-- ...acticTab.tsx => TabSyntacticReference.tsx} | 6 +- .../DlgEditVersions/DlgEditVersions.tsx | 4 +- .../{VersionsTable.tsx => TableVersions.tsx} | 8 +-- .../DlgEditWordForms/DlgEditWordForms.tsx | 4 +- ...{WordFormsTable.tsx => TableWordForms.tsx} | 6 +- .../DlgInlineSynthesis/DlgInlineSynthesis.tsx | 12 ++-- ...onstituentsTab.tsx => TabConstituents.tsx} | 6 +- .../{SchemaTab.tsx => TabSchema.tsx} | 6 +- ...stitutionsTab.tsx => TabSubstitutions.tsx} | 8 +-- rsconcept/frontend/src/dialogs/DlgShowAST.tsx | 2 +- .../frontend/src/hooks/useResolveText.ts | 34 ---------- rsconcept/frontend/src/models/language.ts | 9 --- .../src/pages/LibraryPage/LibraryPage.tsx | 12 ++-- ...LibraryTable.tsx => TableLibraryItems.tsx} | 8 +-- .../{SearchPanel.tsx => ToolbarSearch.tsx} | 8 +-- ...LibraryFolders.tsx => ViewSideFolders.tsx} | 6 +- .../src/pages/ManualsPage/ManualsPage.tsx | 2 +- .../src/pages/ManualsPage/TopicsDropdown.tsx | 2 +- .../src/pages/ManualsPage/TopicsStatic.tsx | 2 +- .../pages/ManualsPage/items/HelpCstEditor.tsx | 2 +- .../ManualsPage/items/HelpFormulaTree.tsx | 2 +- .../pages/ManualsPage/items/HelpTermGraph.tsx | 4 +- .../OssPage/EditorOssCard/EditorOssCard.tsx | 4 +- .../pages/OssPage/EditorOssCard/FormOSS.tsx | 4 +- .../OssPage/EditorOssCard/OssFormToolbar.tsx | 66 ------------------- .../{OssTabsMenu.tsx => MenuOssTabs.tsx} | 6 +- .../src/pages/OssPage/OssEditContext.tsx | 2 +- .../frontend/src/pages/OssPage/OssTabs.tsx | 6 +- .../EditorConstituenta/EditorConstituenta.tsx | 6 +- ...ntaToolbar.tsx => ToolbarConstituenta.tsx} | 8 +-- .../EditorRSExpression/EditorRSExpression.tsx | 4 +- .../EditorRSExpression/StatusBar.tsx | 2 +- ...ionToolbar.tsx => ToolbarRSExpression.tsx} | 8 +-- .../EditorRSFormCard/EditorRSFormCard.tsx | 4 +- .../EditorRSFormCard/FormRSForm.tsx | 8 +-- ...ccessToolbar.tsx => ToolbarItemAccess.tsx} | 6 +- ...SFormToolbar.tsx => ToolbarRSFormCard.tsx} | 6 +- ...sionsToolbar.tsx => ToolbarVersioning.tsx} | 6 +- .../RSFormPage/EditorRSList/EditorRSList.tsx | 10 +-- .../{RSTable.tsx => TableRSList.tsx} | 16 +++-- .../{RSListToolbar.tsx => ToolbarRSList.tsx} | 4 +- .../EditorTermGraph/EditorTermGraph.tsx | 14 ++-- .../RSFormPage/EditorTermGraph/TermGraph.tsx | 2 +- ...FocusToolbar.tsx => ToolbarFocusedCst.tsx} | 10 +-- ...{GraphToolbar.tsx => ToolbarTermGraph.tsx} | 8 +-- .../RSFormPage/EditorTermGraph/ViewHidden.tsx | 6 +- .../{RSTabsMenu.tsx => MenuRSTabs.tsx} | 6 +- .../src/pages/RSFormPage/RSEditContext.tsx | 2 +- .../frontend/src/pages/RSFormPage/RSTabs.tsx | 6 +- ...ntsTable.tsx => TableSideConstituents.tsx} | 14 ++-- .../ViewConstituents/ViewConstituents.tsx | 6 +- ...bscriptions.tsx => TableSubscriptions.tsx} | 6 +- .../{UserTabs.tsx => UserContents.tsx} | 8 +-- .../pages/UserProfilePage/UserProfilePage.tsx | 4 +- 93 files changed, 235 insertions(+), 336 deletions(-) rename rsconcept/frontend/src/app/Navigation/{ToggleNavigationButton.tsx => ToggleNavigation.tsx} (88%) rename rsconcept/frontend/src/components/info/{ConstituentaTooltip.tsx => TooltipConstituenta.tsx} (73%) rename rsconcept/frontend/src/{dialogs/DlgEditReference => components/select}/SelectWordForm.tsx (93%) rename rsconcept/frontend/src/components/select/{GraphSelectionToolbar.tsx => ToolbarGraphSelection.tsx} (93%) rename rsconcept/frontend/src/context/{OptionsContext.tsx => ConceptOptionsContext.tsx} (100%) rename rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/{ArgumentsTab.tsx => TabArguments.tsx} (97%) rename rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/{TemplateTab.tsx => TabTemplate.tsx} (97%) rename rsconcept/frontend/src/dialogs/DlgDeleteCst/{ConstituentsList.tsx => ListConstituents.tsx} (81%) rename rsconcept/frontend/src/dialogs/DlgEditEditors/{UsersTable.tsx => TableUsers.tsx} (92%) rename rsconcept/frontend/src/dialogs/DlgEditReference/{EntityTab.tsx => TabEntityReference.tsx} (93%) rename rsconcept/frontend/src/dialogs/DlgEditReference/{SyntacticTab.tsx => TabSyntacticReference.tsx} (92%) rename rsconcept/frontend/src/dialogs/DlgEditVersions/{VersionsTable.tsx => TableVersions.tsx} (92%) rename rsconcept/frontend/src/dialogs/DlgEditWordForms/{WordFormsTable.tsx => TableWordForms.tsx} (94%) rename rsconcept/frontend/src/dialogs/DlgInlineSynthesis/{ConstituentsTab.tsx => TabConstituents.tsx} (82%) rename rsconcept/frontend/src/dialogs/DlgInlineSynthesis/{SchemaTab.tsx => TabSchema.tsx} (90%) rename rsconcept/frontend/src/dialogs/DlgInlineSynthesis/{SubstitutionsTab.tsx => TabSubstitutions.tsx} (89%) delete mode 100644 rsconcept/frontend/src/hooks/useResolveText.ts rename rsconcept/frontend/src/pages/LibraryPage/{LibraryTable.tsx => TableLibraryItems.tsx} (96%) rename rsconcept/frontend/src/pages/LibraryPage/{SearchPanel.tsx => ToolbarSearch.tsx} (98%) rename rsconcept/frontend/src/pages/LibraryPage/{LibraryFolders.tsx => ViewSideFolders.tsx} (92%) delete mode 100644 rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssFormToolbar.tsx rename rsconcept/frontend/src/pages/OssPage/{OssTabsMenu.tsx => MenuOssTabs.tsx} (98%) rename rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/{ConstituentaToolbar.tsx => ToolbarConstituenta.tsx} (95%) rename rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/{ExpressionToolbar.tsx => ToolbarRSExpression.tsx} (84%) rename rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/{AccessToolbar.tsx => ToolbarItemAccess.tsx} (92%) rename rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/{RSFormToolbar.tsx => ToolbarRSFormCard.tsx} (93%) rename rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/{VersionsToolbar.tsx => ToolbarVersioning.tsx} (92%) rename rsconcept/frontend/src/pages/RSFormPage/EditorRSList/{RSTable.tsx => TableRSList.tsx} (94%) rename rsconcept/frontend/src/pages/RSFormPage/EditorRSList/{RSListToolbar.tsx => ToolbarRSList.tsx} (98%) rename rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/{FocusToolbar.tsx => ToolbarFocusedCst.tsx} (89%) rename rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/{GraphToolbar.tsx => ToolbarTermGraph.tsx} (96%) rename rsconcept/frontend/src/pages/RSFormPage/{RSTabsMenu.tsx => MenuRSTabs.tsx} (99%) rename rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/{ConstituentsTable.tsx => TableSideConstituents.tsx} (94%) rename rsconcept/frontend/src/pages/UserProfilePage/{ViewSubscriptions.tsx => TableSubscriptions.tsx} (94%) rename rsconcept/frontend/src/pages/UserProfilePage/{UserTabs.tsx => UserContents.tsx} (89%) diff --git a/rsconcept/frontend/src/app/ApplicationLayout.tsx b/rsconcept/frontend/src/app/ApplicationLayout.tsx index 84b95b75..f592d4a2 100644 --- a/rsconcept/frontend/src/app/ApplicationLayout.tsx +++ b/rsconcept/frontend/src/app/ApplicationLayout.tsx @@ -3,8 +3,8 @@ import { Outlet } from 'react-router-dom'; import ConceptToaster from '@/app/ConceptToaster'; import Footer from '@/app/Footer'; import Navigation from '@/app/Navigation'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { NavigationState } from '@/context/NavigationContext'; -import { useConceptOptions } from '@/context/OptionsContext'; import { globals } from '@/utils/constants'; function ApplicationLayout() { diff --git a/rsconcept/frontend/src/app/ConceptToaster.tsx b/rsconcept/frontend/src/app/ConceptToaster.tsx index 09e361f2..262759e8 100644 --- a/rsconcept/frontend/src/app/ConceptToaster.tsx +++ b/rsconcept/frontend/src/app/ConceptToaster.tsx @@ -1,6 +1,6 @@ import { ToastContainer, type ToastContainerProps } from 'react-toastify'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; interface ToasterThemedProps extends Omit {} diff --git a/rsconcept/frontend/src/app/Footer.tsx b/rsconcept/frontend/src/app/Footer.tsx index bae26d81..c4f98a8f 100644 --- a/rsconcept/frontend/src/app/Footer.tsx +++ b/rsconcept/frontend/src/app/Footer.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { external_urls } from '@/utils/constants'; import TextURL from '../components/ui/TextURL'; diff --git a/rsconcept/frontend/src/app/GlobalProviders.tsx b/rsconcept/frontend/src/app/GlobalProviders.tsx index d62c99d5..db0369e9 100644 --- a/rsconcept/frontend/src/app/GlobalProviders.tsx +++ b/rsconcept/frontend/src/app/GlobalProviders.tsx @@ -5,8 +5,8 @@ import { IntlProvider } from 'react-intl'; import { pdfjs } from 'react-pdf'; import { AuthState } from '@/context/AuthContext'; +import { OptionsState } from '@/context/ConceptOptionsContext'; import { LibraryState } from '@/context/LibraryContext'; -import { OptionsState } from '@/context/OptionsContext'; import { UsersState } from '@/context/UsersContext'; import ErrorFallback from './ErrorFallback'; diff --git a/rsconcept/frontend/src/app/Navigation/Logo.tsx b/rsconcept/frontend/src/app/Navigation/Logo.tsx index a4d16662..e4097fbb 100644 --- a/rsconcept/frontend/src/app/Navigation/Logo.tsx +++ b/rsconcept/frontend/src/app/Navigation/Logo.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import useWindowSize from '@/hooks/useWindowSize'; function Logo() { diff --git a/rsconcept/frontend/src/app/Navigation/Navigation.tsx b/rsconcept/frontend/src/app/Navigation/Navigation.tsx index 447efeb2..c694a2ba 100644 --- a/rsconcept/frontend/src/app/Navigation/Navigation.tsx +++ b/rsconcept/frontend/src/app/Navigation/Navigation.tsx @@ -3,14 +3,14 @@ import { motion } from 'framer-motion'; import { IconLibrary2, IconManuals, IconNewItem2 } from '@/components/Icons'; import { CProps } from '@/components/props'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { useConceptNavigation } from '@/context/NavigationContext'; -import { useConceptOptions } from '@/context/OptionsContext'; import { animateNavigation } from '@/styling/animations'; import { urls } from '../urls'; import Logo from './Logo'; import NavigationButton from './NavigationButton'; -import ToggleNavigationButton from './ToggleNavigationButton'; +import ToggleNavigation from './ToggleNavigation'; import UserMenu from './UserMenu'; function Navigation() { @@ -33,7 +33,7 @@ function Navigation() { 'select-none' )} > - + ) { - AxiosPost({ - endpoint: `/api/rsforms/${schema}/resolve`, - request: request - }); -} - export function postInflectText(request: FrontExchange) { AxiosPost({ endpoint: `/api/cctext/inflect`, diff --git a/rsconcept/frontend/src/components/RSInput/RSInput.tsx b/rsconcept/frontend/src/components/RSInput/RSInput.tsx index 19ba811b..ebc673f0 100644 --- a/rsconcept/frontend/src/components/RSInput/RSInput.tsx +++ b/rsconcept/frontend/src/components/RSInput/RSInput.tsx @@ -9,7 +9,7 @@ import { EditorView } from 'codemirror'; import { forwardRef, useCallback, useMemo, useRef } from 'react'; import Label from '@/components/ui/Label'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { getFontClassName } from '@/models/miscellaneousAPI'; import { ConstituentaID, IRSForm } from '@/models/rsform'; import { generateAlias, getCstTypePrefix, guessCstType } from '@/models/rsformAPI'; diff --git a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx index bdfe33fe..2c28313e 100644 --- a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx +++ b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx @@ -10,7 +10,7 @@ import { AnimatePresence } from 'framer-motion'; import { forwardRef, useCallback, useMemo, useRef, useState } from 'react'; import Label from '@/components/ui/Label'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import DlgEditReference from '@/dialogs/DlgEditReference'; import { ReferenceType } from '@/models/language'; import { ConstituentaID, IRSForm } from '@/models/rsform'; diff --git a/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx b/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx index 06427b59..207868f6 100644 --- a/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx +++ b/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx @@ -1,10 +1,11 @@ import clsx from 'clsx'; -import ConstituentaTooltip from '@/components/info/ConstituentaTooltip'; import { IConstituenta } from '@/models/rsform'; import { isMockCst } from '@/models/rsformAPI'; import { colorFgCstStatus, IColorTheme } from '@/styling/color'; +import TooltipConstituenta from './TooltipConstituenta'; + interface BadgeConstituentaProps { prefixID?: string; value: IConstituenta; @@ -28,7 +29,7 @@ function BadgeConstituenta({ value, prefixID, theme }: BadgeConstituentaProps) { }} > {value.alias} - + ); } diff --git a/rsconcept/frontend/src/components/info/BadgeGrammeme.tsx b/rsconcept/frontend/src/components/info/BadgeGrammeme.tsx index cf431f1a..55965d89 100644 --- a/rsconcept/frontend/src/components/info/BadgeGrammeme.tsx +++ b/rsconcept/frontend/src/components/info/BadgeGrammeme.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { GramData } from '@/models/language'; import { colorFgGrammeme } from '@/styling/color'; import { labelGrammeme } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/components/info/BadgeHelp.tsx b/rsconcept/frontend/src/components/info/BadgeHelp.tsx index 77a68cde..e57be9da 100644 --- a/rsconcept/frontend/src/components/info/BadgeHelp.tsx +++ b/rsconcept/frontend/src/components/info/BadgeHelp.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import TextURL from '@/components/ui/TextURL'; import Tooltip, { PlacesType } from '@/components/ui/Tooltip'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { HelpTopic } from '@/models/miscellaneous'; import TopicPage from '../../pages/ManualsPage/TopicPage'; diff --git a/rsconcept/frontend/src/components/info/InfoCstClass.tsx b/rsconcept/frontend/src/components/info/InfoCstClass.tsx index 6580bc6e..02605505 100644 --- a/rsconcept/frontend/src/components/info/InfoCstClass.tsx +++ b/rsconcept/frontend/src/components/info/InfoCstClass.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { CstClass } from '@/models/rsform'; import { colorBgCstClass } from '@/styling/color'; import { prefixes } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/components/info/InfoCstStatus.tsx b/rsconcept/frontend/src/components/info/InfoCstStatus.tsx index f3c8002c..ba95a5b9 100644 --- a/rsconcept/frontend/src/components/info/InfoCstStatus.tsx +++ b/rsconcept/frontend/src/components/info/InfoCstStatus.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { ExpressionStatus } from '@/models/rsform'; import { colorBgCstStatus } from '@/styling/color'; import { prefixes } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/components/info/ConstituentaTooltip.tsx b/rsconcept/frontend/src/components/info/TooltipConstituenta.tsx similarity index 73% rename from rsconcept/frontend/src/components/info/ConstituentaTooltip.tsx rename to rsconcept/frontend/src/components/info/TooltipConstituenta.tsx index fc4f2601..42bab46d 100644 --- a/rsconcept/frontend/src/components/info/ConstituentaTooltip.tsx +++ b/rsconcept/frontend/src/components/info/TooltipConstituenta.tsx @@ -2,12 +2,12 @@ import InfoConstituenta from '@/components/info/InfoConstituenta'; import Tooltip from '@/components/ui/Tooltip'; import { IConstituenta } from '@/models/rsform'; -interface ConstituentaTooltipProps { +interface TooltipConstituentaProps { data: IConstituenta; anchor: string; } -function ConstituentaTooltip({ data, anchor }: ConstituentaTooltipProps) { +function TooltipConstituenta({ data, anchor }: TooltipConstituentaProps) { return ( event.stopPropagation()} /> @@ -15,4 +15,4 @@ function ConstituentaTooltip({ data, anchor }: ConstituentaTooltipProps) { ); } -export default ConstituentaTooltip; +export default TooltipConstituenta; diff --git a/rsconcept/frontend/src/components/select/PickConstituenta.tsx b/rsconcept/frontend/src/components/select/PickConstituenta.tsx index 5f656280..976c2f3b 100644 --- a/rsconcept/frontend/src/components/select/PickConstituenta.tsx +++ b/rsconcept/frontend/src/components/select/PickConstituenta.tsx @@ -4,7 +4,7 @@ import { useEffect, useMemo, useState } from 'react'; import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable'; import SearchBar from '@/components/ui/SearchBar'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { CstMatchMode } from '@/models/miscellaneous'; import { IConstituenta } from '@/models/rsform'; import { matchConstituenta } from '@/models/rsformAPI'; diff --git a/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx b/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx index ab1e216f..ee7f0eb8 100644 --- a/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx +++ b/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx @@ -4,14 +4,14 @@ import clsx from 'clsx'; import { useLayoutEffect, useMemo, useState } from 'react'; import DataTable, { createColumnHelper, RowSelectionState } from '@/components/ui/DataTable'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { ConstituentaID, IConstituenta, IRSForm } from '@/models/rsform'; import { isBasicConcept } from '@/models/rsformAPI'; import { describeConstituenta } from '@/utils/labels'; import BadgeConstituenta from '../info/BadgeConstituenta'; import NoData from '../ui/NoData'; -import GraphSelectionToolbar from './GraphSelectionToolbar'; +import ToolbarGraphSelection from './ToolbarGraphSelection'; interface PickMultiConstituentaProps { id?: string; @@ -80,7 +80,7 @@ function PickMultiConstituenta({ id, schema, prefixID, rows, selected, setSelect Выбраны {selected.length} из {schema?.items.length ?? 0} {schema ? ( - isBasicConcept(cst.cst_type)).map(cst => cst.id)} setSelected={setSelected} diff --git a/rsconcept/frontend/src/components/select/PickSchema.tsx b/rsconcept/frontend/src/components/select/PickSchema.tsx index a7f8b897..9162b731 100644 --- a/rsconcept/frontend/src/components/select/PickSchema.tsx +++ b/rsconcept/frontend/src/components/select/PickSchema.tsx @@ -4,7 +4,7 @@ import { useIntl } from 'react-intl'; import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable'; import SearchBar from '@/components/ui/SearchBar'; import { useLibrary } from '@/context/LibraryContext'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library'; import { ILibraryFilter } from '@/models/miscellaneous'; diff --git a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx b/rsconcept/frontend/src/components/select/PickSubstitutions.tsx index c66a73af..ada311e1 100644 --- a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx +++ b/rsconcept/frontend/src/components/select/PickSubstitutions.tsx @@ -7,7 +7,7 @@ import SelectConstituenta from '@/components/select/SelectConstituenta'; import DataTable, { createColumnHelper } from '@/components/ui/DataTable'; import Label from '@/components/ui/Label'; import MiniButton from '@/components/ui/MiniButton'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { IConstituenta, IRSForm, ISubstitution } from '@/models/rsform'; import { describeConstituenta } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx b/rsconcept/frontend/src/components/select/SelectWordForm.tsx similarity index 93% rename from rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx rename to rsconcept/frontend/src/components/select/SelectWordForm.tsx index 1db8c129..7f385da0 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx +++ b/rsconcept/frontend/src/components/select/SelectWordForm.tsx @@ -6,7 +6,7 @@ import { Grammeme } from '@/models/language'; import { prefixes } from '@/utils/constants'; import { DefaultWordForms, IGrammemeOption, SelectorGrammemes } from '@/utils/selectors'; -import WordformButton from './WordformButton'; +import WordformButton from '../../dialogs/DlgEditReference/WordformButton'; interface SelectWordFormProps { selected: IGrammemeOption[]; diff --git a/rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx b/rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx similarity index 93% rename from rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx rename to rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx index ec06db95..3a074964 100644 --- a/rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx +++ b/rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx @@ -14,21 +14,21 @@ import { import { CProps } from '../props'; import MiniButton from '../ui/MiniButton'; -interface GraphSelectionToolbarProps extends CProps.Styling { +interface ToolbarGraphSelectionProps extends CProps.Styling { graph: Graph; core: number[]; setSelected: React.Dispatch>; emptySelection?: boolean; } -function GraphSelectionToolbar({ +function ToolbarGraphSelection({ className, graph, core, setSelected, emptySelection, ...restProps -}: GraphSelectionToolbarProps) { +}: ToolbarGraphSelectionProps) { return (
{ schema: IRSForm; @@ -109,7 +109,7 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }: const templatePanel = useMemo( () => ( - + ), [template, updateTemplate] @@ -118,7 +118,7 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }: const argumentsPanel = useMemo( () => ( - + ), [schema, substitutes, updateSubstitutes] diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabArguments.tsx similarity index 97% rename from rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx rename to rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabArguments.tsx index 4790146d..15ed7d34 100644 --- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabArguments.tsx @@ -11,12 +11,12 @@ import DataTable, { IConditionalStyle } from '@/components/ui/DataTable'; import MiniButton from '@/components/ui/MiniButton'; import NoData from '@/components/ui/NoData'; import AnimateFade from '@/components/wrap/AnimateFade'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { IConstituenta, IRSForm } from '@/models/rsform'; import { IArgumentValue } from '@/models/rslang'; import { prefixes } from '@/utils/constants'; -interface ArgumentsTabProps { +interface TabArgumentsProps { state: IArgumentsState; schema: IRSForm; partialUpdate: React.Dispatch>; @@ -29,7 +29,7 @@ export interface IArgumentsState { const argumentsHelper = createColumnHelper(); -function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) { +function TabArguments({ state, schema, partialUpdate }: TabArgumentsProps) { const { colors } = useConceptOptions(); const [selectedCst, setSelectedCst] = useState(undefined); @@ -226,4 +226,4 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) { ); } -export default ArgumentsTab; +export default TabArguments; diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabTemplate.tsx similarity index 97% rename from rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx rename to rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabTemplate.tsx index e40751bc..b1ea8c3c 100644 --- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TabTemplate.tsx @@ -17,12 +17,12 @@ export interface ITemplateState { filterCategory?: IConstituenta; } -interface TemplateTabProps { +interface TabTemplateProps { state: ITemplateState; partialUpdate: Dispatch>; } -function TemplateTab({ state, partialUpdate }: TemplateTabProps) { +function TabTemplate({ state, partialUpdate }: TabTemplateProps) { const { templates, retrieveTemplate } = useLibrary(); const [templateSchema, setTemplateSchema] = useState(undefined); @@ -147,4 +147,4 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) { ); } -export default TemplateTab; +export default TabTemplate; diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx b/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx index 535d985b..90fc294d 100644 --- a/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx +++ b/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx @@ -8,7 +8,7 @@ import Modal, { ModalProps } from '@/components/ui/Modal'; import { ConstituentaID, IRSForm } from '@/models/rsform'; import { prefixes } from '@/utils/constants'; -import ConstituentsList from './ConstituentsList'; +import ListConstituents from './ListConstituents'; interface DlgDeleteCstProps extends Pick { selected: ConstituentaID[]; @@ -41,8 +41,8 @@ function DlgDeleteCst({ hideWindow, selected, schema, onDelete }: DlgDeleteCstPr onSubmit={handleSubmit} className={clsx('cc-column', 'max-w-[60vw] min-w-[30rem]', 'px-6')} > - - + {title ? ( @@ -28,4 +28,4 @@ function ConstituentsList({ list, schema, title, prefix }: ConstituentsListProps ); } -export default ConstituentsList; +export default ListConstituents; diff --git a/rsconcept/frontend/src/dialogs/DlgEditEditors/DlgEditEditors.tsx b/rsconcept/frontend/src/dialogs/DlgEditEditors/DlgEditEditors.tsx index 60028634..dfaa33ca 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditEditors/DlgEditEditors.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditEditors/DlgEditEditors.tsx @@ -11,7 +11,7 @@ import Modal from '@/components/ui/Modal'; import { useUsers } from '@/context/UsersContext'; import { UserID } from '@/models/user'; -import UsersTable from './UsersTable'; +import TableUsers from './TableUsers'; interface DlgEditEditorsProps { editors: UserID[]; @@ -33,7 +33,7 @@ function DlgEditEditors({ hideWindow, editors, setEditors }: DlgEditEditorsProps const onAddEditor = useCallback((target: UserID) => setSelected(prev => [...prev, target]), []); const usersTable = useMemo( - () => selected.includes(user.id))} onDelete={onDeleteEditor} />, + () => selected.includes(user.id))} onDelete={onDeleteEditor} />, [users, selected, onDeleteEditor] ); diff --git a/rsconcept/frontend/src/dialogs/DlgEditEditors/UsersTable.tsx b/rsconcept/frontend/src/dialogs/DlgEditEditors/TableUsers.tsx similarity index 92% rename from rsconcept/frontend/src/dialogs/DlgEditEditors/UsersTable.tsx rename to rsconcept/frontend/src/dialogs/DlgEditEditors/TableUsers.tsx index 044b1380..338db89b 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditEditors/UsersTable.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditEditors/TableUsers.tsx @@ -7,14 +7,14 @@ import DataTable, { createColumnHelper } from '@/components/ui/DataTable'; import MiniButton from '@/components/ui/MiniButton'; import { IUserInfo, UserID } from '@/models/user'; -interface UsersTableProps { +interface TableUsersProps { items: IUserInfo[]; onDelete: (target: UserID) => void; } const columnHelper = createColumnHelper(); -function UsersTable({ items, onDelete }: UsersTableProps) { +function TableUsers({ items, onDelete }: TableUsersProps) { const columns = useMemo( () => [ columnHelper.accessor('last_name', { @@ -61,4 +61,4 @@ function UsersTable({ items, onDelete }: UsersTableProps) { ); } -export default UsersTable; +export default TableUsers; diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx index ae7397a1..7380be26 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx @@ -14,8 +14,8 @@ import { IRSForm } from '@/models/rsform'; import { PARAMETER } from '@/utils/constants'; import { labelReferenceType } from '@/utils/labels'; -import EntityTab from './EntityTab'; -import SyntacticTab from './SyntacticTab'; +import TabEntityReference from './TabEntityReference'; +import TabSyntacticReference from './TabSyntacticReference'; export interface IReferenceInputState { type: ReferenceType; @@ -48,7 +48,7 @@ function DlgEditReference({ hideWindow, schema, initial, onSave }: DlgEditRefere const entityPanel = useMemo( () => ( - + ), [initial, schema] @@ -57,7 +57,7 @@ function DlgEditReference({ hideWindow, schema, initial, onSave }: DlgEditRefere const syntacticPanel = useMemo( () => ( - + ), [initial] diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx similarity index 93% rename from rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx rename to rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx index 5258aee9..fe9fa987 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/EntityTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference/TabEntityReference.tsx @@ -15,17 +15,17 @@ import { matchConstituenta } from '@/models/rsformAPI'; import { prefixes } from '@/utils/constants'; import { IGrammemeOption, SelectorGrammemes } from '@/utils/selectors'; +import SelectWordForm from '../../components/select/SelectWordForm'; import { IReferenceInputState } from './DlgEditReference'; -import SelectWordForm from './SelectWordForm'; -interface EntityTabProps { +interface TabEntityReferenceProps { initial: IReferenceInputState; schema: IRSForm; setIsValid: React.Dispatch>; setReference: React.Dispatch>; } -function EntityTab({ initial, schema, setIsValid, setReference }: EntityTabProps) { +function TabEntityReference({ initial, schema, setIsValid, setReference }: TabEntityReferenceProps) { const [selectedCst, setSelectedCst] = useState(undefined); const [alias, setAlias] = useState(''); const [term, setTerm] = useState(''); @@ -112,4 +112,4 @@ function EntityTab({ initial, schema, setIsValid, setReference }: EntityTabProps ); } -export default EntityTab; +export default TabEntityReference; diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/SyntacticTab.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/TabSyntacticReference.tsx similarity index 92% rename from rsconcept/frontend/src/dialogs/DlgEditReference/SyntacticTab.tsx rename to rsconcept/frontend/src/dialogs/DlgEditReference/TabSyntacticReference.tsx index 6e132743..0ecdcebc 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/SyntacticTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference/TabSyntacticReference.tsx @@ -9,13 +9,13 @@ import { parseSyntacticReference } from '@/models/languageAPI'; import { IReferenceInputState } from './DlgEditReference'; -interface SyntacticTabProps { +interface TabSyntacticReferenceProps { initial: IReferenceInputState; setIsValid: React.Dispatch>; setReference: React.Dispatch>; } -function SyntacticTab({ initial, setIsValid, setReference }: SyntacticTabProps) { +function TabSyntacticReference({ initial, setIsValid, setReference }: TabSyntacticReferenceProps) { const [nominal, setNominal] = useState(''); const [offset, setOffset] = useState(1); @@ -74,4 +74,4 @@ function SyntacticTab({ initial, setIsValid, setReference }: SyntacticTabProps) ); } -export default SyntacticTab; +export default TabSyntacticReference; diff --git a/rsconcept/frontend/src/dialogs/DlgEditVersions/DlgEditVersions.tsx b/rsconcept/frontend/src/dialogs/DlgEditVersions/DlgEditVersions.tsx index 42b8901f..6407f6aa 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditVersions/DlgEditVersions.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditVersions/DlgEditVersions.tsx @@ -10,7 +10,7 @@ import TextInput from '@/components/ui/TextInput'; import { useRSForm } from '@/context/RSFormContext'; import { IVersionData, IVersionInfo, VersionID } from '@/models/library'; -import VersionsTable from './VersionsTable'; +import TableVersions from './TableVersions'; interface DlgEditVersionsProps { hideWindow: () => void; @@ -66,7 +66,7 @@ function DlgEditVersions({ hideWindow, versions, onDelete, onUpdate }: DlgEditVe const versionsTable = useMemo( () => ( - (); -function VersionsTable({ processing, items, onDelete, selected, onSelect }: VersionsTableProps) { +function TableVersions({ processing, items, onDelete, selected, onSelect }: TableVersionsProps) { const intl = useIntl(); const { colors } = useConceptOptions(); @@ -102,4 +102,4 @@ function VersionsTable({ processing, items, onDelete, selected, onSelect }: Vers ); } -export default VersionsTable; +export default TableVersions; diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx index e0b182b4..dd2ba338 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx @@ -20,7 +20,7 @@ import { PARAMETER } from '@/utils/constants'; import { prompts } from '@/utils/labels'; import { IGrammemeOption, SelectorGrammemes, SelectorGrammemesList } from '@/utils/selectors'; -import WordFormsTable from './WordFormsTable'; +import TableWordForms from './TableWordForms'; interface DlgEditWordFormsProps { hideWindow: () => void; @@ -216,7 +216,7 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
- + ); } diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/TableWordForms.tsx similarity index 94% rename from rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx rename to rsconcept/frontend/src/dialogs/DlgEditWordForms/TableWordForms.tsx index 8bc65c0b..7935748c 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/TableWordForms.tsx @@ -10,7 +10,7 @@ import MiniButton from '@/components/ui/MiniButton'; import NoData from '@/components/ui/NoData'; import { IWordForm } from '@/models/language'; -interface WordFormsTableProps { +interface TableWordFormsProps { forms: IWordForm[]; setForms: React.Dispatch>; onFormSelect?: (form: IWordForm) => void; @@ -18,7 +18,7 @@ interface WordFormsTableProps { const columnHelper = createColumnHelper(); -function WordFormsTable({ forms, setForms, onFormSelect }: WordFormsTableProps) { +function TableWordForms({ forms, setForms, onFormSelect }: TableWordFormsProps) { const handleDeleteRow = useCallback( (row: number) => { setForms(prev => { @@ -89,4 +89,4 @@ function WordFormsTable({ forms, setForms, onFormSelect }: WordFormsTableProps) ); } -export default WordFormsTable; +export default TableWordForms; diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx index f15a4e7c..d0a0a300 100644 --- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx +++ b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/DlgInlineSynthesis.tsx @@ -10,9 +10,9 @@ import useRSFormDetails from '@/hooks/useRSFormDetails'; import { LibraryItemID } from '@/models/library'; import { IInlineSynthesisData, IRSForm, ISubstitution } from '@/models/rsform'; -import ConstituentsTab from './ConstituentsTab'; -import SchemaTab from './SchemaTab'; -import SubstitutionsTab from './SubstitutionsTab'; +import TabConstituents from './TabConstituents'; +import TabSchema from './TabSchema'; +import TabSubstitutions from './TabSubstitutions'; interface DlgInlineSynthesisProps extends Pick { receiver: IRSForm; @@ -61,7 +61,7 @@ function DlgInlineSynthesis({ hideWindow, receiver, onInlineSynthesis }: DlgInli const schemaPanel = useMemo( () => ( - + ), [donorID] @@ -69,7 +69,7 @@ function DlgInlineSynthesis({ hideWindow, receiver, onInlineSynthesis }: DlgInli const itemsPanel = useMemo( () => ( - ( - >; } -function ConstituentsTab({ schema, error, loading, selected, setSelected }: ConstituentsTabProps) { +function TabConstituents({ schema, error, loading, selected, setSelected }: TabConstituentsProps) { return ( void; } -function SchemaTab({ selected, setSelected }: SchemaTabProps) { +function TabSchema({ selected, setSelected }: TabSchemaProps) { const library = useLibrary(); const selectedInfo = useMemo(() => library.items.find(item => item.id === selected), [selected, library.items]); @@ -41,4 +41,4 @@ function SchemaTab({ selected, setSelected }: SchemaTabProps) { ); } -export default SchemaTab; +export default TabSchema; diff --git a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/SubstitutionsTab.tsx b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx similarity index 89% rename from rsconcept/frontend/src/dialogs/DlgInlineSynthesis/SubstitutionsTab.tsx rename to rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx index 2225c448..9057a106 100644 --- a/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/SubstitutionsTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx @@ -7,7 +7,7 @@ import { prefixes } from '@/utils/constants'; import PickSubstitutions from '../../components/select/PickSubstitutions'; -interface SubstitutionsTabProps { +interface TabSubstitutionsProps { receiver?: IRSForm; source?: IRSForm; selected: ConstituentaID[]; @@ -19,7 +19,7 @@ interface SubstitutionsTabProps { setSubstitutions: React.Dispatch>; } -function SubstitutionsTab({ +function TabSubstitutions({ source, receiver, selected, @@ -29,7 +29,7 @@ function SubstitutionsTab({ substitutions, setSubstitutions -}: SubstitutionsTabProps) { +}: TabSubstitutionsProps) { return ( (undefined); - const [refsData, setRefsData] = useState(undefined); - - const resetData = useCallback(() => setRefsData(undefined), []); - - function resolveText(text: string, onSuccess?: DataCallback) { - setError(undefined); - postResolveText(String(schema!.id), { - data: { text: text }, - showError: true, - setLoading: setProcessing, - onError: setError, - onSuccess: data => { - setRefsData(data); - if (onSuccess) onSuccess(data); - } - }); - } - - return { refsData, resolveText, resetData, error, setError, processing }; -} - -export default useResolveText; diff --git a/rsconcept/frontend/src/models/language.ts b/rsconcept/frontend/src/models/language.ts index d58063ea..f872aa86 100644 --- a/rsconcept/frontend/src/models/language.ts +++ b/rsconcept/frontend/src/models/language.ts @@ -291,12 +291,3 @@ export interface IResolvedReference extends IReference { pos_input: ITextPosition; pos_output: ITextPosition; } - -/** - * Represents resolved references data for the whole text. - */ -export interface IResolutionData { - input: string; - output: string; - refs: IResolvedReference[]; -} diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx index 0e167167..87a99d72 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx @@ -12,9 +12,9 @@ import { ILibraryFilter } from '@/models/miscellaneous'; import { storage } from '@/utils/constants'; import { toggleTristateFlag } from '@/utils/utils'; -import LibraryFolders from './LibraryFolders'; -import LibraryTable from './LibraryTable'; -import SearchPanel from './SearchPanel'; +import TableLibraryItems from './TableLibraryItems'; +import ToolbarSearch from './ToolbarSearch'; +import ViewSideFolders from './ViewSideFolders'; function LibraryPage() { const library = useLibrary(); @@ -86,7 +86,7 @@ function LibraryPage() { const view = useMemo( () => ( - - {folderMode ? ( - void; folderMode: boolean; @@ -29,7 +29,7 @@ interface LibraryTableProps { const columnHelper = createColumnHelper(); -function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: LibraryTableProps) { +function TableLibraryItems({ items, resetQuery, folderMode, toggleFolderMode }: TableLibraryItemsProps) { const router = useConceptNavigation(); const intl = useIntl(); const { getUserLabel } = useUsers(); @@ -188,4 +188,4 @@ function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: Libra ); } -export default LibraryTable; +export default TableLibraryItems; diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/ToolbarSearch.tsx similarity index 98% rename from rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx rename to rsconcept/frontend/src/pages/LibraryPage/ToolbarSearch.tsx index 89810182..5a0a4c8f 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/ToolbarSearch.tsx @@ -18,7 +18,7 @@ import { prefixes } from '@/utils/constants'; import { describeLocationHead, labelLocationHead } from '@/utils/labels'; import { tripleToggleColor } from '@/utils/utils'; -interface SearchPanelProps { +interface ToolbarSearchProps { total: number; filtered: number; hasCustomFilter: boolean; @@ -44,7 +44,7 @@ interface SearchPanelProps { resetFilter: () => void; } -function SearchPanel({ +function ToolbarSearch({ total, filtered, hasCustomFilter, @@ -68,7 +68,7 @@ function SearchPanel({ isEditor, toggleEditor, resetFilter -}: SearchPanelProps) { +}: ToolbarSearchProps) { const { user } = useAuth(); const headMenu = useDropdown(); @@ -219,4 +219,4 @@ function SearchPanel({ ); } -export default SearchPanel; +export default ToolbarSearch; diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/ViewSideFolders.tsx similarity index 92% rename from rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx rename to rsconcept/frontend/src/pages/LibraryPage/ViewSideFolders.tsx index f81367f9..63ef9fa1 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/ViewSideFolders.tsx @@ -14,14 +14,14 @@ import { animateSideView } from '@/styling/animations'; import { PARAMETER, prefixes } from '@/utils/constants'; import { information } from '@/utils/labels'; -interface LibraryTableProps { +interface ViewSideFoldersProps { folders: FolderTree; currentFolder: string; setFolder: React.Dispatch>; toggleFolderMode: () => void; } -function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }: LibraryTableProps) { +function ViewSideFolders({ folders, currentFolder, setFolder, toggleFolderMode }: ViewSideFoldersProps) { const handleClickFolder = useCallback( (event: CProps.EventMouse, target: FolderNode) => { event.preventDefault(); @@ -68,4 +68,4 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }: ); } -export default LibraryFolders; +export default ViewSideFolders; diff --git a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx index 3e14ca5a..fd3a9ac0 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx @@ -3,8 +3,8 @@ import { useCallback } from 'react'; import { urls } from '@/app/urls'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { useConceptNavigation } from '@/context/NavigationContext'; -import { useConceptOptions } from '@/context/OptionsContext'; import useQueryStrings from '@/hooks/useQueryStrings'; import { HelpTopic } from '@/models/miscellaneous'; diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsDropdown.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicsDropdown.tsx index ef6345fc..921fd261 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/TopicsDropdown.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/TopicsDropdown.tsx @@ -7,7 +7,7 @@ import { useCallback } from 'react'; import { IconMenuFold, IconMenuUnfold } from '@/components/Icons'; import Button from '@/components/ui/Button'; import SelectTree from '@/components/ui/SelectTree'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import useDropdown from '@/hooks/useDropdown'; import { HelpTopic, topicParent } from '@/models/miscellaneous'; import { animateSlideLeft } from '@/styling/animations'; diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsStatic.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicsStatic.tsx index 0ca8dc54..35f1b477 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/TopicsStatic.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/TopicsStatic.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import SelectTree from '@/components/ui/SelectTree'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { HelpTopic, topicParent } from '@/models/miscellaneous'; import { prefixes } from '@/utils/constants'; import { describeHelpTopic, labelHelpTopic } from '@/utils/labels'; diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpCstEditor.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpCstEditor.tsx index 1dd81cf5..3b066e7e 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpCstEditor.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpCstEditor.tsx @@ -14,7 +14,7 @@ import { IconTree } from '@/components/Icons'; import LinkTopic from '@/components/ui/LinkTopic'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { HelpTopic } from '@/models/miscellaneous'; function HelpCstEditor() { diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpFormulaTree.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpFormulaTree.tsx index 17605d66..b8d7fd23 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpFormulaTree.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpFormulaTree.tsx @@ -1,4 +1,4 @@ -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; function HelpFormulaTree() { const { colors } = useConceptOptions(); diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpTermGraph.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpTermGraph.tsx index 3589d547..614f1e14 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpTermGraph.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpTermGraph.tsx @@ -1,6 +1,6 @@ import Divider from '@/components/ui/Divider'; import LinkTopic from '@/components/ui/LinkTopic'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { HelpTopic } from '@/models/miscellaneous'; import { @@ -68,7 +68,7 @@ function HelpTermGraph() { -
+

Общие

  • diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx index 6933f56f..f997b752 100644 --- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx +++ b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/EditorOssCard.tsx @@ -7,11 +7,11 @@ import AnimateFade from '@/components/wrap/AnimateFade'; import { useAuth } from '@/context/AuthContext'; import { useOSS } from '@/context/OssContext'; import EditorLibraryItem from '@/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem'; +import ToolbarRSFormCard from '@/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard'; import { globals } from '@/utils/constants'; import { useOssEdit } from '../OssEditContext'; import FormOSS from './FormOSS'; -import RSFormToolbar from './OssFormToolbar'; interface EditorOssCardProps { isModified: boolean; @@ -42,7 +42,7 @@ function EditorOssCard({ isModified, onDestroy, setIsModified }: EditorOssCardPr return ( <> - setAlias(event.target.value)} /> - setVisible(prev => !prev)} readOnly={readOnly} diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssFormToolbar.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssFormToolbar.tsx deleted file mode 100644 index a076cffa..00000000 --- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssFormToolbar.tsx +++ /dev/null @@ -1,66 +0,0 @@ -'use client'; - -import { useMemo } from 'react'; - -import { SubscribeIcon } from '@/components/DomainIcons'; -import { IconDestroy, IconSave, IconShare } from '@/components/Icons'; -import BadgeHelp from '@/components/info/BadgeHelp'; -import MiniButton from '@/components/ui/MiniButton'; -import Overlay from '@/components/ui/Overlay'; -import { useAccessMode } from '@/context/AccessModeContext'; -import { HelpTopic } from '@/models/miscellaneous'; -import { UserLevel } from '@/models/user'; -import { PARAMETER } from '@/utils/constants'; -import { prepareTooltip } from '@/utils/labels'; - -import { useOssEdit } from '../OssEditContext'; - -interface RSFormToolbarProps { - modified: boolean; - subscribed: boolean; - anonymous: boolean; - onSubmit: () => void; - onDestroy: () => void; -} - -function RSFormToolbar({ modified, anonymous, subscribed, onSubmit, onDestroy }: RSFormToolbarProps) { - const controller = useOssEdit(); - const { accessLevel } = useAccessMode(); - const canSave = useMemo(() => modified && !controller.isProcessing, [modified, controller.isProcessing]); - return ( - - {controller.isMutable || modified ? ( - } - onClick={onSubmit} - /> - ) : null} - } - onClick={controller.share} - /> - {!anonymous ? ( - ${subscribed ? 'включено' : 'выключено'}`} - icon={} - disabled={controller.isProcessing} - onClick={controller.toggleSubscribe} - /> - ) : null} - {controller.isMutable ? ( - } - disabled={!controller.isMutable || controller.isProcessing || accessLevel < UserLevel.OWNER} - onClick={onDestroy} - /> - ) : null} - - - ); -} - -export default RSFormToolbar; diff --git a/rsconcept/frontend/src/pages/OssPage/OssTabsMenu.tsx b/rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx similarity index 98% rename from rsconcept/frontend/src/pages/OssPage/OssTabsMenu.tsx rename to rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx index ee385eb2..201dabef 100644 --- a/rsconcept/frontend/src/pages/OssPage/OssTabsMenu.tsx +++ b/rsconcept/frontend/src/pages/OssPage/MenuOssTabs.tsx @@ -27,11 +27,11 @@ import { describeAccessMode, labelAccessMode } from '@/utils/labels'; import { useOssEdit } from './OssEditContext'; -interface OssTabsMenuProps { +interface MenuOssTabsProps { onDestroy: () => void; } -function OssTabsMenu({ onDestroy }: OssTabsMenuProps) { +function MenuOssTabs({ onDestroy }: MenuOssTabsProps) { const controller = useOssEdit(); const router = useConceptNavigation(); const { user } = useAuth(); @@ -200,4 +200,4 @@ function OssTabsMenu({ onDestroy }: OssTabsMenuProps) { ); } -export default OssTabsMenu; +export default MenuOssTabs; diff --git a/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx b/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx index 2c13cafe..6bc146e2 100644 --- a/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx +++ b/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx @@ -6,7 +6,7 @@ import { toast } from 'react-toastify'; import { useAccessMode } from '@/context/AccessModeContext'; import { useAuth } from '@/context/AuthContext'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { useOSS } from '@/context/OssContext'; import DlgChangeLocation from '@/dialogs/DlgChangeLocation'; import DlgEditEditors from '@/dialogs/DlgEditEditors'; diff --git a/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx b/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx index 12cbc9da..fe920fb5 100644 --- a/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx +++ b/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx @@ -12,17 +12,17 @@ import Loader from '@/components/ui/Loader'; import TabLabel from '@/components/ui/TabLabel'; import TextURL from '@/components/ui/TextURL'; import AnimateFade from '@/components/wrap/AnimateFade'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { useLibrary } from '@/context/LibraryContext'; import { useBlockNavigation, useConceptNavigation } from '@/context/NavigationContext'; -import { useConceptOptions } from '@/context/OptionsContext'; import { useOSS } from '@/context/OssContext'; import useQueryStrings from '@/hooks/useQueryStrings'; import { information, prompts } from '@/utils/labels'; import EditorRSForm from './EditorOssCard'; import EditorTermGraph from './EditorOssGraph'; +import MenuOssTabs from './MenuOssTabs'; import { OssEditState } from './OssEditContext'; -import OssTabsMenu from './OssTabsMenu'; export enum OssTabID { CARD = 0, @@ -131,7 +131,7 @@ function OssTabs() { className='flex flex-col mx-auto min-w-fit' > - + ${schema.title ?? ''}`} /> diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx index 285ea3e8..45e83f7b 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx @@ -4,7 +4,7 @@ import clsx from 'clsx'; import { AnimatePresence } from 'framer-motion'; import { useMemo, useState } from 'react'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import useLocalStorage from '@/hooks/useLocalStorage'; import useWindowSize from '@/hooks/useWindowSize'; import { ConstituentaID, IConstituenta } from '@/models/rsform'; @@ -12,8 +12,8 @@ import { globals, storage } from '@/utils/constants'; import { useRSEdit } from '../RSEditContext'; import ViewConstituents from '../ViewConstituents'; -import ConstituentaToolbar from './ConstituentaToolbar'; import FormConstituenta from './FormConstituenta'; +import ToolbarConstituenta from './ToolbarConstituenta'; // Threshold window width to switch layout. const SIDELIST_LAYOUT_THRESHOLD = 1000; // px @@ -81,7 +81,7 @@ function EditorConstituenta({ activeCst, isModified, setIsModified, onOpenEdit } return (
    {controller.isContentEditable ? ( - void; } -function ConstituentaToolbar({ +function ToolbarConstituenta({ disabled, modified, showList, @@ -45,7 +45,7 @@ function ConstituentaToolbar({ onClone, onCreate, onToggleList -}: ConstituentaToolbarProps) { +}: ToolbarConstituentaProps) { return ( - void; } -function ExpressionToolbar({ disabled, showControls, toggleControls, showAST }: ExpressionToolbarProps) { +function ToolbarRSExpression({ disabled, showControls, toggleControls, showAST }: ToolbarRSExpressionProps) { const model = useRSForm(); const { mathFont, setMathFont } = useConceptOptions(); @@ -45,4 +45,4 @@ function ExpressionToolbar({ disabled, showControls, toggleControls, showAST }: ); } -export default ExpressionToolbar; +export default ToolbarRSExpression; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx index 479ec0d6..aae478f9 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx @@ -12,7 +12,7 @@ import { useRSEdit } from '../RSEditContext'; import EditorLibraryItem from './EditorLibraryItem'; import FormRSForm from './FormRSForm'; import RSFormStats from './RSFormStats'; -import RSFormToolbar from './RSFormToolbar'; +import ToolbarRSFormCard from './ToolbarRSFormCard'; interface EditorRSFormCardProps { isModified: boolean; @@ -43,7 +43,7 @@ function EditorRSFormCard({ isModified, onDestroy, setIsModified }: EditorRSForm return ( <> - setAlias(event.target.value)} />
    - - + setVisible(prev => !prev)} readOnly={readOnly} diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx similarity index 92% rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx rename to rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx index 79ab54a6..14f5c1bc 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess.tsx @@ -13,7 +13,7 @@ import { HelpTopic } from '@/models/miscellaneous'; import { UserLevel } from '@/models/user'; import { PARAMETER } from '@/utils/constants'; -interface AccessToolbarProps { +interface ToolbarItemAccessProps { visible: boolean; toggleVisible: () => void; readOnly: boolean; @@ -21,7 +21,7 @@ interface AccessToolbarProps { controller: ILibraryItemEditor; } -function AccessToolbar({ visible, toggleVisible, readOnly, toggleReadOnly, controller }: AccessToolbarProps) { +function ToolbarItemAccess({ visible, toggleVisible, readOnly, toggleReadOnly, controller }: ToolbarItemAccessProps) { const { accessLevel } = useAccessMode(); const policy = useMemo( () => controller.schema?.access_policy ?? AccessPolicy.PRIVATE, @@ -64,4 +64,4 @@ function AccessToolbar({ visible, toggleVisible, readOnly, toggleReadOnly, contr ); } -export default AccessToolbar; +export default ToolbarItemAccess; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx similarity index 93% rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx rename to rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx index 5dfb3147..5404898e 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarRSFormCard.tsx @@ -16,7 +16,7 @@ import { prepareTooltip, tooltips } from '@/utils/labels'; import { useRSEdit } from '../RSEditContext'; -interface RSFormToolbarProps { +interface ToolbarRSFormCardProps { modified: boolean; subscribed: boolean; anonymous: boolean; @@ -24,7 +24,7 @@ interface RSFormToolbarProps { onDestroy: () => void; } -function RSFormToolbar({ modified, anonymous, subscribed, onSubmit, onDestroy }: RSFormToolbarProps) { +function ToolbarRSFormCard({ modified, anonymous, subscribed, onSubmit, onDestroy }: ToolbarRSFormCardProps) { const controller = useRSEdit(); const { accessLevel } = useAccessMode(); const canSave = useMemo(() => modified && !controller.isProcessing, [modified, controller.isProcessing]); @@ -65,4 +65,4 @@ function RSFormToolbar({ modified, anonymous, subscribed, onSubmit, onDestroy }: ); } -export default RSFormToolbar; +export default ToolbarRSFormCard; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx similarity index 92% rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx rename to rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx index 7f273de2..a0b23277 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx @@ -7,10 +7,10 @@ import { PARAMETER } from '@/utils/constants'; import { useRSEdit } from '../RSEditContext'; -function VersionsToolbar() { +function ToolbarVersioning() { const controller = useRSEdit(); return ( - + {controller.isMutable ? ( <> void; @@ -104,7 +104,7 @@ function EditorRSList({ onOpenEdit }: EditorRSListProps) { return ( <> - {controller.isContentEditable ? : null} + {controller.isContentEditable ? : null} {controller.isContentEditable ? ( - (); -function RSTable({ items, maxHeight, enableSelection, selected, setSelected, onEdit, onCreateNew }: RSTableProps) { +function TableRSList({ + items, + maxHeight, + enableSelection, + selected, + setSelected, + onEdit, + onCreateNew +}: TableRSListProps) { const { colors } = useConceptOptions(); const windowSize = useWindowSize(); @@ -147,4 +155,4 @@ function RSTable({ items, maxHeight, enableSelection, selected, setSelected, onE ); } -export default RSTable; +export default TableRSList; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx similarity index 98% rename from rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx rename to rsconcept/frontend/src/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx index c297995f..ecd6e787 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSListToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx @@ -21,7 +21,7 @@ import { getCstTypeShortcut, labelCstType, prepareTooltip } from '@/utils/labels import { useRSEdit } from '../RSEditContext'; -function RSListToolbar() { +function ToolbarRSList() { const controller = useRSEdit(); const insertMenu = useDropdown(); @@ -87,4 +87,4 @@ function RSListToolbar() { ); } -export default RSListToolbar; +export default ToolbarRSList; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx index 92c339af..c6cfbf8b 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx @@ -8,11 +8,11 @@ import { useDebounce } from 'use-debounce'; import InfoConstituenta from '@/components/info/InfoConstituenta'; import SelectedCounter from '@/components/info/SelectedCounter'; -import GraphSelectionToolbar from '@/components/select/GraphSelectionToolbar'; +import ToolbarGraphSelection from '@/components/select/ToolbarGraphSelection'; import { GraphCanvasRef, GraphEdge, GraphLayout, GraphNode } from '@/components/ui/GraphUI'; import Overlay from '@/components/ui/Overlay'; import AnimateFade from '@/components/wrap/AnimateFade'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import DlgGraphParams from '@/dialogs/DlgGraphParams'; import useLocalStorage from '@/hooks/useLocalStorage'; import { GraphColoring, GraphFilterParams, GraphSizing } from '@/models/miscellaneous'; @@ -24,10 +24,10 @@ import { PARAMETER, storage } from '@/utils/constants'; import { convertBase64ToBlob } from '@/utils/utils'; import { useRSEdit } from '../RSEditContext'; -import FocusToolbar from './FocusToolbar'; import GraphSelectors from './GraphSelectors'; -import GraphToolbar from './GraphToolbar'; import TermGraph from './TermGraph'; +import ToolbarFocusedCst from './ToolbarFocusedCst'; +import ToolbarTermGraph from './ToolbarTermGraph'; import useGraphFilter from './useGraphFilter'; import ViewHidden from './ViewHidden'; @@ -303,7 +303,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) { position='top-0 pt-1 right-1/2 translate-x-1/2' className='flex flex-col items-center rounded-b-2xl cc-blur' > - {!focusCst ? ( - isBasicConcept(cst.cst_type)).map(cst => cst.id)} setSelected={controller.setSelected} @@ -331,7 +331,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) { /> ) : null} {focusCst ? ( - handleSetFocus(undefined)} showInputs={filterParams.focusShowInputs} diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx index d8334c0a..e68b8dca 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/TermGraph.tsx @@ -12,7 +12,7 @@ import GraphUI, { GraphPointerEvent, useSelection } from '@/components/ui/GraphUI'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { ConstituentaID } from '@/models/rsform'; import { graphDarkT, graphLightT } from '@/styling/color'; import { PARAMETER, resources } from '@/utils/constants'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/FocusToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx similarity index 89% rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/FocusToolbar.tsx rename to rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx index 38e017ba..ffd7642d 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/FocusToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx @@ -4,12 +4,12 @@ import { useCallback } from 'react'; import { IconGraphInputs, IconGraphOutputs, IconReset } from '@/components/Icons'; import MiniButton from '@/components/ui/MiniButton'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { IConstituenta } from '@/models/rsform'; import { useRSEdit } from '../RSEditContext'; -interface FocusToolbarProps { +interface ToolbarFocusedCstProps { center: IConstituenta; showInputs: boolean; showOutputs: boolean; @@ -19,14 +19,14 @@ interface FocusToolbarProps { toggleShowOutputs: () => void; } -function FocusToolbar({ +function ToolbarFocusedCst({ center, reset, showInputs, showOutputs, toggleShowInputs, toggleShowOutputs -}: FocusToolbarProps) { +}: ToolbarFocusedCstProps) { const { colors } = useConceptOptions(); const controller = useRSEdit(); @@ -60,4 +60,4 @@ function FocusToolbar({ ); } -export default FocusToolbar; +export default ToolbarFocusedCst; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx similarity index 96% rename from rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx rename to rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx index d3bbc7ac..b923d4d2 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx @@ -19,7 +19,7 @@ import { PARAMETER } from '@/utils/constants'; import { useRSEdit } from '../RSEditContext'; -interface GraphToolbarProps { +interface ToolbarTermGraphProps { is3D: boolean; orbit: boolean; @@ -37,7 +37,7 @@ interface GraphToolbarProps { toggleOrbit: () => void; } -function GraphToolbar({ +function ToolbarTermGraph({ is3D, noText, foldDerived, @@ -50,7 +50,7 @@ function GraphToolbar({ onDelete, onResetViewpoint, onSaveImage -}: GraphToolbarProps) { +}: ToolbarTermGraphProps) { const controller = useRSEdit(); return ( @@ -123,4 +123,4 @@ function GraphToolbar({ ); } -export default GraphToolbar; +export default ToolbarTermGraph; diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx index c3dd5cd0..e2d20b20 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx @@ -5,11 +5,11 @@ import { motion } from 'framer-motion'; import { useCallback, useMemo } from 'react'; import { IconDropArrow, IconDropArrowUp } from '@/components/Icons'; -import ConstituentaTooltip from '@/components/info/ConstituentaTooltip'; +import TooltipConstituenta from '@/components/info/TooltipConstituenta'; import { CProps } from '@/components/props'; import MiniButton from '@/components/ui/MiniButton'; import Overlay from '@/components/ui/Overlay'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import useLocalStorage from '@/hooks/useLocalStorage'; import useWindowSize from '@/hooks/useWindowSize'; import { GraphColoring } from '@/models/miscellaneous'; @@ -112,7 +112,7 @@ function ViewHidden({ items, selected, toggleSelection, setFocus, schema, colori > {cst.alias} - +
    ); })} diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx similarity index 99% rename from rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx rename to rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx index c6f02a65..1c349e62 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/MenuRSTabs.tsx @@ -38,11 +38,11 @@ import { describeAccessMode, labelAccessMode, tooltips } from '@/utils/labels'; import { useRSEdit } from './RSEditContext'; -interface RSTabsMenuProps { +interface MenuRSTabsProps { onDestroy: () => void; } -function RSTabsMenu({ onDestroy }: RSTabsMenuProps) { +function MenuRSTabs({ onDestroy }: MenuRSTabsProps) { const controller = useRSEdit(); const router = useConceptNavigation(); const { user } = useAuth(); @@ -334,4 +334,4 @@ function RSTabsMenu({ onDestroy }: RSTabsMenuProps) { ); } -export default RSTabsMenu; +export default MenuRSTabs; diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx index f2671926..7b9c6e3d 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx @@ -9,7 +9,7 @@ import { urls } from '@/app/urls'; import { useAccessMode } from '@/context/AccessModeContext'; import { useAuth } from '@/context/AuthContext'; import { useConceptNavigation } from '@/context/NavigationContext'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { useRSForm } from '@/context/RSFormContext'; import DlgChangeLocation from '@/dialogs/DlgChangeLocation'; import DlgCloneLibraryItem from '@/dialogs/DlgCloneLibraryItem'; diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx index ee299aa0..0a04c0cb 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx @@ -13,9 +13,9 @@ import Loader from '@/components/ui/Loader'; import TabLabel from '@/components/ui/TabLabel'; import TextURL from '@/components/ui/TextURL'; import AnimateFade from '@/components/wrap/AnimateFade'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import { useLibrary } from '@/context/LibraryContext'; import { useBlockNavigation, useConceptNavigation } from '@/context/NavigationContext'; -import { useConceptOptions } from '@/context/OptionsContext'; import { useRSForm } from '@/context/RSFormContext'; import useQueryStrings from '@/hooks/useQueryStrings'; import { ConstituentaID, IConstituenta, IConstituentaMeta } from '@/models/rsform'; @@ -26,8 +26,8 @@ import EditorConstituenta from './EditorConstituenta'; import EditorRSForm from './EditorRSFormCard'; import EditorRSList from './EditorRSList'; import EditorTermGraph from './EditorTermGraph'; +import MenuRSTabs from './MenuRSTabs'; import { RSEditState } from './RSEditContext'; -import RSTabsMenu from './RSTabsMenu'; export enum RSTabID { CARD = 0, @@ -249,7 +249,7 @@ function RSTabs() { className='flex flex-col mx-auto min-w-fit' > - + void; @@ -22,7 +22,13 @@ interface ConstituentsTableProps { const columnHelper = createColumnHelper(); -function ConstituentsTable({ items, activeCst, onOpenEdit, maxHeight, denseThreshold = 9999 }: ConstituentsTableProps) { +function TableSideConstituents({ + items, + activeCst, + onOpenEdit, + maxHeight, + denseThreshold = 9999 +}: TableSideConstituentsProps) { const { colors } = useConceptOptions(); const windowSize = useWindowSize(); @@ -165,4 +171,4 @@ function ConstituentsTable({ items, activeCst, onOpenEdit, maxHeight, denseThres ); } -export default ConstituentsTable; +export default TableSideConstituents; diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx index d844dd10..e5aca018 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx @@ -5,14 +5,14 @@ import { motion } from 'framer-motion'; import { useMemo, useState } from 'react'; import { useAccessMode } from '@/context/AccessModeContext'; -import { useConceptOptions } from '@/context/OptionsContext'; +import { useConceptOptions } from '@/context/ConceptOptionsContext'; import useWindowSize from '@/hooks/useWindowSize'; import { ConstituentaID, IConstituenta, IRSForm } from '@/models/rsform'; import { UserLevel } from '@/models/user'; import { animateSideView } from '@/styling/animations'; import ConstituentsSearch from './ConstituentsSearch'; -import ConstituentsTable from './ConstituentsTable'; +import TableSideConstituents from './TableSideConstituents'; // Window width cutoff for expression show const COLUMN_EXPRESSION_HIDE_THRESHOLD = 1500; @@ -37,7 +37,7 @@ function ViewConstituents({ expression, schema, activeCst, isBottom, onOpenEdit const table = useMemo( () => ( - (); -function ViewSubscriptions({ items }: ViewSubscriptionsProps) { +function TableSubscriptions({ items }: TableSubscriptionsProps) { const router = useConceptNavigation(); const intl = useIntl(); @@ -82,4 +82,4 @@ function ViewSubscriptions({ items }: ViewSubscriptionsProps) { ); } -export default ViewSubscriptions; +export default TableSubscriptions; diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserContents.tsx similarity index 89% rename from rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx rename to rsconcept/frontend/src/pages/UserProfilePage/UserContents.tsx index f5357dea..a9185e09 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/UserContents.tsx @@ -14,9 +14,9 @@ import { useUserProfile } from '@/context/UserProfileContext'; import EditorPassword from './EditorPassword'; import EditorProfile from './EditorProfile'; -import ViewSubscriptions from './ViewSubscriptions'; +import TableSubscriptions from './TableSubscriptions'; -function UserTabs() { +function UserContents() { const { user, error, loading } = useUserProfile(); const { user: auth } = useAuth(); const { items } = useLibrary(); @@ -50,11 +50,11 @@ function UserTabs() {
    • - {subscriptions.length > 0 && showSubs ? : null} + {subscriptions.length > 0 && showSubs ? : null} ); } -export default UserTabs; +export default UserContents; diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx index 207e4e91..6f8f608e 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/UserProfilePage.tsx @@ -1,13 +1,13 @@ import RequireAuth from '@/components/wrap/RequireAuth'; import { UserProfileState } from '@/context/UserProfileContext'; -import UserTabs from './UserTabs'; +import UserContents from './UserContents'; function UserProfilePage() { return ( - + );