From 9b6a014fb37cc03a938a5309fd1be18b89c5190f Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Wed, 2 Jul 2025 12:37:47 +0300 Subject: [PATCH] R: Remove index files from components --- .../frontend/src/components/modal/modal-form.tsx | 2 +- .../frontend/src/components/modal/modal-view.tsx | 2 +- .../src/features/auth/components/index.tsx | 2 -- .../src/features/help/components/index.tsx | 2 +- .../src/features/help/items/ui/help-rscard.tsx | 10 +++++----- .../src/features/help/items/ui/help-rsmenu.tsx | 9 ++++----- rsconcept/frontend/src/features/help/labels.ts | 2 +- .../library/components/editor-library-item.tsx | 3 ++- .../src/features/library/components/index.tsx | 8 -------- .../library/components/toolbar-item-access.tsx | 2 +- .../library/components/toolbar-item-card.tsx | 2 +- .../dlg-edit-editors/dlg-edit-editors.tsx | 3 ++- .../pages/create-item-page/create-item-page.tsx | 2 +- .../pages/library-page/toolbar-search.tsx | 2 +- .../pages/library-page/view-side-location.tsx | 2 +- .../oss/dialogs/dlg-change-input-schema.tsx | 2 +- .../dlg-create-block/dlg-create-block.tsx | 2 +- .../dlg-create-operation/tab-input-operation.tsx | 2 +- .../dlg-edit-operation/dlg-edit-operation.tsx | 2 +- .../dialogs/dlg-edit-operation/tab-synthesis.tsx | 2 +- .../oss/dialogs/dlg-relocate-constituents.tsx | 4 ++-- .../oss-page/editor-oss-card/editor-oss-card.tsx | 3 ++- .../pages/oss-page/editor-oss-card/form-oss.tsx | 2 +- .../editor-oss-graph/toolbar-oss-graph.tsx | 2 +- .../oss/pages/oss-page/menu-oss-tabs.tsx | 2 +- .../src/features/oss/pages/oss-page/oss-page.tsx | 2 +- .../src/features/oss/pages/oss-page/oss-tabs.tsx | 2 +- .../src/features/rsform/components/index.tsx | 3 --- .../rsform/components/pick-substitutions.tsx | 2 +- .../dialogs/dlg-create-cst/form-create-cst.tsx | 2 +- .../dlg-inline-synthesis.tsx | 2 +- .../dialogs/dlg-inline-synthesis/tab-source.tsx | 2 +- .../editor-constituenta/toolbar-constituenta.tsx | 4 ++-- .../editor-rsexpression/status-bar.tsx | 2 +- .../editor-rsform-card/editor-rsform-card.tsx | 3 ++- .../editor-rsform-card/form-rsform.tsx | 3 ++- .../editor-rsform-card/toolbar-versioning.tsx | 2 +- .../rsform-page/editor-rslist/toolbar-rslist.tsx | 4 ++-- .../editor-term-graph/select-coloring.tsx | 2 +- .../editor-term-graph/toolbar-term-graph.tsx | 4 ++-- .../rsform/pages/rsform-page/menu-rstabs.tsx | 2 +- .../features/rsform/pages/rsform-page/rstabs.tsx | 16 ++++------------ .../src/features/users/components/index.tsx | 3 --- .../users/pages/register-page/register-page.tsx | 2 +- .../user-profile-page/user-profile-page.tsx | 2 +- 45 files changed, 60 insertions(+), 80 deletions(-) delete mode 100644 rsconcept/frontend/src/features/auth/components/index.tsx delete mode 100644 rsconcept/frontend/src/features/library/components/index.tsx delete mode 100644 rsconcept/frontend/src/features/rsform/components/index.tsx delete mode 100644 rsconcept/frontend/src/features/users/components/index.tsx diff --git a/rsconcept/frontend/src/components/modal/modal-form.tsx b/rsconcept/frontend/src/components/modal/modal-form.tsx index 5022f39e..eced50e2 100644 --- a/rsconcept/frontend/src/components/modal/modal-form.tsx +++ b/rsconcept/frontend/src/components/modal/modal-form.tsx @@ -1,7 +1,7 @@ 'use client'; import { type HelpTopic } from '@/features/help'; -import { BadgeHelp } from '@/features/help/components'; +import { BadgeHelp } from '@/features/help/components/badge-help'; import { useEscapeKey } from '@/hooks/use-escape-key'; import { useDialogsStore } from '@/stores/dialogs'; diff --git a/rsconcept/frontend/src/components/modal/modal-view.tsx b/rsconcept/frontend/src/components/modal/modal-view.tsx index ec65d791..d59eb5c2 100644 --- a/rsconcept/frontend/src/components/modal/modal-view.tsx +++ b/rsconcept/frontend/src/components/modal/modal-view.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; -import { BadgeHelp } from '@/features/help/components'; +import { BadgeHelp } from '@/features/help/components/badge-help'; import { useEscapeKey } from '@/hooks/use-escape-key'; import { useDialogsStore } from '@/stores/dialogs'; diff --git a/rsconcept/frontend/src/features/auth/components/index.tsx b/rsconcept/frontend/src/features/auth/components/index.tsx deleted file mode 100644 index d461becf..00000000 --- a/rsconcept/frontend/src/features/auth/components/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export { ExpectedAnonymous } from './expected-anonymous'; -export { RequireAuth } from './require-auth'; diff --git a/rsconcept/frontend/src/features/help/components/index.tsx b/rsconcept/frontend/src/features/help/components/index.tsx index 72ed59c9..0519ecba 100644 --- a/rsconcept/frontend/src/features/help/components/index.tsx +++ b/rsconcept/frontend/src/features/help/components/index.tsx @@ -1 +1 @@ -export { BadgeHelp } from './badge-help'; + \ No newline at end of file diff --git a/rsconcept/frontend/src/features/help/items/ui/help-rscard.tsx b/rsconcept/frontend/src/features/help/items/ui/help-rscard.tsx index a063f7dc..02a29f01 100644 --- a/rsconcept/frontend/src/features/help/items/ui/help-rscard.tsx +++ b/rsconcept/frontend/src/features/help/items/ui/help-rscard.tsx @@ -15,17 +15,17 @@ import { HelpTopic } from '../../models/help-topic'; export function HelpRSCard() { return (
-

Карточка схемы

+

Паспорт схемы

-

Карточка содержит общую информацию и статистику

+

Паспорт содержит общую информацию и статистику

- Карточка позволяет управлять атрибутами и + Паспорт позволяет управлять атрибутами и

- Карточка позволяет назначать Редакторов + Паспорт позволяет назначать Редакторов

- Карточка позволяет изменить Владельца + Паспорт позволяет изменить Владельца

Управление

diff --git a/rsconcept/frontend/src/features/help/items/ui/help-rsmenu.tsx b/rsconcept/frontend/src/features/help/items/ui/help-rsmenu.tsx index 832be39e..9b40d796 100644 --- a/rsconcept/frontend/src/features/help/items/ui/help-rsmenu.tsx +++ b/rsconcept/frontend/src/features/help/items/ui/help-rsmenu.tsx @@ -32,18 +32,17 @@ export function HelpRSMenu() {

Вкладки

diff --git a/rsconcept/frontend/src/features/help/labels.ts b/rsconcept/frontend/src/features/help/labels.ts index 50227141..86e36cb6 100644 --- a/rsconcept/frontend/src/features/help/labels.ts +++ b/rsconcept/frontend/src/features/help/labels.ts @@ -13,7 +13,7 @@ export function labelHelpTopic(topic: HelpTopic): string { case HelpTopic.INTERFACE: return '🌀 Интерфейс'; case HelpTopic.UI_LIBRARY: return 'Библиотека'; case HelpTopic.UI_RS_MENU: return 'Меню схемы'; - case HelpTopic.UI_RS_CARD: return 'Карточка схемы'; + case HelpTopic.UI_RS_CARD: return 'Паспорт схемы'; case HelpTopic.UI_RS_LIST: return 'Список конституент'; case HelpTopic.UI_RS_EDITOR: return 'Редактор конституенты'; case HelpTopic.UI_GRAPH_TERM: return 'Граф термов'; diff --git a/rsconcept/frontend/src/features/library/components/editor-library-item.tsx b/rsconcept/frontend/src/features/library/components/editor-library-item.tsx index a3f26b2f..e9bb2d1b 100644 --- a/rsconcept/frontend/src/features/library/components/editor-library-item.tsx +++ b/rsconcept/frontend/src/features/library/components/editor-library-item.tsx @@ -3,7 +3,8 @@ import { useIntl } from 'react-intl'; import { urls, useConceptNavigation } from '@/app'; import { useLabelUser, useRoleStore, UserRole } from '@/features/users'; -import { InfoUsers, SelectUser } from '@/features/users/components'; +import { InfoUsers } from '@/features/users/components/info-users'; +import { SelectUser } from '@/features/users/components/select-user'; import { Tooltip } from '@/components/container'; import { MiniButton } from '@/components/control'; diff --git a/rsconcept/frontend/src/features/library/components/index.tsx b/rsconcept/frontend/src/features/library/components/index.tsx deleted file mode 100644 index 140d1c6a..00000000 --- a/rsconcept/frontend/src/features/library/components/index.tsx +++ /dev/null @@ -1,8 +0,0 @@ -export { EditorLibraryItem } from './editor-library-item'; -export { MenuRole } from './menu-role'; -export { MiniSelectorOSS } from './mini-selector-oss'; -export { PickSchema } from './pick-schema'; -export { SelectLibraryItem } from './select-library-item'; -export { SelectVersion } from './select-version'; -export { ToolbarItemAccess } from './toolbar-item-access'; -export { ToolbarItemCard } from './toolbar-item-card'; diff --git a/rsconcept/frontend/src/features/library/components/toolbar-item-access.tsx b/rsconcept/frontend/src/features/library/components/toolbar-item-access.tsx index 49b11e92..811ca8bf 100644 --- a/rsconcept/frontend/src/features/library/components/toolbar-item-access.tsx +++ b/rsconcept/frontend/src/features/library/components/toolbar-item-access.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { HelpTopic } from '@/features/help'; -import { BadgeHelp } from '@/features/help/components'; +import { BadgeHelp } from '@/features/help/components/badge-help'; import { useRoleStore, UserRole } from '@/features/users'; import { MiniButton } from '@/components/control'; diff --git a/rsconcept/frontend/src/features/library/components/toolbar-item-card.tsx b/rsconcept/frontend/src/features/library/components/toolbar-item-card.tsx index 3a2d4750..ece1cb06 100644 --- a/rsconcept/frontend/src/features/library/components/toolbar-item-card.tsx +++ b/rsconcept/frontend/src/features/library/components/toolbar-item-card.tsx @@ -2,7 +2,7 @@ import { urls, useConceptNavigation } from '@/app'; import { HelpTopic } from '@/features/help'; -import { BadgeHelp } from '@/features/help/components'; +import { BadgeHelp } from '@/features/help/components/badge-help'; import { type IRSForm } from '@/features/rsform'; import { useRoleStore, UserRole } from '@/features/users'; diff --git a/rsconcept/frontend/src/features/library/dialogs/dlg-edit-editors/dlg-edit-editors.tsx b/rsconcept/frontend/src/features/library/dialogs/dlg-edit-editors/dlg-edit-editors.tsx index c8b7205d..3fe46911 100644 --- a/rsconcept/frontend/src/features/library/dialogs/dlg-edit-editors/dlg-edit-editors.tsx +++ b/rsconcept/frontend/src/features/library/dialogs/dlg-edit-editors/dlg-edit-editors.tsx @@ -3,7 +3,8 @@ import { useState } from 'react'; import { useUsers } from '@/features/users'; -import { SelectUser, TableUsers } from '@/features/users/components'; +import { SelectUser } from '@/features/users/components/select-user'; +import { TableUsers } from '@/features/users/components/table-users'; import { MiniButton } from '@/components/control'; import { IconRemove } from '@/components/icons'; diff --git a/rsconcept/frontend/src/features/library/pages/create-item-page/create-item-page.tsx b/rsconcept/frontend/src/features/library/pages/create-item-page/create-item-page.tsx index 13931a4d..63cbaed4 100644 --- a/rsconcept/frontend/src/features/library/pages/create-item-page/create-item-page.tsx +++ b/rsconcept/frontend/src/features/library/pages/create-item-page/create-item-page.tsx @@ -1,4 +1,4 @@ -import { RequireAuth } from '@/features/auth/components'; +import { RequireAuth } from '@/features/auth/components/require-auth'; import { FormCreateItem } from './form-create-item'; diff --git a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx index 193fe1de..31b0073e 100644 --- a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx +++ b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; -import { SelectUser } from '@/features/users/components'; +import { SelectUser } from '@/features/users/components/select-user'; import { MiniButton, SelectorButton } from '@/components/control'; import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown'; diff --git a/rsconcept/frontend/src/features/library/pages/library-page/view-side-location.tsx b/rsconcept/frontend/src/features/library/pages/library-page/view-side-location.tsx index 801e2aba..30699f8b 100644 --- a/rsconcept/frontend/src/features/library/pages/library-page/view-side-location.tsx +++ b/rsconcept/frontend/src/features/library/pages/library-page/view-side-location.tsx @@ -3,7 +3,7 @@ import clsx from 'clsx'; import { useAuthSuspense } from '@/features/auth'; import { HelpTopic } from '@/features/help'; -import { BadgeHelp } from '@/features/help/components'; +import { BadgeHelp } from '@/features/help/components/badge-help'; import { MiniButton } from '@/components/control'; import { IconFolderEdit, IconFolderTree } from '@/components/icons'; diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-change-input-schema.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-change-input-schema.tsx index 01c4caf1..5c838c96 100644 --- a/rsconcept/frontend/src/features/oss/dialogs/dlg-change-input-schema.tsx +++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-change-input-schema.tsx @@ -5,7 +5,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; import { type ILibraryItem, LibraryItemType } from '@/features/library'; import { useLibrary } from '@/features/library/backend/use-library'; -import { PickSchema } from '@/features/library/components'; +import { PickSchema } from '@/features/library/components/pick-schema'; import { MiniButton } from '@/components/control'; import { IconReset } from '@/components/icons'; diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-block/dlg-create-block.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-block/dlg-create-block.tsx index a78403a2..01454034 100644 --- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-block/dlg-create-block.tsx +++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-block/dlg-create-block.tsx @@ -86,7 +86,7 @@ export function DlgCreateBlock() { > setActiveTab(index as TabID)}> - + 0 ? '*' : ''}`} diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx index 0d14fc7a..9e9ef291 100644 --- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx +++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx @@ -4,7 +4,7 @@ import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { type ILibraryItem, LibraryItemType } from '@/features/library'; import { useLibrary } from '@/features/library/backend/use-library'; -import { PickSchema } from '@/features/library/components'; +import { PickSchema } from '@/features/library/components/pick-schema'; import { MiniButton } from '@/components/control'; import { IconReset } from '@/components/icons'; diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx index 8dfa0891..c656d753 100644 --- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx +++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx @@ -79,7 +79,7 @@ export function DlgEditOperation() { - + diff --git a/rsconcept/frontend/src/features/rsform/components/index.tsx b/rsconcept/frontend/src/features/rsform/components/index.tsx deleted file mode 100644 index 07258f6f..00000000 --- a/rsconcept/frontend/src/features/rsform/components/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export { ConstituentaTooltip } from './constituenta-tooltip'; -export { PickMultiConstituenta } from './pick-multi-constituenta'; -export { PickSubstitutions } from './pick-substitutions'; diff --git a/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx b/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx index 594f0b80..8b5f02fd 100644 --- a/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx +++ b/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx @@ -4,7 +4,7 @@ import { useState } from 'react'; import { toast } from 'react-toastify'; import { type ILibraryItem } from '@/features/library'; -import { SelectLibraryItem } from '@/features/library/components'; +import { SelectLibraryItem } from '@/features/library/components/select-library-item'; import { MiniButton } from '@/components/control'; import { createColumnHelper, DataTable, type IConditionalStyle } from '@/components/data-table'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx index b22a9b18..74969cf6 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx @@ -4,7 +4,7 @@ import { useState } from 'react'; import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { HelpTopic } from '@/features/help'; -import { BadgeHelp } from '@/features/help/components'; +import { BadgeHelp } from '@/features/help/components/badge-help'; import { TextArea, TextInput } from '@/components/input'; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/dlg-inline-synthesis.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/dlg-inline-synthesis.tsx index 9a046383..49c78801 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/dlg-inline-synthesis.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-inline-synthesis/dlg-inline-synthesis.tsx @@ -66,7 +66,7 @@ export function DlgInlineSynthesis() { className='w-32' /> - Версия: ${labelVersion(schema.version, schema.versions)}`} - /> - Ошибок: ${schema.stats?.count_errors ?? 0}`} - /> - - + + + +
diff --git a/rsconcept/frontend/src/features/users/components/index.tsx b/rsconcept/frontend/src/features/users/components/index.tsx deleted file mode 100644 index f18960c8..00000000 --- a/rsconcept/frontend/src/features/users/components/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export { InfoUsers } from './info-users'; -export { SelectUser } from './select-user'; -export { TableUsers } from './table-users'; diff --git a/rsconcept/frontend/src/features/users/pages/register-page/register-page.tsx b/rsconcept/frontend/src/features/users/pages/register-page/register-page.tsx index 15e6ca4c..cfe5da0c 100644 --- a/rsconcept/frontend/src/features/users/pages/register-page/register-page.tsx +++ b/rsconcept/frontend/src/features/users/pages/register-page/register-page.tsx @@ -1,5 +1,5 @@ import { useAuthSuspense } from '@/features/auth'; -import { ExpectedAnonymous } from '@/features/auth/components'; +import { ExpectedAnonymous } from '@/features/auth/components/expected-anonymous'; import { FormSignup } from './form-signup'; diff --git a/rsconcept/frontend/src/features/users/pages/user-profile-page/user-profile-page.tsx b/rsconcept/frontend/src/features/users/pages/user-profile-page/user-profile-page.tsx index d72c9389..adb58cbd 100644 --- a/rsconcept/frontend/src/features/users/pages/user-profile-page/user-profile-page.tsx +++ b/rsconcept/frontend/src/features/users/pages/user-profile-page/user-profile-page.tsx @@ -1,4 +1,4 @@ -import { RequireAuth } from '@/features/auth/components'; +import { RequireAuth } from '@/features/auth/components/require-auth'; import { EditorPassword } from './editor-password'; import { EditorProfile } from './editor-profile';