From bc811cbf8894ffff783286782e737ecfa3c96be8 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:59:03 +0300
Subject: [PATCH 01/45] Small fixes

---
 rsconcept/frontend/src/models/oss.ts                          | 4 ----
 .../src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx      | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/rsconcept/frontend/src/models/oss.ts b/rsconcept/frontend/src/models/oss.ts
index f1a706e1..9c426f8b 100644
--- a/rsconcept/frontend/src/models/oss.ts
+++ b/rsconcept/frontend/src/models/oss.ts
@@ -3,7 +3,6 @@
  */
 
 import { ILibraryItemData } from './library';
-import { UserID } from './user';
 
 /**
  * Represents backend data for Schema of Synthesis Operations.
@@ -16,8 +15,5 @@ export interface IOperationSchemaData extends ILibraryItemData {
  * Represents Schema of Synthesis Operations.
  */
 export interface IOperationSchema extends IOperationSchemaData {
-  subscribers: UserID[];
-  editors: UserID[];
-
   producedData: number[]; // TODO: modify this to store calculated state on load
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
index 7f55d9e5..3ab9e906 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
@@ -119,7 +119,7 @@ function FormRSForm({ id, isModified, setIsModified }: FormRSFormProps) {
             toggleReadOnly={() => setReadOnly(prev => !prev)}
             controller={controller}
           />
-          <Label text='Версия' className='mb-2' />
+          <Label text='Версия' className='mb-2 select-none' />
           <SelectVersion
             id='schema_version'
             className='select-none'

From c786b541329bd4cb381ac00e47f4c9415bd98353 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 6 Jun 2024 22:01:28 +0300
Subject: [PATCH 02/45] Refactoring Icons

---
 rsconcept/frontend/src/app/Footer.tsx         |  2 +-
 .../frontend/src/components/DomainIcons.tsx   | 52 +++++++++++++------
 .../components/select/SelectGraphFilter.tsx   |  4 +-
 .../src/components/select/SelectMatchMode.tsx |  4 +-
 .../src/pages/LibraryPage/SearchPanel.tsx     |  2 +-
 .../EditorRSExpression/StatusBar.tsx          |  5 +-
 .../EditorRSExpression/StatusIcon.tsx         | 22 --------
 .../EditorTermGraph/FocusToolbar.tsx          | 18 ++-----
 .../src/pages/UserProfilePage/UserTabs.tsx    | 10 +---
 9 files changed, 50 insertions(+), 69 deletions(-)
 delete mode 100644 rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusIcon.tsx

diff --git a/rsconcept/frontend/src/app/Footer.tsx b/rsconcept/frontend/src/app/Footer.tsx
index e22c4655..bae26d81 100644
--- a/rsconcept/frontend/src/app/Footer.tsx
+++ b/rsconcept/frontend/src/app/Footer.tsx
@@ -15,7 +15,7 @@ function Footer() {
       className={clsx(
         'z-navigation',
         'mx-auto',
-        'sm:px-4 sm:py-2 flex flex-col items-center gap-1',
+        'px-3 py-2 flex flex-col items-center gap-1',
         'text-xs sm:text-sm select-none whitespace-nowrap'
       )}
     >
diff --git a/rsconcept/frontend/src/components/DomainIcons.tsx b/rsconcept/frontend/src/components/DomainIcons.tsx
index 065961f0..cf93b85d 100644
--- a/rsconcept/frontend/src/components/DomainIcons.tsx
+++ b/rsconcept/frontend/src/components/DomainIcons.tsx
@@ -1,5 +1,6 @@
 import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
 import { CstMatchMode, DependencyMode } from '@/models/miscellaneous';
+import { ExpressionStatus } from '@/models/rsform';
 
 import {
   IconAlias,
@@ -21,6 +22,10 @@ import {
   IconRSForm,
   IconSettings,
   IconShow,
+  IconStatusError,
+  IconStatusIncalculable,
+  IconStatusOK,
+  IconStatusUnknown,
   IconTemplates,
   IconTerm,
   IconText,
@@ -80,34 +85,51 @@ export function LocationIcon({ value, size = '1.25rem', className }: DomIconProp
   }
 }
 
-export function DependencyIcon(mode: DependencyMode, size: string, color?: string) {
-  switch (mode) {
+export function DependencyIcon({ value, size = '1.25rem', className }: DomIconProps<DependencyMode>) {
+  switch (value) {
     case DependencyMode.ALL:
-      return <IconSettings size={size} className={color} />;
+      return <IconSettings size={size} className={className} />;
     case DependencyMode.EXPRESSION:
-      return <IconText size={size} className={color} />;
+      return <IconText size={size} className={className ?? 'clr-text-primary'} />;
     case DependencyMode.OUTPUTS:
-      return <IconGraphOutputs size={size} className={color} />;
+      return <IconGraphOutputs size={size} className={className ?? 'clr-text-primary'} />;
     case DependencyMode.INPUTS:
-      return <IconGraphInputs size={size} className={color} />;
+      return <IconGraphInputs size={size} className={className ?? 'clr-text-primary'} />;
     case DependencyMode.EXPAND_OUTPUTS:
-      return <IconGraphExpand size={size} className={color} />;
+      return <IconGraphExpand size={size} className={className ?? 'clr-text-primary'} />;
     case DependencyMode.EXPAND_INPUTS:
-      return <IconGraphCollapse size={size} className={color} />;
+      return <IconGraphCollapse size={size} className={className ?? 'clr-text-primary'} />;
   }
 }
 
-export function MatchModeIcon(mode: CstMatchMode, size: string, color?: string) {
-  switch (mode) {
+export function MatchModeIcon({ value, size = '1.25rem', className }: DomIconProps<CstMatchMode>) {
+  switch (value) {
     case CstMatchMode.ALL:
-      return <IconFilter size={size} className={color} />;
+      return <IconFilter size={size} className={className} />;
     case CstMatchMode.TEXT:
-      return <IconText size={size} className={color} />;
+      return <IconText size={size} className={className ?? 'clr-text-primary'} />;
     case CstMatchMode.EXPR:
-      return <IconFormula size={size} className={color} />;
+      return <IconFormula size={size} className={className ?? 'clr-text-primary'} />;
     case CstMatchMode.TERM:
-      return <IconTerm size={size} className={color} />;
+      return <IconTerm size={size} className={className ?? 'clr-text-primary'} />;
     case CstMatchMode.NAME:
-      return <IconAlias size={size} className={color} />;
+      return <IconAlias size={size} className={className ?? 'clr-text-primary'} />;
+  }
+}
+
+export function StatusIcon({ value, size = '1.25rem', className }: DomIconProps<ExpressionStatus>) {
+  switch (value) {
+    case ExpressionStatus.VERIFIED:
+    case ExpressionStatus.PROPERTY:
+      return <IconStatusOK size={size} className={className} />;
+
+    case ExpressionStatus.UNKNOWN:
+      return <IconStatusUnknown size={size} className={className} />;
+    case ExpressionStatus.INCALCULABLE:
+      return <IconStatusIncalculable size={size} className={className} />;
+
+    case ExpressionStatus.INCORRECT:
+    case ExpressionStatus.UNDEFINED:
+      return <IconStatusError size={size} className={className} />;
   }
 }
diff --git a/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx b/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx
index bf8bb90b..0d0bdd8e 100644
--- a/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx
+++ b/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx
@@ -39,7 +39,7 @@ function SelectGraphFilter({ value, dense, onChange }: SelectGraphFilterProps) {
         title='Настройка фильтрации по графу термов'
         hideTitle={menu.isOpen}
         className='h-full pr-2'
-        icon={DependencyIcon(value, '1rem', value !== DependencyMode.ALL ? 'icon-primary' : '')}
+        icon={<DependencyIcon value={value} size='1rem' />}
         text={dense || size.isSmall ? undefined : labelCstSource(value)}
         onClick={menu.toggle}
       />
@@ -55,7 +55,7 @@ function SelectGraphFilter({ value, dense, onChange }: SelectGraphFilterProps) {
                 onClick={() => handleChange(source)}
               >
                 <div className='inline-flex items-center gap-1'>
-                  {DependencyIcon(source, '1rem')}
+                  {<DependencyIcon value={source} size='1rem' />}
                   {!dense ? (
                     <span>
                       <b>{labelCstSource(source)}:</b> {describeCstSource(source)}
diff --git a/rsconcept/frontend/src/components/select/SelectMatchMode.tsx b/rsconcept/frontend/src/components/select/SelectMatchMode.tsx
index 5b07f7cc..1ad1d932 100644
--- a/rsconcept/frontend/src/components/select/SelectMatchMode.tsx
+++ b/rsconcept/frontend/src/components/select/SelectMatchMode.tsx
@@ -38,7 +38,7 @@ function SelectMatchMode({ value, dense, onChange }: SelectMatchModeProps) {
         title='Настройка фильтрации по проверяемым атрибутам'
         hideTitle={menu.isOpen}
         className='h-full pr-2'
-        icon={MatchModeIcon(value, '1rem', value !== CstMatchMode.ALL ? 'icon-primary' : '')}
+        icon={<MatchModeIcon value={value} size='1rem' />}
         text={dense || size.isSmall ? undefined : labelCstMatchMode(value)}
         onClick={menu.toggle}
       />
@@ -54,7 +54,7 @@ function SelectMatchMode({ value, dense, onChange }: SelectMatchModeProps) {
                 onClick={() => handleChange(matchMode)}
               >
                 <div className='inline-flex items-center gap-1'>
-                  {MatchModeIcon(matchMode, '1rem')}
+                  {<MatchModeIcon value={matchMode} size='1rem' />}
                   {!dense ? (
                     <span>
                       <b>{labelCstMatchMode(matchMode)}:</b> {describeCstMatchMode(matchMode)}
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index c026b804..70b188e0 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -79,7 +79,7 @@ function SearchPanel({
         'clr-input'
       )}
     >
-      <div className={clsx('px-3 self-center', 'min-w-[5.5rem]', 'select-none', 'whitespace-nowrap')}>
+      <div className={clsx('px-3 pt-1 self-center', 'min-w-[5.5rem]', 'select-none', 'whitespace-nowrap')}>
         {filtered} из {total}
       </div>
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
index 9b8e1e3f..fac0141c 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
@@ -4,6 +4,7 @@ import clsx from 'clsx';
 import { AnimatePresence } from 'framer-motion';
 import { useMemo } from 'react';
 
+import { StatusIcon } from '@/components/DomainIcons';
 import Loader from '@/components/ui/Loader';
 import { useConceptOptions } from '@/context/OptionsContext';
 import { ExpressionStatus } from '@/models/rsform';
@@ -14,8 +15,6 @@ import { colorBgCstStatus } from '@/styling/color';
 import { globals } from '@/utils/constants';
 import { labelExpressionStatus, prepareTooltip } from '@/utils/labels';
 
-import StatusIcon from './StatusIcon';
-
 interface StatusBarProps {
   processing?: boolean;
   isModified?: boolean;
@@ -58,7 +57,7 @@ function StatusBar({ isModified, processing, constituenta, parseData, onAnalyze
         {processing ? <Loader key='status-loader' size={3} /> : null}
         {!processing ? (
           <>
-            <StatusIcon key='status-icon' status={status} />
+            <StatusIcon key='status-icon' size='1rem' value={status} />
             <span key='status-text' className='pb-[0.125rem] font-controls pr-2'>
               {labelExpressionStatus(status)}
             </span>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusIcon.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusIcon.tsx
deleted file mode 100644
index 7871e619..00000000
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusIcon.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client';
-
-import { IconStatusError, IconStatusIncalculable, IconStatusOK, IconStatusUnknown } from '@/components/Icons';
-import { ExpressionStatus } from '@/models/rsform';
-
-interface StatusIconProps {
-  status: ExpressionStatus;
-}
-
-function StatusIcon({ status }: StatusIconProps) {
-  if (status === ExpressionStatus.VERIFIED || status === ExpressionStatus.PROPERTY) {
-    return <IconStatusOK size='1rem' />;
-  } else if (status === ExpressionStatus.UNKNOWN) {
-    return <IconStatusUnknown size='1rem' />;
-  } else if (status === ExpressionStatus.INCALCULABLE) {
-    return <IconStatusIncalculable size='1rem' />;
-  } else {
-    return <IconStatusError size='1rem' />;
-  }
-}
-
-export default StatusIcon;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/FocusToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/FocusToolbar.tsx
index b56243fb..38e017ba 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/FocusToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/FocusToolbar.tsx
@@ -36,7 +36,7 @@ function FocusToolbar({
   }, [reset, controller]);
 
   return (
-    <div className='cc-icons items-center'>
+    <div className='items-center cc-icons'>
       <div className='w-[7.8rem] text-right select-none' style={{ color: colors.fgPurple }}>
         Фокус
         <b className='px-1'> {center.alias} </b>
@@ -48,24 +48,12 @@ function FocusToolbar({
       />
       <MiniButton
         title={showInputs ? 'Скрыть поставщиков' : 'Отобразить поставщиков'}
-        icon={
-          showInputs ? (
-            <IconGraphInputs size='1.25rem' className='icon-green' />
-          ) : (
-            <IconGraphInputs size='1.25rem' className='icon-primary' />
-          )
-        }
+        icon={<IconGraphInputs size='1.25rem' className={showInputs ? 'icon-green' : 'icon-primary'} />}
         onClick={toggleShowInputs}
       />
       <MiniButton
         title={showOutputs ? 'Скрыть потребителей' : 'Отобразить потребителей'}
-        icon={
-          showOutputs ? (
-            <IconGraphOutputs size='1.25rem' className='icon-green' />
-          ) : (
-            <IconGraphOutputs size='1.25rem' className='icon-primary' />
-          )
-        }
+        icon={<IconGraphOutputs size='1.25rem' className={showOutputs ? 'icon-green' : 'icon-primary'} />}
         onClick={toggleShowOutputs}
       />
     </div>
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
index f4e79272..f5357dea 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx
@@ -3,7 +3,7 @@
 import { AnimatePresence } from 'framer-motion';
 import { useMemo, useState } from 'react';
 
-import { IconFollow, IconFollowOff } from '@/components/Icons';
+import { SubscribeIcon } from '@/components/DomainIcons';
 import MiniButton from '@/components/ui/MiniButton';
 import Overlay from '@/components/ui/Overlay';
 import AnimateFade from '@/components/wrap/AnimateFade';
@@ -39,13 +39,7 @@ function UserTabs() {
           <Overlay position='top-0 right-0'>
             <MiniButton
               title='Отслеживаемые схемы'
-              icon={
-                showSubs ? (
-                  <IconFollow size='1.25rem' className='icon-primary' />
-                ) : (
-                  <IconFollowOff size='1.25rem' className='icon-primary' />
-                )
-              }
+              icon={<SubscribeIcon value={showSubs} className='icon-primary' />}
               onClick={() => setShowSubs(prev => !prev)}
             />
           </Overlay>

From 8c38297de7b70f5a2897e9c64e7a8fb8279e7170 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 6 Jun 2024 23:11:53 +0300
Subject: [PATCH 03/45] Refactoring: pull similar messages together

---
 .../src/context/AccessModeContext.tsx         |  3 +-
 .../frontend/src/context/AuthContext.tsx      |  3 +-
 .../frontend/src/context/LibraryContext.tsx   |  3 +-
 .../src/context/NavigationContext.tsx         |  3 +-
 .../frontend/src/context/OptionsContext.tsx   |  3 +-
 rsconcept/frontend/src/context/OssContext.tsx |  3 +-
 .../frontend/src/context/RSFormContext.tsx    |  3 +-
 .../src/context/UserProfileContext.tsx        |  3 +-
 .../frontend/src/context/UsersContext.tsx     |  3 +-
 .../src/dialogs/DlgCloneLibraryItem.tsx       |  3 +-
 .../DlgEditWordForms/DlgEditWordForms.tsx     |  3 +-
 .../pages/CreateItemPage/FormCreateItem.tsx   |  3 +-
 .../pages/OssPage/EditorOssCard/FormOSS.tsx   |  3 +-
 .../src/pages/OssPage/OssEditContext.tsx      | 15 ++---
 .../frontend/src/pages/OssPage/OssTabs.tsx    |  5 +-
 .../ConstituentaToolbar.tsx                   |  4 +-
 .../EditorConstituenta/ControlsOverlay.tsx    |  6 +-
 .../EditorConstituenta/FormConstituenta.tsx   |  4 +-
 .../EditorRSExpression/EditorRSExpression.tsx |  4 +-
 .../EditorRSFormCard/FormRSForm.tsx           |  3 +-
 .../src/pages/RSFormPage/RSEditContext.tsx    | 47 ++++++++-------
 .../frontend/src/pages/RSFormPage/RSTabs.tsx  |  6 +-
 .../pages/UserProfilePage/EditorPassword.tsx  |  5 +-
 .../pages/UserProfilePage/EditorProfile.tsx   |  3 +-
 rsconcept/frontend/src/utils/labels.ts        | 58 +++++++++++++++++--
 rsconcept/frontend/src/utils/utils.ts         |  4 +-
 26 files changed, 135 insertions(+), 68 deletions(-)

diff --git a/rsconcept/frontend/src/context/AccessModeContext.tsx b/rsconcept/frontend/src/context/AccessModeContext.tsx
index 531fe682..1a0732a1 100644
--- a/rsconcept/frontend/src/context/AccessModeContext.tsx
+++ b/rsconcept/frontend/src/context/AccessModeContext.tsx
@@ -3,6 +3,7 @@
 import { createContext, useContext, useState } from 'react';
 
 import { UserLevel } from '@/models/user';
+import { contextOutsideScope } from '@/utils/labels';
 
 interface IAccessModeContext {
   accessLevel: UserLevel;
@@ -13,7 +14,7 @@ const AccessContext = createContext<IAccessModeContext | null>(null);
 export const useAccessMode = () => {
   const context = useContext(AccessContext);
   if (!context) {
-    throw new Error('useAccessMode has to be used within <AccessModeState.Provider>');
+    throw new Error(contextOutsideScope('useAccessMode', 'AccessModeState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/context/AuthContext.tsx b/rsconcept/frontend/src/context/AuthContext.tsx
index 5ac715bf..073ec11d 100644
--- a/rsconcept/frontend/src/context/AuthContext.tsx
+++ b/rsconcept/frontend/src/context/AuthContext.tsx
@@ -25,6 +25,7 @@ import {
   IUserSignupData,
   IUserUpdatePassword
 } from '@/models/user';
+import { contextOutsideScope } from '@/utils/labels';
 
 import { useUsers } from './UsersContext';
 
@@ -46,7 +47,7 @@ const AuthContext = createContext<IAuthContext | null>(null);
 export const useAuth = () => {
   const context = useContext(AuthContext);
   if (!context) {
-    throw new Error('useAuth has to be used within <AuthState.Provider>');
+    throw new Error(contextOutsideScope('useAuth', 'AuthState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/context/LibraryContext.tsx b/rsconcept/frontend/src/context/LibraryContext.tsx
index 6b5e4646..a93a4ce5 100644
--- a/rsconcept/frontend/src/context/LibraryContext.tsx
+++ b/rsconcept/frontend/src/context/LibraryContext.tsx
@@ -20,6 +20,7 @@ import { matchLibraryItem, matchLibraryItemLocation } from '@/models/libraryAPI'
 import { ILibraryFilter } from '@/models/miscellaneous';
 import { IRSForm, IRSFormCloneData, IRSFormData } from '@/models/rsform';
 import { RSFormLoader } from '@/models/RSFormLoader';
+import { contextOutsideScope } from '@/utils/labels';
 
 import { useAuth } from './AuthContext';
 import { useConceptOptions } from './OptionsContext';
@@ -46,7 +47,7 @@ const LibraryContext = createContext<ILibraryContext | null>(null);
 export const useLibrary = (): ILibraryContext => {
   const context = useContext(LibraryContext);
   if (context === null) {
-    throw new Error('useLibrary has to be used within <LibraryState.Provider>');
+    throw new Error(contextOutsideScope('useLibrary', 'LibraryState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/context/NavigationContext.tsx b/rsconcept/frontend/src/context/NavigationContext.tsx
index c50c385d..91e0accf 100644
--- a/rsconcept/frontend/src/context/NavigationContext.tsx
+++ b/rsconcept/frontend/src/context/NavigationContext.tsx
@@ -4,6 +4,7 @@ import { createContext, useCallback, useContext, useEffect, useState } from 'rea
 import { useLocation, useNavigate } from 'react-router-dom';
 
 import { globals } from '@/utils/constants';
+import { contextOutsideScope } from '@/utils/labels';
 
 interface INavigationContext {
   push: (path: string, newTab?: boolean) => void;
@@ -21,7 +22,7 @@ const NavigationContext = createContext<INavigationContext | null>(null);
 export const useConceptNavigation = () => {
   const context = useContext(NavigationContext);
   if (!context) {
-    throw new Error('useConceptNavigation has to be used within <NavigationState.Provider>');
+    throw new Error(contextOutsideScope('useConceptNavigation', 'NavigationState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/context/OptionsContext.tsx b/rsconcept/frontend/src/context/OptionsContext.tsx
index b02220fe..cef7672f 100644
--- a/rsconcept/frontend/src/context/OptionsContext.tsx
+++ b/rsconcept/frontend/src/context/OptionsContext.tsx
@@ -9,6 +9,7 @@ import { FontStyle } from '@/models/miscellaneous';
 import { animationDuration } from '@/styling/animations';
 import { darkT, IColorTheme, lightT } from '@/styling/color';
 import { globals, storage } from '@/utils/constants';
+import { contextOutsideScope } from '@/utils/labels';
 
 interface IOptionsContext {
   viewportHeight: string;
@@ -45,7 +46,7 @@ const OptionsContext = createContext<IOptionsContext | null>(null);
 export const useConceptOptions = () => {
   const context = useContext(OptionsContext);
   if (!context) {
-    throw new Error('useConceptTheme has to be used within <ThemeState.Provider>');
+    throw new Error(contextOutsideScope('useConceptTheme', 'ThemeState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/context/OssContext.tsx b/rsconcept/frontend/src/context/OssContext.tsx
index 41385511..aa95ab43 100644
--- a/rsconcept/frontend/src/context/OssContext.tsx
+++ b/rsconcept/frontend/src/context/OssContext.tsx
@@ -18,6 +18,7 @@ import { AccessPolicy, ILibraryItem } from '@/models/library';
 import { ILibraryUpdateData } from '@/models/library';
 import { IOperationSchema } from '@/models/oss';
 import { UserID } from '@/models/user';
+import { contextOutsideScope } from '@/utils/labels';
 
 import { useAuth } from './AuthContext';
 import { useLibrary } from './LibraryContext';
@@ -48,7 +49,7 @@ const OssContext = createContext<IOssContext | null>(null);
 export const useOSS = () => {
   const context = useContext(OssContext);
   if (context === null) {
-    throw new Error('useOSS has to be used within <OssState.Provider>');
+    throw new Error(contextOutsideScope('useOSS', 'OssState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/context/RSFormContext.tsx b/rsconcept/frontend/src/context/RSFormContext.tsx
index c61757a1..678c40f9 100644
--- a/rsconcept/frontend/src/context/RSFormContext.tsx
+++ b/rsconcept/frontend/src/context/RSFormContext.tsx
@@ -48,6 +48,7 @@ import {
   ITargetCst
 } from '@/models/rsform';
 import { UserID } from '@/models/user';
+import { contextOutsideScope } from '@/utils/labels';
 
 import { useAuth } from './AuthContext';
 import { useLibrary } from './LibraryContext';
@@ -99,7 +100,7 @@ const RSFormContext = createContext<IRSFormContext | null>(null);
 export const useRSForm = () => {
   const context = useContext(RSFormContext);
   if (context === null) {
-    throw new Error('useRSForm has to be used within <RSFormState.Provider>');
+    throw new Error(contextOutsideScope('useRSForm', 'RSFormState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/context/UserProfileContext.tsx b/rsconcept/frontend/src/context/UserProfileContext.tsx
index c467be5b..7185a553 100644
--- a/rsconcept/frontend/src/context/UserProfileContext.tsx
+++ b/rsconcept/frontend/src/context/UserProfileContext.tsx
@@ -5,6 +5,7 @@ import { createContext, useCallback, useContext, useEffect, useState } from 'rea
 import { DataCallback, getProfile, patchProfile } from '@/app/backendAPI';
 import { ErrorData } from '@/components/info/InfoError';
 import { IUserProfile, IUserUpdateData } from '@/models/user';
+import { contextOutsideScope } from '@/utils/labels';
 
 import { useUsers } from './UsersContext';
 
@@ -23,7 +24,7 @@ const ProfileContext = createContext<IUserProfileContext | null>(null);
 export const useUserProfile = () => {
   const context = useContext(ProfileContext);
   if (!context) {
-    throw new Error('useUserProfile has to be used within <UserProfileState.Provider>');
+    throw new Error(contextOutsideScope('useUserProfile', 'UserProfileState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/context/UsersContext.tsx b/rsconcept/frontend/src/context/UsersContext.tsx
index d404c453..2c966a6e 100644
--- a/rsconcept/frontend/src/context/UsersContext.tsx
+++ b/rsconcept/frontend/src/context/UsersContext.tsx
@@ -4,6 +4,7 @@ import { createContext, useCallback, useContext, useEffect, useState } from 'rea
 
 import { getActiveUsers } from '@/app/backendAPI';
 import { IUserInfo } from '@/models/user';
+import { contextOutsideScope } from '@/utils/labels';
 
 interface IUsersContext {
   users: IUserInfo[];
@@ -15,7 +16,7 @@ const UsersContext = createContext<IUsersContext | null>(null);
 export const useUsers = (): IUsersContext => {
   const context = useContext(UsersContext);
   if (context === null) {
-    throw new Error('useUsers has to be used within <UsersState.Provider>');
+    throw new Error(contextOutsideScope('useUsers', 'UsersState'));
   }
   return context;
 };
diff --git a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
index 16383c1e..bc78f010 100644
--- a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
@@ -20,6 +20,7 @@ import { useConceptNavigation } from '@/context/NavigationContext';
 import { AccessPolicy, ILibraryItem, LocationHead } from '@/models/library';
 import { cloneTitle, combineLocation, validateLocation } from '@/models/libraryAPI';
 import { ConstituentaID, IRSFormCloneData } from '@/models/rsform';
+import { information } from '@/utils/labels';
 
 interface DlgCloneLibraryItemProps extends Pick<ModalProps, 'hideWindow'> {
   base: ILibraryItem;
@@ -62,7 +63,7 @@ function DlgCloneLibraryItem({ hideWindow, base, initialLocation, selected, tota
       data.items = selected;
     }
     cloneItem(base.id, data, newSchema => {
-      toast.success(`Копия создана: ${newSchema.alias}`);
+      toast.success(information.cloneComplete(newSchema.alias));
       router.push(urls.schema(newSchema.id));
     });
   }
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
index 161a5085..28bd882d 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
@@ -16,6 +16,7 @@ import { Grammeme, ITextRequest, IWordForm, IWordFormPlain } from '@/models/lang
 import { parseGrammemes, wordFormEquals } from '@/models/languageAPI';
 import { HelpTopic } from '@/models/miscellaneous';
 import { IConstituenta, TermForm } from '@/models/rsform';
+import { prompts } from '@/utils/labels';
 import { IGrammemeOption, SelectorGrammemes, SelectorGrammemesList } from '@/utils/selectors';
 
 import WordFormsTable from './WordFormsTable';
@@ -92,7 +93,7 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
 
   function handleGenerateLexeme() {
     if (forms.length > 0) {
-      if (!window.confirm('Данное действие приведет к перезаписи словоформ при совпадении граммем. Продолжить?')) {
+      if (!window.confirm(prompts.generateWordforms)) {
         return;
       }
     }
diff --git a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx b/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
index 36e6b528..b7aeec64 100644
--- a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
+++ b/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
@@ -25,6 +25,7 @@ import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
 import { ILibraryCreateData } from '@/models/library';
 import { combineLocation, validateLocation } from '@/models/libraryAPI';
 import { EXTEOR_TRS_FILE, limits, patterns } from '@/utils/constants';
+import { information } from '@/utils/labels';
 
 function FormCreateItem() {
   const router = useConceptNavigation();
@@ -78,7 +79,7 @@ function FormCreateItem() {
       fileName: file?.name
     };
     createItem(data, newItem => {
-      toast.success('Схема успешно создана');
+      toast.success(information.newLibraryItem);
       if (itemType == LibraryItemType.RSFORM) {
         router.push(urls.schema(newItem.id));
       } else {
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx
index e7556797..babd8c69 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx
@@ -12,6 +12,7 @@ import { useOSS } from '@/context/OssContext';
 import { ILibraryUpdateData, LibraryItemType } from '@/models/library';
 import AccessToolbar from '@/pages/RSFormPage/EditorRSFormCard/AccessToolbar';
 import { limits, patterns } from '@/utils/constants';
+import { information } from '@/utils/labels';
 
 import { useOssEdit } from '../OssEditContext';
 
@@ -81,7 +82,7 @@ function FormOSS({ id, isModified, setIsModified }: FormOSSProps) {
       visible: visible,
       read_only: readOnly
     };
-    update(data, () => toast.success('Изменения сохранены'));
+    update(data, () => toast.success(information.changesSaved));
   };
 
   return (
diff --git a/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx b/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx
index 8bf50c57..2c13cafe 100644
--- a/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/OssEditContext.tsx
@@ -13,6 +13,7 @@ import DlgEditEditors from '@/dialogs/DlgEditEditors';
 import { AccessPolicy } from '@/models/library';
 import { IOperationSchema } from '@/models/oss';
 import { UserID, UserLevel } from '@/models/user';
+import { information } from '@/utils/labels';
 
 interface IOssEditContext {
   schema?: IOperationSchema;
@@ -84,7 +85,7 @@ export const OssEditState = ({ children }: OssEditStateProps) => {
       if (!model.schema) {
         return;
       }
-      model.setLocation(newLocation, () => toast.success('Схема перемещена'));
+      model.setLocation(newLocation, () => toast.success(information.moveComplete));
     },
     [model]
   );
@@ -102,35 +103,35 @@ export const OssEditState = ({ children }: OssEditStateProps) => {
     const url = currentRef.includes('?') ? currentRef + '&share' : currentRef + '?share';
     navigator.clipboard
       .writeText(url)
-      .then(() => toast.success(`Ссылка скопирована: ${url}`))
+      .then(() => toast.success(information.linkReady))
       .catch(console.error);
   }, []);
 
   const toggleSubscribe = useCallback(() => {
     if (model.isSubscribed) {
-      model.unsubscribe(() => toast.success('Отслеживание отключено'));
+      model.unsubscribe(() => toast.success(information.unsubscribed));
     } else {
-      model.subscribe(() => toast.success('Отслеживание включено'));
+      model.subscribe(() => toast.success(information.subscribed));
     }
   }, [model]);
 
   const setOwner = useCallback(
     (newOwner: UserID) => {
-      model.setOwner(newOwner, () => toast.success('Владелец обновлен'));
+      model.setOwner(newOwner, () => toast.success(information.changesSaved));
     },
     [model]
   );
 
   const setAccessPolicy = useCallback(
     (newPolicy: AccessPolicy) => {
-      model.setAccessPolicy(newPolicy, () => toast.success('Политика доступа изменена'));
+      model.setAccessPolicy(newPolicy, () => toast.success(information.changesSaved));
     },
     [model]
   );
 
   const setEditors = useCallback(
     (newEditors: UserID[]) => {
-      model.setEditors(newEditors, () => toast.success('Редакторы обновлены'));
+      model.setEditors(newEditors, () => toast.success(information.changesSaved));
     },
     [model]
   );
diff --git a/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx b/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx
index ac6a9505..12cbc9da 100644
--- a/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/OssTabs.tsx
@@ -17,6 +17,7 @@ import { useBlockNavigation, useConceptNavigation } from '@/context/NavigationCo
 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';
@@ -84,11 +85,11 @@ function OssTabs() {
   }
 
   const onDestroySchema = useCallback(() => {
-    if (!schema || !window.confirm('Вы уверены, что хотите удалить данную схему?')) {
+    if (!schema || !window.confirm(prompts.deleteLibraryItem)) {
       return;
     }
     destroyItem(schema.id, () => {
-      toast.success('Схема удалена');
+      toast.success(information.itemDestroyed);
       router.push(urls.library);
     });
   }, [schema, destroyItem, router]);
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
index e58164d6..35b7ce62 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
@@ -13,7 +13,7 @@ import BadgeHelp from '@/components/info/BadgeHelp';
 import MiniButton from '@/components/ui/MiniButton';
 import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
-import { messages, prepareTooltip } from '@/utils/labels';
+import { prepareTooltip, tooltips } from '@/utils/labels';
 
 interface ConstituentaToolbarProps {
   disabled: boolean;
@@ -66,7 +66,7 @@ function ConstituentaToolbar({
         onClick={onCreate}
       />
       <MiniButton
-        titleHtml={modified ? messages.unsaved : prepareTooltip('Клонировать конституенту', 'Alt + V')}
+        titleHtml={modified ? tooltips.unsaved : prepareTooltip('Клонировать конституенту', 'Alt + V')}
         icon={<IconClone size='1.25rem' className='icon-green' />}
         disabled={disabled || modified}
         onClick={onClone}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
index 22893fa2..e7804299 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
@@ -4,7 +4,7 @@ import { IconEdit } from '@/components/Icons';
 import MiniButton from '@/components/ui/MiniButton';
 import Overlay from '@/components/ui/Overlay';
 import { IConstituenta } from '@/models/rsform';
-import { messages } from '@/utils/labels';
+import { tooltips } from '@/utils/labels';
 
 interface ControlsOverlayProps {
   constituenta?: IConstituenta;
@@ -21,7 +21,7 @@ function ControlsOverlay({ constituenta, disabled, modified, processing, onRenam
     <Overlay position='top-1 left-[4.7rem]' className='flex select-none'>
       {!disabled || processing ? (
         <MiniButton
-          title={modified ? messages.unsaved : `Редактировать словоформы термина`}
+          title={modified ? tooltips.unsaved : `Редактировать словоформы термина`}
           noHover
           onClick={onEditTerm}
           icon={<IconEdit size='1rem' className='icon-primary' />}
@@ -42,7 +42,7 @@ function ControlsOverlay({ constituenta, disabled, modified, processing, onRenam
       {!disabled || processing ? (
         <MiniButton
           noHover
-          title={modified ? messages.unsaved : 'Переименовать конституенту'}
+          title={modified ? tooltips.unsaved : 'Переименовать конституенту'}
           onClick={onRename}
           icon={<IconEdit size='1rem' className='icon-primary' />}
           disabled={modified}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index fba58580..e54688df 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -13,7 +13,7 @@ import AnimateFade from '@/components/wrap/AnimateFade';
 import { useRSForm } from '@/context/RSFormContext';
 import { CstType, IConstituenta, ICstUpdateData } from '@/models/rsform';
 import { isBaseSet, isBasicConcept, isFunctional } from '@/models/rsformAPI';
-import { labelCstTypification } from '@/utils/labels';
+import { information, labelCstTypification } from '@/utils/labels';
 
 import EditorRSExpression from '../EditorRSExpression';
 import ControlsOverlay from './ControlsOverlay';
@@ -119,7 +119,7 @@ function FormConstituenta({
       definition_raw: textDefinition,
       convention: convention
     };
-    cstUpdate(data, () => toast.success('Изменения сохранены'));
+    cstUpdate(data, () => toast.success(information.changesSaved));
   }
 
   return (
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
index 0071997c..284ad11b 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@@ -19,7 +19,7 @@ import { getDefinitionPrefix } from '@/models/rsformAPI';
 import { IExpressionParse, IRSErrorDescription, SyntaxTree } from '@/models/rslang';
 import { TokenID } from '@/models/rslang';
 import { storage } from '@/utils/constants';
-import { labelTypification } from '@/utils/labels';
+import { errors, labelTypification } from '@/utils/labels';
 
 import ExpressionToolbar from './ExpressionToolbar';
 import ParsingResult from './ParsingResult';
@@ -131,7 +131,7 @@ function EditorRSExpression({
   function handleShowAST() {
     handleCheckExpression(parse => {
       if (!parse.astText) {
-        toast.error('Невозможно построить дерево разбора');
+        toast.error(errors.astFailed);
       } else {
         setSyntaxTree(parse.ast);
         setExpression(getDefinitionPrefix(activeCst!) + value);
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
index 3ab9e906..15b4becf 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
@@ -13,6 +13,7 @@ import TextInput from '@/components/ui/TextInput';
 import { useRSForm } from '@/context/RSFormContext';
 import { ILibraryUpdateData, LibraryItemType } from '@/models/library';
 import { limits, patterns } from '@/utils/constants';
+import { information } from '@/utils/labels';
 
 import { useRSEdit } from '../RSEditContext';
 import AccessToolbar from './AccessToolbar';
@@ -84,7 +85,7 @@ function FormRSForm({ id, isModified, setIsModified }: FormRSFormProps) {
       visible: visible,
       read_only: readOnly
     };
-    update(data, () => toast.success('Изменения сохранены'));
+    update(data, () => toast.success(information.changesSaved));
   };
 
   return (
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx
index d774a8cb..f2671926 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx
@@ -43,6 +43,7 @@ import {
 import { generateAlias } from '@/models/rsformAPI';
 import { UserID, UserLevel } from '@/models/user';
 import { EXTEOR_TRS_FILE } from '@/utils/constants';
+import { information, prompts } from '@/utils/labels';
 import { promptUnsaved } from '@/utils/utils';
 
 interface IRSEditContext {
@@ -189,14 +190,11 @@ export const RSEditState = ({
   }, [isModified]);
 
   const restoreVersion = useCallback(() => {
-    if (
-      !model.versionID ||
-      !window.confirm('При восстановлении архивной версии актуальная схему будет заменена. Продолжить?')
-    ) {
+    if (!model.versionID || !window.confirm(prompts.restoreArchive)) {
       return;
     }
     model.versionRestore(model.versionID, () => {
-      toast.success('Загрузка версии завершена');
+      toast.success(information.versionRestored);
       viewVersion(undefined);
     });
   }, [model, viewVersion]);
@@ -223,7 +221,7 @@ export const RSEditState = ({
       }
       data.alias = data.alias || generateAlias(data.cst_type, model.schema);
       model.cstCreate(data, newCst => {
-        toast.success(`Конституента добавлена: ${newCst.alias}`);
+        toast.success(information.newConstituent(newCst.alias));
         setSelected([newCst.id]);
         if (onCreateCst) onCreateCst(newCst);
       });
@@ -233,14 +231,15 @@ export const RSEditState = ({
 
   const handleRenameCst = useCallback(
     (data: ICstRenameData) => {
-      model.cstRename(data, () => toast.success(`Переименование: ${renameInitialData!.alias} -> ${data.alias}`));
+      const oldAlias = renameInitialData!.alias;
+      model.cstRename(data, () => toast.success(information.renameComplete(oldAlias, data.alias)));
     },
     [model, renameInitialData]
   );
 
   const handleSubstituteCst = useCallback(
     (data: ICstSubstituteData) => {
-      model.cstSubstitute(data, () => toast.success('Отождествление завершено'));
+      model.cstSubstitute(data, () => toast.success(information.substituteSingle));
     },
     [model]
   );
@@ -259,7 +258,7 @@ export const RSEditState = ({
       const nextActive = isEmpty ? undefined : getNextActiveOnDelete(activeCst?.id, model.schema.items, deleted);
 
       model.cstDelete(data, () => {
-        toast.success(`Конституенты удалены: ${deletedNames}`);
+        toast.success(information.constituentsDestroyed(deletedNames));
         setSelected(nextActive ? [nextActive] : []);
         if (onDeleteCst) onDeleteCst(nextActive);
       });
@@ -276,7 +275,7 @@ export const RSEditState = ({
         id: activeCst.id,
         term_forms: forms
       };
-      model.cstUpdate(data, () => toast.success('Изменения сохранены'));
+      model.cstUpdate(data, () => toast.success(information.changesSaved));
     },
     [model, activeCst]
   );
@@ -287,7 +286,7 @@ export const RSEditState = ({
         return;
       }
       model.versionCreate(data, newVersion => {
-        toast.success('Версия создана');
+        toast.success(information.newVersion(data.version));
         viewVersion(newVersion);
       });
     },
@@ -300,7 +299,7 @@ export const RSEditState = ({
         return;
       }
       model.versionDelete(versionID, () => {
-        toast.success('Версия удалена');
+        toast.success(information.versionDestroyed);
         if (String(versionID) === model.versionID) {
           viewVersion(undefined);
         }
@@ -314,7 +313,7 @@ export const RSEditState = ({
       if (!model.schema) {
         return;
       }
-      model.versionUpdate(versionID, data, () => toast.success('Версия обновлена'));
+      model.versionUpdate(versionID, data, () => toast.success(information.changesSaved));
     },
     [model]
   );
@@ -324,7 +323,7 @@ export const RSEditState = ({
       if (!model.schema) {
         return;
       }
-      model.setLocation(newLocation, () => toast.success('Схема перемещена'));
+      model.setLocation(newLocation, () => toast.success(information.moveComplete));
     },
     [model]
   );
@@ -337,7 +336,7 @@ export const RSEditState = ({
       const oldCount = model.schema.items.length;
       model.inlineSynthesis(data, newSchema => {
         setSelected([]);
-        toast.success(`Конституенты добавлены: ${newSchema['items'].length - oldCount}`);
+        toast.success(information.addedConstituents(newSchema['items'].length - oldCount));
       });
     },
     [model, setSelected]
@@ -463,8 +462,8 @@ export const RSEditState = ({
     setShowEditTerm(true);
   }, [isModified, activeCst]);
 
-  const reindex = useCallback(() => model.resetAliases(() => toast.success('Имена конституент обновлены')), [model]);
-  const reorder = useCallback(() => model.restoreOrder(() => toast.success('Конституенты упорядочены')), [model]);
+  const reindex = useCallback(() => model.resetAliases(() => toast.success(information.reindexComplete)), [model]);
+  const reorder = useCallback(() => model.restoreOrder(() => toast.success(information.reorderComplete)), [model]);
 
   const canProduceStructure = useMemo(() => {
     return (
@@ -486,7 +485,7 @@ export const RSEditState = ({
       target: activeCst.id
     };
     model.produceStructure(data, cstList => {
-      toast.success(`Добавлены конституенты: ${cstList.length}`);
+      toast.success(information.addedConstituents(cstList.length));
       if (cstList.length !== 0) {
         setSelected(cstList);
       }
@@ -535,35 +534,35 @@ export const RSEditState = ({
     const url = currentRef.includes('?') ? currentRef + '&share' : currentRef + '?share';
     navigator.clipboard
       .writeText(url)
-      .then(() => toast.success(`Ссылка скопирована: ${url}`))
+      .then(() => toast.success(information.linkReady))
       .catch(console.error);
   }, []);
 
   const toggleSubscribe = useCallback(() => {
     if (model.isSubscribed) {
-      model.unsubscribe(() => toast.success('Отслеживание отключено'));
+      model.unsubscribe(() => toast.success(information.unsubscribed));
     } else {
-      model.subscribe(() => toast.success('Отслеживание включено'));
+      model.subscribe(() => toast.success(information.subscribed));
     }
   }, [model]);
 
   const setOwner = useCallback(
     (newOwner: UserID) => {
-      model.setOwner(newOwner, () => toast.success('Владелец обновлен'));
+      model.setOwner(newOwner, () => toast.success(information.changesSaved));
     },
     [model]
   );
 
   const setAccessPolicy = useCallback(
     (newPolicy: AccessPolicy) => {
-      model.setAccessPolicy(newPolicy, () => toast.success('Политика доступа изменена'));
+      model.setAccessPolicy(newPolicy, () => toast.success(information.changesSaved));
     },
     [model]
   );
 
   const setEditors = useCallback(
     (newEditors: UserID[]) => {
-      model.setEditors(newEditors, () => toast.success('Редакторы обновлены'));
+      model.setEditors(newEditors, () => toast.success(information.changesSaved));
     },
     [model]
   );
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
index 2f37de51..ee299aa0 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
@@ -20,7 +20,7 @@ import { useRSForm } from '@/context/RSFormContext';
 import useQueryStrings from '@/hooks/useQueryStrings';
 import { ConstituentaID, IConstituenta, IConstituentaMeta } from '@/models/rsform';
 import { PARAMETER, prefixes } from '@/utils/constants';
-import { labelVersion } from '@/utils/labels';
+import { information, labelVersion, prompts } from '@/utils/labels';
 
 import EditorConstituenta from './EditorConstituenta';
 import EditorRSForm from './EditorRSFormCard';
@@ -173,11 +173,11 @@ function RSTabs() {
   );
 
   const onDestroySchema = useCallback(() => {
-    if (!schema || !window.confirm('Вы уверены, что хотите удалить данную схему?')) {
+    if (!schema || !window.confirm(prompts.deleteLibraryItem)) {
       return;
     }
     destroyItem(schema.id, () => {
-      toast.success('Схема удалена');
+      toast.success(information.itemDestroyed);
       router.push(urls.library);
     });
   }, [schema, destroyItem, router]);
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
index 890a7972..ce61faaf 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorPassword.tsx
@@ -13,6 +13,7 @@ import TextInput from '@/components/ui/TextInput';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { IUserUpdatePassword } from '@/models/user';
+import { errors, information } from '@/utils/labels';
 
 function EditorPassword() {
   const router = useConceptNavigation();
@@ -37,7 +38,7 @@ function EditorPassword() {
   function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault();
     if (newPassword !== newPasswordRepeat) {
-      toast.error('Пароли не совпадают');
+      toast.error(errors.passwordsMismatch);
       return;
     }
     const data: IUserUpdatePassword = {
@@ -45,7 +46,7 @@ function EditorPassword() {
       new_password: newPassword
     };
     updatePassword(data, () => {
-      toast.success('Изменения сохранены');
+      toast.success(information.changesSaved);
       router.push(urls.login);
     });
   }
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx b/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
index 4b06b5aa..f1840e80 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/EditorProfile.tsx
@@ -11,6 +11,7 @@ import TextInput from '@/components/ui/TextInput';
 import { useBlockNavigation } from '@/context/NavigationContext';
 import { useUserProfile } from '@/context/UserProfileContext';
 import { IUserUpdateData } from '@/models/user';
+import { information } from '@/utils/labels';
 
 function EditorProfile() {
   const { updateUser, user, errorProcessing, processing } = useUserProfile();
@@ -45,7 +46,7 @@ function EditorProfile() {
       first_name: first_name,
       last_name: last_name
     };
-    updateUser(data, () => toast.success('Изменения сохранены'));
+    updateUser(data, () => toast.success(information.changesSaved));
   }
 
   return (
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index 697e0f8b..25f2704f 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -852,9 +852,59 @@ export function describeLibraryItemType(itemType: LibraryItemType): string {
 }
 
 /**
- * UI shared messages.
+ * UI info descriptors.
  */
-export const messages = {
-  unsaved: 'Сохраните или отмените изменения',
-  promptUnsaved: 'Присутствуют несохраненные изменения. Продолжить без их учета?'
+export const information = {
+  changesSaved: 'Изменения сохранены',
+
+  subscribed: 'Отслеживание отключено',
+  unsubscribed: 'Отслеживание выключено',
+
+  substituteSingle: 'Отождествление завершено',
+  reorderComplete: 'Упорядочение завершено',
+  reindexComplete: 'Имена конституент обновлены',
+  moveComplete: 'Перемещение завершено',
+  linkReady: 'Ссылка скопирована',
+  versionRestored: 'Загрузка версии завершена',
+  cloneComplete: (alias: string) => `Копия создана: ${alias}`,
+
+  addedConstituents: (count: number) => `Добавлены конституенты: ${count}`,
+  newLibraryItem: 'Схема успешно создана',
+  newConstituent: (alias: string) => `Конституента добавлена: ${alias}`,
+  newVersion: (version: string) => `Версия создана: ${version}`,
+  renameComplete: (oldAlias: string, newAlias: string) => `Переименование: ${oldAlias} -> ${newAlias}`,
+
+  versionDestroyed: 'Версия удалена',
+  itemDestroyed: 'Схема удалена',
+  constituentsDestroyed: (aliases: string) => `Конституенты удалены: ${aliases}`
 };
+
+/**
+ * UI error descriptors.
+ */
+export const errors = {
+  astFailed: 'Невозможно построить дерево разбора',
+  passwordsMismatch: 'Пароли не совпадают'
+};
+
+/**
+ * UI tooltip descriptors.
+ */
+export const tooltips = {
+  unsaved: 'Сохраните или отмените изменения'
+};
+
+/**
+ * UI prompt messages.
+ */
+export const prompts = {
+  promptUnsaved: 'Присутствуют несохраненные изменения. Продолжить без их учета?',
+  deleteLibraryItem: 'Вы уверены, что хотите удалить данную схему?',
+  generateWordforms: 'Данное действие приведет к перезаписи словоформ при совпадении граммем. Продолжить?',
+  restoreArchive: 'При восстановлении архивной версии актуальная схему будет заменена. Продолжить?'
+};
+
+// ============== INTERNAL LABELS FOR DEVELOPERS TEXT ================
+export function contextOutsideScope(contextName: string, contextState: string): string {
+  return `${contextName} has to be used within <${contextState}.Provider>`;
+}
diff --git a/rsconcept/frontend/src/utils/utils.ts b/rsconcept/frontend/src/utils/utils.ts
index 5970e2b8..a775d679 100644
--- a/rsconcept/frontend/src/utils/utils.ts
+++ b/rsconcept/frontend/src/utils/utils.ts
@@ -4,7 +4,7 @@
 
 import { AxiosHeaderValue, AxiosResponse } from 'axios';
 
-import { messages } from './labels';
+import { prompts } from './labels';
 
 /**
  * Checks if arguments is Node.
@@ -102,7 +102,7 @@ export function convertBase64ToBlob(base64String: string): Uint8Array {
  * Prompt user of confirming discarding changes before continue.
  */
 export function promptUnsaved(): boolean {
-  return window.confirm(messages.promptUnsaved);
+  return window.confirm(prompts.promptUnsaved);
 }
 
 /**

From c00ad097d650195c8c6bf0722eef1b04485d4349 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 7 Jun 2024 13:42:50 +0300
Subject: [PATCH 04/45] Help topics and tooltips improvements

---
 .../components/select/SelectGraphFilter.tsx   |  2 +-
 .../src/components/select/SelectMatchMode.tsx |  2 +-
 .../frontend/src/components/ui/SelectTree.tsx |  2 +-
 .../DlgConstituentaTemplate.tsx               |  2 +-
 .../frontend/src/dialogs/DlgGraphParams.tsx   |  6 +-
 .../frontend/src/models/miscellaneous.ts      | 36 ++++++----
 .../src/pages/ManualsPage/TopicItem.tsx       |  4 +-
 .../src/pages/ManualsPage/TopicPage.tsx       | 17 +++--
 .../ManualsPage/items/HelpContributors.tsx    | 10 +++
 .../items/{HelpDocs.tsx => HelpInfo.tsx}      |  6 +-
 .../src/pages/ManualsPage/items/HelpOSS.tsx   | 10 +++
 .../pages/ManualsPage/items/HelpPortal.tsx    |  4 +-
 .../EditorRSFormCard/VersionsToolbar.tsx      |  6 +-
 .../src/pages/RSFormPage/RSTabsMenu.tsx       | 10 +--
 rsconcept/frontend/src/pages/RegisterPage.tsx |  4 +-
 rsconcept/frontend/src/utils/labels.ts        | 72 +++++++++++--------
 16 files changed, 121 insertions(+), 72 deletions(-)
 create mode 100644 rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
 rename rsconcept/frontend/src/pages/ManualsPage/items/{HelpDocs.tsx => HelpInfo.tsx} (66%)
 create mode 100644 rsconcept/frontend/src/pages/ManualsPage/items/HelpOSS.tsx

diff --git a/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx b/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx
index 0d0bdd8e..d5eacd17 100644
--- a/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx
+++ b/rsconcept/frontend/src/components/select/SelectGraphFilter.tsx
@@ -36,7 +36,7 @@ function SelectGraphFilter({ value, dense, onChange }: SelectGraphFilterProps) {
       <SelectorButton
         transparent
         tabIndex={-1}
-        title='Настройка фильтрации по графу термов'
+        titleHtml='Настройка фильтрации <br/>по графу термов'
         hideTitle={menu.isOpen}
         className='h-full pr-2'
         icon={<DependencyIcon value={value} size='1rem' />}
diff --git a/rsconcept/frontend/src/components/select/SelectMatchMode.tsx b/rsconcept/frontend/src/components/select/SelectMatchMode.tsx
index 1ad1d932..5cb87d66 100644
--- a/rsconcept/frontend/src/components/select/SelectMatchMode.tsx
+++ b/rsconcept/frontend/src/components/select/SelectMatchMode.tsx
@@ -35,7 +35,7 @@ function SelectMatchMode({ value, dense, onChange }: SelectMatchModeProps) {
     <div ref={menu.ref}>
       <SelectorButton
         transparent
-        title='Настройка фильтрации по проверяемым атрибутам'
+        titleHtml='Настройка фильтрации <br/>по проверяемым атрибутам'
         hideTitle={menu.isOpen}
         className='h-full pr-2'
         icon={<MatchModeIcon value={value} size='1rem' />}
diff --git a/rsconcept/frontend/src/components/ui/SelectTree.tsx b/rsconcept/frontend/src/components/ui/SelectTree.tsx
index bc85cff3..939a6cd2 100644
--- a/rsconcept/frontend/src/components/ui/SelectTree.tsx
+++ b/rsconcept/frontend/src/components/ui/SelectTree.tsx
@@ -92,7 +92,7 @@ function SelectTree<ItemType>({
                 value === item && 'clr-selected'
               )}
               data-tooltip-id={globals.tooltip}
-              data-tooltip-content={getDescription(item)}
+              data-tooltip-html={getDescription(item)}
               onClick={event => handleSetValue(event, item)}
               initial={{ ...animateSideAppear.initial }}
               animate={{ ...animateSideAppear.animate }}
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
index 7921c805..6b6ded19 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
@@ -155,7 +155,7 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }:
         <TabList className={clsx('mb-3 self-center', 'flex', 'border divide-x rounded-none')}>
           <TabLabel label='Шаблон' title='Выбор шаблона выражения' className='w-[8rem]' />
           <TabLabel label='Аргументы' title='Подстановка аргументов шаблона' className='w-[8rem]' />
-          <TabLabel label='Конституента' title='Редактирование атрибутов конституенты' className='w-[8rem]' />
+          <TabLabel label='Конституента' title='Редактирование конституенты' className='w-[8rem]' />
         </TabList>
 
         {templatePanel}
diff --git a/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx b/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx
index 280dc0ce..67da136e 100644
--- a/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgGraphParams.tsx
@@ -27,7 +27,7 @@ function DlgGraphParams({ hideWindow, initial, onConfirm }: DlgGraphParamsProps)
       header='Настройки графа термов'
       onSubmit={handleSubmit}
       submitText='Применить'
-      className='flex gap-6 px-6 py-2 w-[35rem]'
+      className='flex gap-6 justify-between px-6 pb-3 w-[30rem]'
     >
       <div className='flex flex-col gap-1'>
         <h1 className='mb-2'>Преобразования</h1>
@@ -45,13 +45,13 @@ function DlgGraphParams({ hideWindow, initial, onConfirm }: DlgGraphParamsProps)
         />
         <Checkbox
           label='Скрыть шаблоны'
-          title='Терм-функции и предикат-функции с параметризованными аргументами'
+          titleHtml='Терм-функции и предикат-функции <br/>с параметризованными аргументами'
           value={params.noTemplates}
           setValue={value => updateParams({ noTemplates: value })}
         />
         <Checkbox
           label='Транзитивная редукция'
-          title='Удалить связи, образующие транзитивные пути в графе'
+          titleHtml='Удалить связи, образующие <br/>транзитивные пути в графе'
           value={params.noTransitive}
           setValue={value => updateParams({ noTransitive: value })}
         />
diff --git a/rsconcept/frontend/src/models/miscellaneous.ts b/rsconcept/frontend/src/models/miscellaneous.ts
index 8fbf2db6..ce0f686c 100644
--- a/rsconcept/frontend/src/models/miscellaneous.ts
+++ b/rsconcept/frontend/src/models/miscellaneous.ts
@@ -37,11 +37,6 @@ export type FontStyle = 'controls' | 'main' | 'math' | 'math2';
 export enum HelpTopic {
   MAIN = 'main',
 
-  DOCS = 'documentation',
-  RULES = 'rules',
-  PRIVACY = 'privacy',
-  API = 'api',
-
   INTERFACE = 'user-interface',
   UI_LIBRARY = 'ui-library',
   UI_RS_MENU = 'ui-rsform-menu',
@@ -54,10 +49,11 @@ export enum HelpTopic {
   UI_CST_CLASS = 'ui-rsform-cst-class',
 
   CONCEPTUAL = 'concept',
-  CC_SYSTEM = 'rslang-rsform',
-  CC_CONSTITUENTA = 'rslang-cst',
-  CC_RELATIONS = 'rslang-relations',
-  CC_SYNTHESIS = 'rslang-synthesis',
+  CC_SYSTEM = 'concept-rsform',
+  CC_CONSTITUENTA = 'concept-constituenta',
+  CC_RELATIONS = 'concept-relations',
+  CC_SYNTHESIS = 'concept-synthesis',
+  CC_OSS = 'concept-operations-schema',
 
   RSLANG = 'rslang',
   RSL_TYPES = 'rslang-types',
@@ -69,6 +65,13 @@ export enum HelpTopic {
   TERM_CONTROL = 'terminology-control',
   ACCESS = 'access',
   VERSIONS = 'versions',
+
+  INFO = 'documentation',
+  INFO_RULES = 'rules',
+  INFO_CONTRIB = 'contributors',
+  INFO_PRIVACY = 'privacy',
+  INFO_API = 'api',
+
   EXTEOR = 'exteor'
 }
 
@@ -78,11 +81,6 @@ export enum HelpTopic {
 export const topicParent: Map<HelpTopic, HelpTopic> = new Map([
   [HelpTopic.MAIN, HelpTopic.MAIN],
 
-  [HelpTopic.DOCS, HelpTopic.DOCS],
-  [HelpTopic.RULES, HelpTopic.DOCS],
-  [HelpTopic.API, HelpTopic.DOCS],
-  [HelpTopic.PRIVACY, HelpTopic.DOCS],
-
   [HelpTopic.INTERFACE, HelpTopic.INTERFACE],
   [HelpTopic.UI_LIBRARY, HelpTopic.INTERFACE],
   [HelpTopic.UI_RS_MENU, HelpTopic.INTERFACE],
@@ -99,6 +97,7 @@ export const topicParent: Map<HelpTopic, HelpTopic> = new Map([
   [HelpTopic.CC_CONSTITUENTA, HelpTopic.CONCEPTUAL],
   [HelpTopic.CC_RELATIONS, HelpTopic.CONCEPTUAL],
   [HelpTopic.CC_SYNTHESIS, HelpTopic.CONCEPTUAL],
+  [HelpTopic.CC_OSS, HelpTopic.CONCEPTUAL],
 
   [HelpTopic.RSLANG, HelpTopic.RSLANG],
   [HelpTopic.RSL_TYPES, HelpTopic.RSLANG],
@@ -110,13 +109,20 @@ export const topicParent: Map<HelpTopic, HelpTopic> = new Map([
   [HelpTopic.TERM_CONTROL, HelpTopic.TERM_CONTROL],
   [HelpTopic.ACCESS, HelpTopic.ACCESS],
   [HelpTopic.VERSIONS, HelpTopic.VERSIONS],
+
+  [HelpTopic.INFO, HelpTopic.INFO],
+  [HelpTopic.INFO_RULES, HelpTopic.INFO],
+  [HelpTopic.INFO_CONTRIB, HelpTopic.INFO],
+  [HelpTopic.INFO_PRIVACY, HelpTopic.INFO],
+  [HelpTopic.INFO_API, HelpTopic.INFO],
+
   [HelpTopic.EXTEOR, HelpTopic.EXTEOR]
 ]);
 
 /**
  *  Topics that can be folded.
  */
-export const foldableTopics = [HelpTopic.INTERFACE, HelpTopic.RSLANG, HelpTopic.CONCEPTUAL, HelpTopic.DOCS];
+export const foldableTopics = [HelpTopic.INTERFACE, HelpTopic.RSLANG, HelpTopic.CONCEPTUAL, HelpTopic.INFO];
 
 /**
  * Represents {@link IConstituenta} matching mode.
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicItem.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicItem.tsx
index eceb153b..c6d09c31 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicItem.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/TopicItem.tsx
@@ -1,5 +1,5 @@
 import { HelpTopic } from '@/models/miscellaneous';
-import { describeHelpTopic, labelHelpTopic } from '@/utils/labels';
+import { describeHelpTopic, labelHelpTopic, removeTags } from '@/utils/labels';
 
 import LinkTopic from '../../components/ui/LinkTopic';
 
@@ -10,7 +10,7 @@ interface TopicItemProps {
 function TopicItem({ topic }: TopicItemProps) {
   return (
     <li>
-      <LinkTopic text={labelHelpTopic(topic)} topic={topic} /> – {describeHelpTopic(topic)}
+      <LinkTopic text={labelHelpTopic(topic)} topic={topic} /> – {removeTags(describeHelpTopic(topic))}
     </li>
   );
 }
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
index 54640a5f..230bdc4b 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
@@ -6,15 +6,17 @@ import HelpConcept from './items/HelpConcept';
 import HelpConceptRelations from './items/HelpConceptRelations';
 import HelpConceptSynthesis from './items/HelpConceptSynthesis';
 import HelpConceptSystem from './items/HelpConceptSystem';
+import HelpContributors from './items/HelpContributors';
 import HelpCstAttributes from './items/HelpCstAttributes';
 import HelpCstClass from './items/HelpCstClass';
 import HelpCstEditor from './items/HelpCstEditor';
 import HelpCstStatus from './items/HelpCstStatus';
-import HelpDocs from './items/HelpDocs';
 import HelpExteor from './items/HelpExteor';
 import HelpFormulaTree from './items/HelpFormulaTree';
+import HelpInfo from './items/HelpInfo';
 import HelpInterface from './items/HelpInterface';
 import HelpLibrary from './items/HelpLibrary';
+import HelpOSS from './items/HelpOSS';
 import HelpPortal from './items/HelpPortal';
 import HelpPrivacy from './items/HelpPrivacy';
 import HelpRSFormCard from './items/HelpRSFormCard';
@@ -38,11 +40,6 @@ interface TopicPageProps {
 function TopicPage({ topic }: TopicPageProps) {
   if (topic === HelpTopic.MAIN) return <HelpPortal />;
 
-  if (topic === HelpTopic.DOCS) return <HelpDocs />;
-  if (topic === HelpTopic.RULES) return <HelpRules />;
-  if (topic === HelpTopic.PRIVACY) return <HelpPrivacy />;
-  if (topic === HelpTopic.API) return <HelpAPI />;
-
   if (topic === HelpTopic.INTERFACE) return <HelpInterface />;
   if (topic === HelpTopic.UI_LIBRARY) return <HelpLibrary />;
   if (topic === HelpTopic.UI_RS_MENU) return <HelpRSFormMenu />;
@@ -59,6 +56,7 @@ function TopicPage({ topic }: TopicPageProps) {
   if (topic === HelpTopic.CC_CONSTITUENTA) return <HelpCstAttributes />;
   if (topic === HelpTopic.CC_RELATIONS) return <HelpConceptRelations />;
   if (topic === HelpTopic.CC_SYNTHESIS) return <HelpConceptSynthesis />;
+  if (topic === HelpTopic.CC_OSS) return <HelpOSS />;
 
   if (topic === HelpTopic.RSLANG) return <HelpRSLang />;
   if (topic === HelpTopic.RSL_TYPES) return <HelpRSLangTypes />;
@@ -70,6 +68,13 @@ function TopicPage({ topic }: TopicPageProps) {
   if (topic === HelpTopic.TERM_CONTROL) return <HelpTerminologyControl />;
   if (topic === HelpTopic.ACCESS) return <HelpAccess />;
   if (topic === HelpTopic.VERSIONS) return <HelpVersions />;
+
+  if (topic === HelpTopic.INFO) return <HelpInfo />;
+  if (topic === HelpTopic.INFO_RULES) return <HelpRules />;
+  if (topic === HelpTopic.INFO_CONTRIB) return <HelpContributors />;
+  if (topic === HelpTopic.INFO_PRIVACY) return <HelpPrivacy />;
+  if (topic === HelpTopic.INFO_API) return <HelpAPI />;
+
   if (topic === HelpTopic.EXTEOR) return <HelpExteor />;
   return null;
 }
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
new file mode 100644
index 00000000..205550b2
--- /dev/null
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
@@ -0,0 +1,10 @@
+function HelpInfo() {
+  return (
+    <div>
+      <h1>Благодарности участникам</h1>
+      <p>TBD.</p>
+    </div>
+  );
+}
+
+export default HelpInfo;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpDocs.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx
similarity index 66%
rename from rsconcept/frontend/src/pages/ManualsPage/items/HelpDocs.tsx
rename to rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx
index 47d68089..7efb3da9 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpDocs.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx
@@ -2,15 +2,15 @@ import { HelpTopic } from '@/models/miscellaneous';
 
 import Subtopics from '../Subtopics';
 
-function HelpDocs() {
+function HelpInfo() {
   return (
     <div>
       <h1>Документы</h1>
       <p>TBD.</p>
 
-      <Subtopics headTopic={HelpTopic.DOCS} />
+      <Subtopics headTopic={HelpTopic.INFO} />
     </div>
   );
 }
 
-export default HelpDocs;
+export default HelpInfo;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpOSS.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpOSS.tsx
new file mode 100644
index 00000000..58d54ff4
--- /dev/null
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpOSS.tsx
@@ -0,0 +1,10 @@
+function HelpOSS() {
+  return (
+    <div>
+      <h1>Операционная схема синтеза</h1>
+      <p>TBD.</p>
+    </div>
+  );
+}
+
+export default HelpOSS;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpPortal.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpPortal.tsx
index ccee134d..f9fb5e71 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpPortal.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpPortal.tsx
@@ -39,7 +39,7 @@ function HelpPortal() {
 
       <h2>Разделы Справки</h2>
       {[
-        HelpTopic.DOCS,
+        HelpTopic.INFO,
         HelpTopic.INTERFACE,
         HelpTopic.CONCEPTUAL,
         HelpTopic.RSLANG,
@@ -55,7 +55,7 @@ function HelpPortal() {
       <h2>Лицензирование и раскрытие информации</h2>
       <li>Пользователи Портала сохраняют авторские права на создаваемый ими контент</li>
       <li>
-        Политика обработки данных доступна по <LinkTopic text='ссылке' topic={HelpTopic.PRIVACY} />
+        Политика обработки данных доступна по <LinkTopic text='ссылке' topic={HelpTopic.INFO_PRIVACY} />
       </li>
       <li>
         Портал является проектом с открытым исходным кодом, доступным на{' '}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx
index 9958ea4b..45683640 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx
@@ -13,13 +13,15 @@ function VersionsToolbar() {
       {controller.isMutable ? (
         <>
           <MiniButton
-            title={!controller.isContentEditable ? 'Откатить к версии' : 'Переключитесь на неактуальную версию'}
+            titleHtml={
+              !controller.isContentEditable ? 'Откатить к версии' : 'Переключитесь на <br/>неактуальную версию'
+            }
             disabled={controller.isContentEditable}
             onClick={() => controller.restoreVersion()}
             icon={<IconUpload size='1.25rem' className='icon-red' />}
           />
           <MiniButton
-            title={controller.isContentEditable ? 'Создать версию' : 'Переключитесь на актуальную версию'}
+            titleHtml={controller.isContentEditable ? 'Создать версию' : 'Переключитесь <br/>на актуальную версию'}
             disabled={!controller.isContentEditable}
             onClick={controller.createVersion}
             icon={<IconNewItem size='1.25rem' className='icon-green' />}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
index 69b5ec73..b72687b2 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
@@ -209,7 +209,7 @@ function RSTabsMenu({ onDestroy }: RSTabsMenuProps) {
             />
             <DropdownButton
               text='Встраивание'
-              title='Импортировать совокупность конституент из другой схемы'
+              titleHtml='Импортировать совокупность <br/>конституент из другой схемы'
               icon={<IconInlineSynthesis size='1rem' className='icon-green' />}
               disabled={!controller.isContentEditable || controller.isProcessing}
               onClick={handleInlineSynthesis}
@@ -217,28 +217,28 @@ function RSTabsMenu({ onDestroy }: RSTabsMenuProps) {
             <DropdownButton
               className='border-t-2'
               text='Упорядочить список'
-              title='Упорядочить список конституент исходя из логики типов и связей конституент'
+              titleHtml='Упорядочить список, исходя из <br/>логики типов и связей конституент'
               icon={<IconSortList size='1rem' className='icon-primary' />}
               disabled={!controller.isContentEditable || controller.isProcessing}
               onClick={handleRestoreOrder}
             />
             <DropdownButton
               text='Порядковые имена'
-              title='Присвоить порядковые имена и обновить выражения'
+              titleHtml='Присвоить порядковые имена <br/>и обновить выражения'
               icon={<IconGenerateNames size='1rem' className='icon-primary' />}
               disabled={!controller.isContentEditable || controller.isProcessing}
               onClick={handleReindex}
             />
             <DropdownButton
               text='Порождение структуры'
-              title='Раскрыть структуру типизации выделенной конституенты'
+              titleHtml='Раскрыть структуру типизации <br/>выделенной конституенты'
               icon={<IconGenerateStructure size='1rem' className='icon-primary' />}
               disabled={!controller.isContentEditable || !controller.canProduceStructure}
               onClick={handleProduceStructure}
             />
             <DropdownButton
               text='Отождествление'
-              title='Заменить вхождения одной конституенты на другую'
+              titleHtml='Заменить вхождения <br/>одной конституенты на другую'
               icon={<IconReplace size='1rem' className='icon-red' />}
               onClick={handleSubstituteCst}
               disabled={!controller.isContentEditable || controller.isProcessing}
diff --git a/rsconcept/frontend/src/pages/RegisterPage.tsx b/rsconcept/frontend/src/pages/RegisterPage.tsx
index ba3f4963..adb5bfa2 100644
--- a/rsconcept/frontend/src/pages/RegisterPage.tsx
+++ b/rsconcept/frontend/src/pages/RegisterPage.tsx
@@ -163,11 +163,11 @@ function RegisterPage() {
 
         <div className='flex gap-1 text-sm'>
           <Checkbox id='accept_terms' label='Принимаю условия' value={acceptPrivacy} setValue={setAcceptPrivacy} />
-          <TextURL text='обработки персональных данных...' href={urls.help_topic(HelpTopic.PRIVACY)} />
+          <TextURL text='обработки персональных данных...' href={urls.help_topic(HelpTopic.INFO_PRIVACY)} />
         </div>
         <div className='flex gap-1 text-sm'>
           <Checkbox id='accept_rules' label='Принимаю ' value={acceptRules} setValue={setAcceptRules} />
-          <TextURL text='правила поведения на Портале...' href={urls.help_topic(HelpTopic.RULES)} />
+          <TextURL text='правила поведения на Портале...' href={urls.help_topic(HelpTopic.INFO_RULES)} />
         </div>
 
         <div className='flex justify-around my-3'>
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index 25f2704f..c79bb834 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -19,6 +19,16 @@ import {
 } from '@/models/rslang';
 import { UserLevel } from '@/models/user';
 
+/**
+ * Remove html tags from target string.
+ */
+export function removeTags(target?: string): string {
+  if (!target) {
+    return '';
+  }
+  return target.toString().replace(/(<([^>]+)>)/gi, '');
+}
+
 /**
  * Generates description for {@link IConstituenta}.
  */
@@ -352,11 +362,6 @@ export function labelHelpTopic(topic: HelpTopic): string {
   switch (topic) {
     case HelpTopic.MAIN:            return 'Портал';
 
-    case HelpTopic.DOCS:            return 'Документы';
-    case HelpTopic.RULES:           return 'Правила';
-    case HelpTopic.PRIVACY:         return 'Обработка данных';
-    case HelpTopic.API:             return 'REST API';
-
     case HelpTopic.INTERFACE:       return 'Интерфейс';
     case HelpTopic.UI_LIBRARY:      return 'Библиотека';
     case HelpTopic.UI_RS_MENU:      return 'Меню схемы';
@@ -373,17 +378,25 @@ export function labelHelpTopic(topic: HelpTopic): string {
     case HelpTopic.CC_CONSTITUENTA: return 'Конституента';
     case HelpTopic.CC_RELATIONS:    return 'Связи понятий';
     case HelpTopic.CC_SYNTHESIS:    return 'Синтез схем';
+    case HelpTopic.CC_OSS:          return 'Операционная схема';
 
     case HelpTopic.RSLANG:          return 'Экспликация';
     case HelpTopic.RSL_TYPES:       return 'Типизация';
     case HelpTopic.RSL_CORRECT:     return 'Переносимость';
     case HelpTopic.RSL_INTERPRET:   return 'Интерпретируемость';
     case HelpTopic.RSL_OPERATIONS:  return 'Операции';
-    case HelpTopic.RSL_TEMPLATES:   return 'Шаблоны выражений';
+    case HelpTopic.RSL_TEMPLATES:   return 'Банк выражений';
 
     case HelpTopic.TERM_CONTROL:    return 'Терминологизация';
     case HelpTopic.ACCESS:          return 'Доступы';
     case HelpTopic.VERSIONS:        return 'Версионирование';
+
+    case HelpTopic.INFO:            return 'Информация';
+    case HelpTopic.INFO_RULES:      return 'Правила';
+    case HelpTopic.INFO_CONTRIB:    return 'Участники';
+    case HelpTopic.INFO_PRIVACY:    return 'Обработка данных';
+    case HelpTopic.INFO_API:        return 'REST API';
+
     case HelpTopic.EXTEOR:          return 'Экстеор';
   }
 }
@@ -396,39 +409,42 @@ export function describeHelpTopic(topic: HelpTopic): string {
   switch (topic) {
     case HelpTopic.MAIN:            return 'общая справка по порталу';
 
-    case HelpTopic.DOCS:            return 'нормативные и технические документы';
-    case HelpTopic.RULES:           return 'правила пользования Порталом';
-    case HelpTopic.PRIVACY:         return 'политика обработки персональных данных';
-    case HelpTopic.API:             return 'интерфейс для разработчиков';
-
     case HelpTopic.INTERFACE:       return 'описание интерфейса пользователя';
-    case HelpTopic.UI_LIBRARY:      return 'интерфейс Библиотеки схем';
+    case HelpTopic.UI_LIBRARY:      return 'поиск и просмотр схем';
     case HelpTopic.UI_RS_MENU:      return 'меню редактирования схемы';
-    case HelpTopic.UI_RS_CARD:      return 'интерфейс Карточки схемы';
-    case HelpTopic.UI_RS_LIST:      return 'интерфейс Списка конституент';
-    case HelpTopic.UI_RS_EDITOR:    return 'интерфейс редактирования конституенты';
+    case HelpTopic.UI_RS_CARD:      return 'общие атрибуты схемы';
+    case HelpTopic.UI_RS_LIST:      return 'концептуальная схема <br/>в форме таблицы';
+    case HelpTopic.UI_RS_EDITOR:    return 'редактирование конституенты';
     case HelpTopic.UI_GRAPH_TERM:   return 'интерфейс графа термов';
-    case HelpTopic.UI_FORMULA_TREE: return 'интерфейс дерева разбора родоструктурного выражения';
-    case HelpTopic.UI_CST_STATUS:   return 'нотация отображения статуса конституенты';
-    case HelpTopic.UI_CST_CLASS:    return 'нотация отображения класса конституенты';
+    case HelpTopic.UI_FORMULA_TREE: return 'просмотр дерева разбора <br/>родоструктурного выражения';
+    case HelpTopic.UI_CST_STATUS:   return 'нотация статуса конституенты';
+    case HelpTopic.UI_CST_CLASS:    return 'нотация класса конституенты';
 
-    case HelpTopic.CONCEPTUAL:      return 'основы концептуализации и концептуального мышления';
-    case HelpTopic.CC_SYSTEM:       return 'концептуальная схема как система понятий';
+    case HelpTopic.CONCEPTUAL:      return 'основы концептуализации';
+    case HelpTopic.CC_SYSTEM:       return 'концептуальная схема <br/>как система понятий';
     case HelpTopic.CC_CONSTITUENTA: return 'понятия конституенты и ее атрибутов';
     case HelpTopic.CC_RELATIONS:    return 'отношения между конституентами';
     case HelpTopic.CC_SYNTHESIS:    return 'операция синтеза концептуальных схем';
+    case HelpTopic.CC_OSS:          return 'операционная схема синтеза <br/>и протаскивание изменений';
 
-    case HelpTopic.RSLANG:          return 'справка по языку родов структур и экспликации';
-    case HelpTopic.RSL_TYPES:       return 'система типов в родоструктурной экспликации';
-    case HelpTopic.RSL_CORRECT:     return 'корректность и переносимость определений';
-    case HelpTopic.RSL_INTERPRET:   return 'интерпретация формальных определений';
-    case HelpTopic.RSL_OPERATIONS:  return 'операции над концептуальными схемами';
-    case HelpTopic.RSL_TEMPLATES:   return 'работа с шаблонными выражениями';
+    case HelpTopic.RSLANG:          return 'экспликация и язык родов структур';
+    case HelpTopic.RSL_TYPES:       return 'система типов в <br/>родоструктурной экспликации';
+    case HelpTopic.RSL_CORRECT:     return 'биективная переносимость';
+    case HelpTopic.RSL_INTERPRET:   return 'интерпретация определений <br/>и утверждений';
+    case HelpTopic.RSL_OPERATIONS:  return 'формальные операции';
+    case HelpTopic.RSL_TEMPLATES:   return 'применение Банка выражений';
 
-    case HelpTopic.TERM_CONTROL:    return 'справка по контролю терминов и текстовым отсылкам';
+    case HelpTopic.TERM_CONTROL:    return 'контроль терминов и текстовых отсылок';
     case HelpTopic.ACCESS:          return 'организация доступов к схемам';
     case HelpTopic.VERSIONS:        return 'справка по управлению версиями схем';
-    case HelpTopic.EXTEOR:          return 'справка по программе для экспликации "Экстеор" для Windows';
+
+    case HelpTopic.INFO:            return 'справочные, нормативные <br/>и технические документы';
+    case HelpTopic.INFO_RULES:      return 'правила пользования Порталом';
+    case HelpTopic.INFO_CONTRIB:    return 'признание вклада участников <br/>в создание Портала';
+    case HelpTopic.INFO_PRIVACY:    return 'политика обработки <br/>персональных данных';
+    case HelpTopic.INFO_API:        return 'интерфейс для разработчиков';
+
+    case HelpTopic.EXTEOR:          return 'программа экспликации теорий <br/>"Экстеор" для Windows';
   }
 }
 

From feb9618d4415db3e36d20445452a76775210544b Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 7 Jun 2024 13:49:34 +0300
Subject: [PATCH 05/45] npm update

---
 rsconcept/frontend/package-lock.json | 373 ++++++++++++++-------------
 rsconcept/frontend/package.json      |  10 +-
 2 files changed, 194 insertions(+), 189 deletions(-)

diff --git a/rsconcept/frontend/package-lock.json b/rsconcept/frontend/package-lock.json
index 63fd6d1d..5e19fafa 100644
--- a/rsconcept/frontend/package-lock.json
+++ b/rsconcept/frontend/package-lock.json
@@ -10,8 +10,8 @@
       "dependencies": {
         "@lezer/lr": "^1.4.1",
         "@tanstack/react-table": "^8.17.3",
-        "@uiw/codemirror-themes": "^4.22.1",
-        "@uiw/react-codemirror": "^4.22.1",
+        "@uiw/codemirror-themes": "^4.22.2",
+        "@uiw/react-codemirror": "^4.22.2",
         "axios": "^1.7.2",
         "clsx": "^2.1.1",
         "framer-motion": "^10.18.0",
@@ -28,13 +28,13 @@
         "react-tabs": "^6.0.2",
         "react-toastify": "^9.1.3",
         "react-tooltip": "^5.26.4",
-        "reagraph": "^4.19.0",
+        "reagraph": "^4.19.1",
         "use-debounce": "^10.0.1"
       },
       "devDependencies": {
         "@lezer/generator": "^1.7.0",
         "@types/jest": "^29.5.12",
-        "@types/node": "^20.14.0",
+        "@types/node": "^20.14.2",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
@@ -48,7 +48,7 @@
         "eslint-plugin-tsdoc": "^0.2.17",
         "jest": "^29.7.0",
         "postcss": "^8.4.38",
-        "tailwindcss": "^3.4.3",
+        "tailwindcss": "^3.4.4",
         "ts-jest": "^29.1.4",
         "typescript": "^5.4.5",
         "vite": "^4.5.3"
@@ -81,12 +81,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz",
-      "integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.6",
+        "@babel/highlight": "^7.24.7",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -94,30 +94,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.6.tgz",
-      "integrity": "sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz",
+      "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.6.tgz",
-      "integrity": "sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz",
+      "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==",
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.6",
-        "@babel/generator": "^7.24.6",
-        "@babel/helper-compilation-targets": "^7.24.6",
-        "@babel/helper-module-transforms": "^7.24.6",
-        "@babel/helpers": "^7.24.6",
-        "@babel/parser": "^7.24.6",
-        "@babel/template": "^7.24.6",
-        "@babel/traverse": "^7.24.6",
-        "@babel/types": "^7.24.6",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helpers": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -142,12 +142,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.6.tgz",
-      "integrity": "sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
+      "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.6",
+        "@babel/types": "^7.24.7",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
@@ -157,25 +157,25 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.6.tgz",
-      "integrity": "sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz",
-      "integrity": "sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz",
+      "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.24.6",
-        "@babel/helper-validator-option": "^7.24.6",
+        "@babel/compat-data": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
         "browserslist": "^4.22.2",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -194,62 +194,66 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz",
-      "integrity": "sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
       "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz",
-      "integrity": "sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz",
+      "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.24.6",
-        "@babel/types": "^7.24.6"
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz",
-      "integrity": "sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz",
+      "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz",
-      "integrity": "sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.6"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz",
-      "integrity": "sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz",
+      "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.24.6",
-        "@babel/helper-module-imports": "^7.24.6",
-        "@babel/helper-simple-access": "^7.24.6",
-        "@babel/helper-split-export-declaration": "^7.24.6",
-        "@babel/helper-validator-identifier": "^7.24.6"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -259,85 +263,86 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz",
-      "integrity": "sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz",
+      "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.6.tgz",
-      "integrity": "sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.6"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz",
-      "integrity": "sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.6"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz",
-      "integrity": "sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz",
+      "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz",
-      "integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz",
-      "integrity": "sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz",
+      "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.6.tgz",
-      "integrity": "sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
+      "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.24.6",
-        "@babel/types": "^7.24.6"
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz",
-      "integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.6",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -347,9 +352,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.6.tgz",
-      "integrity": "sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz",
+      "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==",
       "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -424,12 +429,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.6.tgz",
-      "integrity": "sha512-lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -533,13 +538,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.6.tgz",
-      "integrity": "sha512-TzCtxGgVTEJWWwcYwQhCIQ6WaKlo80/B+Onsk4RRCcYqpYGFcG9etPW94VToGte5AAcxRrhjPUFvUS3Y2qKi4A==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
+      "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -549,13 +554,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.6.tgz",
-      "integrity": "sha512-FfZfHXtQ5jYPQsCRyLpOv2GeLIIJhs8aydpNh39vRDjhD411XcfWDni5i7OjP/Rs8GAtTn7sWFFELJSHqkIxYg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz",
+      "integrity": "sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -565,13 +570,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.6.tgz",
-      "integrity": "sha512-BQTBCXmFRreU3oTUXcGKuPOfXAGb1liNY4AvvFKsOBAJ89RKcTsIrSsnMYkj59fNa66OFKnSa4AJZfy5Y4B9WA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz",
+      "integrity": "sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.6"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -581,9 +586,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.6.tgz",
-      "integrity": "sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
+      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
       "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -593,33 +598,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.6.tgz",
-      "integrity": "sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz",
+      "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.6",
-        "@babel/parser": "^7.24.6",
-        "@babel/types": "^7.24.6"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.6.tgz",
-      "integrity": "sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz",
+      "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.6",
-        "@babel/generator": "^7.24.6",
-        "@babel/helper-environment-visitor": "^7.24.6",
-        "@babel/helper-function-name": "^7.24.6",
-        "@babel/helper-hoist-variables": "^7.24.6",
-        "@babel/helper-split-export-declaration": "^7.24.6",
-        "@babel/parser": "^7.24.6",
-        "@babel/types": "^7.24.6",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -628,13 +633,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.24.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.6.tgz",
-      "integrity": "sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz",
+      "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.6",
-        "@babel/helper-validator-identifier": "^7.24.6",
+        "@babel/helper-string-parser": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -667,21 +672,21 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.5.0.tgz",
-      "integrity": "sha512-rK+sj4fCAN/QfcY9BEzYMgp4wwL/q5aj/VfNSoH1RWPF9XS/dUwBkvlL3hpWgEjOqlpdN1uLC9UkjJ4tmyjJYg==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz",
+      "integrity": "sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
-        "@codemirror/view": "^6.0.0",
+        "@codemirror/view": "^6.27.0",
         "@lezer/common": "^1.1.0"
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz",
-      "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==",
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
+      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -733,9 +738,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.3.tgz",
-      "integrity": "sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw==",
+      "version": "6.27.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.27.0.tgz",
+      "integrity": "sha512-8kqX1sHbVW1lVzWwrjAbh4dR7eKhV8eIQ952JKaBXOoXE04WncoqCy4DMU701LSrPZ3N2Q4zsTawz7GQ+2mrUw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
@@ -1310,9 +1315,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz",
+      "integrity": "sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3019,9 +3024,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.14.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.0.tgz",
-      "integrity": "sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==",
+      "version": "20.14.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz",
+      "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3340,9 +3345,9 @@
       }
     },
     "node_modules/@uiw/codemirror-extensions-basic-setup": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.22.1.tgz",
-      "integrity": "sha512-Iz8eFaZBNrwjaAADszOxOv2byDMn4rqob/luuSPAzJjTrSn5KawRXcoNLoWGPGNO6Mils6bIly/g2LaU34otNw==",
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.22.2.tgz",
+      "integrity": "sha512-zcHGkldLFN3cGoI5XdOGAkeW24yaAgrDEYoyPyWHODmPiNwybQQoZGnH3qUdzZwUaXtAcLWoAeOPzfNRW2yGww==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -3367,9 +3372,9 @@
       }
     },
     "node_modules/@uiw/codemirror-themes": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.22.1.tgz",
-      "integrity": "sha512-5TeB8wCc0aNd3YEhzOvgekpAFQfEm4fCTUcGmEIQqaRNgKAM83HYNpE1JF2j7x2oDFugdiO0yJynS6bo1zVOuw==",
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.22.2.tgz",
+      "integrity": "sha512-gsLHn6SUuV5iboBvGrM7YimzLFHQmsNlkGIYs3UaVUJTo/A/ZrKoSJNyPziShLRjBXA2UwKdBTIU6VhHyyaChw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
@@ -3386,16 +3391,16 @@
       }
     },
     "node_modules/@uiw/react-codemirror": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.22.1.tgz",
-      "integrity": "sha512-yrq9FdGZ6E4Rh+7W0xyirSEeESGyG/k54/DfFqSk40fqel/3x/3fqjIImEZUYPxxgFPmZ3RtP+O0Em46nwRvgg==",
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.22.2.tgz",
+      "integrity": "sha512-okCSl+WJG63gRx8Fdz7v0C6RakBQnbb3pHhuzIgDB+fwhipgFodSnu2n9oOsQesJ5YQ7mSOcKMgX0JEsu4nnfQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
         "@codemirror/commands": "^6.1.0",
         "@codemirror/state": "^6.1.1",
         "@codemirror/theme-one-dark": "^6.0.0",
-        "@uiw/codemirror-extensions-basic-setup": "4.22.1",
+        "@uiw/codemirror-extensions-basic-setup": "4.22.2",
         "codemirror": "^6.0.0"
       },
       "funding": {
@@ -4074,9 +4079,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001626",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001626.tgz",
-      "integrity": "sha512-JRW7kAH8PFJzoPCJhLSHgDgKg5348hsQ68aqb+slnzuB5QFERv846oA/mRChmlLAOdEDeOkRn3ynb1gSFnjt3w==",
+      "version": "1.0.30001629",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz",
+      "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==",
       "funding": [
         {
           "type": "opencollective",
@@ -4876,9 +4881,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.788",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.788.tgz",
-      "integrity": "sha512-ubp5+Ev/VV8KuRoWnfP2QF2Bg+O2ZFdb49DiiNbz2VmgkIqrnyYaqIOqj8A6K/3p1xV0QcU5hBQ1+BmB6ot1OA==",
+      "version": "1.4.794",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.794.tgz",
+      "integrity": "sha512-6FApLtsYhDCY0Vglq3AptsdxQ+PJLc6AxlAM0HjEihUAiOPPbkASEsq9gtxUeZY9o0sJIEa3WnF0vVH4VT4iug==",
       "license": "ISC"
     },
     "node_modules/ellipsize": {
@@ -6439,9 +6444,9 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz",
-      "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
+      "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
@@ -8133,9 +8138,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
-      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+      "version": "1.21.3",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.3.tgz",
+      "integrity": "sha512-uy2bNX5zQ+tESe+TiC7ilGRz8AtRGmnJH55NC5S0nSUjvvvM2hJHmefHErugGXN4pNv4Qx7vLsnNw9qJ9mtIsw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -8444,9 +8449,9 @@
       }
     },
     "node_modules/meshline": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/meshline/-/meshline-3.2.1.tgz",
-      "integrity": "sha512-/Zrhq1sbQCtqSsrud0hN/U8wOdKKOcxCWefEowZRHsosIcy1p87+2PlWSNO4s9zOoT/zjrQR8YikXYao8XCqVQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/meshline/-/meshline-3.3.1.tgz",
+      "integrity": "sha512-/TQj+JdZkeSUOl5Mk2J7eLcYTLiQm2IDzmlSvYm7ov15anEcDJ92GHqqazxTSreeNgfnYu24kiEvvv0WlbCdFQ==",
       "license": "MIT",
       "peerDependencies": {
         "three": ">=0.137"
@@ -9756,9 +9761,9 @@
       }
     },
     "node_modules/reagraph": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/reagraph/-/reagraph-4.19.0.tgz",
-      "integrity": "sha512-hQZjA8coxFS6UjDhlP5Ho/woc36sM1dqsliwvTtThN/1ZoGbAuxt5QntVka4jesh0HhNB3ZafYgCIqXoo2sq8Q==",
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/reagraph/-/reagraph-4.19.1.tgz",
+      "integrity": "sha512-BMSfZ2CoLSWsxe+vowHbCZSqeJJlH2UcbQA6hM1JHI0PmZ/3UHIXCQUHXrsROtYIIH5AnFEj9pUAZh2FGnfGhw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@react-spring/three": "9.6.1",
@@ -10465,9 +10470,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
-      "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz",
+      "integrity": "sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10793,9 +10798,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
       "license": "0BSD"
     },
     "node_modules/tunnel-rat": {
diff --git a/rsconcept/frontend/package.json b/rsconcept/frontend/package.json
index fffb494a..36453a14 100644
--- a/rsconcept/frontend/package.json
+++ b/rsconcept/frontend/package.json
@@ -14,8 +14,8 @@
   "dependencies": {
     "@lezer/lr": "^1.4.1",
     "@tanstack/react-table": "^8.17.3",
-    "@uiw/codemirror-themes": "^4.22.1",
-    "@uiw/react-codemirror": "^4.22.1",
+    "@uiw/codemirror-themes": "^4.22.2",
+    "@uiw/react-codemirror": "^4.22.2",
     "axios": "^1.7.2",
     "clsx": "^2.1.1",
     "framer-motion": "^10.18.0",
@@ -32,13 +32,13 @@
     "react-tabs": "^6.0.2",
     "react-toastify": "^9.1.3",
     "react-tooltip": "^5.26.4",
-    "reagraph": "^4.19.0",
+    "reagraph": "^4.19.1",
     "use-debounce": "^10.0.1"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.0",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.0",
+    "@types/node": "^20.14.2",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
@@ -52,7 +52,7 @@
     "eslint-plugin-tsdoc": "^0.2.17",
     "jest": "^29.7.0",
     "postcss": "^8.4.38",
-    "tailwindcss": "^3.4.3",
+    "tailwindcss": "^3.4.4",
     "ts-jest": "^29.1.4",
     "typescript": "^5.4.5",
     "vite": "^4.5.3"

From 53e75b9ddd2ecf1a503caa3b7d771504ee3959d4 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 7 Jun 2024 15:05:08 +0300
Subject: [PATCH 06/45] Update react-pdf and improve PDFViewer

---
 rsconcept/frontend/package-lock.json          | 37 +++++++++----------
 rsconcept/frontend/package.json               |  2 +-
 .../frontend/src/app/GlobalProviders.tsx      |  2 +-
 .../src/components/ui/PDFViewer/PDFViewer.tsx | 14 ++++---
 .../components/ui/PDFViewer/PageControls.tsx  |  8 ++--
 .../src/pages/ManualsPage/TopicPage.tsx       | 18 ++++++++-
 .../src/pages/ManualsPage/ViewTopic.tsx       |  2 +-
 .../pages/ManualsPage/items/HelpPrivacy.tsx   |  9 ++++-
 8 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/rsconcept/frontend/package-lock.json b/rsconcept/frontend/package-lock.json
index 5e19fafa..3ea66d90 100644
--- a/rsconcept/frontend/package-lock.json
+++ b/rsconcept/frontend/package-lock.json
@@ -22,7 +22,7 @@
         "react-icons": "^4.12.0",
         "react-intl": "^6.6.8",
         "react-loader-spinner": "^5.4.5",
-        "react-pdf": "^7.7.3",
+        "react-pdf": "^9.0.0",
         "react-router-dom": "^6.23.1",
         "react-select": "^5.8.0",
         "react-tabs": "^6.0.2",
@@ -8972,27 +8972,27 @@
         "node": ">=8"
       }
     },
-    "node_modules/path2d-polyfill": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz",
-      "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==",
+    "node_modules/path2d": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/path2d/-/path2d-0.2.0.tgz",
+      "integrity": "sha512-KdPAykQX6kmLSOO6Jpu2KNcCED7CKjmaBNGGNuctOsG0hgYO1OdYQaan6cYXJiG0WmXOwZZPILPBimu5QAIw3A==",
       "license": "MIT",
       "optional": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
     "node_modules/pdfjs-dist": {
-      "version": "3.11.174",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.11.174.tgz",
-      "integrity": "sha512-TdTZPf1trZ8/UFu5Cx/GXB7GZM30LT+wWUNfsi6Bq8ePLnb+woNKtDymI2mxZYBpMbonNFqKmiz684DIfnd8dA==",
+      "version": "4.3.136",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.3.136.tgz",
+      "integrity": "sha512-gzfnt1qc4yA+U46golPGYtU4WM2ssqP2MvFjKga8GEKOrEnzRPrA/9jogLLPYHiA3sGBPJ+p7BdAq+ytmw3jEg==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=18"
       },
       "optionalDependencies": {
         "canvas": "^2.11.2",
-        "path2d-polyfill": "^2.0.1"
+        "path2d": "^0.2.0"
       }
     },
     "node_modules/picocolors": {
@@ -9517,18 +9517,17 @@
       }
     },
     "node_modules/react-pdf": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-7.7.3.tgz",
-      "integrity": "sha512-a2VfDl8hiGjugpqezBTUzJHYLNB7IS7a2t7GD52xMI9xHg8LdVaTMsnM9ZlNmKadnStT/tvX5IfV0yLn+JvYmw==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-9.0.0.tgz",
+      "integrity": "sha512-J+pza8R2p9oNEOJOHIQJI4o5rFK7ji7bBl2IvsHvz1OOyphvuzVDo5tOJwWAFAbxYauCH3Kt8jOvcMJUOpxYZQ==",
       "license": "MIT",
       "dependencies": {
         "clsx": "^2.0.0",
         "dequal": "^2.0.3",
         "make-cancellable-promise": "^1.3.1",
         "make-event-props": "^1.6.0",
-        "merge-refs": "^1.2.1",
-        "pdfjs-dist": "3.11.174",
-        "prop-types": "^15.6.2",
+        "merge-refs": "^1.3.0",
+        "pdfjs-dist": "4.3.136",
         "tiny-invariant": "^1.0.0",
         "warning": "^4.0.0"
       },
@@ -9536,9 +9535,9 @@
         "url": "https://github.com/wojtekmaj/react-pdf?sponsor=1"
       },
       "peerDependencies": {
-        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
         "@types/react": {
diff --git a/rsconcept/frontend/package.json b/rsconcept/frontend/package.json
index 36453a14..26bfd922 100644
--- a/rsconcept/frontend/package.json
+++ b/rsconcept/frontend/package.json
@@ -26,7 +26,7 @@
     "react-icons": "^4.12.0",
     "react-intl": "^6.6.8",
     "react-loader-spinner": "^5.4.5",
-    "react-pdf": "^7.7.3",
+    "react-pdf": "^9.0.0",
     "react-router-dom": "^6.23.1",
     "react-select": "^5.8.0",
     "react-tabs": "^6.0.2",
diff --git a/rsconcept/frontend/src/app/GlobalProviders.tsx b/rsconcept/frontend/src/app/GlobalProviders.tsx
index 1ede839e..d62c99d5 100644
--- a/rsconcept/frontend/src/app/GlobalProviders.tsx
+++ b/rsconcept/frontend/src/app/GlobalProviders.tsx
@@ -11,7 +11,7 @@ import { UsersState } from '@/context/UsersContext';
 
 import ErrorFallback from './ErrorFallback';
 
-pdfjs.GlobalWorkerOptions.workerSrc = new URL('pdfjs-dist/build/pdf.worker.min.js', import.meta.url).toString();
+pdfjs.GlobalWorkerOptions.workerSrc = new URL('pdfjs-dist/build/pdf.worker.min.mjs', import.meta.url).toString();
 
 const resetState = () => {
   console.log('Resetting state after error fallback');
diff --git a/rsconcept/frontend/src/components/ui/PDFViewer/PDFViewer.tsx b/rsconcept/frontend/src/components/ui/PDFViewer/PDFViewer.tsx
index cdf54c9e..112c9447 100644
--- a/rsconcept/frontend/src/components/ui/PDFViewer/PDFViewer.tsx
+++ b/rsconcept/frontend/src/components/ui/PDFViewer/PDFViewer.tsx
@@ -11,21 +11,23 @@ import Overlay from '../Overlay';
 import PageControls from './PageControls';
 
 const MAXIMUM_WIDTH = 1000;
-const MINIMUM_WIDTH = 320;
+const MINIMUM_WIDTH = 300;
 
 interface PDFViewerProps {
   file?: string | ArrayBuffer | Blob;
+  offsetXpx?: number;
+  minWidth?: number;
 }
 
-function PDFViewer({ file }: PDFViewerProps) {
+function PDFViewer({ file, offsetXpx, minWidth = MINIMUM_WIDTH }: PDFViewerProps) {
   const windowSize = useWindowSize();
 
   const [pageCount, setPageCount] = useState(0);
   const [pageNumber, setPageNumber] = useState(1);
 
   const pageWidth = useMemo(() => {
-    return Math.max(MINIMUM_WIDTH, Math.min((windowSize?.width ?? 0) - 10, MAXIMUM_WIDTH));
-  }, [windowSize]);
+    return Math.max(minWidth, Math.min((windowSize?.width ?? 0) - (offsetXpx ?? 0) - 10, MAXIMUM_WIDTH));
+  }, [windowSize, offsetXpx, minWidth]);
 
   function onDocumentLoadSuccess({ numPages }: PDFDocumentProxy) {
     setPageCount(numPages);
@@ -42,14 +44,14 @@ function PDFViewer({ file }: PDFViewerProps) {
         <PageControls pageCount={pageCount} pageNumber={pageNumber} setPageNumber={setPageNumber} />
       </Overlay>
       <Page
-        className='pointer-events-none select-none sm:translate-x-0'
+        className='overflow-hidden pointer-events-none select-none'
         renderTextLayer={false}
         renderAnnotationLayer={false}
         pageNumber={pageNumber}
         width={pageWidth}
         canvasBackground={graphLightT.canvas.background}
       />
-      <Overlay position='bottom-6 left-1/2 -translate-x-1/2' className='flex select-none'>
+      <Overlay position='bottom-3 left-1/2 -translate-x-1/2' className='flex select-none'>
         <PageControls pageCount={pageCount} pageNumber={pageNumber} setPageNumber={setPageNumber} />
       </Overlay>
     </Document>
diff --git a/rsconcept/frontend/src/components/ui/PDFViewer/PageControls.tsx b/rsconcept/frontend/src/components/ui/PDFViewer/PageControls.tsx
index c3bf841d..511288e4 100644
--- a/rsconcept/frontend/src/components/ui/PDFViewer/PageControls.tsx
+++ b/rsconcept/frontend/src/components/ui/PDFViewer/PageControls.tsx
@@ -8,7 +8,7 @@ interface PageControlsProps {
 
 function PageControls({ pageNumber, pageCount, setPageNumber }: PageControlsProps) {
   return (
-    <>
+    <div className='flex items-center'>
       <button
         type='button'
         className='clr-hover clr-text-controls'
@@ -25,9 +25,9 @@ function PageControls({ pageNumber, pageCount, setPageNumber }: PageControlsProp
       >
         <IconPageLeft size='1.5rem' />
       </button>
-      <p className='px-3 text-black text-nowrap'>
+      <div className='px-3 text-nowrap'>
         Страница {pageNumber} из {pageCount}
-      </p>
+      </div>
       <button
         type='button'
         className='clr-hover clr-text-controls'
@@ -44,7 +44,7 @@ function PageControls({ pageNumber, pageCount, setPageNumber }: PageControlsProp
       >
         <IconPageLast size='1.5rem' />
       </button>
-    </>
+    </div>
   );
 }
 
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
index 230bdc4b..b15e55b0 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
@@ -1,3 +1,4 @@
+import useWindowSize from '@/hooks/useWindowSize';
 import { HelpTopic } from '@/models/miscellaneous';
 
 import HelpAccess from './items/HelpAccess';
@@ -33,11 +34,20 @@ import HelpTermGraph from './items/HelpTermGraph';
 import HelpTerminologyControl from './items/HelpTerminologyControl';
 import HelpVersions from './items/HelpVersions';
 
+// PDF Viewer setup
+const OFFSET_X_SMALL = 32;
+const OFFSET_X_LARGE = 280;
+
+const MIN_SIZE_SMALL = 300;
+const MIN_SIZE_LARGE = 600;
+
 interface TopicPageProps {
   topic: HelpTopic;
 }
 
 function TopicPage({ topic }: TopicPageProps) {
+  const size = useWindowSize();
+
   if (topic === HelpTopic.MAIN) return <HelpPortal />;
 
   if (topic === HelpTopic.INTERFACE) return <HelpInterface />;
@@ -72,7 +82,13 @@ function TopicPage({ topic }: TopicPageProps) {
   if (topic === HelpTopic.INFO) return <HelpInfo />;
   if (topic === HelpTopic.INFO_RULES) return <HelpRules />;
   if (topic === HelpTopic.INFO_CONTRIB) return <HelpContributors />;
-  if (topic === HelpTopic.INFO_PRIVACY) return <HelpPrivacy />;
+  if (topic === HelpTopic.INFO_PRIVACY)
+    return (
+      <HelpPrivacy
+        offsetXpx={size.isSmall ? OFFSET_X_SMALL : OFFSET_X_LARGE}
+        minWidth={size.isSmall ? MIN_SIZE_SMALL : MIN_SIZE_LARGE}
+      />
+    );
   if (topic === HelpTopic.INFO_API) return <HelpAPI />;
 
   if (topic === HelpTopic.EXTEOR) return <HelpExteor />;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
index 130e86ce..caeb3f33 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
@@ -8,7 +8,7 @@ interface ViewTopicProps {
 
 function ViewTopic({ topic }: ViewTopicProps) {
   return (
-    <AnimateFade key={topic} className='py-2 pl-6 pr-3 mx-auto'>
+    <AnimateFade key={topic} className='px-3 py-2 mx-auto'>
       <TopicPage topic={topic} />
     </AnimateFade>
   );
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpPrivacy.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpPrivacy.tsx
index ee699df8..d4166947 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpPrivacy.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpPrivacy.tsx
@@ -1,10 +1,15 @@
 import PDFViewer from '@/components/ui/PDFViewer';
 import { resources } from '@/utils/constants';
 
-function HelpPrivacy() {
+interface HelpPrivacyProps {
+  offsetXpx: number;
+  minWidth: number;
+}
+
+function HelpPrivacy({ offsetXpx, minWidth }: HelpPrivacyProps) {
   return (
     <div>
-      <PDFViewer file={resources.privacy_policy} />
+      <PDFViewer file={resources.privacy_policy} offsetXpx={offsetXpx} minWidth={minWidth} />
     </div>
   );
 }

From 186545afe931d4d30fed185100a7ff3322002592 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 7 Jun 2024 15:35:34 +0300
Subject: [PATCH 07/45] Add rules of conduct

---
 .vscode/settings.json                         |  2 +
 .../src/pages/ManualsPage/items/HelpInfo.tsx  |  7 ++-
 .../src/pages/ManualsPage/items/HelpRules.tsx | 50 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 49f80dd4..5774325c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -156,6 +156,7 @@
     "Бурбаки",
     "Версионирование",
     "Десинглетон",
+    "доксинг",
     "интерпретируемости",
     "интерпретируемость",
     "компаратив",
@@ -178,6 +179,7 @@
     "Синглетон",
     "твор",
     "Терминологизация",
+    "троллинг",
     "Цермелло",
     "ЦИВТ",
     "Экстеор",
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx
index 7efb3da9..be4670d6 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpInfo.tsx
@@ -5,8 +5,11 @@ import Subtopics from '../Subtopics';
 function HelpInfo() {
   return (
     <div>
-      <h1>Документы</h1>
-      <p>TBD.</p>
+      <h1>Справочная информация и документы</h1>
+      <p>
+        Раздел содержит различные документы, задающие правовой статус Портала,
+        <br />а также документацию для разработчиков.
+      </p>
 
       <Subtopics headTopic={HelpTopic.INFO} />
     </div>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpRules.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpRules.tsx
index af9a6b72..7ff5c7cf 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpRules.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpRules.tsx
@@ -1,8 +1,54 @@
+import { urls } from '@/app/urls';
+import TextURL from '@/components/ui/TextURL';
+import { external_urls } from '@/utils/constants';
+
 function HelpRules() {
   return (
     <div>
-      <h1>Правила Портала</h1>
-      <p>TBD.</p>
+      <h1>Правила поведения участников Портала</h1>
+
+      <p>
+        Мы стремимся предоставить возможность участия в работе Портала как можно большему количеству людей. Мы считаем,
+        что сообщества участников у нас должны быть как можно более разнообразными и открытыми для новых участников. Мы
+        хотим, чтобы эти сообщества представляли собой позитивное, безопасное и здоровое окружение для всех, кто
+        присоединяется или хочет присоединиться к ним. Мы стремимся сохранить такое окружение, в том числе путем
+        принятия этих Правил поведения. Кроме того, мы хотим защитить наши проекты от тех, кто портит или искажает их
+        содержание, поэтому к участникам, нарушающим Правила будут применяться санкции, определяемые Администрацией
+        Портала.
+      </p>
+
+      <p>
+        Поведение в рамках Портала основано на уважении, вежливости, коллегиальности, солидарности и социальной
+        ответственности. Это относится ко всем читателям, участникам и администраторам в их взаимодействии без
+        исключений, основанных на возрасте, умственных или физических возможностях, внешнем виде, национальном,
+        религиозном, этническом и культурном происхождении, касте, социальном классе, уровне владения языком,
+        сексуальной ориентации, гендерной идентичности, поле или сфере работы. Мы также не будем делать исключения на
+        основании статуса, навыков или достижений
+      </p>
+
+      <h2>Ожидаемое поведение</h2>
+      <li>взаимное уважением, поддержка в отношениях с участниками Портала.</li>
+      <li>
+        пожелания по доработке, найденные ошибки и иные предложения следует направлять по адресу email:{' '}
+        <TextURL href={external_urls.mail_portal} text='portal@acconcept.ru' />.
+      </li>
+
+      <h2>Неприемлемое поведение</h2>
+      <li>оскорбления, угрозы, сексуальное домогательство, троллинг и преследование других участников.</li>
+      <li>
+        раскрытие персональных данных (доксинг) участников Портала. Не распространяется на персональные данные,
+        раскрытые участниками для отображения на Портале. Эти данные можно изменить в{' '}
+        <TextURL text='профиле' href={urls.profile} />.
+      </li>
+      <li>
+        злоупотребление властью, привилегиями или влиянием, включая использование статусов и доступов, предоставленных
+        Порталом в личных целях, не связанных с разработкой контента, развитием и продвижением Портала.
+      </li>
+      <li>
+        вандализм, намеренное добавление неуместного контента, или препятствование, затруднение или другого рода
+        осложнение создания (и/или поддержания) контента, созданного другими участниками.
+      </li>
+      <li>нарушение работоспособности Портала, в том числе путем использования уязвимостей и ошибок в коде.</li>
     </div>
   );
 }

From 1a5f887c0a30ee7a7d3bb202b28017d0fa8ac478 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 7 Jun 2024 18:38:15 +0300
Subject: [PATCH 08/45] Small layout fix

---
 .../pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
index f9335d36..974e9828 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
@@ -98,7 +98,7 @@ function EditorConstituenta({ activeCst, isModified, setIsModified, onOpenEdit }
       <div
         tabIndex={-1}
         className={clsx(
-          'max-w-[95rem]', // prettier: split lines
+          'max-w-[95rem] mx-auto', // prettier: split lines
           'flex',
           { 'flex-col md:items-center': isNarrow }
         )}

From 00a13495dd260653ba0ab43f2c9030fb3a1f5738 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 7 Jun 2024 23:18:05 +0300
Subject: [PATCH 09/45] Small navigation fix for touch accuracy

---
 rsconcept/frontend/src/app/Navigation/Navigation.tsx       | 2 +-
 rsconcept/frontend/src/app/Navigation/NavigationButton.tsx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rsconcept/frontend/src/app/Navigation/Navigation.tsx b/rsconcept/frontend/src/app/Navigation/Navigation.tsx
index e7f82256..207dccae 100644
--- a/rsconcept/frontend/src/app/Navigation/Navigation.tsx
+++ b/rsconcept/frontend/src/app/Navigation/Navigation.tsx
@@ -47,7 +47,7 @@ function Navigation() {
         <div tabIndex={-1} className='flex items-center mr-auto cursor-pointer' onClick={navigateHome}>
           <Logo />
         </div>
-        <div className='flex'>
+        <div className='flex gap-1 py-[0.3rem]'>
           <NavigationButton
             text='Новая схема'
             title='Создать новую схему'
diff --git a/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx b/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx
index 18cf36f7..8961af85 100644
--- a/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx
+++ b/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx
@@ -23,6 +23,7 @@ function NavigationButton({ icon, title, titleHtml, hideTitle, onClick, text }:
         'mr-1 h-full', // prettier: split lines
         'flex items-center gap-1',
         'clr-btn-nav',
+        'rounded-xl',
         'font-controls whitespace-nowrap',
         {
           'px-2': text,

From 63197273bc53f01872c5b0dd7b9453a99ff29924 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sat, 8 Jun 2024 21:32:11 +0300
Subject: [PATCH 10/45] Fix dark mode detection

---
 rsconcept/frontend/index.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/rsconcept/frontend/index.html b/rsconcept/frontend/index.html
index 1933410f..dc965934 100644
--- a/rsconcept/frontend/index.html
+++ b/rsconcept/frontend/index.html
@@ -22,11 +22,14 @@
     <title>Концепт Портал</title>
 
     <script>
-      if (
-        localStorage.getItem('darkMode') === 'true' ||
-        localStorage.getItem('color-theme') === 'dark' ||
-        (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)
-      ) {
+      let isDark = false;
+      if ('portal.theme.dark' in localStorage) {
+        isDark = localStorage.getItem('portal.theme.dark') === 'true';
+      } else if (window.matchMedia) {
+        isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+        localStorage.setItem('portal.theme.dark', isDark ? 'true' : 'false');
+      }
+      if (isDark) {
         document.documentElement.classList.add('dark');
       } else {
         document.documentElement.classList.remove('dark');

From 4eb9f8e26d7bd0d5943274248bcda20ac548a4db Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sat, 8 Jun 2024 21:44:44 +0300
Subject: [PATCH 11/45] Remove text-adjust for Safari

---
 rsconcept/frontend/src/styling/setup.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rsconcept/frontend/src/styling/setup.css b/rsconcept/frontend/src/styling/setup.css
index 0e3fab41..64fb2ce5 100644
--- a/rsconcept/frontend/src/styling/setup.css
+++ b/rsconcept/frontend/src/styling/setup.css
@@ -10,6 +10,8 @@
 
 html,
 body {
+  -webkit-text-size-adjust: 100%;
+
   width: 100%;
   height: 100%;
   margin: 0px;

From 36e33a2a38ef076bed6e2792b995b0e9bae77469 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sat, 8 Jun 2024 21:53:24 +0300
Subject: [PATCH 12/45] Fix convention display if newline is present

---
 .../pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index e54688df..edd9dc04 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -204,12 +204,11 @@ function FormConstituenta({
             <TextArea
               id='cst_convention'
               spellCheck
-              className='min-h-[3.75rem]'
               label={isBasic ? 'Конвенция' : 'Комментарий'}
               placeholder={isBasic ? 'Договоренность об интерпретации' : 'Пояснение разработчика'}
               value={convention}
               disabled={disabled}
-              rows={convention.length > 2 * ROW_SIZE_IN_CHARACTERS ? 3 : 2}
+              rows={convention.length > 2 * ROW_SIZE_IN_CHARACTERS || convention.includes('\n') ? 4 : 2}
               onChange={event => setConvention(event.target.value)}
             />
           </AnimateFade>

From 4d04fe76bca48145c397c075d0b8d2a171ed5dc8 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sun, 9 Jun 2024 15:19:39 +0300
Subject: [PATCH 13/45] UI: Improve readonly mode

---
 .../RSFormPage/ViewConstituents/ViewConstituents.tsx  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx
index f002448f..d844dd10 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ViewConstituents.tsx
@@ -4,9 +4,11 @@ import clsx from 'clsx';
 import { motion } from 'framer-motion';
 import { useMemo, useState } from 'react';
 
+import { useAccessMode } from '@/context/AccessModeContext';
 import { useConceptOptions } from '@/context/OptionsContext';
 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';
@@ -29,20 +31,25 @@ interface ViewConstituentsProps {
 function ViewConstituents({ expression, schema, activeCst, isBottom, onOpenEdit }: ViewConstituentsProps) {
   const { calculateHeight } = useConceptOptions();
   const windowSize = useWindowSize();
+  const { accessLevel } = useAccessMode();
 
   const [filteredData, setFilteredData] = useState<IConstituenta[]>(schema?.items ?? []);
 
   const table = useMemo(
     () => (
       <ConstituentsTable
-        maxHeight={isBottom ? calculateHeight('42rem', '10rem') : calculateHeight('8.2rem')}
+        maxHeight={
+          isBottom
+            ? calculateHeight(accessLevel !== UserLevel.READER ? '42rem' : '35rem', '10rem')
+            : calculateHeight('8.2rem')
+        }
         items={filteredData}
         activeCst={activeCst}
         onOpenEdit={onOpenEdit}
         denseThreshold={COLUMN_EXPRESSION_HIDE_THRESHOLD}
       />
     ),
-    [isBottom, filteredData, activeCst, onOpenEdit, calculateHeight]
+    [isBottom, filteredData, activeCst, onOpenEdit, calculateHeight, accessLevel]
   );
 
   return (

From 5507761c0fcaaff0d2e23211b42260f02a431af4 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sun, 9 Jun 2024 20:41:33 +0300
Subject: [PATCH 14/45] Improve help UI for small screens

---
 .vscode/settings.json                         |  1 +
 .../frontend/src/components/ui/Tooltip.tsx    |  3 +-
 .../DlgConstituentaTemplate.tsx               |  7 +-
 .../dialogs/DlgCreateCst/FormCreateCst.tsx    |  8 ++-
 .../DlgEditReference/DlgEditReference.tsx     | 18 +++---
 .../DlgEditReference/SelectWordForm.tsx       |  2 +-
 .../DlgEditReference/WordformButton.tsx       |  2 +-
 .../DlgEditWordForms/DlgEditWordForms.tsx     | 64 +++++++++++--------
 .../frontend/src/dialogs/DlgRenameCst.tsx     | 12 +++-
 rsconcept/frontend/src/dialogs/DlgShowAST.tsx |  4 +-
 .../src/pages/LibraryPage/SearchPanel.tsx     |  9 ++-
 .../pages/ManualsPage/items/HelpAccess.tsx    | 25 +++++++-
 .../ManualsPage/items/HelpFormulaTree.tsx     |  6 +-
 .../pages/ManualsPage/items/HelpTermGraph.tsx | 16 ++---
 .../OssPage/EditorOssCard/OssFormToolbar.tsx  |  3 +-
 .../ConstituentaToolbar.tsx                   |  3 +-
 .../EditorConstituenta/ControlsOverlay.tsx    |  4 +-
 .../EditorRSExpression/ExpressionToolbar.tsx  |  2 +-
 .../EditorRSExpression/StatusBar.tsx          |  2 +
 .../EditorRSFormCard/AccessToolbar.tsx        |  3 +-
 .../EditorRSFormCard/RSFormToolbar.tsx        |  3 +-
 .../EditorRSFormCard/VersionsToolbar.tsx      |  3 +-
 .../EditorTermGraph/GraphToolbar.tsx          |  9 ++-
 rsconcept/frontend/src/utils/constants.ts     |  4 +-
 24 files changed, 141 insertions(+), 72 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5774325c..2e751ffe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -155,6 +155,7 @@
     "Булеан",
     "Бурбаки",
     "Версионирование",
+    "Владельцом",
     "Десинглетон",
     "доксинг",
     "интерпретируемости",
diff --git a/rsconcept/frontend/src/components/ui/Tooltip.tsx b/rsconcept/frontend/src/components/ui/Tooltip.tsx
index 627894d7..8f15e86d 100644
--- a/rsconcept/frontend/src/components/ui/Tooltip.tsx
+++ b/rsconcept/frontend/src/components/ui/Tooltip.tsx
@@ -33,7 +33,8 @@ function Tooltip({
       delayHide={100}
       opacity={0.97}
       className={clsx(
-        'overflow-auto sm:overflow-hidden overscroll-contain',
+        'max-h-[calc(100svh-6rem)]',
+        'overflow-y-auto overflow-x-hidden sm:overflow-hidden overscroll-contain',
         'border shadow-md',
         'text-balance',
         layer,
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
index 6b6ded19..95450716 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx
@@ -14,6 +14,7 @@ import { HelpTopic } from '@/models/miscellaneous';
 import { CstType, ICstCreateData, IRSForm } from '@/models/rsform';
 import { generateAlias, validateNewAlias } from '@/models/rsformAPI';
 import { inferTemplatedType, substituteTemplateArgs } from '@/models/rslangAPI';
+import { PARAMETER } from '@/utils/constants';
 
 import FormCreateCst from '../DlgCreateCst/FormCreateCst';
 import ArgumentsTab, { IArgumentsState } from './ArgumentsTab';
@@ -144,7 +145,11 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }:
       onSubmit={handleSubmit}
     >
       <Overlay position='top-0 right-[6rem]'>
-        <BadgeHelp topic={HelpTopic.RSL_TEMPLATES} className='max-w-[40rem]' offset={12} />
+        <BadgeHelp
+          topic={HelpTopic.RSL_TEMPLATES}
+          className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')}
+          offset={12}
+        />
       </Overlay>
       <Tabs
         selectedTabClassName='clr-selected'
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx b/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
index 140bcfc8..c1cc724e 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import clsx from 'clsx';
 import { AnimatePresence } from 'framer-motion';
 import { useLayoutEffect, useMemo, useState } from 'react';
 
@@ -12,6 +13,7 @@ import AnimateFade from '@/components/wrap/AnimateFade';
 import { HelpTopic } from '@/models/miscellaneous';
 import { CstType, ICstCreateData, IRSForm } from '@/models/rsform';
 import { generateAlias, isBaseSet, isBasicConcept, isFunctional, validateNewAlias } from '@/models/rsformAPI';
+import { PARAMETER } from '@/utils/constants';
 import { labelCstType } from '@/utils/labels';
 import { SelectorCstType } from '@/utils/selectors';
 
@@ -52,7 +54,11 @@ function FormCreateCst({ schema, state, partialUpdate, setValidated }: FormCreat
           value={{ value: state.cst_type, label: labelCstType(state.cst_type) }}
           onChange={data => partialUpdate({ cst_type: data?.value ?? CstType.BASE })}
         />
-        <BadgeHelp topic={HelpTopic.CC_CONSTITUENTA} offset={16} className='max-w-[40rem] max-h-[calc(100svh-2rem)]' />
+        <BadgeHelp
+          topic={HelpTopic.CC_CONSTITUENTA}
+          offset={16}
+          className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')}
+        />
         <TextInput
           id='dlg_cst_alias'
           dense
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
index 7358ffac..ae7397a1 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/DlgEditReference.tsx
@@ -11,6 +11,7 @@ import TabLabel from '@/components/ui/TabLabel';
 import { ReferenceType } from '@/models/language';
 import { HelpTopic } from '@/models/miscellaneous';
 import { IRSForm } from '@/models/rsform';
+import { PARAMETER } from '@/utils/constants';
 import { labelReferenceType } from '@/utils/labels';
 
 import EntityTab from './EntityTab';
@@ -69,10 +70,14 @@ function DlgEditReference({ hideWindow, schema, initial, onSave }: DlgEditRefere
       hideWindow={hideWindow}
       canSubmit={isValid}
       onSubmit={handleSubmit}
-      className='w-[40rem] px-6 min-h-[34rem]'
+      className='w-[40rem] px-6 min-h-[35rem]'
     >
-      <Overlay position='top-0 right-[4rem]'>
-        <BadgeHelp topic={HelpTopic.TERM_CONTROL} className='max-w-[35rem]' offset={14} />
+      <Overlay position='top-0 right-0'>
+        <BadgeHelp
+          topic={HelpTopic.TERM_CONTROL}
+          className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')}
+          offset={14}
+        />
       </Overlay>
 
       <Tabs
@@ -82,15 +87,10 @@ function DlgEditReference({ hideWindow, schema, initial, onSave }: DlgEditRefere
         onSelect={setActiveTab}
       >
         <TabList className={clsx('mb-3 self-center', 'flex', 'border divide-x rounded-none')}>
-          <TabLabel
-            title='Отсылка на термин в заданной словоформе'
-            label={labelReferenceType(ReferenceType.ENTITY)}
-            className='w-[12rem]'
-          />
+          <TabLabel title='Отсылка на термин в заданной словоформе' label={labelReferenceType(ReferenceType.ENTITY)} />
           <TabLabel
             title='Установление синтаксической связи с отсылкой на термин'
             label={labelReferenceType(ReferenceType.SYNTACTIC)}
-            className='w-[12rem]'
           />
         </TabList>
 
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx
index 6f6b7ce5..1db8c129 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx
@@ -22,7 +22,7 @@ function SelectWordForm({ selected, setSelected }: SelectWordFormProps) {
   );
 
   return (
-    <div className='text-sm'>
+    <div className='text-xs sm:text-sm'>
       {DefaultWordForms.slice(0, 12).map((data, index) => (
         <WordformButton
           key={`${prefixes.wordform_list}${index}`}
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx
index ab60fb02..513c5ba6 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditReference/WordformButton.tsx
@@ -17,7 +17,7 @@ function WordformButton({ text, example, grams, onSelectGrams, isSelected, ...re
       tabIndex={-1}
       onClick={() => onSelectGrams(grams)}
       className={clsx(
-        'min-w-[6.15rem]',
+        'min-w-[4.15rem] sm:min-w-[6.15rem]',
         'p-1',
         'border rounded-none',
         'cursor-pointer',
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
index 28bd882d..e1557d99 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx
@@ -16,6 +16,7 @@ import { Grammeme, ITextRequest, IWordForm, IWordFormPlain } from '@/models/lang
 import { parseGrammemes, wordFormEquals } from '@/models/languageAPI';
 import { HelpTopic } from '@/models/miscellaneous';
 import { IConstituenta, TermForm } from '@/models/rsform';
+import { PARAMETER } from '@/utils/constants';
 import { prompts } from '@/utils/labels';
 import { IGrammemeOption, SelectorGrammemes, SelectorGrammemesList } from '@/utils/selectors';
 
@@ -131,7 +132,11 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
       className='flex flex-col w-[40rem] px-6'
     >
       <Overlay position='top-[-0.2rem] left-[8rem]'>
-        <BadgeHelp topic={HelpTopic.TERM_CONTROL} className='max-w-[38rem]' offset={3} />
+        <BadgeHelp
+          topic={HelpTopic.TERM_CONTROL}
+          className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')}
+          offset={3}
+        />
       </Overlay>
 
       <TextArea
@@ -179,33 +184,36 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps)
         />
       </div>
 
-      <Overlay position='top-2 left-0'>
-        <MiniButton
-          noHover
-          title='Внести словоформу'
-          icon={<IconAccept size='1.5rem' className='icon-green' />}
-          disabled={textProcessor.loading || !inputText || inputGrams.length == 0}
-          onClick={handleAddForm}
-        />
-        <MiniButton
-          noHover
-          title='Генерировать стандартные словоформы'
-          icon={<IconMoveDown size='1.5rem' className='icon-primary' />}
-          disabled={textProcessor.loading || !inputText}
-          onClick={handleGenerateLexeme}
-        />
-      </Overlay>
-
-      <div className={clsx('mt-3 mb-2', 'flex self-center items-center', 'text-sm text-center font-semibold')}>
-        <span>Заданные вручную словоформы [{forms.length}]</span>
-        <MiniButton
-          noHover
-          title='Сбросить все словоформы'
-          className='py-0'
-          icon={<IconRemove size='1.5rem' className='icon-red' />}
-          disabled={textProcessor.loading || forms.length === 0}
-          onClick={handleResetAll}
-        />
+      <div className='flex justify-between'>
+        <div className='cc-icons'>
+          <MiniButton
+            noHover
+            title='Внести словоформу'
+            icon={<IconAccept size='1.5rem' className='icon-green' />}
+            disabled={textProcessor.loading || !inputText || inputGrams.length == 0}
+            onClick={handleAddForm}
+          />
+          <MiniButton
+            noHover
+            title='Генерировать стандартные словоформы'
+            icon={<IconMoveDown size='1.5rem' className='icon-primary' />}
+            disabled={textProcessor.loading || !inputText}
+            onClick={handleGenerateLexeme}
+          />
+        </div>
+        <div
+          className={clsx('mt-3 mb-2', 'w-full flex justify-center items-center', 'text-sm text-center font-semibold')}
+        >
+          <div>Заданные вручную словоформы [{forms.length}]</div>
+          <MiniButton
+            noHover
+            title='Сбросить все словоформы'
+            className='py-0'
+            icon={<IconRemove size='1.5rem' className='icon-red' />}
+            disabled={textProcessor.loading || forms.length === 0}
+            onClick={handleResetAll}
+          />
+        </div>
       </div>
 
       <WordFormsTable forms={forms} setForms={setForms} onFormSelect={handleSelectForm} />
diff --git a/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx b/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
index 2ac31154..55a84acb 100644
--- a/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgRenameCst.tsx
@@ -12,6 +12,7 @@ import usePartialUpdate from '@/hooks/usePartialUpdate';
 import { HelpTopic } from '@/models/miscellaneous';
 import { CstType, ICstRenameData } from '@/models/rsform';
 import { generateAlias, validateNewAlias } from '@/models/rsformAPI';
+import { PARAMETER } from '@/utils/constants';
 import { labelCstType } from '@/utils/labels';
 import { SelectorCstType } from '@/utils/selectors';
 
@@ -47,7 +48,7 @@ function DlgRenameCst({ hideWindow, initial, onRename }: DlgRenameCstProps) {
       hideWindow={hideWindow}
       canSubmit={validated}
       onSubmit={handleSubmit}
-      className={clsx('w-[30rem]', 'py-6 px-6 flex gap-3 justify-center items-center')}
+      className={clsx('w-[30rem]', 'py-6 pr-3 pl-6 flex justify-center items-center')}
     >
       <SelectSingle
         id='dlg_cst_type'
@@ -60,15 +61,20 @@ function DlgRenameCst({ hideWindow, initial, onRename }: DlgRenameCstProps) {
         }}
         onChange={data => updateData({ cst_type: data?.value ?? CstType.BASE })}
       />
-      <BadgeHelp topic={HelpTopic.CC_CONSTITUENTA} offset={16} className='max-w-[40rem] max-h-[calc(100svh-2rem)]' />
+
       <TextInput
         id='dlg_cst_alias'
         dense
         label='Имя'
-        className='w-[7rem]'
+        className='w-[7rem] ml-3'
         value={cstData.alias}
         onChange={event => updateData({ alias: event.target.value })}
       />
+      <BadgeHelp
+        topic={HelpTopic.CC_CONSTITUENTA}
+        offset={16}
+        className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')}
+      />
     </Modal>
   );
 }
diff --git a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
index de51f8cc..b3cf21f6 100644
--- a/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgShowAST.tsx
@@ -11,7 +11,7 @@ import { HelpTopic } from '@/models/miscellaneous';
 import { SyntaxTree } from '@/models/rslang';
 import { graphDarkT, graphLightT } from '@/styling/color';
 import { colorBgSyntaxTree } from '@/styling/color';
-import { resources } from '@/utils/constants';
+import { PARAMETER, resources } from '@/utils/constants';
 import { labelSyntaxTree } from '@/utils/labels';
 
 interface DlgShowASTProps extends Pick<ModalProps, 'hideWindow'> {
@@ -55,7 +55,7 @@ function DlgShowAST({ hideWindow, syntaxTree, expression }: DlgShowASTProps) {
   return (
     <Modal readonly hideWindow={hideWindow} className='px-6'>
       <Overlay position='left-[-1rem] top-[0.25rem]'>
-        <BadgeHelp topic={HelpTopic.UI_FORMULA_TREE} className='max-w-[32rem]' />
+        <BadgeHelp topic={HelpTopic.UI_FORMULA_TREE} className={PARAMETER.TOOLTIP_WIDTH} />
       </Overlay>
       <div className='my-2 text-lg text-center'>
         {!hoverNode ? expression : null}
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index 70b188e0..af62af5d 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -14,7 +14,7 @@ import SelectorButton from '@/components/ui/SelectorButton';
 import useDropdown from '@/hooks/useDropdown';
 import { LocationHead } from '@/models/library';
 import { HelpTopic } from '@/models/miscellaneous';
-import { prefixes } from '@/utils/constants';
+import { PARAMETER, prefixes } from '@/utils/constants';
 import { describeLocationHead, labelLocationHead } from '@/utils/labels';
 import { tripleToggleColor } from '@/utils/utils';
 
@@ -170,7 +170,12 @@ function SearchPanel({
         />
       </div>
 
-      <BadgeHelp topic={HelpTopic.UI_LIBRARY} className='max-w-[28rem] text-sm' offset={5} place='right-start' />
+      <BadgeHelp
+        topic={HelpTopic.UI_LIBRARY}
+        className={clsx(PARAMETER.TOOLTIP_WIDTH, 'text-sm')}
+        offset={5}
+        place='right-start'
+      />
     </div>
   );
 }
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpAccess.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpAccess.tsx
index 36d1b547..9700d954 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpAccess.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpAccess.tsx
@@ -1,8 +1,31 @@
+import { IconHide, IconImmutable, IconPrivate, IconProtected, IconPublic } from '@/components/Icons';
+
 function HelpAccess() {
   return (
     <div>
       <h1>Организация доступов</h1>
-      <p>TBD.</p>
+      <p>Редактирование контента осуществляется Редакторами и Владельцом.</p>
+      <p>Редактирование прав и доступов осуществляется Владельцом.</p>
+      <p>
+        Доступ к контенту на Портале может быть ограничен владельцем каждой схемы в рамках <b>политики доступа</b>.
+      </p>
+      <li>
+        <IconPublic className='inline-icon icon-green' /> публичная политика не ограничивает чтение схемы
+      </li>
+      <li>
+        <IconProtected className='inline-icon icon-blue' /> защитная политика запрещает доступ для всех кроме редакторов
+        и владельца схемы
+      </li>
+      <li>
+        <IconPrivate className='inline-icon icon-red' /> личная политика оставляет доступ к схеме только владельцу
+      </li>
+      <li>
+        <IconHide className='inline-icon' /> режим скрытия схемы из списка в Библиотеке не ограничивает доступ к схеме
+        по прямой ссылке
+      </li>
+      <li>
+        <IconImmutable className='inline-icon' /> режим защиты от редактирования предохраняет от случайных изменений
+      </li>
     </div>
   );
 }
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpFormulaTree.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpFormulaTree.tsx
index dd7fb724..17605d66 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpFormulaTree.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpFormulaTree.tsx
@@ -5,10 +5,8 @@ function HelpFormulaTree() {
   return (
     <div>
       <h1>Дерево разбора выражения</h1>
-      <p>
-        Дерево разбора получено путем семантических преобразований дерева синтаксического разбора. Оно отражает
-        структуру грамматически корректного выражения языка родов структур.
-      </p>
+      <p>Дерево получено путем семантических преобразований дерева синтаксического разбора.</p>
+      <p>Оно отражает структуру грамматически корректного выражения языка родов структур.</p>
       <li>Порядок узлов в рамках одного уровня может отличаться от их порядка в выражении</li>
       <li>При наведении курсора на узел в тексте выделяется соответствующий ему фрагмент</li>
       <li>Текст в узле дерева соответствует элементу языка</li>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpTermGraph.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpTermGraph.tsx
index 07631625..3589d547 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpTermGraph.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpTermGraph.tsx
@@ -26,8 +26,8 @@ function HelpTermGraph() {
   const { colors } = useConceptOptions();
   return (
     <div className='flex flex-col'>
-      <div className='flex'>
-        <div className='dense w-[14rem]'>
+      <div className='flex flex-col sm:flex-row'>
+        <div className='w-full sm:w-[14rem]'>
           <h1>Настройка графа</h1>
           <li>Цвет – покраска узлов</li>
           <li>Граф – расположение</li>
@@ -43,9 +43,9 @@ function HelpTermGraph() {
           </li>
         </div>
 
-        <Divider vertical margins='mx-3 mt-3' />
+        <Divider vertical margins='mx-3 mt-3' className='hidden sm:block' />
 
-        <div className='dense w-[21rem]'>
+        <div className='w-full sm:w-[21rem]'>
           <h1>Изменение узлов</h1>
           <li>Клик на конституенту – выделение</li>
           <li>
@@ -66,10 +66,10 @@ function HelpTermGraph() {
         </div>
       </div>
 
-      <Divider margins='my-3' />
+      <Divider margins='my-3' className='hidden sm:block' />
 
-      <div className='flex mb-3'>
-        <div className='dense w-[14rem]'>
+      <div className='flex mb-3 flex-col-reverse sm:flex-row'>
+        <div className='w-full sm:w-[14rem]'>
           <h1>Общие</h1>
           <li>
             <IconFilter className='inline-icon' /> Открыть настройки
@@ -82,7 +82,7 @@ function HelpTermGraph() {
           </li>
         </div>
 
-        <Divider vertical margins='mx-3' />
+        <Divider vertical margins='mx-3' className='hidden sm:block' />
 
         <div className='dense w-[21rem]'>
           <h1>Выделение</h1>
diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssFormToolbar.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssFormToolbar.tsx
index 243fbe5d..a076cffa 100644
--- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssFormToolbar.tsx
+++ b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/OssFormToolbar.tsx
@@ -10,6 +10,7 @@ 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';
@@ -57,7 +58,7 @@ function RSFormToolbar({ modified, anonymous, subscribed, onSubmit, onDestroy }:
           onClick={onDestroy}
         />
       ) : null}
-      <BadgeHelp topic={HelpTopic.UI_RS_CARD} offset={4} className='max-w-[30rem]' />
+      <BadgeHelp topic={HelpTopic.UI_RS_CARD} offset={4} className={PARAMETER.TOOLTIP_WIDTH} />
     </Overlay>
   );
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
index 35b7ce62..2d10e1bf 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ConstituentaToolbar.tsx
@@ -13,6 +13,7 @@ import BadgeHelp from '@/components/info/BadgeHelp';
 import MiniButton from '@/components/ui/MiniButton';
 import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
+import { PARAMETER } from '@/utils/constants';
 import { prepareTooltip, tooltips } from '@/utils/labels';
 
 interface ConstituentaToolbarProps {
@@ -94,7 +95,7 @@ function ConstituentaToolbar({
         disabled={disabled || modified}
         onClick={onMoveDown}
       />
-      <BadgeHelp topic={HelpTopic.UI_RS_EDITOR} offset={4} />
+      <BadgeHelp topic={HelpTopic.UI_RS_EDITOR} offset={4} className={PARAMETER.TOOLTIP_WIDTH} />
     </Overlay>
   );
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
index e7804299..b9ed14bc 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/ControlsOverlay.tsx
@@ -30,10 +30,10 @@ function ControlsOverlay({ constituenta, disabled, modified, processing, onRenam
       ) : null}
       <div
         className={clsx(
-          'pt-1 pl-[1.375rem]', // prettier: split lines
+          'pt-1 sm:pl-[1.375rem] pl-1', // prettier: split lines
           'text-sm font-medium whitespace-nowrap',
           'select-text cursor-default',
-          disabled && !processing && 'pl-[2.8rem]'
+          disabled && !processing && 'pl-[1.6rem] sm:pl-[2.8rem]'
         )}
       >
         <span>Имя </span>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ExpressionToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ExpressionToolbar.tsx
index 6e504adc..61c2d2ff 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ExpressionToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ExpressionToolbar.tsx
@@ -21,7 +21,7 @@ function ExpressionToolbar({ disabled, showControls, toggleControls, showAST }:
   }
 
   return (
-    <Overlay position='top-[-0.5rem] right-0 cc-icons'>
+    <Overlay position='top-[-0.5rem] right-0' className='cc-icons'>
       <MiniButton
         title='Изменить шрифт'
         onClick={toggleFont}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
index fac0141c..5fe006bf 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
@@ -41,10 +41,12 @@ function StatusBar({ isModified, processing, constituenta, parseData, onAnalyze
       tabIndex={0}
       className={clsx(
         'w-[10rem] h-[1.75rem]',
+        'scale-75 sm:scale-100 mx-[-2.5rem] sm:m-0',
         'px-2 flex items-center justify-center gap-2',
         'border',
         'select-none',
         'cursor-pointer',
+        'translate-x-[-1.5rem]',
         'focus-frame',
         'duration-500 transition-colors'
       )}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx
index fd7db157..034eaab6 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx
@@ -11,6 +11,7 @@ import { useAccessMode } from '@/context/AccessModeContext';
 import { AccessPolicy, ILibraryItemEditor } from '@/models/library';
 import { HelpTopic } from '@/models/miscellaneous';
 import { UserLevel } from '@/models/user';
+import { PARAMETER } from '@/utils/constants';
 
 interface AccessToolbarProps {
   visible: boolean;
@@ -59,7 +60,7 @@ function AccessToolbar({ visible, toggleVisible, readOnly, toggleReadOnly, contr
           disabled={accessLevel === UserLevel.READER || controller.isProcessing}
         />
 
-        <BadgeHelp topic={HelpTopic.ACCESS} className='max-w-[30rem]' offset={4} />
+        <BadgeHelp topic={HelpTopic.ACCESS} className={PARAMETER.TOOLTIP_WIDTH} offset={4} />
       </div>
     </Overlay>
   );
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx
index e46e830e..664a061b 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx
@@ -10,6 +10,7 @@ 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 { useRSEdit } from '../RSEditContext';
@@ -57,7 +58,7 @@ function RSFormToolbar({ modified, anonymous, subscribed, onSubmit, onDestroy }:
           onClick={onDestroy}
         />
       ) : null}
-      <BadgeHelp topic={HelpTopic.UI_RS_CARD} offset={4} className='max-w-[30rem]' />
+      <BadgeHelp topic={HelpTopic.UI_RS_CARD} offset={4} className={PARAMETER.TOOLTIP_WIDTH} />
     </Overlay>
   );
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx
index 45683640..7f273de2 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/VersionsToolbar.tsx
@@ -3,6 +3,7 @@ import BadgeHelp from '@/components/info/BadgeHelp';
 import MiniButton from '@/components/ui/MiniButton';
 import Overlay from '@/components/ui/Overlay';
 import { HelpTopic } from '@/models/miscellaneous';
+import { PARAMETER } from '@/utils/constants';
 
 import { useRSEdit } from '../RSEditContext';
 
@@ -34,7 +35,7 @@ function VersionsToolbar() {
           />
         </>
       ) : null}
-      <BadgeHelp topic={HelpTopic.VERSIONS} className='max-w-[30rem]' offset={4} />
+      <BadgeHelp topic={HelpTopic.VERSIONS} className={PARAMETER.TOOLTIP_WIDTH} offset={4} />
     </Overlay>
   );
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
index dce89b86..d3bbc7ac 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/GraphToolbar.tsx
@@ -1,3 +1,5 @@
+import clsx from 'clsx';
+
 import {
   IconClustering,
   IconClusteringOff,
@@ -13,6 +15,7 @@ import {
 import BadgeHelp from '@/components/info/BadgeHelp';
 import MiniButton from '@/components/ui/MiniButton';
 import { HelpTopic } from '@/models/miscellaneous';
+import { PARAMETER } from '@/utils/constants';
 
 import { useRSEdit } from '../RSEditContext';
 
@@ -111,7 +114,11 @@ function GraphToolbar({
         title='Сохранить изображение'
         onClick={onSaveImage}
       />
-      <BadgeHelp topic={HelpTopic.UI_GRAPH_TERM} className='max-w-[calc(100vw-4rem)]' offset={4} />
+      <BadgeHelp
+        topic={HelpTopic.UI_GRAPH_TERM}
+        className={clsx(PARAMETER.TOOLTIP_WIDTH, 'sm:max-w-[40rem]')}
+        offset={4}
+      />
     </div>
   );
 }
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index 37569757..0d2f3d16 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -16,7 +16,9 @@ export const PARAMETER = {
   graphPopupDelay: 500, // milliseconds delay for graph popup selections
   graphRefreshDelay: 10, // milliseconds delay for graph viewpoint reset
 
-  logicLabel: 'LOGIC'
+  logicLabel: 'LOGIC',
+
+  TOOLTIP_WIDTH: 'max-w-[29rem]'
 };
 
 /**

From 436297f943895884cbd9bc734833e8c373c6b04a Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 10 Jun 2024 11:58:18 +0300
Subject: [PATCH 15/45] Update robots.txt

---
 rsconcept/frontend/public/robots.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rsconcept/frontend/public/robots.txt b/rsconcept/frontend/public/robots.txt
index 087e56dc..a7022980 100644
--- a/rsconcept/frontend/public/robots.txt
+++ b/rsconcept/frontend/public/robots.txt
@@ -1,3 +1,2 @@
 User-agent: *
-Allow: /
 Disallow: /library
\ No newline at end of file

From ed47b1b0d672f28ec86069bc900877ce1d4aba9d Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 10 Jun 2024 11:58:23 +0300
Subject: [PATCH 16/45] Improve help UI

---
 .../frontend/src/models/miscellaneous.ts      |  2 ++
 .../src/pages/ManualsPage/TopicPage.tsx       |  6 +++--
 .../ManualsPage/items/HelpConceptOSS.tsx      | 27 +++++++++++++++++++
 .../src/pages/ManualsPage/items/HelpOSS.tsx   | 10 -------
 .../pages/ManualsPage/items/HelpOssGraph.tsx  | 10 +++++++
 rsconcept/frontend/src/utils/labels.ts        |  2 ++
 6 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 rsconcept/frontend/src/pages/ManualsPage/items/HelpConceptOSS.tsx
 delete mode 100644 rsconcept/frontend/src/pages/ManualsPage/items/HelpOSS.tsx
 create mode 100644 rsconcept/frontend/src/pages/ManualsPage/items/HelpOssGraph.tsx

diff --git a/rsconcept/frontend/src/models/miscellaneous.ts b/rsconcept/frontend/src/models/miscellaneous.ts
index ce0f686c..84a1d892 100644
--- a/rsconcept/frontend/src/models/miscellaneous.ts
+++ b/rsconcept/frontend/src/models/miscellaneous.ts
@@ -47,6 +47,7 @@ export enum HelpTopic {
   UI_FORMULA_TREE = 'ui-formula-tree',
   UI_CST_STATUS = 'ui-rsform-cst-status',
   UI_CST_CLASS = 'ui-rsform-cst-class',
+  UI_OSS_GRAPH = 'ui-oss-graph',
 
   CONCEPTUAL = 'concept',
   CC_SYSTEM = 'concept-rsform',
@@ -91,6 +92,7 @@ export const topicParent: Map<HelpTopic, HelpTopic> = new Map([
   [HelpTopic.UI_FORMULA_TREE, HelpTopic.INTERFACE],
   [HelpTopic.UI_CST_STATUS, HelpTopic.INTERFACE],
   [HelpTopic.UI_CST_CLASS, HelpTopic.INTERFACE],
+  [HelpTopic.UI_OSS_GRAPH, HelpTopic.INTERFACE],
 
   [HelpTopic.CONCEPTUAL, HelpTopic.CONCEPTUAL],
   [HelpTopic.CC_SYSTEM, HelpTopic.CONCEPTUAL],
diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
index b15e55b0..85f44997 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/TopicPage.tsx
@@ -4,6 +4,7 @@ import { HelpTopic } from '@/models/miscellaneous';
 import HelpAccess from './items/HelpAccess';
 import HelpAPI from './items/HelpAPI';
 import HelpConcept from './items/HelpConcept';
+import HelpConceptOSS from './items/HelpConceptOSS';
 import HelpConceptRelations from './items/HelpConceptRelations';
 import HelpConceptSynthesis from './items/HelpConceptSynthesis';
 import HelpConceptSystem from './items/HelpConceptSystem';
@@ -17,7 +18,7 @@ import HelpFormulaTree from './items/HelpFormulaTree';
 import HelpInfo from './items/HelpInfo';
 import HelpInterface from './items/HelpInterface';
 import HelpLibrary from './items/HelpLibrary';
-import HelpOSS from './items/HelpOSS';
+import HelpOssGraph from './items/HelpOssGraph';
 import HelpPortal from './items/HelpPortal';
 import HelpPrivacy from './items/HelpPrivacy';
 import HelpRSFormCard from './items/HelpRSFormCard';
@@ -60,13 +61,14 @@ function TopicPage({ topic }: TopicPageProps) {
   if (topic === HelpTopic.UI_FORMULA_TREE) return <HelpFormulaTree />;
   if (topic === HelpTopic.UI_CST_STATUS) return <HelpCstStatus />;
   if (topic === HelpTopic.UI_CST_CLASS) return <HelpCstClass />;
+  if (topic === HelpTopic.UI_OSS_GRAPH) return <HelpOssGraph />;
 
   if (topic === HelpTopic.CONCEPTUAL) return <HelpConcept />;
   if (topic === HelpTopic.CC_SYSTEM) return <HelpConceptSystem />;
   if (topic === HelpTopic.CC_CONSTITUENTA) return <HelpCstAttributes />;
   if (topic === HelpTopic.CC_RELATIONS) return <HelpConceptRelations />;
   if (topic === HelpTopic.CC_SYNTHESIS) return <HelpConceptSynthesis />;
-  if (topic === HelpTopic.CC_OSS) return <HelpOSS />;
+  if (topic === HelpTopic.CC_OSS) return <HelpConceptOSS />;
 
   if (topic === HelpTopic.RSLANG) return <HelpRSLang />;
   if (topic === HelpTopic.RSL_TYPES) return <HelpRSLangTypes />;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpConceptOSS.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpConceptOSS.tsx
new file mode 100644
index 00000000..bf7940a3
--- /dev/null
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpConceptOSS.tsx
@@ -0,0 +1,27 @@
+import LinkTopic from '@/components/ui/LinkTopic';
+import { HelpTopic } from '@/models/miscellaneous';
+
+function HelpConceptOSS() {
+  return (
+    <div>
+      <h1>Операционная схема синтеза</h1>
+      <p>
+        Работа со сложными предметными областями требует многократного{' '}
+        <LinkTopic text='синтеза' topic={HelpTopic.CC_SYNTHESIS} /> для построения целевых понятий. Последовательность
+        синтезов концептуальных схем задается с помощью <b>Операционной схемы синтеза (ОСС)</b> в форме Графа синтеза.
+      </p>
+      <p>
+        Отдельные операции в рамках ОСС задаются <b>таблицами отождествлений</b> понятий из синтезируемых схем. Таким
+        образом <LinkTopic text='конституенты' topic={HelpTopic.CC_CONSTITUENTA} /> в каждой КС разделяются на
+        наследованные, отождествленные и дописанные.
+      </p>
+      <p>
+        Портал поддерживает <b>сквозные изменения</b> в рамках ОСС. Изменения, внесенные в исходные концептуальные схемы
+        автоматически проносятся через граф синтеза (путем обновления наследованных конституент). Формальные определения
+        наследованных конституент можно редактировать только путем изменения исходных конституент.
+      </p>
+    </div>
+  );
+}
+
+export default HelpConceptOSS;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpOSS.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpOSS.tsx
deleted file mode 100644
index 58d54ff4..00000000
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpOSS.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-function HelpOSS() {
-  return (
-    <div>
-      <h1>Операционная схема синтеза</h1>
-      <p>TBD.</p>
-    </div>
-  );
-}
-
-export default HelpOSS;
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpOssGraph.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpOssGraph.tsx
new file mode 100644
index 00000000..9cfe4040
--- /dev/null
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpOssGraph.tsx
@@ -0,0 +1,10 @@
+function HelpOssGraph() {
+  return (
+    <div>
+      <h1>Граф синтеза</h1>
+      <p>TBD.</p>
+    </div>
+  );
+}
+
+export default HelpOssGraph;
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index c79bb834..604763fa 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -372,6 +372,7 @@ export function labelHelpTopic(topic: HelpTopic): string {
     case HelpTopic.UI_FORMULA_TREE: return 'Дерево разбора';
     case HelpTopic.UI_CST_STATUS:   return 'Статус конституенты';
     case HelpTopic.UI_CST_CLASS:    return 'Класс конституенты';
+    case HelpTopic.UI_OSS_GRAPH:    return 'Граф синтеза';
 
     case HelpTopic.CONCEPTUAL:      return 'Концептуализация';
     case HelpTopic.CC_SYSTEM:       return 'Система определений';
@@ -419,6 +420,7 @@ export function describeHelpTopic(topic: HelpTopic): string {
     case HelpTopic.UI_FORMULA_TREE: return 'просмотр дерева разбора <br/>родоструктурного выражения';
     case HelpTopic.UI_CST_STATUS:   return 'нотация статуса конституенты';
     case HelpTopic.UI_CST_CLASS:    return 'нотация класса конституенты';
+    case HelpTopic.UI_OSS_GRAPH:    return 'графическая форма <br/>операционной схемы синтеза';
 
     case HelpTopic.CONCEPTUAL:      return 'основы концептуализации';
     case HelpTopic.CC_SYSTEM:       return 'концептуальная схема <br/>как система понятий';

From 001069a7d9edd8481d2b2e653db147f4a98d48ed Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 10 Jun 2024 21:03:10 +0300
Subject: [PATCH 17/45] Fix text color for typification

---
 .../RSFormPage/EditorConstituenta/FormConstituenta.tsx      | 2 +-
 rsconcept/frontend/src/styling/styles.css                   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index edd9dc04..05b86374 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -159,7 +159,7 @@ function FormConstituenta({
           disabled={true}
           label='Типизация'
           value={typification}
-          colors='clr-app'
+          colors='clr-app clr-text-default'
         />
         <AnimatePresence>
           <AnimateFade key='cst_expression_fade' hideContent={!!state && !state?.definition_formal && isElementary}>
diff --git a/rsconcept/frontend/src/styling/styles.css b/rsconcept/frontend/src/styling/styles.css
index 02410612..e6527d1e 100644
--- a/rsconcept/frontend/src/styling/styles.css
+++ b/rsconcept/frontend/src/styling/styles.css
@@ -156,9 +156,13 @@
     }
   }
 
-  .clr-text-default {
+  :is(.clr-text-default, input:disabled, textarea:disabled) {
+    opacity: 1;
+    -webkit-text-fill-color: var(--cl-fg-100);
     color: var(--cl-fg-100);
     .dark & {
+      opacity: 1;
+      -webkit-text-fill-color: var(--cd-fg-100);
       color: var(--cd-fg-100);
     }
   }

From 5ddad91dbd6122e3e9687c5a8e1b0fae0da88ef7 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 14 Jun 2024 20:56:42 +0300
Subject: [PATCH 18/45] Update dependencies

---
 rsconcept/backend/requirements.txt   |  4 +-
 rsconcept/frontend/package-lock.json | 88 ++++++++++++++--------------
 rsconcept/frontend/package.json      |  2 +-
 3 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/rsconcept/backend/requirements.txt b/rsconcept/backend/requirements.txt
index 4ad504c2..8fdafb21 100644
--- a/rsconcept/backend/requirements.txt
+++ b/rsconcept/backend/requirements.txt
@@ -4,11 +4,11 @@ djangorestframework==3.15.1
 django-cors-headers==4.3.1
 django-filter==24.2
 drf-spectacular==0.27.2
-drf-spectacular-sidecar==2024.5.1
+drf-spectacular-sidecar==2024.6.1
 coreapi==2.3.3
 django-rest-passwordreset==1.4.1
 cctext==0.1.3
-pyconcept==0.1.5
+pyconcept==0.1.6
 
 psycopg2-binary==2.9.9
 gunicorn==22.0.0
\ No newline at end of file
diff --git a/rsconcept/frontend/package-lock.json b/rsconcept/frontend/package-lock.json
index 3ea66d90..ccaa0954 100644
--- a/rsconcept/frontend/package-lock.json
+++ b/rsconcept/frontend/package-lock.json
@@ -39,7 +39,7 @@
         "@types/react-dom": "^18.3.0",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
-        "@vitejs/plugin-react": "^4.3.0",
+        "@vitejs/plugin-react": "^4.3.1",
         "autoprefixer": "^10.4.19",
         "eslint": "^8.57.0",
         "eslint-plugin-react-hooks": "^4.6.2",
@@ -738,9 +738,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.27.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.27.0.tgz",
-      "integrity": "sha512-8kqX1sHbVW1lVzWwrjAbh4dR7eKhV8eIQ952JKaBXOoXE04WncoqCy4DMU701LSrPZ3N2Q4zsTawz7GQ+2mrUw==",
+      "version": "6.28.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.28.1.tgz",
+      "integrity": "sha512-BUWr+zCJpMkA/u69HlJmR+YkV4yPpM81HeMkOMZuwFa8iM5uJdEPKAs1icIRZKkKmy0Ub1x9/G3PQLTXdpBxrQ==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
@@ -1534,6 +1534,7 @@
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
       "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1587,6 +1588,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true,
       "license": "BSD-3-Clause"
     },
@@ -3442,9 +3444,9 @@
       }
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.0.tgz",
-      "integrity": "sha512-KcEbMsn4Dpk+LIbHMj7gDPRKaTMStxxWRkRmxsg/jVdFdJCZWt1SchZcf0M4t8lIKdwwMsEyzhrcOXRrDPtOBw==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz",
+      "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3475,9 +3477,9 @@
       "optional": true
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
+      "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -3970,9 +3972,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "version": "4.23.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
+      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
       "funding": [
         {
           "type": "opencollective",
@@ -3989,10 +3991,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
+        "caniuse-lite": "^1.0.30001629",
+        "electron-to-chromium": "^1.4.796",
         "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "update-browserslist-db": "^1.0.16"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4070,18 +4072,18 @@
       }
     },
     "node_modules/camera-controls": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/camera-controls/-/camera-controls-2.8.4.tgz",
-      "integrity": "sha512-pzVKpeZCRXIx2VOMB+E4OPjOhErHqhxrHYxcRLofOVgBeCeKSb8QAC2toc1onMllrxldRWXR8bl4K50hkrtwsg==",
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/camera-controls/-/camera-controls-2.8.5.tgz",
+      "integrity": "sha512-7VTwRk7Nu1nRKsY7bEt9HVBfKt8DETvzyYhLN4OW26OByBayMDB5fUaNcPI+z++vG23RH5yqn6ZRhZcgLQy2rA==",
       "license": "MIT",
       "peerDependencies": {
         "three": ">=0.126.1"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001629",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz",
-      "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==",
+      "version": "1.0.30001634",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz",
+      "integrity": "sha512-fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA==",
       "funding": [
         {
           "type": "opencollective",
@@ -4881,9 +4883,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.794",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.794.tgz",
-      "integrity": "sha512-6FApLtsYhDCY0Vglq3AptsdxQ+PJLc6AxlAM0HjEihUAiOPPbkASEsq9gtxUeZY9o0sJIEa3WnF0vVH4VT4iug==",
+      "version": "1.4.802",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz",
+      "integrity": "sha512-TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA==",
       "license": "ISC"
     },
     "node_modules/ellipsize": {
@@ -5555,9 +5557,9 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.0.tgz",
+      "integrity": "sha512-CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -5995,9 +5997,9 @@
       }
     },
     "node_modules/graphology-metrics": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/graphology-metrics/-/graphology-metrics-2.2.0.tgz",
-      "integrity": "sha512-eZZFRLGGyyI+iD+XwQvc+lLM3EKCoqUvVjvF/14Htgy4grB2m95OytToYq3saWuHfuf22VVnj9GBHv/pTzKuTw==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/graphology-metrics/-/graphology-metrics-2.3.0.tgz",
+      "integrity": "sha512-ayDWSnSlq2wIL1QIrRQ3cIUsS7V/kRdBzciLPkGsI8Vl/MDQkxiU9WDt9cUAMzAE6Q1n1pWT5SXPkKeZdKCjzA==",
       "license": "MIT",
       "dependencies": {
         "graphology-shortest-path": "^2.0.0",
@@ -8138,9 +8140,9 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.3",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.3.tgz",
-      "integrity": "sha512-uy2bNX5zQ+tESe+TiC7ilGRz8AtRGmnJH55NC5S0nSUjvvvM2hJHmefHErugGXN4pNv4Qx7vLsnNw9qJ9mtIsw==",
+      "version": "1.21.6",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
+      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -8622,9 +8624,9 @@
       }
     },
     "node_modules/nan": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
-      "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
+      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
       "license": "MIT",
       "optional": true
     },
@@ -9206,9 +9208,9 @@
       }
     },
     "node_modules/postcss-load-config/node_modules/lilconfig": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz",
-      "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9219,9 +9221,9 @@
       }
     },
     "node_modules/postcss-load-config/node_modules/yaml": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.3.tgz",
-      "integrity": "sha512-sntgmxj8o7DE7g/Qi60cqpLBA3HG3STcDA0kO+WfB05jEKhZMbY7umNm2rBpQvsmZ16/lPXCJGW2672dgOUkrg==",
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
+      "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
       "dev": true,
       "license": "ISC",
       "bin": {
diff --git a/rsconcept/frontend/package.json b/rsconcept/frontend/package.json
index 26bfd922..308c3710 100644
--- a/rsconcept/frontend/package.json
+++ b/rsconcept/frontend/package.json
@@ -43,7 +43,7 @@
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "@vitejs/plugin-react": "^4.3.0",
+    "@vitejs/plugin-react": "^4.3.1",
     "autoprefixer": "^10.4.19",
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.2",

From 255fe90ce79269f118cf2ef82c922e1d9111a1b8 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 14 Jun 2024 21:43:37 +0300
Subject: [PATCH 19/45] Fix library view for anonymous user

---
 .../src/pages/LibraryPage/LibraryPage.tsx     | 12 +++--
 .../src/pages/LibraryPage/SearchPanel.tsx     | 49 ++++++++++---------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
index e404ef1f..9070a0e3 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
@@ -3,6 +3,7 @@
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
 import DataLoader from '@/components/wrap/DataLoader';
+import { useAuth } from '@/context/AuthContext';
 import { useLibrary } from '@/context/LibraryContext';
 import useLocalStorage from '@/hooks/useLocalStorage';
 import { ILibraryItem, LocationHead } from '@/models/library';
@@ -15,6 +16,7 @@ import SearchPanel from './SearchPanel';
 
 function LibraryPage() {
   const library = useLibrary();
+  const { user } = useAuth();
   const [items, setItems] = useState<ILibraryItem[]>([]);
 
   const [query, setQuery] = useState('');
@@ -34,12 +36,12 @@ function LibraryPage() {
       head: head,
       path: path,
       query: query,
-      isEditor: isEditor,
-      isOwned: isOwned,
-      isSubscribed: isSubscribed,
-      isVisible: isVisible
+      isEditor: user ? isEditor : undefined,
+      isOwned: user ? isOwned : undefined,
+      isSubscribed: user ? isSubscribed : undefined,
+      isVisible: user ? isVisible : true
     }),
-    [head, path, query, isEditor, isOwned, isSubscribed, isVisible]
+    [head, path, query, isEditor, isOwned, isSubscribed, isVisible, user]
   );
 
   useLayoutEffect(() => {
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index af62af5d..f58719cb 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -11,6 +11,7 @@ import DropdownButton from '@/components/ui/DropdownButton';
 import MiniButton from '@/components/ui/MiniButton';
 import SearchBar from '@/components/ui/SearchBar';
 import SelectorButton from '@/components/ui/SelectorButton';
+import { useAuth } from '@/context/AuthContext';
 import useDropdown from '@/hooks/useDropdown';
 import { LocationHead } from '@/models/library';
 import { HelpTopic } from '@/models/miscellaneous';
@@ -58,6 +59,7 @@ function SearchPanel({
   isEditor,
   toggleEditor
 }: SearchPanelProps) {
+  const { user } = useAuth();
   const headMenu = useDropdown();
 
   const handleChange = useCallback(
@@ -83,29 +85,32 @@ function SearchPanel({
         {filtered} из {total}
       </div>
 
-      <div className='cc-icons'>
-        <MiniButton
-          title='Видимость'
-          icon={<VisibilityIcon value={true} className={tripleToggleColor(isVisible)} />}
-          onClick={toggleVisible}
-        />
-        <MiniButton
-          title='Я - Подписчик'
-          icon={<SubscribeIcon value={true} className={tripleToggleColor(isSubscribed)} />}
-          onClick={toggleSubscribed}
-        />
-        <MiniButton
-          title='Я - Владелец'
-          icon={<IconOwner size='1.25rem' className={tripleToggleColor(isOwned)} />}
-          onClick={toggleOwned}
-        />
+      {user ? (
+        <div className='cc-icons'>
+          <MiniButton
+            title='Видимость'
+            icon={<VisibilityIcon value={true} className={tripleToggleColor(isVisible)} />}
+            onClick={toggleVisible}
+          />
+          <MiniButton
+            title='Я - Подписчик'
+            icon={<SubscribeIcon value={true} className={tripleToggleColor(isSubscribed)} />}
+            onClick={toggleSubscribed}
+          />
 
-        <MiniButton
-          title='Я - Редактор'
-          icon={<IconEditor size='1.25rem' className={tripleToggleColor(isEditor)} />}
-          onClick={toggleEditor}
-        />
-      </div>
+          <MiniButton
+            title='Я - Владелец'
+            icon={<IconOwner size='1.25rem' className={tripleToggleColor(isOwned)} />}
+            onClick={toggleOwned}
+          />
+
+          <MiniButton
+            title='Я - Редактор'
+            icon={<IconEditor size='1.25rem' className={tripleToggleColor(isEditor)} />}
+            onClick={toggleEditor}
+          />
+        </div>
+      ) : null}
 
       <div className='flex items-center h-full mx-auto'>
         <SearchBar

From 0fc299c0b2360e9ed76adc4793ca3494ef1f3d05 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sun, 16 Jun 2024 16:00:28 +0300
Subject: [PATCH 20/45] Fix schema buffering

---
 rsconcept/frontend/src/context/RSFormContext.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rsconcept/frontend/src/context/RSFormContext.tsx b/rsconcept/frontend/src/context/RSFormContext.tsx
index 678c40f9..981b071e 100644
--- a/rsconcept/frontend/src/context/RSFormContext.tsx
+++ b/rsconcept/frontend/src/context/RSFormContext.tsx
@@ -337,7 +337,7 @@ export const RSFormState = ({ itemID, versionID, children }: RSFormStateProps) =
         setLoading: setProcessing,
         onError: setProcessingError,
         onSuccess: newData => {
-          setSchema(Object.assign(schema, newData));
+          setSchema(newData);
           library.localUpdateTimestamp(newData.id);
           if (callback) callback();
         }
@@ -357,7 +357,7 @@ export const RSFormState = ({ itemID, versionID, children }: RSFormStateProps) =
         setLoading: setProcessing,
         onError: setProcessingError,
         onSuccess: newData => {
-          setSchema(Object.assign(schema, newData));
+          setSchema(newData);
           library.localUpdateTimestamp(newData.id);
           if (callback) callback();
         }
@@ -573,14 +573,14 @@ export const RSFormState = ({ itemID, versionID, children }: RSFormStateProps) =
         showError: true,
         setLoading: setProcessing,
         onError: setProcessingError,
-        onSuccess: () => {
-          setSchema(schema);
-          library.localUpdateItem(schema!);
+        onSuccess: newData => {
+          setSchema(newData);
+          library.localUpdateItem(newData);
           if (callback) callback();
         }
       });
     },
-    [schema, setSchema, library]
+    [setSchema, library]
   );
 
   const inlineSynthesis = useCallback(

From 011ef7222cf055edd2fe814054dbe461b6039066 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sun, 16 Jun 2024 22:53:30 +0300
Subject: [PATCH 21/45] Update manuals

---
 .vscode/settings.json                         |  28 +-
 rsconcept/frontend/package-lock.json          |  12 +-
 .../ManualsPage/items/HelpContributors.tsx    | 261 +++++++++++++++++-
 .../pages/ManualsPage/items/HelpExteor.tsx    |  17 +-
 rsconcept/frontend/src/utils/constants.ts     |   1 +
 rsconcept/frontend/src/utils/labels.ts        |   4 +-
 6 files changed, 307 insertions(+), 16 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2e751ffe..b666ff7a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -84,6 +84,7 @@
     "Grammeme",
     "Grammemes",
     "GRND",
+    "IDEF",
     "impr",
     "inan",
     "incapsulation",
@@ -150,42 +151,67 @@
     "viewsets",
     "wordform",
     "Wordforms",
+    "Айзенштат",
+    "Акименков",
+    "Астрина",
+    "Ашихмин",
     "Биективная",
     "биективной",
     "Булеан",
     "Бурбаки",
+    "Бурбакизатор",
     "Версионирование",
     "Владельцом",
+    "Демешко",
     "Десинглетон",
     "доксинг",
+    "Закс",
     "интерпретируемости",
     "интерпретируемость",
+    "Инттеор",
+    "Климишин",
     "компаратив",
+    "Кононенко",
     "конституент",
     "Конституента",
     "конституентами",
     "конституенте",
     "конституенту",
     "конституенты",
+    "Крайнев",
     "Кучкаров",
     "Кучкарова",
     "неинтерпретируемый",
     "неитерируемого",
+    "Никанорова",
+    "операционализации",
+    "операционализированных",
+    "Оргтеор",
+    "Пакулина",
     "пересинтез",
+    "Персиц",
+    "Присакарь",
+    "ПРОКСИМА",
     "Родоструктурная",
     "родоструктурного",
     "Родоструктурное",
     "родоструктурной",
     "родоструктурном",
+    "родоструктурных",
+    "Савелов",
     "Синглетон",
     "твор",
     "Терминологизация",
     "троллинг",
+    "Тулисов",
     "Цермелло",
     "ЦИВТ",
+    "Чувашов",
+    "Шульпекин",
     "Экстеор",
     "Экстеора",
-    "Экстеоре"
+    "Экстеоре",
+    "Юдкин"
   ],
   "cSpell.language": "en,ru",
   "cSpell.ignorePaths": ["node_modules/**", "*.json"]
diff --git a/rsconcept/frontend/package-lock.json b/rsconcept/frontend/package-lock.json
index ccaa0954..43b9c95f 100644
--- a/rsconcept/frontend/package-lock.json
+++ b/rsconcept/frontend/package-lock.json
@@ -4883,9 +4883,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.802",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz",
-      "integrity": "sha512-TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA==",
+      "version": "1.4.803",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.803.tgz",
+      "integrity": "sha512-61H9mLzGOCLLVsnLiRzCbc63uldP0AniRYPV3hbGVtONA1pI7qSGILdbofR7A8TMbOypDocEAjH/e+9k1QIe3g==",
       "license": "ISC"
     },
     "node_modules/ellipsize": {
@@ -5557,9 +5557,9 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.0.tgz",
-      "integrity": "sha512-CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
index 205550b2..365d466d 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
@@ -1,8 +1,265 @@
 function HelpInfo() {
   return (
     <div>
-      <h1>Благодарности участникам</h1>
-      <p>TBD.</p>
+      <h1>Благодарности разработчикам и исследователям</h1>
+      <p>
+        История создания инструментов разработки концептуальных схем начинается с 1970-х годов и продолжается в
+        настоящее время. Данный раздел является скромной попыткой перечислить вклад различных людей в развитие
+        инструментов и математического аппарата, лежащего в основе экспликации концептуальных схем.
+      </p>
+      <p>
+        В списке указан год окончания работ над соответствующим результатом или год публикации соответствующей статьи,
+        курсивом выделены комментарии к значимости указанного результата.
+      </p>
+      <p>Любые добавления и поправки приветствуются.</p>
+      <div className='flex flex-col gap-2'>
+        <li>1973 Никаноров С.П., Персиц Д.Б. Формальное проектирование целостных СОУ.</li>
+        <li>
+          1975-1981 Никаноров С.П., Персиц Д.Б., Айзенштат А.В., Закс Б.А. Экспериментальная система пакетов прикладных
+          программ автоматизированного проектирования систем организационного управления (АСП СОУ).
+        </li>
+        <li>
+          1977 Персиц Д.Б., Савелов Е.В., Тищенко А.В. Теоретические основы АСП СОУ,{' '}
+          <i>
+            сформировавшие базу для развития формализации предметных областей с помощью экспликации концептуальных схем
+          </i>
+          .
+        </li>
+        <li>
+          1980 Никаноров С.П., Персиц Д.Б., Егоров Б.Б., Никитина Н.К., Ашихмин В.С., Астрина И.В., Тищенко А.В. Блок
+          документирования в АСП СОУ.
+        </li>
+        <li>
+          1986 Никаноров С.П., Кучкаров З.А., Никитина Н.К., Крюков И.А., Комаров В.Г. Система автоматизированного
+          проектирования концептуального уровня баз данных (МАКС),{' '}
+          <i>
+            заложивший основу для хранения концептуальных схем в базах данных и ставший первым редактором
+            родоструктурной экспликации в группе Никитиной.
+          </i>
+        </li>
+        <li>
+          1987 Иванов А.Ю., Кучкаров З.А. Разработка концептуальных и математических средств описания процессов принятия
+          решений.
+        </li>
+        <li>
+          1989 Кучкаров З.А., Остапов А.В. Методические вопросы концептуализации предметных областей,{' '}
+          <i>
+            как пример одной из работ Остапова, значительно расширившего технику экспликации и практику применения
+            "бескванторных" выражений.
+          </i>
+        </li>
+        <li>
+          1990 Никитина Н.К., Постников В.В. Синтаксический анализатор текста рода структуры для МАКС,{' '}
+          <i>являющийся первой попыткой реализовать автоматизированную проверку синтаксиса родов структур.</i>
+        </li>
+        <li>
+          1993 Костюк А.В., Никитина Н.К., Юдкин Ю.Ю. Программа визуализации М-графов, представляющих родовую структуру
+          (М-граф).
+        </li>
+        <li>1993 Никитина Н.К., Чувашов Е.В. Система проектирования баз данных по их концептуальной модели</li>
+        <li>
+          1993 Никаноров С.П., Кучкаров З.А., Остапов А.В., Шульпекин А.Н., Коваль А.Г., Костюк А.В. Программа
+          операционализации текстов концептуальных моделей, эксплицированных в аппарате родов структур Экстеор 1,{' '}
+          <i>ставший первым редактором родоструктурной экспликации в группе Кучкарова.</i>
+        </li>
+        <li>
+          1993 Кучкаров З.А., Лавров В., Крайнев А., Шульпекин А.Н., Симонов М. Автоматический генератор
+          PROLOG-программ, формирующих предметные интерпретации родоструктурных экспликаций Инттеор.
+        </li>
+        <li>
+          1994 Кучкаров З.А., Ким В.Л. Разработка родоструктурных конструктов для библиотеки моделей и исследование
+          возможностей их развития
+        </li>
+        <li>
+          1996 Коваль А.Г., Кучкаров З.А., Костюк А.В., Кононенко А.А., Син Ю.Е., Маклаков Ю.И. Программа
+          родоструктурного синтеза операционализированных терминальных концептуальных моделей Экстеор 2,{' '}
+          <i>ставшая первой версией реализации родоструктурного аппарата на C++ под Windows.</i>
+        </li>
+        <li>
+          1996 Никаноров С.П., Никитина Н.К., Климишин В.В. Автоматизированная система "Библиотека концептуальных схем",{' '}
+          <i>впервые определившая паспорт концептуальной схемы.</i>
+        </li>
+        <li>
+          1997 Никитина Н.К., Юрьев О.И. Система поддержки процессов концептуального анализа и проектирования ПРОКСИМА
+          1.
+        </li>
+        <li>
+          1998 Никитина Н.К., Гараева Ю.Р. Синтаксический анализатор выражений на языке родоструктурной экспликации для
+          ПРОКСИМА 1.
+        </li>
+        <li>
+          Син Ю.Е. Разработка и исследование класса теоретико-модельных операций для технологической линии
+          концептуального проектирования.
+        </li>
+        <li>1999 Кучкаров З.А., Чернышев С.Б. Метод построения формально-логической модели большой размерности.</li>
+        <li>
+          1999 Кучкаров З.А., Кононенко А.А. Программа преобразования родоструктурного синтеза операционализированных
+          терминальных концептуальных моделей Экстеор 3,{' '}
+          <i>впервые включившая операционную схему синтеза (дерево синтеза).</i>
+        </li>
+        <li>
+          1999 Никитина Н.К., Ландин Н.А. Разработка автоматизированной подсистемы, реализующей операции отслоения и
+          рассечения над концептуальными схемами
+        </li>
+        <li>
+          1999 Юрьев О.И., Зверев В.Ю. Разработка и создание экспериментальной версии автоматизированной системы
+          "Библиотека проектов систем организационного управления".
+        </li>
+        <li>
+          2000 Кучкаров З.А., Кононенко А.А., Син Ю.Е. Программа генерации концептуально определенной предметно
+          интерпретированной сети организационных процедур Оргтеор,{' '}
+          <i>
+            позволившая строить процессные схемы по графу термов концептуальной схемы и впервые включившая модуль
+            терминологических преобразований текстовых описаний.
+          </i>
+        </li>
+        <li>
+          2000 Кононенко А.А., Майоров В.А. Программа автоматизированной генерации структуры данных и их визуализации по
+          концептуальной модели БДтеор,{' '}
+          <i>
+            определившая проблемы интерфейса наполнения концептуальной модели в сложных ступенях и предложившая
+            библиотеку Kernel для удержания интерпретации с помощью М-графа.
+          </i>
+        </li>
+        <li>2000 Тищенко А.В. Шкалы множеств и родов структур.</li>
+        <li>
+          2000 Тищенко А.В., Акименков А.М., Ключников А.В. Система операций над концептуальными схемами,
+          представленными в родоструктурной форме.
+        </li>
+        <li>2000 Ключников А.В. Эквивалентность теорий родов структур.</li>
+        <li>
+          2001 Кучкаров З.А., Никитин А.В. Исследование и построение типологии изменений теоретико-множественных
+          интерпретаций класса декартового произведения
+        </li>
+        <li>
+          2001 Кононенко А.А., Майоров В.А. Программа преобразования сети процедур из формата Оргтеор в формат BPWin
+          (IDEF0).
+        </li>
+        <li>
+          2001 Майоров В.А. Программа построения формального выражения путем выбора альтернатив Grammar,{' '}
+          <i>предложившая альтернативной подход к построению корректных формальных выражений</i>.
+        </li>
+        <li>
+          2004 Гараева Ю.Р., Пономарев И.Н. Семантико-синтаксический анализатор текстов родов структур Бурбакизатор,{' '}
+          <i>
+            впервые включивший полный грамматический анализ родов структур и проверку биективной переносимости выражения
+          </i>
+        </li>
+        <li>
+          2003 Юдкин Ю.Ю., Кудюкин Д.А. Разработка и испытание компьютерной программы, формирующей
+          теоретико-множественную интерпретацию терма частной родоструктурной теории.
+        </li>
+        <li>
+          2004 Кононенко А.А. Генерация кода на языке программирования C++ по тексту концептуальной схемы,
+          эксплицированной в родах структур.
+        </li>
+        <li>2006 Кучкаров З.А., Никаноров С.П. Библиотека моделей.</li>
+        <li>2006 Кучкаров З.А., Лавров В.А. Полные системы простых теоретико-множественных операций.</li>
+        <li>
+          2006 Солнцев С.В., Присакарь С.В. Введение количественных отношений в методологию концептуального анализа и
+          проектирования, в том числе в язык родоструктурной экспликации.
+        </li>
+        <li>
+          2007 Пономарев И.Н. Учебное пособие: Введение в математическую логику и роды структур,{' '}
+          <i>
+            являющееся наиболее полным описанием теории родов структур, используемой в родоструктурных экспликациях.
+          </i>
+        </li>
+        <li>
+          2008 Пономарев И.Н. Об эквивалентной представимости рода структуры с помощью заданной типовой характеристики
+        </li>
+        <li>
+          2008 Кононенко А.А., Кучкаров З.А., Никаноров С.П., Никитина Н.К. Технология концептуального проектирования, -{' '}
+          <i>монография, собравшая исторический обзор и перспективы развития технологического направления.</i>
+        </li>
+        <li>
+          2010 Кононенко А.А., Грязнов А.Д. Исследование и построение транслятора концептуальной схемы в концептуальную
+          модель.
+        </li>
+        <li>
+          2012 Кононенко А.А., Елисов Д.Н. Использование механизма XSD-схем для хранения и операционализации
+          концептуальных схем и концептуальных моделей с помощью XML.
+        </li>
+        <li>
+          2013 Кононенко А.А., Борисов И.Р. Исследование, разработка и экспериментальная программная реализация операций
+          над концептуальными моделями,{' '}
+          <i>
+            впервые реализовавшая модуль прямого вычисления интерпретации формального выражения, встроенный в Экстеор
+            3.5
+          </i>
+        </li>
+        <li>2013 Пономарев И.Н., Липатов А.А. Операции над родами структур и пример автоматизации их выполнения.</li>
+        <li>
+          2014 Борисов И.Р., Баширов Р.М. Исследования и программная реализации оптимальной структуры данных для
+          вычисления интерпретации концептуальных схем.
+        </li>
+        <li>
+          2014 Борисов И.Р. Программный комплекс Экстеор 4,{' '}
+          <i>
+            включавший доработанный модуль операционного синтеза и синтаксический анализатор на базе грамматики,
+            предложенной Пономаревым И.Н.
+          </i>
+        </li>
+        <li>
+          2014 Борисов И.Р. Концептуальные конструкции в задаче синтеза систем на примере Экологического кодекса, -{' '}
+          <i>
+            статья, вводящая понятие концептуальных конструкций как промежуточных форм для операционализации
+            концептуальных схем.
+          </i>
+        </li>
+        <li>2015 Иванов А.Ю. Аппарат ступеней С.П.Никанорова и возможное развитие идей по его использованию.</li>
+        <li>
+          2016 Борисов И.Р., Баширов Р.М. Исследование области компьютерной лингвистики и разработка модулей
+          терминологического контроля в Экстеор 4 и Microsoft Office Word, <i>являющееся основой библиотеки cctext.</i>
+        </li>
+        <li>
+          2016 Борисов И.Р. Программный комплекс Экстеор 4.5,{' '}
+          <i>
+            включавший текстовый модуль и полностью переработанное ядро, выделенное в отдельную библиотеку (впоследствии
+            - ConceptCore)
+          </i>
+        </li>
+        <li>
+          2017 Иванов А.Ю. Введение в технологию концептуализации предметных областей социологии: основы полагания ядра
+          теории (на примере родственных отношений)
+        </li>
+        <li>
+          2017 Борисов И.Р., Мурадов А.К. Организация операций над системами понятий посредством графических
+          интерфейсов, <i>заложивший основу для технологии Концепт.Блоки и блока графического синтеза.</i>
+        </li>
+        <li>
+          2018 Борисов И.Р., Князев А.В. Изучение методов концептуальной расчистки, разметки текстов и разработка
+          программных средств их автоматизации,{' '}
+          <i> - диплом, сформировавший основу для технологий Концепт.Разметка и Концепт.Майнинг.</i>
+        </li>
+        <li>
+          2019 Борисов И.Р., Широкова Л.Р. Исследование возможностей применения методов машинного обучения для решения
+          задач расчистки текстов. Разработка прототипа программного модуля, -{' '}
+          <i>первая попытка внедрения технологий ИИ в текстовый модуль.</i>
+        </li>
+        <li>
+          2020 Борисов И.Р., Пакулина Т.А. Исследование применения методов машинного обучения для выделения именованных
+          сущностей в текстах интервью. Экспериментальная разработка программного модуля расчистки текстов,{' '}
+          <i>ставшего расширением технологии Концепт.Расчистка.</i>
+        </li>
+        <li>
+          2020 Программный комплекс Экстеор 4.7, включающий значительное расширение выразительных средств языка родов
+          структур (рекурсивные и императивные выражения, фильтры, ASCII синтаксис).
+        </li>
+        <li>
+          2021 Борисов И.Р., Демешко А.Б. Исследование и разработка программного модуля формирования текстов функций на
+          основе концепта функциональная структура,{' '}
+          <i>дополнившего текстовый модуль возможностью работы с глагольными формами.</i>
+        </li>
+        <li>
+          2023 Борисов И.Р., Тулисов А.В. Разработка инструмента экспликации концептуальных схем в родоструктурной форме
+          через веб-интерфейс, - <i>разработка прототипа интерфейса КонцептПортал.</i>
+        </li>
+        <li>
+          2024 Борисов И.Р. Программный комплекс Экстеор 4.9, поддерживающий работу со схемами, выгруженными из
+          КонцептПортал.
+        </li>
+      </div>
     </div>
   );
 }
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpExteor.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpExteor.tsx
index b1541d09..c8adb80f 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpExteor.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpExteor.tsx
@@ -1,19 +1,26 @@
 import TextURL from '@/components/ui/TextURL';
-import { external_urls } from '@/utils/constants';
+import { external_urls, PARAMETER } from '@/utils/constants';
 
 function HelpExteor() {
   return (
     <div>
       <h1>Экстеор</h1>
-      <p>Экстеор 4.9 — редактор текстов систем понятий эксплицированных в родах структур</p>
+      <p>Экстеор 4.9 — редактор текстов систем понятий эксплицированных в родах структур.</p>
       <p>
         Портал превосходит Экстеор в части редактирования экспликаций, но вычисление интерпретации доступно только в
-        Экстеоре. Также следует использовать Экстеор для выгрузки экспликаций в Word для последующей печати
+        Экстеор. Также следует использовать Экстеор для выгрузки экспликаций в Word для последующей печати.
       </p>
-      <p>Экстеор доступен на операционной системы Windows 10+</p>
+
       <p>
         Скачать установщик: <TextURL href={external_urls.exteor64} text='64bit' /> |{' '}
-        <TextURL href={external_urls.exteor32} text='32bit' />
+        <TextURL href={external_urls.exteor32} text='32bit' /> (Windows 10 и выше)
+      </p>
+      <p>
+        Текущая версия: <b>{PARAMETER.exteorVersion}</b>
+      </p>
+      <p>
+        Экстеор не поддерживает автоматическое обновление. Если в выгруженной схеме присутствуют неожиданные диагностики
+        или ошибки, то попробуйте скачать новую версию по ссылкам выше.
       </p>
 
       <h2>Основные функции</h2>
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index 0d2f3d16..081c6d62 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -17,6 +17,7 @@ export const PARAMETER = {
   graphRefreshDelay: 10, // milliseconds delay for graph viewpoint reset
 
   logicLabel: 'LOGIC',
+  exteorVersion: '4.9.3',
 
   TOOLTIP_WIDTH: 'max-w-[29rem]'
 };
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index 604763fa..f67cd608 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -394,7 +394,7 @@ export function labelHelpTopic(topic: HelpTopic): string {
 
     case HelpTopic.INFO:            return 'Информация';
     case HelpTopic.INFO_RULES:      return 'Правила';
-    case HelpTopic.INFO_CONTRIB:    return 'Участники';
+    case HelpTopic.INFO_CONTRIB:    return 'Разработчики';
     case HelpTopic.INFO_PRIVACY:    return 'Обработка данных';
     case HelpTopic.INFO_API:        return 'REST API';
 
@@ -442,7 +442,7 @@ export function describeHelpTopic(topic: HelpTopic): string {
 
     case HelpTopic.INFO:            return 'справочные, нормативные <br/>и технические документы';
     case HelpTopic.INFO_RULES:      return 'правила пользования Порталом';
-    case HelpTopic.INFO_CONTRIB:    return 'признание вклада участников <br/>в создание Портала';
+    case HelpTopic.INFO_CONTRIB:    return 'признание вклада <br/>в создание Портала';
     case HelpTopic.INFO_PRIVACY:    return 'политика обработки <br/>персональных данных';
     case HelpTopic.INFO_API:        return 'интерфейс для разработчиков';
 

From 7927e9edb310add93e6d01d7e79af20eca094da4 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 17 Jun 2024 20:21:11 +0300
Subject: [PATCH 22/45] Update help page

---
 .../ManualsPage/items/HelpContributors.tsx    | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
index 365d466d..c5a5397b 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
@@ -15,15 +15,15 @@ function HelpInfo() {
       <div className='flex flex-col gap-2'>
         <li>1973 Никаноров С.П., Персиц Д.Б. Формальное проектирование целостных СОУ.</li>
         <li>
-          1975-1981 Никаноров С.П., Персиц Д.Б., Айзенштат А.В., Закс Б.А. Экспериментальная система пакетов прикладных
+          1975–1981 Никаноров С.П., Персиц Д.Б., Айзенштат А.В., Закс Б.А. Экспериментальная система пакетов прикладных
           программ автоматизированного проектирования систем организационного управления (АСП СОУ).
         </li>
+        <li>1976 Поспелов Д.А., Чернышев С.Б. Метод построения формально-логической модели большой размерности.</li>
         <li>
           1977 Персиц Д.Б., Савелов Е.В., Тищенко А.В. Теоретические основы АСП СОУ,{' '}
           <i>
-            сформировавшие базу для развития формализации предметных областей с помощью экспликации концептуальных схем
+            сформировавшие базу для развития формализации предметных областей с помощью экспликации концептуальных схем.
           </i>
-          .
         </li>
         <li>
           1980 Никаноров С.П., Персиц Д.Б., Егоров Б.Б., Никитина Н.К., Ашихмин В.С., Астрина И.В., Тищенко А.В. Блок
@@ -53,10 +53,9 @@ function HelpInfo() {
           <i>являющийся первой попыткой реализовать автоматизированную проверку синтаксиса родов структур.</i>
         </li>
         <li>
-          1993 Костюк А.В., Никитина Н.К., Юдкин Ю.Ю. Программа визуализации М-графов, представляющих родовую структуру
-          (М-граф).
+          1993 Костюк А.В., Никитина Н.К., Юдкин Ю.Ю. Программа визуализации М-графов, представляющих родовую структуру.
         </li>
-        <li>1993 Никитина Н.К., Чувашов Е.В. Система проектирования баз данных по их концептуальной модели</li>
+        <li>1993 Никитина Н.К., Чувашов Е.В. Система проектирования баз данных по их концептуальной модели.</li>
         <li>
           1993 Никаноров С.П., Кучкаров З.А., Остапов А.В., Шульпекин А.Н., Коваль А.Г., Костюк А.В. Программа
           операционализации текстов концептуальных моделей, эксплицированных в аппарате родов структур Экстеор 1,{' '}
@@ -68,7 +67,7 @@ function HelpInfo() {
         </li>
         <li>
           1994 Кучкаров З.А., Ким В.Л. Разработка родоструктурных конструктов для библиотеки моделей и исследование
-          возможностей их развития
+          возможностей их развития.
         </li>
         <li>
           1996 Коваль А.Г., Кучкаров З.А., Костюк А.В., Кононенко А.А., Син Ю.Е., Маклаков Ю.И. Программа
@@ -88,10 +87,9 @@ function HelpInfo() {
           ПРОКСИМА 1.
         </li>
         <li>
-          Син Ю.Е. Разработка и исследование класса теоретико-модельных операций для технологической линии
+          1998 Син Ю.Е. Разработка и исследование класса теоретико-модельных операций для технологической линии
           концептуального проектирования.
         </li>
-        <li>1999 Кучкаров З.А., Чернышев С.Б. Метод построения формально-логической модели большой размерности.</li>
         <li>
           1999 Кучкаров З.А., Кононенко А.А. Программа преобразования родоструктурного синтеза операционализированных
           терминальных концептуальных моделей Экстеор 3,{' '}
@@ -99,7 +97,7 @@ function HelpInfo() {
         </li>
         <li>
           1999 Никитина Н.К., Ландин Н.А. Разработка автоматизированной подсистемы, реализующей операции отслоения и
-          рассечения над концептуальными схемами
+          рассечения над концептуальными схемами.
         </li>
         <li>
           1999 Юрьев О.И., Зверев В.Ю. Разработка и создание экспериментальной версии автоматизированной системы
@@ -129,7 +127,7 @@ function HelpInfo() {
         <li>2000 Ключников А.В. Эквивалентность теорий родов структур.</li>
         <li>
           2001 Кучкаров З.А., Никитин А.В. Исследование и построение типологии изменений теоретико-множественных
-          интерпретаций класса декартового произведения
+          интерпретаций класса декартового произведения.
         </li>
         <li>
           2001 Кононенко А.А., Майоров В.А. Программа преобразования сети процедур из формата Оргтеор в формат BPWin
@@ -137,12 +135,13 @@ function HelpInfo() {
         </li>
         <li>
           2001 Майоров В.А. Программа построения формального выражения путем выбора альтернатив Grammar,{' '}
-          <i>предложившая альтернативной подход к построению корректных формальных выражений</i>.
+          <i>предложившая альтернативной подход к построению корректных формальных выражений.</i>
         </li>
         <li>
           2004 Гараева Ю.Р., Пономарев И.Н. Семантико-синтаксический анализатор текстов родов структур Бурбакизатор,{' '}
           <i>
-            впервые включивший полный грамматический анализ родов структур и проверку биективной переносимости выражения
+            впервые включивший полный грамматический анализ родов структур и проверку биективной переносимости
+            выражения.
           </i>
         </li>
         <li>
@@ -166,16 +165,17 @@ function HelpInfo() {
           </i>
         </li>
         <li>
-          2008 Пономарев И.Н. Об эквивалентной представимости рода структуры с помощью заданной типовой характеристики
+          2008 Пономарев И.Н. Об эквивалентной представимости рода структуры с помощью заданной типовой характеристики.
         </li>
         <li>
-          2008 Кононенко А.А., Кучкаров З.А., Никаноров С.П., Никитина Н.К. Технология концептуального проектирования, -{' '}
-          <i>монография, собравшая исторический обзор и перспективы развития технологического направления.</i>
+          2008 Кононенко А.А., Кучкаров З.А., Никаноров С.П., Никитина Н.К. Технология концептуального проектирования,
+          &mdash; <i>монография, собравшая исторический обзор и перспективы развития технологического направления.</i>
         </li>
         <li>
           2010 Кононенко А.А., Грязнов А.Д. Исследование и построение транслятора концептуальной схемы в концептуальную
           модель.
         </li>
+        <li>2010 Никаноров С.П. Введение в аппарат ступеней.</li>
         <li>
           2012 Кононенко А.А., Елисов Д.Н. Использование механизма XSD-схем для хранения и операционализации
           концептуальных схем и концептуальных моделей с помощью XML.
@@ -185,7 +185,7 @@ function HelpInfo() {
           над концептуальными моделями,{' '}
           <i>
             впервые реализовавшая модуль прямого вычисления интерпретации формального выражения, встроенный в Экстеор
-            3.5
+            3.5.
           </i>
         </li>
         <li>2013 Пономарев И.Н., Липатов А.А. Операции над родами структур и пример автоматизации их выполнения.</li>
@@ -201,13 +201,14 @@ function HelpInfo() {
           </i>
         </li>
         <li>
-          2014 Борисов И.Р. Концептуальные конструкции в задаче синтеза систем на примере Экологического кодекса, -{' '}
+          2014 Борисов И.Р. Концептуальные конструкции в задаче синтеза систем на примере Экологического кодекса,
+          &mdash;{' '}
           <i>
             статья, вводящая понятие концептуальных конструкций как промежуточных форм для операционализации
             концептуальных схем.
           </i>
         </li>
-        <li>2015 Иванов А.Ю. Аппарат ступеней С.П.Никанорова и возможное развитие идей по его использованию.</li>
+        <li>2015 Иванов А.Ю. Аппарат ступеней С.П. Никанорова и возможное развитие идей по его использованию.</li>
         <li>
           2016 Борисов И.Р., Баширов Р.М. Исследование области компьютерной лингвистики и разработка модулей
           терминологического контроля в Экстеор 4 и Microsoft Office Word, <i>являющееся основой библиотеки cctext.</i>
@@ -216,12 +217,12 @@ function HelpInfo() {
           2016 Борисов И.Р. Программный комплекс Экстеор 4.5,{' '}
           <i>
             включавший текстовый модуль и полностью переработанное ядро, выделенное в отдельную библиотеку (впоследствии
-            - ConceptCore)
+            &mdash; ConceptCore).
           </i>
         </li>
         <li>
           2017 Иванов А.Ю. Введение в технологию концептуализации предметных областей социологии: основы полагания ядра
-          теории (на примере родственных отношений)
+          теории (на примере родственных отношений).
         </li>
         <li>
           2017 Борисов И.Р., Мурадов А.К. Организация операций над системами понятий посредством графических
@@ -230,11 +231,15 @@ function HelpInfo() {
         <li>
           2018 Борисов И.Р., Князев А.В. Изучение методов концептуальной расчистки, разметки текстов и разработка
           программных средств их автоматизации,{' '}
-          <i> - диплом, сформировавший основу для технологий Концепт.Разметка и Концепт.Майнинг.</i>
+          <i> &mdash; диплом, сформировавший основу для технологий Концепт.Разметка и Концепт.Майнинг.</i>
+        </li>
+        <li>
+          2018 Никитин А.В., Болотин П.В. Исследование типологии изменения теоретико-множественной интерпретации класса
+          множества подмножеств.
         </li>
         <li>
           2019 Борисов И.Р., Широкова Л.Р. Исследование возможностей применения методов машинного обучения для решения
-          задач расчистки текстов. Разработка прототипа программного модуля, -{' '}
+          задач расчистки текстов. Разработка прототипа программного модуля, &mdash;{' '}
           <i>первая попытка внедрения технологий ИИ в текстовый модуль.</i>
         </li>
         <li>
@@ -253,7 +258,7 @@ function HelpInfo() {
         </li>
         <li>
           2023 Борисов И.Р., Тулисов А.В. Разработка инструмента экспликации концептуальных схем в родоструктурной форме
-          через веб-интерфейс, - <i>разработка прототипа интерфейса КонцептПортал.</i>
+          через веб-интерфейс, &mdash; <i>разработка прототипа интерфейса КонцептПортал.</i>
         </li>
         <li>
           2024 Борисов И.Р. Программный комплекс Экстеор 4.9, поддерживающий работу со схемами, выгруженными из

From 63f51e026fca87868e647e646258aa15a713a94c Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 17 Jun 2024 21:31:19 +0300
Subject: [PATCH 23/45] Improve first loading behavior

---
 .../src/components/wrap/RequireAuth.tsx       |  33 +--
 rsconcept/frontend/src/pages/HomePage.tsx     |  25 ++-
 rsconcept/frontend/src/pages/RegisterPage.tsx | 207 ------------------
 .../src/pages/RegisterPage/FormSignup.tsx     | 195 +++++++++++++++++
 .../src/pages/RegisterPage/RegisterPage.tsx   |  40 ++++
 .../frontend/src/pages/RegisterPage/index.tsx |   1 +
 6 files changed, 270 insertions(+), 231 deletions(-)
 delete mode 100644 rsconcept/frontend/src/pages/RegisterPage.tsx
 create mode 100644 rsconcept/frontend/src/pages/RegisterPage/FormSignup.tsx
 create mode 100644 rsconcept/frontend/src/pages/RegisterPage/RegisterPage.tsx
 create mode 100644 rsconcept/frontend/src/pages/RegisterPage/index.tsx

diff --git a/rsconcept/frontend/src/components/wrap/RequireAuth.tsx b/rsconcept/frontend/src/components/wrap/RequireAuth.tsx
index 7cf30688..bd5f1bcd 100644
--- a/rsconcept/frontend/src/components/wrap/RequireAuth.tsx
+++ b/rsconcept/frontend/src/components/wrap/RequireAuth.tsx
@@ -1,27 +1,34 @@
 'use client';
 
+import { AnimatePresence } from 'framer-motion';
+
 import { useAuth } from '@/context/AuthContext';
 
+import Loader from '../ui/Loader';
 import TextURL from '../ui/TextURL';
+import AnimateFade from './AnimateFade';
 
 interface RequireAuthProps {
   children: React.ReactNode;
 }
 
 function RequireAuth({ children }: RequireAuthProps) {
-  const { user } = useAuth();
-  if (user) {
-    return children;
-  } else {
-    return (
-      <div className='flex flex-col items-center gap-1 mt-2'>
-        <p className='mb-2'>Пожалуйста войдите в систему</p>
-        <TextURL text='Войти в Портал' href='/login' />
-        <TextURL text='Зарегистрироваться' href='/signup' />
-        <TextURL text='Начальная страница' href='/' />
-      </div>
-    );
-  }
+  const { user, loading } = useAuth();
+
+  return (
+    <AnimatePresence mode='wait'>
+      {loading ? <Loader key='auth-loader' /> : null}
+      {!loading && user ? <AnimateFade key='auth-data'>{children}</AnimateFade> : null}
+      {!loading && !user ? (
+        <AnimateFade key='auth-no-user' className='flex flex-col items-center gap-1 mt-2'>
+          <p className='mb-2'>Пожалуйста войдите в систему</p>
+          <TextURL text='Войти в Портал' href='/login' />
+          <TextURL text='Зарегистрироваться' href='/signup' />
+          <TextURL text='Начальная страница' href='/' />
+        </AnimateFade>
+      ) : null}
+    </AnimatePresence>
+  );
 }
 
 export default RequireAuth;
diff --git a/rsconcept/frontend/src/pages/HomePage.tsx b/rsconcept/frontend/src/pages/HomePage.tsx
index a0272dbe..f02778e3 100644
--- a/rsconcept/frontend/src/pages/HomePage.tsx
+++ b/rsconcept/frontend/src/pages/HomePage.tsx
@@ -1,27 +1,30 @@
 import { useLayoutEffect } from 'react';
 
 import { urls } from '@/app/urls';
+import Loader from '@/components/ui/Loader';
 import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { PARAMETER } from '@/utils/constants';
 
 function HomePage() {
   const router = useConceptNavigation();
-  const { user } = useAuth();
+  const { user, loading } = useAuth();
 
   useLayoutEffect(() => {
-    if (!user) {
-      setTimeout(() => {
-        router.push(urls.manuals);
-      }, PARAMETER.refreshTimeout);
-    } else {
-      setTimeout(() => {
-        router.push(urls.library);
-      }, PARAMETER.refreshTimeout);
+    if (!loading) {
+      if (!user) {
+        setTimeout(() => {
+          router.push(urls.manuals);
+        }, PARAMETER.refreshTimeout);
+      } else {
+        setTimeout(() => {
+          router.push(urls.library);
+        }, PARAMETER.refreshTimeout);
+      }
     }
-  }, [router, user]);
+  }, [router, user, loading]);
 
-  return <div />;
+  return <Loader />;
 }
 
 export default HomePage;
diff --git a/rsconcept/frontend/src/pages/RegisterPage.tsx b/rsconcept/frontend/src/pages/RegisterPage.tsx
deleted file mode 100644
index adb5bfa2..00000000
--- a/rsconcept/frontend/src/pages/RegisterPage.tsx
+++ /dev/null
@@ -1,207 +0,0 @@
-'use client';
-
-import axios from 'axios';
-import clsx from 'clsx';
-import { useEffect, useMemo, useState } from 'react';
-import { toast } from 'react-toastify';
-
-import { urls } from '@/app/urls';
-import { IconHelp } from '@/components/Icons';
-import InfoError, { ErrorData } from '@/components/info/InfoError';
-import Button from '@/components/ui/Button';
-import Checkbox from '@/components/ui/Checkbox';
-import FlexColumn from '@/components/ui/FlexColumn';
-import Overlay from '@/components/ui/Overlay';
-import PrettyJson from '@/components/ui/PrettyJSON';
-import SubmitButton from '@/components/ui/SubmitButton';
-import TextInput from '@/components/ui/TextInput';
-import TextURL from '@/components/ui/TextURL';
-import Tooltip from '@/components/ui/Tooltip';
-import AnimateFade from '@/components/wrap/AnimateFade';
-import ExpectedAnonymous from '@/components/wrap/ExpectedAnonymous';
-import { useAuth } from '@/context/AuthContext';
-import { useConceptNavigation } from '@/context/NavigationContext';
-import { HelpTopic } from '@/models/miscellaneous';
-import { IUserSignupData } from '@/models/user';
-import { globals, patterns } from '@/utils/constants';
-
-function RegisterPage() {
-  const router = useConceptNavigation();
-  const { user, signup, loading, error, setError } = useAuth();
-
-  const [username, setUsername] = useState('');
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-  const [password2, setPassword2] = useState('');
-  const [firstName, setFirstName] = useState('');
-  const [lastName, setLastName] = useState('');
-
-  const [acceptPrivacy, setAcceptPrivacy] = useState(false);
-  const [acceptRules, setAcceptRules] = useState(false);
-
-  const isValid = useMemo(
-    () => acceptPrivacy && acceptRules && !!email && !!username,
-    [acceptPrivacy, acceptRules, email, username]
-  );
-
-  useEffect(() => {
-    setError(undefined);
-  }, [username, email, password, password2, setError]);
-
-  function handleCancel() {
-    if (router.canBack()) {
-      router.back();
-    } else {
-      router.push(urls.library);
-    }
-  }
-
-  function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
-    event.preventDefault();
-    if (!loading) {
-      const data: IUserSignupData = {
-        username,
-        email,
-        password,
-        password2,
-        first_name: firstName,
-        last_name: lastName
-      };
-      signup(data, createdUser => {
-        router.push(urls.login_hint(createdUser.username));
-        toast.success(`Пользователь успешно создан: ${createdUser.username}`);
-      });
-    }
-  }
-
-  if (user) {
-    return (
-      <AnimateFade>
-        <ExpectedAnonymous />
-      </AnimateFade>
-    );
-  }
-  return (
-    <AnimateFade>
-      <form className={clsx('cc-column', 'mx-auto w-[36rem]', 'px-6 py-3')} onSubmit={handleSubmit}>
-        <h1>
-          <span>Новый пользователь</span>
-          <Overlay id={globals.password_tooltip} position='top-[5.4rem] left-[3.5rem]'>
-            <IconHelp size='1.25rem' className='icon-primary' />
-          </Overlay>
-          <Tooltip anchorSelect={`#${globals.password_tooltip}`} offset={6}>
-            используйте уникальный пароль для каждого сайта
-          </Tooltip>
-          <Overlay id={globals.email_tooltip} position='top-[0.5rem] right-[1.75rem]'>
-            <IconHelp size='1.25rem' className='icon-primary' />
-          </Overlay>
-          <Tooltip anchorSelect={`#${globals.email_tooltip}`} offset={6}>
-            электронная почта используется для восстановления пароля
-          </Tooltip>
-        </h1>
-        <div className='flex gap-12'>
-          <FlexColumn>
-            <TextInput
-              id='username'
-              autoComplete='username'
-              required
-              label='Имя пользователя (логин)'
-              pattern={patterns.login}
-              title='Минимум 3 знака. Латинские буквы и цифры. Не может начинаться с цифры'
-              value={username}
-              className='w-[15rem]'
-              onChange={event => setUsername(event.target.value)}
-            />
-            <TextInput
-              id='password'
-              type='password'
-              autoComplete='new-password'
-              required
-              label='Пароль'
-              className='w-[15rem]'
-              value={password}
-              onChange={event => setPassword(event.target.value)}
-            />
-            <TextInput
-              id='password2'
-              type='password'
-              label='Повторите пароль'
-              autoComplete='new-password'
-              required
-              className='w-[15rem]'
-              value={password2}
-              onChange={event => setPassword2(event.target.value)}
-            />
-          </FlexColumn>
-
-          <FlexColumn className='w-[15rem]'>
-            <TextInput
-              id='email'
-              autoComplete='email'
-              required
-              label='Электронная почта (email)'
-              title='электронная почта в корректном формате, например: i.petrov@mycompany.ru.com'
-              value={email}
-              onChange={event => setEmail(event.target.value)}
-            />
-            <TextInput
-              id='first_name'
-              label='Отображаемое имя'
-              autoComplete='given-name'
-              value={firstName}
-              onChange={event => setFirstName(event.target.value)}
-            />
-            <TextInput
-              id='last_name'
-              label='Отображаемая фамилия'
-              autoComplete='family-name'
-              value={lastName}
-              onChange={event => setLastName(event.target.value)}
-            />
-          </FlexColumn>
-        </div>
-
-        <div className='flex gap-1 text-sm'>
-          <Checkbox id='accept_terms' label='Принимаю условия' value={acceptPrivacy} setValue={setAcceptPrivacy} />
-          <TextURL text='обработки персональных данных...' href={urls.help_topic(HelpTopic.INFO_PRIVACY)} />
-        </div>
-        <div className='flex gap-1 text-sm'>
-          <Checkbox id='accept_rules' label='Принимаю ' value={acceptRules} setValue={setAcceptRules} />
-          <TextURL text='правила поведения на Портале...' href={urls.help_topic(HelpTopic.INFO_RULES)} />
-        </div>
-
-        <div className='flex justify-around my-3'>
-          <SubmitButton text='Регистрировать' className='min-w-[10rem]' loading={loading} disabled={!isValid} />
-          <Button text='Назад' className='min-w-[10rem]' onClick={() => handleCancel()} />
-        </div>
-        {error ? <ProcessError error={error} /> : null}
-      </form>
-    </AnimateFade>
-  );
-}
-
-export default RegisterPage;
-
-// ====== Internals =========
-function ProcessError({ error }: { error: ErrorData }): React.ReactElement {
-  if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
-    if ('email' in error.response.data) {
-      return (
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        <div className='mx-auto text-sm select-text clr-text-red'>{error.response.data.email}.</div>
-      );
-    } else if ('username' in error.response.data) {
-      return (
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        <div className='mx-auto text-sm select-text clr-text-red'>{error.response.data.username}.</div>
-      );
-    } else {
-      return (
-        <div className='mx-auto text-sm select-text clr-text-red'>
-          <PrettyJson data={error.response} />
-        </div>
-      );
-    }
-  }
-  return <InfoError error={error} />;
-}
diff --git a/rsconcept/frontend/src/pages/RegisterPage/FormSignup.tsx b/rsconcept/frontend/src/pages/RegisterPage/FormSignup.tsx
new file mode 100644
index 00000000..91afc60a
--- /dev/null
+++ b/rsconcept/frontend/src/pages/RegisterPage/FormSignup.tsx
@@ -0,0 +1,195 @@
+'use client';
+
+import axios from 'axios';
+import clsx from 'clsx';
+import { useEffect, useMemo, useState } from 'react';
+import { toast } from 'react-toastify';
+
+import { urls } from '@/app/urls';
+import { IconHelp } from '@/components/Icons';
+import InfoError, { ErrorData } from '@/components/info/InfoError';
+import Button from '@/components/ui/Button';
+import Checkbox from '@/components/ui/Checkbox';
+import FlexColumn from '@/components/ui/FlexColumn';
+import Overlay from '@/components/ui/Overlay';
+import PrettyJson from '@/components/ui/PrettyJSON';
+import SubmitButton from '@/components/ui/SubmitButton';
+import TextInput from '@/components/ui/TextInput';
+import TextURL from '@/components/ui/TextURL';
+import Tooltip from '@/components/ui/Tooltip';
+import { useAuth } from '@/context/AuthContext';
+import { useConceptNavigation } from '@/context/NavigationContext';
+import { HelpTopic } from '@/models/miscellaneous';
+import { IUserSignupData } from '@/models/user';
+import { globals, patterns } from '@/utils/constants';
+
+function FormSignup() {
+  const router = useConceptNavigation();
+  const { signup, loading, error, setError } = useAuth();
+
+  const [username, setUsername] = useState('');
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [password2, setPassword2] = useState('');
+  const [firstName, setFirstName] = useState('');
+  const [lastName, setLastName] = useState('');
+
+  const [acceptPrivacy, setAcceptPrivacy] = useState(false);
+  const [acceptRules, setAcceptRules] = useState(false);
+
+  const isValid = useMemo(
+    () => acceptPrivacy && acceptRules && !!email && !!username,
+    [acceptPrivacy, acceptRules, email, username]
+  );
+
+  useEffect(() => {
+    setError(undefined);
+  }, [username, email, password, password2, setError]);
+
+  function handleCancel() {
+    if (router.canBack()) {
+      router.back();
+    } else {
+      router.push(urls.library);
+    }
+  }
+
+  function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    if (!loading) {
+      const data: IUserSignupData = {
+        username,
+        email,
+        password,
+        password2,
+        first_name: firstName,
+        last_name: lastName
+      };
+      signup(data, createdUser => {
+        router.push(urls.login_hint(createdUser.username));
+        toast.success(`Пользователь успешно создан: ${createdUser.username}`);
+      });
+    }
+  }
+  return (
+    <form className={clsx('cc-column', 'mx-auto w-[36rem]', 'px-6 py-3')} onSubmit={handleSubmit}>
+      <h1>
+        <span>Новый пользователь</span>
+        <Overlay id={globals.password_tooltip} position='top-[5.4rem] left-[3.5rem]'>
+          <IconHelp size='1.25rem' className='icon-primary' />
+        </Overlay>
+        <Tooltip anchorSelect={`#${globals.password_tooltip}`} offset={6}>
+          используйте уникальный пароль для каждого сайта
+        </Tooltip>
+        <Overlay id={globals.email_tooltip} position='top-[0.5rem] right-[1.75rem]'>
+          <IconHelp size='1.25rem' className='icon-primary' />
+        </Overlay>
+        <Tooltip anchorSelect={`#${globals.email_tooltip}`} offset={6}>
+          электронная почта используется для восстановления пароля
+        </Tooltip>
+      </h1>
+      <div className='flex gap-12'>
+        <FlexColumn>
+          <TextInput
+            id='username'
+            autoComplete='username'
+            required
+            label='Имя пользователя (логин)'
+            pattern={patterns.login}
+            title='Минимум 3 знака. Латинские буквы и цифры. Не может начинаться с цифры'
+            value={username}
+            className='w-[15rem]'
+            onChange={event => setUsername(event.target.value)}
+          />
+          <TextInput
+            id='password'
+            type='password'
+            autoComplete='new-password'
+            required
+            label='Пароль'
+            className='w-[15rem]'
+            value={password}
+            onChange={event => setPassword(event.target.value)}
+          />
+          <TextInput
+            id='password2'
+            type='password'
+            label='Повторите пароль'
+            autoComplete='new-password'
+            required
+            className='w-[15rem]'
+            value={password2}
+            onChange={event => setPassword2(event.target.value)}
+          />
+        </FlexColumn>
+
+        <FlexColumn className='w-[15rem]'>
+          <TextInput
+            id='email'
+            autoComplete='email'
+            required
+            label='Электронная почта (email)'
+            title='электронная почта в корректном формате, например: i.petrov@mycompany.ru.com'
+            value={email}
+            onChange={event => setEmail(event.target.value)}
+          />
+          <TextInput
+            id='first_name'
+            label='Отображаемое имя'
+            autoComplete='given-name'
+            value={firstName}
+            onChange={event => setFirstName(event.target.value)}
+          />
+          <TextInput
+            id='last_name'
+            label='Отображаемая фамилия'
+            autoComplete='family-name'
+            value={lastName}
+            onChange={event => setLastName(event.target.value)}
+          />
+        </FlexColumn>
+      </div>
+
+      <div className='flex gap-1 text-sm'>
+        <Checkbox id='accept_terms' label='Принимаю условия' value={acceptPrivacy} setValue={setAcceptPrivacy} />
+        <TextURL text='обработки персональных данных...' href={urls.help_topic(HelpTopic.INFO_PRIVACY)} />
+      </div>
+      <div className='flex gap-1 text-sm'>
+        <Checkbox id='accept_rules' label='Принимаю ' value={acceptRules} setValue={setAcceptRules} />
+        <TextURL text='правила поведения на Портале...' href={urls.help_topic(HelpTopic.INFO_RULES)} />
+      </div>
+
+      <div className='flex justify-around my-3'>
+        <SubmitButton text='Регистрировать' className='min-w-[10rem]' loading={loading} disabled={!isValid} />
+        <Button text='Назад' className='min-w-[10rem]' onClick={() => handleCancel()} />
+      </div>
+      {error ? <ProcessError error={error} /> : null}
+    </form>
+  );
+}
+
+export default FormSignup;
+
+// ====== Internals =========
+function ProcessError({ error }: { error: ErrorData }): React.ReactElement {
+  if (axios.isAxiosError(error) && error.response && error.response.status === 400) {
+    if ('email' in error.response.data) {
+      return (
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        <div className='mx-auto text-sm select-text clr-text-red'>{error.response.data.email}.</div>
+      );
+    } else if ('username' in error.response.data) {
+      return (
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        <div className='mx-auto text-sm select-text clr-text-red'>{error.response.data.username}.</div>
+      );
+    } else {
+      return (
+        <div className='mx-auto text-sm select-text clr-text-red'>
+          <PrettyJson data={error.response} />
+        </div>
+      );
+    }
+  }
+  return <InfoError error={error} />;
+}
diff --git a/rsconcept/frontend/src/pages/RegisterPage/RegisterPage.tsx b/rsconcept/frontend/src/pages/RegisterPage/RegisterPage.tsx
new file mode 100644
index 00000000..f57ec233
--- /dev/null
+++ b/rsconcept/frontend/src/pages/RegisterPage/RegisterPage.tsx
@@ -0,0 +1,40 @@
+import { AnimatePresence } from 'framer-motion';
+
+import Loader from '@/components/ui/Loader';
+import AnimateFade from '@/components/wrap/AnimateFade';
+import ExpectedAnonymous from '@/components/wrap/ExpectedAnonymous';
+import { useAuth } from '@/context/AuthContext';
+
+import FormSignup from './FormSignup';
+
+function RegisterPage() {
+  const { user, loading } = useAuth();
+
+  if (loading) {
+    return <Loader />;
+  }
+  if (user && !loading) {
+    return (
+      <AnimateFade>
+        <ExpectedAnonymous />
+      </AnimateFade>
+    );
+  }
+  return (
+    <AnimatePresence mode='wait'>
+      {loading ? <Loader key='signup-loader' /> : null}
+      {!loading && user ? (
+        <AnimateFade key='signup-has-user'>
+          <ExpectedAnonymous />
+        </AnimateFade>
+      ) : null}
+      {!loading && !user ? (
+        <AnimateFade key='signup-no-user'>
+          <FormSignup />
+        </AnimateFade>
+      ) : null}
+    </AnimatePresence>
+  );
+}
+
+export default RegisterPage;
diff --git a/rsconcept/frontend/src/pages/RegisterPage/index.tsx b/rsconcept/frontend/src/pages/RegisterPage/index.tsx
new file mode 100644
index 00000000..1b9629b7
--- /dev/null
+++ b/rsconcept/frontend/src/pages/RegisterPage/index.tsx
@@ -0,0 +1 @@
+export { default } from './RegisterPage';

From 2d2a605991e353a9febb5b7f686eaa04a8ee3c5d Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:07:41 +0300
Subject: [PATCH 24/45] UI improvements

---
 TODO.txt                                      | 13 ++++---
 .../src/app/Navigation/NavigationButton.tsx   |  1 +
 rsconcept/frontend/src/components/Icons.tsx   |  3 +-
 .../src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx |  7 +++-
 .../src/pages/LibraryPage/LibraryPage.tsx     | 18 ++++++++--
 .../src/pages/LibraryPage/SearchPanel.tsx     | 34 +++++++++++++------
 .../EditorRSFormCard/RSFormToolbar.tsx        |  6 ++--
 .../src/pages/RSFormPage/RSTabsMenu.tsx       |  5 ++-
 rsconcept/frontend/src/utils/labels.ts        |  4 ++-
 9 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 5da26944..171a23fa 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,25 +2,26 @@
 For more specific TODOs see comments in code
 
 [Functionality - PROGRESS]
-- Landing page
-- Home page (user specific)
-
 - Operational synthesis schema as LibraryItem ?
 
-- Draggable rows in constituents table
 - Clickable IDs in RSEditor tooltips
 
 - Library organization, search and exploration. Consider new user experience
 - Private projects and permissions. Consider cooperative editing
-- Rework access setup: project-based, user-based, enable sharing. Prevent enumerating access to private schemas by default
 
 
 [Functionality - PENDING]
+- Search functionality for manuals
 - User notifications on edit - consider spam prevention and change aggregation
 - Static analyzer for RSForm
 - Content based search in Library
 - User profile: Settings + settings persistency
 
+- Landing page
+- Home page (user specific)
+
+- Draggable rows in constituents table
+
 - Export PDF (Items list, Graph)
 - ARIA (accessibility considerations) - for now machine reading not supported
 - Internationalization - at least english version. Consider react.intl
@@ -42,6 +43,8 @@ For more specific TODOs see comments in code
 [Security]
 - password-reset leaks info of email being used
 - improve nginx config. Consider DDOS and other types of attacks on infrastructure
+- recaptcha for create user and rest password
+https://yandex.cloud/ru/docs/smartcaptcha
 
 
 [Research]
diff --git a/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx b/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx
index 8961af85..b3be6950 100644
--- a/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx
+++ b/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx
@@ -24,6 +24,7 @@ function NavigationButton({ icon, title, titleHtml, hideTitle, onClick, text }:
         'flex items-center gap-1',
         'clr-btn-nav',
         'rounded-xl',
+        'transition duration-500',
         'font-controls whitespace-nowrap',
         {
           'px-2': text,
diff --git a/rsconcept/frontend/src/components/Icons.tsx b/rsconcept/frontend/src/components/Icons.tsx
index 425f95bf..623c0bb1 100644
--- a/rsconcept/frontend/src/components/Icons.tsx
+++ b/rsconcept/frontend/src/components/Icons.tsx
@@ -18,7 +18,8 @@ export { BiCog            as IconSettings }       from 'react-icons/bi';
 export { TbEye            as IconShow }           from 'react-icons/tb';
 export { TbEyeX           as IconHide }           from 'react-icons/tb';
 export { BiShareAlt       as IconShare }          from 'react-icons/bi';
-export { BiFilterAlt      as IconFilter }         from 'react-icons/bi';
+export { LuFilter         as IconFilter }         from 'react-icons/lu';
+export { LuFilterX        as IconFilterReset }    from 'react-icons/lu';
 export {BiDownArrowCircle as IconOpenList }       from 'react-icons/bi';
 export { LuAlertTriangle  as IconAlert }          from 'react-icons/lu';
 
diff --git a/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx b/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
index 7cae9043..535d985b 100644
--- a/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgDeleteCst/DlgDeleteCst.tsx
@@ -48,7 +48,12 @@ function DlgDeleteCst({ hideWindow, selected, schema, onDelete }: DlgDeleteCstPr
         schema={schema}
         prefix={prefixes.cst_dependant_list}
       />
-      <Checkbox label='Удалить зависимые конституенты' value={expandOut} setValue={value => setExpandOut(value)} />
+      <Checkbox
+        label='Удалить зависимые конституенты'
+        className='my-2'
+        value={expandOut}
+        setValue={value => setExpandOut(value)}
+      />
     </Modal>
   );
 }
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
index 9070a0e3..e79719e5 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
@@ -44,6 +44,18 @@ function LibraryPage() {
     [head, path, query, isEditor, isOwned, isSubscribed, isVisible, user]
   );
 
+  const hasCustomFilter = useMemo(
+    () =>
+      !!filter.path ||
+      !!filter.query ||
+      filter.head !== undefined ||
+      filter.isEditor !== undefined ||
+      filter.isOwned !== undefined ||
+      filter.isSubscribed !== undefined ||
+      filter.isVisible !== true,
+    [filter]
+  );
+
   useLayoutEffect(() => {
     setItems(library.applyFilter(filter));
   }, [library, filter, filter.query]);
@@ -81,14 +93,15 @@ function LibraryPage() {
       hasNoData={library.items.length === 0}
     >
       <SearchPanel
+        total={library.items.length ?? 0}
+        filtered={items.length}
+        hasCustomFilter={hasCustomFilter}
         query={query}
         setQuery={setQuery}
         path={path}
         setPath={setPath}
         head={head}
         setHead={setHead}
-        total={library.items.length ?? 0}
-        filtered={items.length}
         isVisible={isVisible}
         isOwned={isOwned}
         toggleOwned={toggleOwned}
@@ -97,6 +110,7 @@ function LibraryPage() {
         toggleSubscribed={toggleSubscribed}
         isEditor={isEditor}
         toggleEditor={toggleEditor}
+        resetFilter={resetFilter}
       />
       {view}
     </DataLoader>
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index f58719cb..70cc528d 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -4,11 +4,12 @@ import clsx from 'clsx';
 import { useCallback } from 'react';
 
 import { LocationIcon, SubscribeIcon, VisibilityIcon } from '@/components/DomainIcons';
-import { IconEditor, IconFolder, IconOwner } from '@/components/Icons';
+import { IconEditor, IconFilterReset, IconFolder, IconOwner } from '@/components/Icons';
 import BadgeHelp from '@/components/info/BadgeHelp';
 import Dropdown from '@/components/ui/Dropdown';
 import DropdownButton from '@/components/ui/DropdownButton';
 import MiniButton from '@/components/ui/MiniButton';
+import Overlay from '@/components/ui/Overlay';
 import SearchBar from '@/components/ui/SearchBar';
 import SelectorButton from '@/components/ui/SelectorButton';
 import { useAuth } from '@/context/AuthContext';
@@ -22,6 +23,7 @@ import { tripleToggleColor } from '@/utils/utils';
 interface SearchPanelProps {
   total: number;
   filtered: number;
+  hasCustomFilter: boolean;
 
   query: string;
   setQuery: React.Dispatch<React.SetStateAction<string>>;
@@ -38,11 +40,14 @@ interface SearchPanelProps {
   toggleSubscribed: () => void;
   isEditor: boolean | undefined;
   toggleEditor: () => void;
+  resetFilter: () => void;
 }
 
 function SearchPanel({
   total,
   filtered,
+  hasCustomFilter,
+
   query,
   setQuery,
   path,
@@ -57,7 +62,8 @@ function SearchPanel({
   isSubscribed,
   toggleSubscribed,
   isEditor,
-  toggleEditor
+  toggleEditor,
+  resetFilter
 }: SearchPanelProps) {
   const { user } = useAuth();
   const headMenu = useDropdown();
@@ -109,6 +115,13 @@ function SearchPanel({
             icon={<IconEditor size='1.25rem' className={tripleToggleColor(isEditor)} />}
             onClick={toggleEditor}
           />
+
+          <MiniButton
+            title='Сбросить фильтры'
+            icon={<IconFilterReset size='1.25rem' className='icon-primary' />}
+            onClick={resetFilter}
+            disabled={!hasCustomFilter}
+          />
         </div>
       ) : null}
 
@@ -169,18 +182,19 @@ function SearchPanel({
           placeholder='Путь'
           noIcon
           noBorder
-          className='min-w-[5rem]'
+          className='min-w-[4.5rem] sm:min-w-[5rem]'
           value={path}
           onChange={setPath}
         />
       </div>
-
-      <BadgeHelp
-        topic={HelpTopic.UI_LIBRARY}
-        className={clsx(PARAMETER.TOOLTIP_WIDTH, 'text-sm')}
-        offset={5}
-        place='right-start'
-      />
+      <Overlay position='top-[-0.75rem] right-0'>
+        <BadgeHelp
+          topic={HelpTopic.UI_LIBRARY}
+          className={clsx(PARAMETER.TOOLTIP_WIDTH, 'text-sm')}
+          offset={5}
+          place='right-start'
+        />
+      </Overlay>
     </div>
   );
 }
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx
index 664a061b..5dfb3147 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/RSFormToolbar.tsx
@@ -8,10 +8,11 @@ import BadgeHelp from '@/components/info/BadgeHelp';
 import MiniButton from '@/components/ui/MiniButton';
 import Overlay from '@/components/ui/Overlay';
 import { useAccessMode } from '@/context/AccessModeContext';
+import { AccessPolicy } from '@/models/library';
 import { HelpTopic } from '@/models/miscellaneous';
 import { UserLevel } from '@/models/user';
 import { PARAMETER } from '@/utils/constants';
-import { prepareTooltip } from '@/utils/labels';
+import { prepareTooltip, tooltips } from '@/utils/labels';
 
 import { useRSEdit } from '../RSEditContext';
 
@@ -38,9 +39,10 @@ function RSFormToolbar({ modified, anonymous, subscribed, onSubmit, onDestroy }:
         />
       ) : null}
       <MiniButton
-        title='Поделиться схемой'
+        titleHtml={tooltips.shareItem(controller.schema?.access_policy)}
         icon={<IconShare size='1.25rem' className='icon-primary' />}
         onClick={controller.share}
+        disabled={controller.schema?.access_policy !== AccessPolicy.PUBLIC}
       />
       {!anonymous ? (
         <MiniButton
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
index b72687b2..c6f02a65 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx
@@ -32,8 +32,9 @@ import { useAuth } from '@/context/AuthContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { useRSForm } from '@/context/RSFormContext';
 import useDropdown from '@/hooks/useDropdown';
+import { AccessPolicy } from '@/models/library';
 import { UserLevel } from '@/models/user';
-import { describeAccessMode, labelAccessMode } from '@/utils/labels';
+import { describeAccessMode, labelAccessMode, tooltips } from '@/utils/labels';
 
 import { useRSEdit } from './RSEditContext';
 
@@ -138,8 +139,10 @@ function RSTabsMenu({ onDestroy }: RSTabsMenuProps) {
         <Dropdown isOpen={schemaMenu.isOpen}>
           <DropdownButton
             text='Поделиться'
+            titleHtml={tooltips.shareItem(controller.schema?.access_policy)}
             icon={<IconShare size='1rem' className='icon-primary' />}
             onClick={handleShare}
+            disabled={controller.schema?.access_policy !== AccessPolicy.PUBLIC}
           />
           {user ? (
             <DropdownButton
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index f67cd608..9e1c5be1 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -909,7 +909,9 @@ export const errors = {
  * UI tooltip descriptors.
  */
 export const tooltips = {
-  unsaved: 'Сохраните или отмените изменения'
+  unsaved: 'Сохраните или отмените изменения',
+  shareItem: (policy?: AccessPolicy) =>
+    policy === AccessPolicy.PUBLIC ? 'Поделиться схемой' : 'Поделиться можно только <br/>открытой схемой'
 };
 
 /**

From 867e60581b052919f816d4c539ad3756eabdca55 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:19:19 +0300
Subject: [PATCH 25/45] Improve cursor blocking icon

---
 rsconcept/frontend/README.md                                    | 2 +-
 .../frontend/src/app/Navigation/ToggleNavigationButton.tsx      | 2 +-
 .../frontend/src/components/select/GraphSelectionToolbar.tsx    | 2 +-
 rsconcept/frontend/src/components/ui/Button.tsx                 | 2 +-
 rsconcept/frontend/src/components/ui/Checkbox.tsx               | 2 +-
 rsconcept/frontend/src/components/ui/CheckboxTristate.tsx       | 2 +-
 rsconcept/frontend/src/components/ui/DropdownButton.tsx         | 2 +-
 rsconcept/frontend/src/components/ui/MiniButton.tsx             | 2 +-
 rsconcept/frontend/src/components/ui/SelectorButton.tsx         | 2 +-
 rsconcept/frontend/src/components/ui/SubmitButton.tsx           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rsconcept/frontend/README.md b/rsconcept/frontend/README.md
index 681d51b4..4b2ccd23 100644
--- a/rsconcept/frontend/README.md
+++ b/rsconcept/frontend/README.md
@@ -16,7 +16,7 @@ Styling conventions
   - border: borer-2 outline-none shadow-md
   - colors: clr-controls
   - text: text-start text-sm font-semibold whitespace-nowrap
-  - behavior modifiers: select-none disabled:cursor-not-allowed
+  - behavior modifiers: select-none disabled:cursor-auto
   - transitions: 
   </pre>
 </details>
diff --git a/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx b/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx
index 43166e66..556b1acb 100644
--- a/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx
+++ b/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx
@@ -15,7 +15,7 @@ function ToggleNavigationButton() {
       className={clsx(
         'absolute top-0 right-0 z-navigation flex items-center justify-center',
         'clr-btn-nav',
-        'select-none disabled:cursor-not-allowed'
+        'select-none'
       )}
       onClick={toggleNoNavigation}
       initial={false}
diff --git a/rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx b/rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx
index ff8a399a..ec06db95 100644
--- a/rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx
+++ b/rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx
@@ -50,7 +50,7 @@ function GraphSelectionToolbar({
         disabled={emptySelection}
       />
       <MiniButton
-        titleHtml='<b>Максимизация</b> - дополнение выделения конституентами, зависимыми только от выделенных'
+        titleHtml='<b>Максимизация</b> <br/>дополнение выделения конституентами, <br/>зависимыми только от выделенных'
         icon={<IconGraphMaximize size='1.25rem' className='icon-primary' />}
         onClick={() => setSelected(prev => graph.maximizePart(prev))}
         disabled={emptySelection}
diff --git a/rsconcept/frontend/src/components/ui/Button.tsx b/rsconcept/frontend/src/components/ui/Button.tsx
index 7d2dbb80..1798292c 100644
--- a/rsconcept/frontend/src/components/ui/Button.tsx
+++ b/rsconcept/frontend/src/components/ui/Button.tsx
@@ -33,7 +33,7 @@ function Button({
       disabled={disabled ?? loading}
       className={clsx(
         'inline-flex gap-2 items-center justify-center',
-        'select-none disabled:cursor-not-allowed',
+        'select-none disabled:cursor-auto',
         {
           'border rounded': !noBorder,
           'px-1': dense,
diff --git a/rsconcept/frontend/src/components/ui/Checkbox.tsx b/rsconcept/frontend/src/components/ui/Checkbox.tsx
index dc4b8d3a..633e3ea8 100644
--- a/rsconcept/frontend/src/components/ui/Checkbox.tsx
+++ b/rsconcept/frontend/src/components/ui/Checkbox.tsx
@@ -27,7 +27,7 @@ function Checkbox({
 }: CheckboxProps) {
   const cursor = useMemo(() => {
     if (disabled) {
-      return 'cursor-not-allowed';
+      return 'cursor-auto';
     } else if (setValue) {
       return 'cursor-pointer';
     } else {
diff --git a/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx b/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx
index e19a195c..ee886cce 100644
--- a/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx
+++ b/rsconcept/frontend/src/components/ui/CheckboxTristate.tsx
@@ -25,7 +25,7 @@ function CheckboxTristate({
 }: CheckboxTristateProps) {
   const cursor = useMemo(() => {
     if (disabled) {
-      return 'cursor-not-allowed';
+      return 'cursor-auto';
     } else if (setValue) {
       return 'cursor-pointer';
     } else {
diff --git a/rsconcept/frontend/src/components/ui/DropdownButton.tsx b/rsconcept/frontend/src/components/ui/DropdownButton.tsx
index 6dd35db1..254d9fbb 100644
--- a/rsconcept/frontend/src/components/ui/DropdownButton.tsx
+++ b/rsconcept/frontend/src/components/ui/DropdownButton.tsx
@@ -35,7 +35,7 @@ function DropdownButton({
         'disabled:clr-text-controls',
         {
           'clr-hover': onClick,
-          'cursor-pointer disabled:cursor-not-allowed': onClick,
+          'cursor-pointer disabled:cursor-auto': onClick,
           'cursor-default': !onClick
         },
         className
diff --git a/rsconcept/frontend/src/components/ui/MiniButton.tsx b/rsconcept/frontend/src/components/ui/MiniButton.tsx
index cad3c927..feb0f454 100644
--- a/rsconcept/frontend/src/components/ui/MiniButton.tsx
+++ b/rsconcept/frontend/src/components/ui/MiniButton.tsx
@@ -28,7 +28,7 @@ function MiniButton({
       className={clsx(
         'rounded-lg',
         'clr-btn-clear',
-        'cursor-pointer disabled:cursor-not-allowed',
+        'cursor-pointer disabled:cursor-auto',
         {
           'px-1 py-1': !noPadding,
           'outline-none': noHover,
diff --git a/rsconcept/frontend/src/components/ui/SelectorButton.tsx b/rsconcept/frontend/src/components/ui/SelectorButton.tsx
index da38e151..df0daccb 100644
--- a/rsconcept/frontend/src/components/ui/SelectorButton.tsx
+++ b/rsconcept/frontend/src/components/ui/SelectorButton.tsx
@@ -31,7 +31,7 @@ function SelectorButton({
         'px-1 flex flex-start items-center gap-1',
         'text-sm font-controls select-none',
         'text-btn clr-text-controls',
-        'disabled:cursor-not-allowed cursor-pointer',
+        'disabled:cursor-auto cursor-pointer',
         {
           'clr-hover': transparent,
           'border': !transparent
diff --git a/rsconcept/frontend/src/components/ui/SubmitButton.tsx b/rsconcept/frontend/src/components/ui/SubmitButton.tsx
index 86c1a570..7cac7a76 100644
--- a/rsconcept/frontend/src/components/ui/SubmitButton.tsx
+++ b/rsconcept/frontend/src/components/ui/SubmitButton.tsx
@@ -17,7 +17,7 @@ function SubmitButton({ text = 'ОК', icon, disabled, loading, className, ...re
         'border',
         'font-medium',
         'clr-btn-primary',
-        'select-none disabled:cursor-not-allowed',
+        'select-none disabled:cursor-auto',
         loading && 'cursor-progress',
         className
       )}

From 568886d1b75ee794416c0ba560466c61947cc0f1 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:55:23 +0300
Subject: [PATCH 26/45] Implement click navigation for RSInput

---
 TODO.txt                                      |  2 -
 .../src/components/RSInput/RSInput.tsx        | 16 +++++---
 .../src/components/RSInput/clickNavigation.ts | 38 +++++++++++++++++++
 .../src/components/RSInput/tooltip.ts         | 22 +----------
 .../dialogs/DlgCreateCst/FormCreateCst.tsx    |  1 +
 .../EditorConstituenta/EditorConstituenta.tsx |  1 +
 .../EditorConstituenta/FormConstituenta.tsx   |  7 +++-
 .../EditorRSExpression/EditorRSExpression.tsx |  6 ++-
 .../ViewConstituents/ConstituentsTable.tsx    |  2 +-
 rsconcept/frontend/src/utils/codemirror.ts    | 37 +++++++++++++++---
 10 files changed, 94 insertions(+), 38 deletions(-)
 create mode 100644 rsconcept/frontend/src/components/RSInput/clickNavigation.ts

diff --git a/TODO.txt b/TODO.txt
index 171a23fa..d5bb5628 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,8 +4,6 @@ For more specific TODOs see comments in code
 [Functionality - PROGRESS]
 - Operational synthesis schema as LibraryItem ?
 
-- Clickable IDs in RSEditor tooltips
-
 - Library organization, search and exploration. Consider new user experience
 - Private projects and permissions. Consider cooperative editing
 
diff --git a/rsconcept/frontend/src/components/RSInput/RSInput.tsx b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
index d20f5d8d..edd650a5 100644
--- a/rsconcept/frontend/src/components/RSInput/RSInput.tsx
+++ b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
@@ -10,12 +10,13 @@ import { forwardRef, useCallback, useMemo, useRef } from 'react';
 
 import Label from '@/components/ui/Label';
 import { useConceptOptions } from '@/context/OptionsContext';
-import { useRSForm } from '@/context/RSFormContext';
 import { getFontClassName } from '@/models/miscellaneousAPI';
+import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { generateAlias, getCstTypePrefix, guessCstType } from '@/models/rsformAPI';
 import { extractGlobals } from '@/models/rslangAPI';
 
 import { ccBracketMatching } from './bracketMatching';
+import { rsNavigation } from './clickNavigation';
 import { RSLanguage } from './rslang';
 import { getSymbolSubstitute, RSTextWrapper } from './textEditing';
 import { rsHoverTooltip } from './tooltip';
@@ -39,6 +40,8 @@ interface RSInputProps
   noTooltip?: boolean;
   onChange?: (newValue: string) => void;
   onAnalyze?: () => void;
+  schema?: IRSForm;
+  onOpenEdit?: (cstID: ConstituentaID) => void;
 }
 
 const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
@@ -49,6 +52,9 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
       disabled,
       noTooltip,
 
+      schema,
+      onOpenEdit,
+
       className,
       style,
 
@@ -59,7 +65,6 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
     ref
   ) => {
     const { darkMode, colors, mathFont } = useConceptOptions();
-    const { schema } = useRSForm();
 
     const internalRef = useRef<ReactCodeMirrorRef>(null);
     const thisRef = useMemo(() => (!ref || typeof ref === 'function' ? internalRef : ref), [internalRef, ref]);
@@ -77,7 +82,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
             caret: colors.fgDefault
           },
           styles: [
-            { tag: tags.name, color: colors.fgPurple, cursor: 'default' }, // GlobalID
+            { tag: tags.name, color: colors.fgPurple, cursor: schema ? 'default' : 'text' }, // GlobalID
             { tag: tags.variableName, color: colors.fgGreen }, // LocalID
             { tag: tags.propertyName, color: colors.fgTeal }, // Radical
             { tag: tags.keyword, color: colors.fgBlue }, // keywords
@@ -87,7 +92,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
             { tag: tags.brace, color: colors.fgPurple, fontWeight: '600' } // braces (curly brackets)
           ]
         }),
-      [disabled, colors, darkMode]
+      [disabled, colors, darkMode, schema]
     );
 
     const editorExtensions = useMemo(
@@ -95,9 +100,10 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
         EditorView.lineWrapping,
         RSLanguage,
         ccBracketMatching(darkMode),
+        ...(!schema || !onOpenEdit ? [] : [rsNavigation(schema, onOpenEdit)]),
         ...(noTooltip || !schema ? [] : [rsHoverTooltip(schema)])
       ],
-      [darkMode, schema, noTooltip]
+      [darkMode, schema, noTooltip, onOpenEdit]
     );
 
     const handleInput = useCallback(
diff --git a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts b/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
new file mode 100644
index 00000000..2ee94a6b
--- /dev/null
+++ b/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
@@ -0,0 +1,38 @@
+import { Extension } from '@codemirror/state';
+import { EditorView } from '@uiw/react-codemirror';
+
+import { ConstituentaID, IRSForm } from '@/models/rsform';
+import { findAliasAt } from '@/utils/codemirror';
+
+const globalsNavigation = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
+  return EditorView.domEventHandlers({
+    click: (event: MouseEvent, view: EditorView) => {
+      if (!event.ctrlKey) {
+        return;
+      }
+
+      const pos = view.posAtCoords({ x: event.clientX, y: event.clientY });
+      if (!pos) {
+        return;
+      }
+
+      const { alias } = findAliasAt(pos, view.state);
+      if (!alias) {
+        return;
+      }
+
+      const cst = schema.cstByAlias.get(alias);
+      if (!cst) {
+        return;
+      }
+
+      event.preventDefault();
+      event.stopPropagation();
+      onOpenEdit(cst.id);
+    }
+  });
+};
+
+export function rsNavigation(schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void): Extension {
+  return [globalsNavigation(schema, onOpenEdit)];
+}
diff --git a/rsconcept/frontend/src/components/RSInput/tooltip.ts b/rsconcept/frontend/src/components/RSInput/tooltip.ts
index 341a6942..95239a53 100644
--- a/rsconcept/frontend/src/components/RSInput/tooltip.ts
+++ b/rsconcept/frontend/src/components/RSInput/tooltip.ts
@@ -1,30 +1,10 @@
-import { syntaxTree } from '@codemirror/language';
 import { Extension } from '@codemirror/state';
 import { hoverTooltip } from '@codemirror/view';
-import { EditorState } from '@uiw/react-codemirror';
 
 import { IRSForm } from '@/models/rsform';
-import { findEnvelopingNodes } from '@/utils/codemirror';
+import { findAliasAt } from '@/utils/codemirror';
 import { domTooltipConstituenta } from '@/utils/codemirror';
 
-import { GlobalTokens } from './rslang';
-
-function findAliasAt(pos: number, state: EditorState) {
-  const { from: lineStart, to: lineEnd, text } = state.doc.lineAt(pos);
-  const nodes = findEnvelopingNodes(pos, pos, syntaxTree(state), GlobalTokens);
-  let alias = '';
-  let start = 0;
-  let end = 0;
-  nodes.forEach(node => {
-    if (node.to <= lineEnd && node.from >= lineStart) {
-      alias = text.slice(node.from - lineStart, node.to - lineStart);
-      start = node.from;
-      end = node.to;
-    }
-  });
-  return { alias, start, end };
-}
-
 const globalsHoverTooltip = (schema: IRSForm) => {
   return hoverTooltip((view, pos) => {
     const { alias, start, end } = findAliasAt(pos, view.state);
diff --git a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx b/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
index c1cc724e..75d8e208 100644
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
@@ -95,6 +95,7 @@ function FormCreateCst({ schema, state, partialUpdate, setValidated }: FormCreat
           }
           value={state.definition_formal}
           onChange={value => partialUpdate({ definition_formal: value })}
+          schema={schema}
         />
       </AnimateFade>
       <AnimateFade key='dlg_cst_definition' hideContent={!state.definition_raw && isElementary}>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
index 974e9828..f52321ab 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
@@ -113,6 +113,7 @@ function EditorConstituenta({ activeCst, isModified, setIsModified, onOpenEdit }
           setIsModified={setIsModified}
           onEditTerm={controller.editTermForms}
           onRename={controller.renameCst}
+          onOpenEdit={onOpenEdit}
         />
         <AnimatePresence>
           {showList ? (
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 05b86374..211c5b3b 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -11,7 +11,7 @@ import SubmitButton from '@/components/ui/SubmitButton';
 import TextArea from '@/components/ui/TextArea';
 import AnimateFade from '@/components/wrap/AnimateFade';
 import { useRSForm } from '@/context/RSFormContext';
-import { CstType, IConstituenta, ICstUpdateData } from '@/models/rsform';
+import { ConstituentaID, CstType, IConstituenta, ICstUpdateData } from '@/models/rsform';
 import { isBaseSet, isBasicConcept, isFunctional } from '@/models/rsformAPI';
 import { information, labelCstTypification } from '@/utils/labels';
 
@@ -35,6 +35,7 @@ interface FormConstituentaProps {
 
   onRename: () => void;
   onEditTerm: () => void;
+  onOpenEdit?: (cstID: ConstituentaID) => void;
 }
 
 function FormConstituenta({
@@ -47,7 +48,8 @@ function FormConstituenta({
 
   toggleReset,
   onRename,
-  onEditTerm
+  onEditTerm,
+  onOpenEdit
 }: FormConstituentaProps) {
   const { schema, cstUpdate, processing } = useRSForm();
 
@@ -183,6 +185,7 @@ function FormConstituenta({
               toggleReset={toggleReset}
               onChange={newValue => setExpression(newValue)}
               setTypification={setTypification}
+              onOpenEdit={onOpenEdit}
             />
           </AnimateFade>
           <AnimateFade key='cst_definition_fade' hideContent={!!state && !state?.definition_raw && isElementary}>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
index 284ad11b..c61ac3f8 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@@ -14,7 +14,7 @@ import DlgShowAST from '@/dialogs/DlgShowAST';
 import useCheckExpression from '@/hooks/useCheckExpression';
 import useLocalStorage from '@/hooks/useLocalStorage';
 import { HelpTopic } from '@/models/miscellaneous';
-import { IConstituenta } from '@/models/rsform';
+import { ConstituentaID, IConstituenta } from '@/models/rsform';
 import { getDefinitionPrefix } from '@/models/rsformAPI';
 import { IExpressionParse, IRSErrorDescription, SyntaxTree } from '@/models/rslang';
 import { TokenID } from '@/models/rslang';
@@ -38,6 +38,7 @@ interface EditorRSExpressionProps {
 
   setTypification: (typification: string) => void;
   onChange: (newValue: string) => void;
+  onOpenEdit?: (cstID: ConstituentaID) => void;
 }
 
 function EditorRSExpression({
@@ -47,6 +48,7 @@ function EditorRSExpression({
   toggleReset,
   setTypification,
   onChange,
+  onOpenEdit,
   ...restProps
 }: EditorRSExpressionProps) {
   const model = useRSForm();
@@ -185,6 +187,8 @@ function EditorRSExpression({
         disabled={disabled}
         onChange={handleChange}
         onAnalyze={handleCheckExpression}
+        schema={model.schema}
+        onOpenEdit={onOpenEdit}
         {...restProps}
       />
 
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
index 6839cb72..606a6ce5 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
@@ -37,7 +37,7 @@ function ConstituentsTable({ items, activeCst, onOpenEdit, maxHeight, denseThres
       if (element) {
         element.scrollIntoView({
           behavior: 'smooth',
-          block: 'nearest',
+          block: 'center',
           inline: 'end'
         });
       }
diff --git a/rsconcept/frontend/src/utils/codemirror.ts b/rsconcept/frontend/src/utils/codemirror.ts
index d1728b6f..aa989914 100644
--- a/rsconcept/frontend/src/utils/codemirror.ts
+++ b/rsconcept/frontend/src/utils/codemirror.ts
@@ -3,9 +3,10 @@
  */
 import { syntaxTree } from '@codemirror/language';
 import { NodeType, Tree, TreeCursor } from '@lezer/common';
-import { ReactCodeMirrorRef, SelectionRange } from '@uiw/react-codemirror';
+import { EditorState, ReactCodeMirrorRef, SelectionRange } from '@uiw/react-codemirror';
 import clsx from 'clsx';
 
+import { GlobalTokens } from '@/components/RSInput/rslang';
 import { IEntityReference, ISyntacticReference } from '@/models/language';
 import { parseGrammemes } from '@/models/languageAPI';
 import { IConstituenta } from '@/models/rsform';
@@ -122,6 +123,25 @@ export function findContainedNodes(start: number, finish: number, tree: Tree, fi
   return result;
 }
 
+/**
+ * Retrieves globalID from position in Editor.
+ */
+export function findAliasAt(pos: number, state: EditorState) {
+  const { from: lineStart, to: lineEnd, text } = state.doc.lineAt(pos);
+  const nodes = findEnvelopingNodes(pos, pos, syntaxTree(state), GlobalTokens);
+  let alias = '';
+  let start = 0;
+  let end = 0;
+  nodes.forEach(node => {
+    if (node.to <= lineEnd && node.from >= lineStart) {
+      alias = text.slice(node.from - lineStart, node.to - lineStart);
+      start = node.from;
+      end = node.to;
+    }
+  });
+  return { alias, start, end };
+}
+
 /**
  * Create DOM tooltip for {@link Constituenta}.
  */
@@ -137,7 +157,11 @@ export function domTooltipConstituenta(cst?: IConstituenta) {
     'text-sm font-main'
   );
 
-  if (cst) {
+  if (!cst) {
+    const text = document.createElement('p');
+    text.innerText = 'Конституента не определена';
+    dom.appendChild(text);
+  } else {
     const alias = document.createElement('p');
     alias.innerHTML = `<b>${cst.alias}:</b> ${labelCstTypification(cst)}`;
     dom.appendChild(alias);
@@ -181,10 +205,11 @@ export function domTooltipConstituenta(cst?: IConstituenta) {
       children.innerHTML = `<b>Порождает:</b> ${cst.children_alias.join(', ')}`;
       dom.appendChild(children);
     }
-  } else {
-    const text = document.createElement('p');
-    text.innerText = 'Конституента не определена';
-    dom.appendChild(text);
+
+    const clickTip = document.createElement('p');
+    clickTip.className = 'w-full text-center text-xs mt-2';
+    clickTip.innerText = 'Ctrl + клик для перехода';
+    dom.appendChild(clickTip);
   }
   return { dom: dom };
 }

From c5035344454ce624a7951ded6b4f0df4fd13ffd1 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:58:25 +0300
Subject: [PATCH 27/45] npm update

---
 rsconcept/frontend/package-lock.json | 42 ++++++++++++++--------------
 rsconcept/frontend/package.json      |  6 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/rsconcept/frontend/package-lock.json b/rsconcept/frontend/package-lock.json
index 43b9c95f..3251523d 100644
--- a/rsconcept/frontend/package-lock.json
+++ b/rsconcept/frontend/package-lock.json
@@ -27,14 +27,14 @@
         "react-select": "^5.8.0",
         "react-tabs": "^6.0.2",
         "react-toastify": "^9.1.3",
-        "react-tooltip": "^5.26.4",
+        "react-tooltip": "^5.27.0",
         "reagraph": "^4.19.1",
         "use-debounce": "^10.0.1"
       },
       "devDependencies": {
         "@lezer/generator": "^1.7.0",
         "@types/jest": "^29.5.12",
-        "@types/node": "^20.14.2",
+        "@types/node": "^20.14.5",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
@@ -49,7 +49,7 @@
         "jest": "^29.7.0",
         "postcss": "^8.4.38",
         "tailwindcss": "^3.4.4",
-        "ts-jest": "^29.1.4",
+        "ts-jest": "^29.1.5",
         "typescript": "^5.4.5",
         "vite": "^4.5.3"
       }
@@ -3026,9 +3026,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.14.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz",
-      "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
+      "version": "20.14.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.5.tgz",
+      "integrity": "sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3126,9 +3126,9 @@
       }
     },
     "node_modules/@types/webxr": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.16.tgz",
-      "integrity": "sha512-0E0Cl84FECtzrB4qG19TNTqpunw0F1YF0QZZnFMF6pDw1kNKJtrlTKlVB34stGIsHbZsYQ7H0tNjPfZftkHHoA==",
+      "version": "0.5.17",
+      "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.17.tgz",
+      "integrity": "sha512-JYcclaQIlisHRXM9dMF7SeVvQ54kcYc7QK1eKCExCTLKWnZDxP4cp/rXH4Uoa1j5+5oQJ0Cc2sZC/PWiiG4q2g==",
       "license": "MIT"
     },
     "node_modules/@types/yargs": {
@@ -4081,9 +4081,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001634",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz",
-      "integrity": "sha512-fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA==",
+      "version": "1.0.30001636",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz",
+      "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==",
       "funding": [
         {
           "type": "opencollective",
@@ -4883,9 +4883,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.803",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.803.tgz",
-      "integrity": "sha512-61H9mLzGOCLLVsnLiRzCbc63uldP0AniRYPV3hbGVtONA1pI7qSGILdbofR7A8TMbOypDocEAjH/e+9k1QIe3g==",
+      "version": "1.4.805",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.805.tgz",
+      "integrity": "sha512-8W4UJwX/w9T0QSzINJckTKG6CYpAUTqsaWcWIsdud3I1FYJcMgW9QqT1/4CBff/pP/TihWh13OmiyY8neto6vw==",
       "license": "ISC"
     },
     "node_modules/ellipsize": {
@@ -9671,9 +9671,9 @@
       }
     },
     "node_modules/react-tooltip": {
-      "version": "5.26.4",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.26.4.tgz",
-      "integrity": "sha512-5WyDrsfw1+6qNVSr3IjqElqJ+cCwE8+44b+HpJ8qRLv7v0a3mcKf8wvv+NfgALFS6QpksGFqTLV2JQ60c+okZQ==",
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.27.0.tgz",
+      "integrity": "sha512-JXROcdfCEbCqkAkh8LyTSP3guQ0dG53iY2E2o4fw3D8clKzziMpE6QG6CclDaHELEKTzpMSeAOsdtg0ahoQosw==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.6.1",
@@ -10751,9 +10751,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/ts-jest": {
-      "version": "29.1.4",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.4.tgz",
-      "integrity": "sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==",
+      "version": "29.1.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.5.tgz",
+      "integrity": "sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/rsconcept/frontend/package.json b/rsconcept/frontend/package.json
index 308c3710..b5bfaefd 100644
--- a/rsconcept/frontend/package.json
+++ b/rsconcept/frontend/package.json
@@ -31,14 +31,14 @@
     "react-select": "^5.8.0",
     "react-tabs": "^6.0.2",
     "react-toastify": "^9.1.3",
-    "react-tooltip": "^5.26.4",
+    "react-tooltip": "^5.27.0",
     "reagraph": "^4.19.1",
     "use-debounce": "^10.0.1"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.0",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.5",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
@@ -53,7 +53,7 @@
     "jest": "^29.7.0",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.4",
-    "ts-jest": "^29.1.4",
+    "ts-jest": "^29.1.5",
     "typescript": "^5.4.5",
     "vite": "^4.5.3"
   },

From 3b13a278681ca399ecbb24ad9364bf1c13296a2d Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 18 Jun 2024 20:11:45 +0300
Subject: [PATCH 28/45] Improve manuals

---
 .../src/pages/ManualsPage/items/HelpAPI.tsx   |  2 +-
 .../ManualsPage/items/HelpContributors.tsx    | 33 +++++++++++++------
 .../pages/ManualsPage/items/HelpPortal.tsx    |  2 +-
 .../src/pages/ManualsPage/items/HelpRules.tsx |  2 +-
 rsconcept/frontend/src/utils/constants.ts     |  4 ++-
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpAPI.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpAPI.tsx
index 27338c64..cd68d140 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpAPI.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpAPI.tsx
@@ -11,7 +11,7 @@ function HelpAPI() {
         С описанием интерфейса можно ознакомиться <TextURL text='по ссылке' href={external_urls.restAPI} />.
       </p>
       <p>
-        <TextURL text='Принять участие в разработке' href={external_urls.git_repo} />
+        <TextURL text='Принять участие в разработке' href={external_urls.git_portal} />
       </p>
     </div>
   );
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
index c5a5397b..c50615f4 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpContributors.tsx
@@ -1,18 +1,23 @@
+import LinkTopic from '@/components/ui/LinkTopic';
+import TextURL from '@/components/ui/TextURL';
+import { HelpTopic } from '@/models/miscellaneous';
+import { external_urls } from '@/utils/constants';
+
 function HelpInfo() {
   return (
     <div>
       <h1>Благодарности разработчикам и исследователям</h1>
       <p>
-        История создания инструментов разработки концептуальных схем начинается с 1970-х годов и продолжается в
-        настоящее время. Данный раздел является скромной попыткой перечислить вклад различных людей в развитие
-        инструментов и математического аппарата, лежащего в основе экспликации концептуальных схем.
+        История инструментов работы с концептуальными схемами начинается с 1970-х годов и продолжается в настоящее
+        время. Здесь представлена скромная попытка перечислить вклад различных людей в развитие инструментов и
+        математического аппарата, лежащего в основе экспликации концептуальных схем.
       </p>
       <p>
-        В списке указан год окончания работ над соответствующим результатом или год публикации соответствующей статьи,
-        курсивом выделены комментарии к значимости указанного результата.
+        В списке указан год окончания работ над соответствующим результатом или год публикации соответствующей статьи.
+        Курсивом выделены комментарии к значимости указанного результата.
       </p>
       <p>Любые добавления и поправки приветствуются.</p>
-      <div className='flex flex-col gap-2'>
+      <div className='flex flex-col gap-3'>
         <li>1973 Никаноров С.П., Персиц Д.Б. Формальное проектирование целостных СОУ.</li>
         <li>
           1975–1981 Никаноров С.П., Персиц Д.Б., Айзенштат А.В., Закс Б.А. Экспериментальная система пакетов прикладных
@@ -211,13 +216,17 @@ function HelpInfo() {
         <li>2015 Иванов А.Ю. Аппарат ступеней С.П. Никанорова и возможное развитие идей по его использованию.</li>
         <li>
           2016 Борисов И.Р., Баширов Р.М. Исследование области компьютерной лингвистики и разработка модулей
-          терминологического контроля в Экстеор 4 и Microsoft Office Word, <i>являющееся основой библиотеки cctext.</i>
+          терминологического контроля в Экстеор 4 и Microsoft Office Word,{' '}
+          <i>
+            являющееся основой библиотеки <TextURL text='cctext' href={external_urls.git_cctext} />.
+          </i>
         </li>
         <li>
           2016 Борисов И.Р. Программный комплекс Экстеор 4.5,{' '}
           <i>
             включавший текстовый модуль и полностью переработанное ядро, выделенное в отдельную библиотеку (впоследствии
-            &mdash; ConceptCore).
+            &mdash; <TextURL text='ConceptCore' href={external_urls.git_core} />
+            ).
           </i>
         </li>
         <li>
@@ -261,8 +270,12 @@ function HelpInfo() {
           через веб-интерфейс, &mdash; <i>разработка прототипа интерфейса КонцептПортал.</i>
         </li>
         <li>
-          2024 Борисов И.Р. Программный комплекс Экстеор 4.9, поддерживающий работу со схемами, выгруженными из
-          КонцептПортал.
+          2024 Борисов И.Р. Программный комплекс <LinkTopic text='Экстеор 4.9' topic={HelpTopic.EXTEOR} />,
+          поддерживающий работу со схемами, выгруженными из КонцептПортал.{' '}
+          <i>
+            Функционал ConceptCore (С++) стал доступен в Python через обертку{' '}
+            <TextURL text='pyconcept' href={external_urls.git_core} />.
+          </i>
         </li>
       </div>
     </div>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpPortal.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpPortal.tsx
index f9fb5e71..9bbf0a87 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpPortal.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpPortal.tsx
@@ -59,7 +59,7 @@ function HelpPortal() {
       </li>
       <li>
         Портал является проектом с открытым исходным кодом, доступным на{' '}
-        <TextURL text='Github' href={external_urls.git_repo} />
+        <TextURL text='Github' href={external_urls.git_portal} />
       </li>
       <li>
         Данный сайт использует доменное имя и серверные мощности{' '}
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpRules.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpRules.tsx
index 7ff5c7cf..85817fe3 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpRules.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpRules.tsx
@@ -23,7 +23,7 @@ function HelpRules() {
         исключений, основанных на возрасте, умственных или физических возможностях, внешнем виде, национальном,
         религиозном, этническом и культурном происхождении, касте, социальном классе, уровне владения языком,
         сексуальной ориентации, гендерной идентичности, поле или сфере работы. Мы также не будем делать исключения на
-        основании статуса, навыков или достижений
+        основании статуса, навыков или достижений.
       </p>
 
       <h2>Ожидаемое поведение</h2>
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index 081c6d62..c8b01617 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -72,7 +72,9 @@ export const external_urls = {
   zak_lectures:
     'https://www.acconcept.ru/product/metody-konceptualnogo-analiza-i-sinteza-v-teoreticheskom-issledovanii-i-proektirovanii-socialno-jekonomicheskih-sistem-3-e-izdanie/',
 
-  git_repo: 'https://github.com/IRBorisov/ConceptPortal',
+  git_portal: 'https://github.com/IRBorisov/ConceptPortal',
+  git_core: 'https://github.com/IRBorisov/ConceptCore',
+  git_cctext: 'https://github.com/IRBorisov/cctext',
   mail_portal: 'mailto:portal@acconcept.ru',
   restAPI: 'https://api.portal.acconcept.ru'
 };

From e81e53e7d5d763e8b67fc8321d674fa39b52ea37 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 19 Jun 2024 12:13:05 +0300
Subject: [PATCH 29/45] Add click navigation for references

---
 .../src/components/RSInput/RSInput.tsx        |  6 +-
 .../src/components/RSInput/clickNavigation.ts |  4 +-
 .../src/components/RSInput/tooltip.ts         |  8 +--
 .../src/components/RefsInput/RefsInput.tsx    | 27 ++++++--
 .../components/RefsInput/clickNavigation.ts   | 38 +++++++++++
 .../src/components/RefsInput/tooltip.ts       | 57 +++++++---------
 .../DlgConstituentaTemplate/TemplateTab.tsx   | 26 ++++----
 .../EditorConstituenta/FormConstituenta.tsx   |  2 +
 rsconcept/frontend/src/utils/codemirror.ts    | 65 +++++++++++++++----
 9 files changed, 165 insertions(+), 68 deletions(-)
 create mode 100644 rsconcept/frontend/src/components/RefsInput/clickNavigation.ts

diff --git a/rsconcept/frontend/src/components/RSInput/RSInput.tsx b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
index edd650a5..19ba811b 100644
--- a/rsconcept/frontend/src/components/RSInput/RSInput.tsx
+++ b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
@@ -82,7 +82,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
             caret: colors.fgDefault
           },
           styles: [
-            { tag: tags.name, color: colors.fgPurple, cursor: schema ? 'default' : 'text' }, // GlobalID
+            { tag: tags.name, color: colors.fgPurple, cursor: schema ? 'default' : cursor }, // GlobalID
             { tag: tags.variableName, color: colors.fgGreen }, // LocalID
             { tag: tags.propertyName, color: colors.fgTeal }, // Radical
             { tag: tags.keyword, color: colors.fgBlue }, // keywords
@@ -92,7 +92,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
             { tag: tags.brace, color: colors.fgPurple, fontWeight: '600' } // braces (curly brackets)
           ]
         }),
-      [disabled, colors, darkMode, schema]
+      [disabled, colors, darkMode, schema, cursor]
     );
 
     const editorExtensions = useMemo(
@@ -101,7 +101,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
         RSLanguage,
         ccBracketMatching(darkMode),
         ...(!schema || !onOpenEdit ? [] : [rsNavigation(schema, onOpenEdit)]),
-        ...(noTooltip || !schema ? [] : [rsHoverTooltip(schema)])
+        ...(noTooltip || !schema ? [] : [rsHoverTooltip(schema, onOpenEdit !== undefined)])
       ],
       [darkMode, schema, noTooltip, onOpenEdit]
     );
diff --git a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts b/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
index 2ee94a6b..9e26ac92 100644
--- a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
+++ b/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
@@ -4,7 +4,7 @@ import { EditorView } from '@uiw/react-codemirror';
 import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { findAliasAt } from '@/utils/codemirror';
 
-const globalsNavigation = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
+const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
   return EditorView.domEventHandlers({
     click: (event: MouseEvent, view: EditorView) => {
       if (!event.ctrlKey) {
@@ -34,5 +34,5 @@ const globalsNavigation = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID)
 };
 
 export function rsNavigation(schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void): Extension {
-  return [globalsNavigation(schema, onOpenEdit)];
+  return [navigationProducer(schema, onOpenEdit)];
 }
diff --git a/rsconcept/frontend/src/components/RSInput/tooltip.ts b/rsconcept/frontend/src/components/RSInput/tooltip.ts
index 95239a53..69545683 100644
--- a/rsconcept/frontend/src/components/RSInput/tooltip.ts
+++ b/rsconcept/frontend/src/components/RSInput/tooltip.ts
@@ -5,7 +5,7 @@ import { IRSForm } from '@/models/rsform';
 import { findAliasAt } from '@/utils/codemirror';
 import { domTooltipConstituenta } from '@/utils/codemirror';
 
-const globalsHoverTooltip = (schema: IRSForm) => {
+const tooltipProducer = (schema: IRSForm, canClick?: boolean) => {
   return hoverTooltip((view, pos) => {
     const { alias, start, end } = findAliasAt(pos, view.state);
     if (!alias) {
@@ -16,11 +16,11 @@ const globalsHoverTooltip = (schema: IRSForm) => {
       pos: start,
       end: end,
       above: false,
-      create: () => domTooltipConstituenta(cst)
+      create: () => domTooltipConstituenta(cst, canClick)
     };
   });
 };
 
-export function rsHoverTooltip(schema: IRSForm): Extension {
-  return [globalsHoverTooltip(schema)];
+export function rsHoverTooltip(schema: IRSForm, canClick?: boolean): Extension {
+  return [tooltipProducer(schema, canClick)];
 }
diff --git a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
index 6a684a8e..bdfe33fe 100644
--- a/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
+++ b/rsconcept/frontend/src/components/RefsInput/RefsInput.tsx
@@ -13,10 +13,11 @@ import Label from '@/components/ui/Label';
 import { useConceptOptions } from '@/context/OptionsContext';
 import DlgEditReference from '@/dialogs/DlgEditReference';
 import { ReferenceType } from '@/models/language';
-import { IRSForm } from '@/models/rsform';
+import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { CodeMirrorWrapper } from '@/utils/codemirror';
 import { PARAMETER } from '@/utils/constants';
 
+import { refsNavigation } from './clickNavigation';
 import { NaturalLanguage, ReferenceTokens } from './parse';
 import { RefEntity } from './parse/parser.terms';
 import { refsHoverTooltip } from './tooltip';
@@ -65,6 +66,7 @@ interface RefsInputInputProps
   label?: string;
   onChange?: (newValue: string) => void;
   schema?: IRSForm;
+  onOpenEdit?: (cstID: ConstituentaID) => void;
   disabled?: boolean;
 
   initialValue?: string;
@@ -73,7 +75,23 @@ interface RefsInputInputProps
 }
 
 const RefsInput = forwardRef<ReactCodeMirrorRef, RefsInputInputProps>(
-  ({ id, label, disabled, schema, initialValue, value, resolved, onFocus, onBlur, onChange, ...restProps }, ref) => {
+  (
+    {
+      id, // prettier: split-lines
+      label,
+      disabled,
+      schema,
+      onOpenEdit,
+      initialValue,
+      value,
+      resolved,
+      onFocus,
+      onBlur,
+      onChange,
+      ...restProps
+    },
+    ref
+  ) => {
     const { darkMode, colors } = useConceptOptions();
 
     const [isFocused, setIsFocused] = useState(false);
@@ -114,9 +132,10 @@ const RefsInput = forwardRef<ReactCodeMirrorRef, RefsInputInputProps>(
         EditorView.lineWrapping,
         EditorView.contentAttributes.of({ spellcheck: 'true' }),
         NaturalLanguage,
-        ...(schema ? [refsHoverTooltip(schema, colors)] : [])
+        ...(!schema || !onOpenEdit ? [] : [refsNavigation(schema, onOpenEdit)]),
+        ...(schema ? [refsHoverTooltip(schema, colors, onOpenEdit !== undefined)] : [])
       ],
-      [schema, colors]
+      [schema, colors, onOpenEdit]
     );
 
     function handleChange(newValue: string) {
diff --git a/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts b/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts
new file mode 100644
index 00000000..3a3a4a14
--- /dev/null
+++ b/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts
@@ -0,0 +1,38 @@
+import { Extension } from '@codemirror/state';
+import { EditorView } from '@uiw/react-codemirror';
+
+import { ConstituentaID, IRSForm } from '@/models/rsform';
+import { findReferenceAt } from '@/utils/codemirror';
+
+const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
+  return EditorView.domEventHandlers({
+    click: (event: MouseEvent, view: EditorView) => {
+      if (!event.ctrlKey) {
+        return;
+      }
+
+      const pos = view.posAtCoords({ x: event.clientX, y: event.clientY });
+      if (!pos) {
+        return;
+      }
+
+      const parse = findReferenceAt(pos, view.state);
+      if (!parse || !('entity' in parse.ref)) {
+        return;
+      }
+
+      const cst = schema.cstByAlias.get(parse.ref.entity);
+      if (!cst) {
+        return;
+      }
+
+      event.preventDefault();
+      event.stopPropagation();
+      onOpenEdit(cst.id);
+    }
+  });
+};
+
+export function refsNavigation(schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void): Extension {
+  return [navigationProducer(schema, onOpenEdit)];
+}
diff --git a/rsconcept/frontend/src/components/RefsInput/tooltip.ts b/rsconcept/frontend/src/components/RefsInput/tooltip.ts
index bddca913..fa9cbc0f 100644
--- a/rsconcept/frontend/src/components/RefsInput/tooltip.ts
+++ b/rsconcept/frontend/src/components/RefsInput/tooltip.ts
@@ -2,65 +2,58 @@ import { syntaxTree } from '@codemirror/language';
 import { Extension } from '@codemirror/state';
 import { hoverTooltip } from '@codemirror/view';
 
-import { parseEntityReference, parseSyntacticReference } from '@/models/languageAPI';
+import { IEntityReference, ISyntacticReference } from '@/models/language';
 import { IRSForm } from '@/models/rsform';
 import { IColorTheme } from '@/styling/color';
 import {
   domTooltipEntityReference,
   domTooltipSyntacticReference,
   findContainedNodes,
-  findEnvelopingNodes
+  findReferenceAt
 } from '@/utils/codemirror';
 
-import { ReferenceTokens } from './parse';
-import { RefEntity, RefSyntactic } from './parse/parser.terms';
+import { RefEntity } from './parse/parser.terms';
 
-export const globalsHoverTooltip = (schema: IRSForm, colors: IColorTheme) => {
+export const tooltipProducer = (schema: IRSForm, colors: IColorTheme, canClick?: boolean) => {
   return hoverTooltip((view, pos) => {
-    const nodes = findEnvelopingNodes(pos, pos, syntaxTree(view.state), ReferenceTokens);
-    if (nodes.length !== 1) {
+    const parse = findReferenceAt(pos, view.state);
+    if (!parse) {
       return null;
     }
-    const start = nodes[0].from;
-    const end = nodes[0].to;
-    const text = view.state.doc.sliceString(start, end);
-    if (nodes[0].type.id === RefEntity) {
-      const ref = parseEntityReference(text);
-      const cst = schema.cstByAlias.get(ref.entity);
+
+    if ('entity' in parse.ref) {
+      const cst = schema.cstByAlias.get(parse.ref.entity);
       return {
-        pos: start,
-        end: end,
+        pos: parse.start,
+        end: parse.end,
         above: false,
-        create: () => domTooltipEntityReference(ref, cst, colors)
+        create: () => domTooltipEntityReference(parse.ref as IEntityReference, cst, colors, canClick)
       };
-    } else if (nodes[0].type.id === RefSyntactic) {
-      const ref = parseSyntacticReference(text);
+    } else {
       let masterText: string | undefined = undefined;
-      if (ref.offset > 0) {
-        const entities = findContainedNodes(end, view.state.doc.length, syntaxTree(view.state), [RefEntity]);
-        if (ref.offset <= entities.length) {
-          const master = entities[ref.offset - 1];
+      if (parse.ref.offset > 0) {
+        const entities = findContainedNodes(parse.end, view.state.doc.length, syntaxTree(view.state), [RefEntity]);
+        if (parse.ref.offset <= entities.length) {
+          const master = entities[parse.ref.offset - 1];
           masterText = view.state.doc.sliceString(master.from, master.to);
         }
       } else {
-        const entities = findContainedNodes(0, start, syntaxTree(view.state), [RefEntity]);
-        if (-ref.offset <= entities.length) {
-          const master = entities[-ref.offset - 1];
+        const entities = findContainedNodes(0, parse.start, syntaxTree(view.state), [RefEntity]);
+        if (-parse.ref.offset <= entities.length) {
+          const master = entities[-parse.ref.offset - 1];
           masterText = view.state.doc.sliceString(master.from, master.to);
         }
       }
       return {
-        pos: start,
-        end: end,
+        pos: parse.start,
+        end: parse.end,
         above: false,
-        create: () => domTooltipSyntacticReference(ref, masterText)
+        create: () => domTooltipSyntacticReference(parse.ref as ISyntacticReference, masterText, canClick)
       };
-    } else {
-      return null;
     }
   });
 };
 
-export function refsHoverTooltip(schema: IRSForm, colors: IColorTheme): Extension {
-  return [globalsHoverTooltip(schema, colors)];
+export function refsHoverTooltip(schema: IRSForm, colors: IColorTheme, canClick?: boolean): Extension {
+  return [tooltipProducer(schema, colors, canClick)];
 }
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
index 890b43d7..e42726cf 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx
@@ -24,7 +24,7 @@ interface TemplateTabProps {
 
 function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
   const { templates, retrieveTemplate } = useLibrary();
-  const [category, setCategory] = useState<IRSForm | undefined>(undefined);
+  const [templateSchema, setTemplateSchema] = useState<IRSForm | undefined>(undefined);
 
   const [filteredData, setFilteredData] = useState<IConstituenta[]>([]);
 
@@ -48,16 +48,16 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
   );
 
   const categorySelector = useMemo((): { value: number; label: string }[] => {
-    if (!category) {
+    if (!templateSchema) {
       return [];
     }
-    return category.items
+    return templateSchema.items
       .filter(cst => cst.cst_type === CATEGORY_CST_TYPE)
       .map(cst => ({
         value: cst.id,
         label: cst.term_raw
       }));
-  }, [category]);
+  }, [templateSchema]);
 
   useEffect(() => {
     if (templates.length > 0 && !state.templateID) {
@@ -67,22 +67,22 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
 
   useEffect(() => {
     if (!state.templateID) {
-      setCategory(undefined);
+      setTemplateSchema(undefined);
     } else {
-      retrieveTemplate(state.templateID, setCategory);
+      retrieveTemplate(state.templateID, setTemplateSchema);
     }
   }, [state.templateID, retrieveTemplate]);
 
   useEffect(() => {
-    if (!category) {
+    if (!templateSchema) {
       return;
     }
-    let data = category.items;
+    let data = templateSchema.items;
     if (state.filterCategory) {
-      data = applyFilterCategory(state.filterCategory, category);
+      data = applyFilterCategory(state.filterCategory, templateSchema);
     }
     setFilteredData(data);
-  }, [state.filterCategory, category]);
+  }, [state.filterCategory, templateSchema]);
 
   return (
     <AnimateFade>
@@ -93,14 +93,16 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
           className='flex-grow border-none'
           options={categorySelector}
           value={
-            state.filterCategory && category
+            state.filterCategory && templateSchema
               ? {
                   value: state.filterCategory.id,
                   label: state.filterCategory.term_raw
                 }
               : null
           }
-          onChange={data => partialUpdate({ filterCategory: data ? category?.cstByID.get(data?.value) : undefined })}
+          onChange={data =>
+            partialUpdate({ filterCategory: data ? templateSchema?.cstByID.get(data?.value) : undefined })
+          }
           isClearable
         />
         <SelectSingle
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 211c5b3b..6fa0d46f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -146,6 +146,7 @@ function FormConstituenta({
           maxHeight='8rem'
           placeholder='Обозначение, используемое в текстовых определениях'
           schema={schema}
+          onOpenEdit={onOpenEdit}
           value={term}
           initialValue={state?.term_raw ?? ''}
           resolved={state?.term_resolved ?? ''}
@@ -196,6 +197,7 @@ function FormConstituenta({
               minHeight='3.75rem'
               maxHeight='8rem'
               schema={schema}
+              onOpenEdit={onOpenEdit}
               value={textDefinition}
               initialValue={state?.definition_raw ?? ''}
               resolved={state?.definition_resolved ?? ''}
diff --git a/rsconcept/frontend/src/utils/codemirror.ts b/rsconcept/frontend/src/utils/codemirror.ts
index aa989914..b4d9736e 100644
--- a/rsconcept/frontend/src/utils/codemirror.ts
+++ b/rsconcept/frontend/src/utils/codemirror.ts
@@ -6,9 +6,11 @@ import { NodeType, Tree, TreeCursor } from '@lezer/common';
 import { EditorState, ReactCodeMirrorRef, SelectionRange } from '@uiw/react-codemirror';
 import clsx from 'clsx';
 
+import { ReferenceTokens } from '@/components/RefsInput/parse';
+import { RefEntity } from '@/components/RefsInput/parse/parser.terms';
 import { GlobalTokens } from '@/components/RSInput/rslang';
 import { IEntityReference, ISyntacticReference } from '@/models/language';
-import { parseGrammemes } from '@/models/languageAPI';
+import { parseEntityReference, parseGrammemes, parseSyntacticReference } from '@/models/languageAPI';
 import { IConstituenta } from '@/models/rsform';
 import { isBasicConcept } from '@/models/rsformAPI';
 
@@ -142,13 +144,30 @@ export function findAliasAt(pos: number, state: EditorState) {
   return { alias, start, end };
 }
 
+/**
+ * Retrieves reference from position in Editor.
+ */
+export function findReferenceAt(pos: number, state: EditorState) {
+  const nodes = findEnvelopingNodes(pos, pos, syntaxTree(state), ReferenceTokens);
+  if (nodes.length !== 1) {
+    return undefined;
+  }
+  const start = nodes[0].from;
+  const end = nodes[0].to;
+  const text = state.doc.sliceString(start, end);
+  if (nodes[0].type.id === RefEntity) {
+    return { ref: parseEntityReference(text), start, end };
+  } else {
+    return { ref: parseSyntacticReference(text), start, end };
+  }
+}
+
 /**
  * Create DOM tooltip for {@link Constituenta}.
  */
-export function domTooltipConstituenta(cst?: IConstituenta) {
+export function domTooltipConstituenta(cst?: IConstituenta, canClick?: boolean) {
   const dom = document.createElement('div');
   dom.className = clsx(
-    'z-modalTooltip',
     'max-h-[25rem] max-w-[25rem] min-w-[10rem]',
     'dense',
     'p-2',
@@ -206,10 +225,12 @@ export function domTooltipConstituenta(cst?: IConstituenta) {
       dom.appendChild(children);
     }
 
-    const clickTip = document.createElement('p');
-    clickTip.className = 'w-full text-center text-xs mt-2';
-    clickTip.innerText = 'Ctrl + клик для перехода';
-    dom.appendChild(clickTip);
+    if (canClick) {
+      const clickTip = document.createElement('p');
+      clickTip.className = 'w-full text-center text-xs mt-2';
+      clickTip.innerText = 'Ctrl + клик для перехода';
+      dom.appendChild(clickTip);
+    }
   }
   return { dom: dom };
 }
@@ -217,10 +238,14 @@ export function domTooltipConstituenta(cst?: IConstituenta) {
 /**
  * Create DOM tooltip for {@link IEntityReference}.
  */
-export function domTooltipEntityReference(ref: IEntityReference, cst: IConstituenta | undefined, colors: IColorTheme) {
+export function domTooltipEntityReference(
+  ref: IEntityReference,
+  cst: IConstituenta | undefined,
+  colors: IColorTheme,
+  canClick?: boolean
+) {
   const dom = document.createElement('div');
   dom.className = clsx(
-    'z-tooltip',
     'max-h-[25rem] max-w-[25rem] min-w-[10rem]',
     'dense',
     'p-2 flex flex-col',
@@ -258,16 +283,27 @@ export function domTooltipEntityReference(ref: IEntityReference, cst: IConstitue
     grams.appendChild(gram);
   });
   dom.appendChild(grams);
+
+  if (canClick) {
+    const clickTip = document.createElement('p');
+    clickTip.className = 'w-full text-center text-xs mt-2';
+    clickTip.innerHTML = 'Ctrl + клик для перехода</br>Ctrl + пробел для редактирования';
+    dom.appendChild(clickTip);
+  }
+
   return { dom: dom };
 }
 
 /**
  * Create DOM tooltip for {@link ISyntacticReference}.
  */
-export function domTooltipSyntacticReference(ref: ISyntacticReference, masterRef: string | undefined) {
+export function domTooltipSyntacticReference(
+  ref: ISyntacticReference,
+  masterRef: string | undefined,
+  canClick?: boolean
+) {
   const dom = document.createElement('div');
   dom.className = clsx(
-    'z-tooltip',
     'max-h-[25rem] max-w-[25rem] min-w-[10rem]',
     'dense',
     'p-2 flex flex-col',
@@ -293,6 +329,13 @@ export function domTooltipSyntacticReference(ref: ISyntacticReference, masterRef
   nominal.innerHTML = `<b>Начальная форма:</b> ${ref.nominal}`;
   dom.appendChild(nominal);
 
+  if (canClick) {
+    const clickTip = document.createElement('p');
+    clickTip.className = 'w-full text-center text-xs mt-2';
+    clickTip.innerHTML = 'Ctrl + пробел для редактирования';
+    dom.appendChild(clickTip);
+  }
+
   return { dom: dom };
 }
 

From 9e1c08910d9f2952dcdbf2a2452c74687253e669 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 19 Jun 2024 22:10:15 +0300
Subject: [PATCH 30/45] Add FolderTree UI

---
 rsconcept/frontend/src/components/Icons.tsx   |   5 +-
 .../src/components/select/PickSchema.tsx      |   5 +-
 .../frontend/src/context/LibraryContext.tsx   |  84 +++++++---
 .../frontend/src/context/RSFormContext.tsx    |   3 +-
 .../frontend/src/models/FolderTree.test.ts    |  47 ++++++
 rsconcept/frontend/src/models/FolderTree.ts   | 157 ++++++++++++++++++
 rsconcept/frontend/src/models/library.ts      |   4 +-
 .../frontend/src/models/miscellaneous.ts      |   7 +-
 .../pages/CreateItemPage/FormCreateItem.tsx   |   8 +-
 .../src/pages/LibraryPage/LibraryFolders.tsx  | 139 ++++++++++++++++
 .../src/pages/LibraryPage/LibraryPage.tsx     |  40 ++++-
 .../src/pages/LibraryPage/LibraryTable.tsx    |  60 +++++--
 .../src/pages/LibraryPage/SearchPanel.tsx     | 137 +++++++++------
 .../EditorRSFormCard/EditorLibraryItem.tsx    |   2 +-
 .../EditorRSFormCard/EditorRSFormCard.tsx     |   2 +-
 rsconcept/frontend/src/utils/constants.ts     |   3 +
 rsconcept/frontend/src/utils/labels.ts        |  15 ++
 17 files changed, 603 insertions(+), 115 deletions(-)
 create mode 100644 rsconcept/frontend/src/models/FolderTree.test.ts
 create mode 100644 rsconcept/frontend/src/models/FolderTree.ts
 create mode 100644 rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx

diff --git a/rsconcept/frontend/src/components/Icons.tsx b/rsconcept/frontend/src/components/Icons.tsx
index 623c0bb1..202423d4 100644
--- a/rsconcept/frontend/src/components/Icons.tsx
+++ b/rsconcept/frontend/src/components/Icons.tsx
@@ -31,7 +31,10 @@ export { RiMenuFoldFill   as IconMenuFold }       from 'react-icons/ri';
 export { RiMenuUnfoldFill as IconMenuUnfold }     from 'react-icons/ri';
 export { LuMoon           as IconDarkTheme }      from 'react-icons/lu';
 export { LuSun            as IconLightTheme }     from 'react-icons/lu';
-export { FaRegFolder      as IconFolder }         from 'react-icons/fa';
+export { LuFolderTree     as IconFolderTree }     from 'react-icons/lu';
+export { FaRegFolder      as IconFolder }         from 'react-icons/fa6';
+export { FaRegFolderOpen  as IconFolderOpened }   from 'react-icons/fa6';
+export { FaRegFolderClosed as IconFolderClosed }  from 'react-icons/fa6';
 export { LuLightbulb      as IconHelp }           from 'react-icons/lu';
 export { LuLightbulbOff   as IconHelpOff }        from 'react-icons/lu';
 export { RiPushpinFill    as IconPin }            from 'react-icons/ri';
diff --git a/rsconcept/frontend/src/components/select/PickSchema.tsx b/rsconcept/frontend/src/components/select/PickSchema.tsx
index 0d1cb27a..6117235d 100644
--- a/rsconcept/frontend/src/components/select/PickSchema.tsx
+++ b/rsconcept/frontend/src/components/select/PickSchema.tsx
@@ -5,7 +5,7 @@ import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/u
 import SearchBar from '@/components/ui/SearchBar';
 import { useLibrary } from '@/context/LibraryContext';
 import { useConceptOptions } from '@/context/OptionsContext';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
+import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library';
 import { ILibraryFilter } from '@/models/miscellaneous';
 
 import FlexColumn from '../ui/FlexColumn';
@@ -32,7 +32,8 @@ function PickSchema({ id, initialFilter = '', rows = 4, value, onSelectValue }:
 
   useLayoutEffect(() => {
     setFilter({
-      query: filterText
+      query: filterText,
+      type: LibraryItemType.RSFORM
     });
   }, [filterText]);
 
diff --git a/rsconcept/frontend/src/context/LibraryContext.tsx b/rsconcept/frontend/src/context/LibraryContext.tsx
index a93a4ce5..48e81743 100644
--- a/rsconcept/frontend/src/context/LibraryContext.tsx
+++ b/rsconcept/frontend/src/context/LibraryContext.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { createContext, useCallback, useContext, useEffect, useState } from 'react';
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
 import {
   DataCallback,
@@ -14,7 +14,8 @@ import {
   postRSFormFromFile
 } from '@/app/backendAPI';
 import { ErrorData } from '@/components/info/InfoError';
-import { ILibraryItem, LibraryItemID } from '@/models/library';
+import { FolderTree } from '@/models/FolderTree';
+import { ILibraryItem, LibraryItemID, LocationHead } from '@/models/library';
 import { ILibraryCreateData } from '@/models/library';
 import { matchLibraryItem, matchLibraryItemLocation } from '@/models/libraryAPI';
 import { ILibraryFilter } from '@/models/miscellaneous';
@@ -28,10 +29,17 @@ import { useConceptOptions } from './OptionsContext';
 interface ILibraryContext {
   items: ILibraryItem[];
   templates: ILibraryItem[];
+  folders: FolderTree;
+
   loading: boolean;
+  loadingError: ErrorData;
+  setLoadingError: (error: ErrorData) => void;
+
   processing: boolean;
-  error: ErrorData;
-  setError: (error: ErrorData) => void;
+  processingError: ErrorData;
+  setProcessingError: (error: ErrorData) => void;
+
+  reloadItems: (callback?: () => void) => void;
 
   applyFilter: (params: ILibraryFilter) => ILibraryItem[];
   retrieveTemplate: (templateID: LibraryItemID, callback: (schema: IRSForm) => void) => void;
@@ -64,15 +72,31 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
   const [templates, setTemplates] = useState<ILibraryItem[]>([]);
   const [loading, setLoading] = useState(false);
   const [processing, setProcessing] = useState(false);
-  const [error, setError] = useState<ErrorData>(undefined);
+  const [loadingError, setLoadingError] = useState<ErrorData>(undefined);
+  const [processingError, setProcessingError] = useState<ErrorData>(undefined);
   const [cachedTemplates, setCachedTemplates] = useState<IRSForm[]>([]);
 
+  const folders = useMemo(() => {
+    const result = new FolderTree(items.map(item => item.location));
+    result.addPath(LocationHead.USER, 0);
+    result.addPath(LocationHead.COMMON, 0);
+    result.addPath(LocationHead.LIBRARY, 0);
+    result.addPath(LocationHead.PROJECTS, 0);
+    return result;
+  }, [items]);
+
   const applyFilter = useCallback(
     (filter: ILibraryFilter) => {
       let result = items;
-      if (filter.head) {
+      if (!filter.folderMode && filter.head) {
         result = result.filter(item => item.location.startsWith(filter.head!));
       }
+      if (filter.folderMode && filter.folder) {
+        result = result.filter(item => item.location == filter.folder);
+      }
+      if (filter.type) {
+        result = result.filter(item => item.item_type === filter.type);
+      }
       if (filter.isVisible !== undefined) {
         result = result.filter(item => filter.isVisible === item.visible);
       }
@@ -85,12 +109,12 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
       if (filter.isEditor !== undefined) {
         result = result.filter(item => filter.isEditor == user?.editor.includes(item.id));
       }
+      if (!filter.folderMode && filter.path) {
+        result = result.filter(item => matchLibraryItemLocation(item, filter.path!));
+      }
       if (filter.query) {
         result = result.filter(item => matchLibraryItem(item, filter.query!));
       }
-      if (filter.path) {
-        result = result.filter(item => matchLibraryItemLocation(item, filter.path!));
-      }
       return result;
     },
     [items, user]
@@ -103,11 +127,11 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
         callback(cached);
         return;
       }
-      setError(undefined);
+      setProcessingError(undefined);
       getRSFormDetails(String(templateID), '', {
         showError: true,
         setLoading: setProcessing,
-        onError: setError,
+        onError: setProcessingError,
         onSuccess: data => {
           const schema = new RSFormLoader(data).produceRSForm();
           setCachedTemplates(prev => [...prev, schema]);
@@ -121,12 +145,12 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
   const reloadItems = useCallback(
     (callback?: () => void) => {
       setItems([]);
-      setError(undefined);
+      setLoadingError(undefined);
       if (user?.is_staff && adminMode) {
         getAdminLibrary({
           setLoading: setLoading,
           showError: true,
-          onError: setError,
+          onError: setLoadingError,
           onSuccess: newData => {
             setItems(newData);
             if (callback) callback();
@@ -136,7 +160,7 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
         getLibrary({
           setLoading: setLoading,
           showError: true,
-          onError: setError,
+          onError: setLoadingError,
           onSuccess: newData => {
             setItems(newData);
             if (callback) callback();
@@ -150,6 +174,8 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
   const reloadTemplates = useCallback(() => {
     setTemplates([]);
     getTemplates({
+      setLoading: setLoading,
+      onError: setLoadingError,
       showError: true,
       onSuccess: newData => setTemplates(newData)
     });
@@ -190,13 +216,13 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
           }
           if (callback) callback(newSchema);
         });
-      setError(undefined);
+      setProcessingError(undefined);
       if (data.file) {
         postRSFormFromFile({
           data: data,
           showError: true,
           setLoading: setProcessing,
-          onError: setError,
+          onError: setProcessingError,
           onSuccess: onSuccess
         });
       } else {
@@ -204,7 +230,7 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
           data: data,
           showError: true,
           setLoading: setProcessing,
-          onError: setError,
+          onError: setProcessingError,
           onSuccess: onSuccess
         });
       }
@@ -214,11 +240,11 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
 
   const destroyItem = useCallback(
     (target: LibraryItemID, callback?: () => void) => {
-      setError(undefined);
+      setProcessingError(undefined);
       deleteLibraryItem(String(target), {
         showError: true,
         setLoading: setProcessing,
-        onError: setError,
+        onError: setProcessingError,
         onSuccess: () =>
           reloadItems(() => {
             if (user && user.subscriptions.includes(target)) {
@@ -231,7 +257,7 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
           })
       });
     },
-    [setError, reloadItems, user]
+    [reloadItems, user]
   );
 
   const cloneItem = useCallback(
@@ -239,12 +265,12 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
       if (!user) {
         return;
       }
-      setError(undefined);
+      setProcessingError(undefined);
       postCloneLibraryItem(String(target), {
         data: data,
         showError: true,
         setLoading: setProcessing,
-        onError: setError,
+        onError: setProcessingError,
         onSuccess: newSchema =>
           reloadItems(() => {
             if (user && !user.subscriptions.includes(newSchema.id)) {
@@ -254,18 +280,26 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
           })
       });
     },
-    [reloadItems, setError, user]
+    [reloadItems, user]
   );
 
   return (
     <LibraryContext.Provider
       value={{
         items,
+        folders,
         templates,
+
         loading,
+        loadingError,
+        setLoadingError,
+
         processing,
-        error,
-        setError,
+        processingError,
+        setProcessingError,
+
+        reloadItems,
+
         applyFilter,
         createItem,
         cloneItem,
diff --git a/rsconcept/frontend/src/context/RSFormContext.tsx b/rsconcept/frontend/src/context/RSFormContext.tsx
index 981b071e..a54e2394 100644
--- a/rsconcept/frontend/src/context/RSFormContext.tsx
+++ b/rsconcept/frontend/src/context/RSFormContext.tsx
@@ -296,8 +296,7 @@ export const RSFormState = ({ itemID, versionID, children }: RSFormStateProps) =
         onError: setProcessingError,
         onSuccess: () => {
           schema.location = newLocation;
-          library.localUpdateItem(schema);
-          if (callback) callback();
+          library.reloadItems(callback);
         }
       });
     },
diff --git a/rsconcept/frontend/src/models/FolderTree.test.ts b/rsconcept/frontend/src/models/FolderTree.test.ts
new file mode 100644
index 00000000..122ad08b
--- /dev/null
+++ b/rsconcept/frontend/src/models/FolderTree.test.ts
@@ -0,0 +1,47 @@
+import { FolderTree } from './FolderTree';
+
+// TODO: test FolderNode and FolderTree exhaustively
+
+describe('Testing Tree construction', () => {
+  test('empty Tree should be empty', () => {
+    const tree = new FolderTree();
+    expect(tree.roots.size).toBe(0);
+  });
+
+  test('constructing from paths', () => {
+    const tree = new FolderTree(['/S', '/S/project1/123', '/U']);
+    expect(tree.roots.size).toBe(2);
+    expect(tree.roots.get('S')?.children.size).toBe(1);
+  });
+});
+
+describe('Testing Tree editing', () => {
+  test('add invalid path', () => {
+    const tree = new FolderTree();
+    expect(() => tree.addPath('invalid')).toThrow(Error);
+  });
+
+  test('add valid path', () => {
+    const tree = new FolderTree();
+    const node = tree.addPath('/S/test');
+    expect(node.getPath()).toBe('/S/test');
+    expect(node.filesInside).toBe(1);
+    expect(node.filesTotal).toBe(1);
+
+    expect(node.parent?.getPath()).toBe('/S');
+    expect(node.parent?.filesInside).toBe(0);
+    expect(node.parent?.filesTotal).toBe(1);
+  });
+
+  test('incrementing counter', () => {
+    const tree = new FolderTree();
+    const node1 = tree.addPath('/S/test', 0);
+    expect(node1.filesInside).toBe(0);
+    expect(node1.filesTotal).toBe(0);
+
+    const node2 = tree.addPath('/S/test', 2);
+    expect(node1).toBe(node2);
+    expect(node2.filesInside).toBe(2);
+    expect(node2.filesTotal).toBe(2);
+  });
+});
diff --git a/rsconcept/frontend/src/models/FolderTree.ts b/rsconcept/frontend/src/models/FolderTree.ts
new file mode 100644
index 00000000..ca9d6702
--- /dev/null
+++ b/rsconcept/frontend/src/models/FolderTree.ts
@@ -0,0 +1,157 @@
+/**
+ * Module: Folder tree data structure. Does not support deletions.
+ */
+
+/**
+ * Represents single node of a {@link FolderTree}.
+ */
+export class FolderNode {
+  rank: number = 0;
+  text: string;
+  children: Map<string, FolderNode>;
+  parent: FolderNode | undefined;
+
+  filesInside: number = 0;
+  filesTotal: number = 0;
+
+  constructor(text: string, parent?: FolderNode) {
+    this.text = text;
+    this.parent = parent;
+    this.children = new Map();
+    if (parent) {
+      this.rank = parent.rank + 1;
+    }
+  }
+
+  addChild(text: string): FolderNode {
+    const node = new FolderNode(text, this);
+    this.children.set(text, node);
+    return node;
+  }
+
+  hasPredecessor(target: FolderNode): boolean {
+    if (this.parent === target) {
+      return true;
+    } else if (!this.parent) {
+      return false;
+    }
+    let node = this.parent;
+    while (node.parent) {
+      if (node.parent === target) {
+        return true;
+      }
+      node = node.parent;
+    }
+    return false;
+  }
+
+  incrementFiles(count: number = 1): void {
+    this.filesInside = this.filesInside + count;
+    this.incrementTotal(count);
+  }
+
+  incrementTotal(count: number = 1): void {
+    this.filesTotal = this.filesTotal + count;
+    if (this.parent) {
+      this.parent.incrementTotal(count);
+    }
+  }
+
+  getPath(): string {
+    const suffix = this.text ? `/${this.text}` : '';
+    if (!this.parent) {
+      return suffix;
+    } else {
+      return this.parent.getPath() + suffix;
+    }
+  }
+}
+
+/**
+ * Represents a FolderTree.
+ *
+ */
+export class FolderTree {
+  roots: Map<string, FolderNode> = new Map();
+
+  constructor(arr?: string[]) {
+    arr?.forEach(path => this.addPath(path));
+  }
+
+  at(path: string): FolderNode | undefined {
+    let parse = ChopPathHead(path);
+    if (!this.roots.has(parse.head)) {
+      return undefined;
+    }
+    let node = this.roots.get(parse.head)!;
+    while (parse.tail !== '') {
+      parse = ChopPathHead(parse.tail);
+      if (!node.children.has(parse.head)) {
+        return undefined;
+      }
+      node = node.children.get(parse.head)!;
+    }
+    return node;
+  }
+
+  getTree(): FolderNode[] {
+    const result: FolderNode[] = [];
+    this.roots.forEach(root => this.visitNode(root, result));
+    return result;
+  }
+
+  private visitNode(target: FolderNode, result: FolderNode[]) {
+    result.push(target);
+    target.children.forEach(child => this.visitNode(child, result));
+  }
+
+  addPath(path: string, filesCount: number = 1): FolderNode {
+    let parse = ChopPathHead(path);
+    if (!parse.head) {
+      throw Error(`Invalid path ${path}`);
+    }
+    let node = this.roots.has(parse.head) ? this.roots.get(parse.head)! : this.addNode(parse.head);
+    while (parse.tail !== '') {
+      parse = ChopPathHead(parse.tail);
+      if (node.children.has(parse.head)) {
+        node = node.children.get(parse.head)!;
+      } else {
+        node = this.addNode(parse.head, node);
+      }
+    }
+    node.incrementFiles(filesCount);
+    return node;
+  }
+
+  private addNode(text: string, parent?: FolderNode): FolderNode {
+    if (parent === undefined) {
+      const newNode = new FolderNode(text);
+      this.roots.set(text, newNode);
+      return newNode;
+    } else {
+      return parent.addChild(text);
+    }
+  }
+}
+
+// ========= Internals =======
+function ChopPathHead(path: string) {
+  if (!path || path.at(0) !== '/') {
+    return {
+      head: '',
+      tail: ''
+    };
+  }
+  const slash = path.indexOf('/', 1);
+  if (slash === -1) {
+    return {
+      head: path.substring(1),
+      tail: ''
+    };
+  } else {
+    return {
+      head: path.substring(1, slash),
+      tail: path.substring(slash)
+    };
+  }
+}
diff --git a/rsconcept/frontend/src/models/library.ts b/rsconcept/frontend/src/models/library.ts
index e0f5ec4c..6ad1abd9 100644
--- a/rsconcept/frontend/src/models/library.ts
+++ b/rsconcept/frontend/src/models/library.ts
@@ -26,9 +26,9 @@ export enum AccessPolicy {
  */
 export enum LocationHead {
   USER = '/U',
-  LIBRARY = '/L',
   COMMON = '/S',
-  PROJECTS = '/P'
+  PROJECTS = '/P',
+  LIBRARY = '/L'
 }
 
 /**
diff --git a/rsconcept/frontend/src/models/miscellaneous.ts b/rsconcept/frontend/src/models/miscellaneous.ts
index 84a1d892..4ea90958 100644
--- a/rsconcept/frontend/src/models/miscellaneous.ts
+++ b/rsconcept/frontend/src/models/miscellaneous.ts
@@ -2,7 +2,7 @@
  * Module: Miscellaneous frontend model types. Future targets for refactoring aimed at extracting modules.
  */
 
-import { LocationHead } from './library';
+import { LibraryItemType, LocationHead } from './library';
 
 /**
  * Represents graph dependency mode.
@@ -141,10 +141,15 @@ export enum CstMatchMode {
  * Represents Library filter parameters.
  */
 export interface ILibraryFilter {
+  type?: LibraryItemType;
   query?: string;
+
   path?: string;
   head?: LocationHead;
 
+  folderMode?: boolean;
+  folder?: string;
+
   isVisible?: boolean;
   isOwned?: boolean;
   isSubscribed?: boolean;
diff --git a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx b/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
index b7aeec64..78eb2998 100644
--- a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
+++ b/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
@@ -30,7 +30,7 @@ import { information } from '@/utils/labels';
 function FormCreateItem() {
   const router = useConceptNavigation();
   const { user } = useAuth();
-  const { createItem, error, setError, processing } = useLibrary();
+  const { createItem, processingError, setProcessingError, processing } = useLibrary();
 
   const [itemType, setItemType] = useState(LibraryItemType.RSFORM);
   const [title, setTitle] = useState('');
@@ -50,8 +50,8 @@ function FormCreateItem() {
   const inputRef = useRef<HTMLInputElement | null>(null);
 
   useEffect(() => {
-    setError(undefined);
-  }, [title, alias, setError]);
+    setProcessingError(undefined);
+  }, [title, alias, setProcessingError]);
 
   function handleCancel() {
     if (router.canBack()) {
@@ -194,7 +194,7 @@ function FormCreateItem() {
         <SubmitButton text='Создать схему' loading={processing} className='min-w-[10rem]' disabled={!isValid} />
         <Button text='Отмена' className='min-w-[10rem]' onClick={() => handleCancel()} />
       </div>
-      {error ? <InfoError error={error} /> : null}
+      {processingError ? <InfoError error={processingError} /> : null}
     </form>
   );
 }
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
new file mode 100644
index 00000000..b9189b2c
--- /dev/null
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
@@ -0,0 +1,139 @@
+'use client';
+
+import clsx from 'clsx';
+import { AnimatePresence, motion } from 'framer-motion';
+import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
+
+import { IconFolder, IconFolderClosed, IconFolderOpened, IconFolderTree } from '@/components/Icons';
+import { CProps } from '@/components/props';
+import MiniButton from '@/components/ui/MiniButton';
+import { FolderNode, FolderTree } from '@/models/FolderTree';
+import { animateSideAppear, animateSideView } from '@/styling/animations';
+import { globals, prefixes } from '@/utils/constants';
+import { describeFolderNode, labelFolderNode } from '@/utils/labels';
+
+interface LibraryTableProps {
+  folders: FolderTree;
+  currentFolder: string;
+  setFolder: React.Dispatch<React.SetStateAction<string>>;
+  toggleFolderMode: () => void;
+}
+
+function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }: LibraryTableProps) {
+  const activeNode = useMemo(() => folders.at(currentFolder), [folders, currentFolder]);
+
+  const items = useMemo(() => folders.getTree(), [folders]);
+  const [folded, setFolded] = useState<FolderNode[]>([]);
+
+  useLayoutEffect(() => {
+    setFolded(items.filter(item => item !== activeNode && (!activeNode || !activeNode.hasPredecessor(item))));
+  }, [items, activeNode]);
+
+  const onFoldItem = useCallback(
+    (target: FolderNode, showChildren: boolean) => {
+      setFolded(prev =>
+        items.filter(item => {
+          if (item === target) {
+            return !showChildren;
+          }
+          if (!showChildren && item.hasPredecessor(target)) {
+            return true;
+          } else {
+            return prev.includes(item);
+          }
+        })
+      );
+    },
+    [items]
+  );
+
+  const handleSetValue = useCallback(
+    (event: CProps.EventMouse, target: FolderNode) => {
+      event.preventDefault();
+      event.stopPropagation();
+      setFolder(target.getPath());
+    },
+    [setFolder]
+  );
+
+  const handleClickFold = useCallback(
+    (event: CProps.EventMouse, target: FolderNode, showChildren: boolean) => {
+      event.preventDefault();
+      event.stopPropagation();
+      onFoldItem(target, showChildren);
+    },
+    [onFoldItem]
+  );
+
+  return (
+    <motion.div
+      className='flex flex-col text:xs sm:text-sm'
+      initial={{ ...animateSideView.initial }}
+      animate={{ ...animateSideView.animate }}
+      exit={{ ...animateSideView.exit }}
+    >
+      <div className='h-[2.08rem] flex justify-end pr-1'>
+        <MiniButton
+          icon={<IconFolderTree size='1.25rem' className='icon-green' />}
+          title='Режим: проводник'
+          onClick={toggleFolderMode}
+        />
+      </div>
+      <div
+        className={clsx(
+          'max-w-[10rem] sm:max-w-[15rem] min-w-[10rem] sm:min-w-[15rem]',
+          'flex flex-col',
+          'cc-scroll-y'
+        )}
+      >
+        <AnimatePresence initial={false}>
+          {items.map((item, index) =>
+            !item.parent || !folded.includes(item.parent) ? (
+              <motion.div
+                tabIndex={-1}
+                key={`${prefixes.folders_list}${index}`}
+                className={clsx(
+                  'min-h-[2.0825rem] sm:min-h-[2.3125rem]',
+                  'pr-3 flex items-center gap-2',
+                  'cc-scroll-row',
+                  'clr-hover',
+                  'cursor-pointer',
+                  activeNode === item && 'clr-selected'
+                )}
+                style={{ paddingLeft: `${(item.rank > 5 ? 5 : item.rank) * 0.5 + 0.5}rem` }}
+                data-tooltip-id={globals.tooltip}
+                data-tooltip-html={describeFolderNode(item)}
+                onClick={event => handleSetValue(event, item)}
+                initial={{ ...animateSideAppear.initial }}
+                animate={{ ...animateSideAppear.animate }}
+                exit={{ ...animateSideAppear.exit }}
+              >
+                {item.children.size > 0 ? (
+                  <MiniButton
+                    noPadding
+                    noHover
+                    icon={
+                      folded.includes(item) ? (
+                        <IconFolderClosed size='1rem' className='icon-primary' />
+                      ) : (
+                        <IconFolderOpened size='1rem' className='icon-green' />
+                      )
+                    }
+                    onClick={event => handleClickFold(event, item, folded.includes(item))}
+                  />
+                ) : (
+                  <div>
+                    <IconFolder size='1rem' />
+                  </div>
+                )}
+                <div className='self-center'>{labelFolderNode(item)}</div>
+              </motion.div>
+            ) : null
+          )}
+        </AnimatePresence>
+      </div>
+    </motion.div>
+  );
+}
+
+export default LibraryFolders;
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
index e79719e5..a1b82dbf 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { AnimatePresence } from 'framer-motion';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
 import DataLoader from '@/components/wrap/DataLoader';
@@ -11,6 +12,7 @@ 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';
 
@@ -23,6 +25,8 @@ function LibraryPage() {
   const [path, setPath] = useState('');
 
   const [head, setHead] = useLocalStorage<LocationHead | undefined>(storage.librarySearchHead, undefined);
+  const [folderMode, setFolderMode] = useLocalStorage<boolean>(storage.librarySearchFolderMode, true);
+  const [folder, setFolder] = useLocalStorage<string>(storage.librarySearchFolder, '');
   const [isVisible, setIsVisible] = useLocalStorage<boolean | undefined>(storage.librarySearchVisible, true);
   const [isSubscribed, setIsSubscribed] = useLocalStorage<boolean | undefined>(
     storage.librarySearchSubscribed,
@@ -39,9 +43,11 @@ function LibraryPage() {
       isEditor: user ? isEditor : undefined,
       isOwned: user ? isOwned : undefined,
       isSubscribed: user ? isSubscribed : undefined,
-      isVisible: user ? isVisible : true
+      isVisible: user ? isVisible : true,
+      folderMode: folderMode,
+      folder: folder
     }),
-    [head, path, query, isEditor, isOwned, isSubscribed, isVisible, user]
+    [head, path, query, isEditor, isOwned, isSubscribed, isVisible, user, folderMode, folder]
   );
 
   const hasCustomFilter = useMemo(
@@ -52,7 +58,8 @@ function LibraryPage() {
       filter.isEditor !== undefined ||
       filter.isOwned !== undefined ||
       filter.isSubscribed !== undefined ||
-      filter.isVisible !== true,
+      filter.isVisible !== true ||
+      !!filter.folder,
     [filter]
   );
 
@@ -64,6 +71,7 @@ function LibraryPage() {
   const toggleOwned = useCallback(() => setIsOwned(prev => toggleTristateFlag(prev)), [setIsOwned]);
   const toggleSubscribed = useCallback(() => setIsSubscribed(prev => toggleTristateFlag(prev)), [setIsSubscribed]);
   const toggleEditor = useCallback(() => setIsEditor(prev => toggleTristateFlag(prev)), [setIsEditor]);
+  const toggleFolderMode = useCallback(() => setFolderMode(prev => !prev), [setFolderMode]);
 
   const resetFilter = useCallback(() => {
     setQuery('');
@@ -73,23 +81,26 @@ function LibraryPage() {
     setIsSubscribed(undefined);
     setIsOwned(undefined);
     setIsEditor(undefined);
-  }, [setHead, setIsVisible, setIsSubscribed, setIsOwned, setIsEditor]);
+    setFolder('');
+  }, [setHead, setIsVisible, setIsSubscribed, setIsOwned, setIsEditor, setFolder]);
 
   const view = useMemo(
     () => (
       <LibraryTable
         resetQuery={resetFilter} // prettier: split lines
         items={items}
+        folderMode={folderMode}
+        toggleFolderMode={toggleFolderMode}
       />
     ),
-    [resetFilter, items]
+    [resetFilter, items, folderMode, toggleFolderMode]
   );
 
   return (
     <DataLoader
       id='library-page' // prettier: split lines
       isLoading={library.loading}
-      error={library.error}
+      error={library.loadingError}
       hasNoData={library.items.length === 0}
     >
       <SearchPanel
@@ -111,8 +122,23 @@ function LibraryPage() {
         isEditor={isEditor}
         toggleEditor={toggleEditor}
         resetFilter={resetFilter}
+        folderMode={folderMode}
+        toggleFolderMode={toggleFolderMode}
       />
-      {view}
+
+      <div className='flex'>
+        <AnimatePresence>
+          {folderMode ? (
+            <LibraryFolders
+              currentFolder={folder} // prettier: split-lines
+              setFolder={setFolder}
+              folders={library.folders}
+              toggleFolderMode={toggleFolderMode}
+            />
+          ) : null}
+        </AnimatePresence>
+        {view}
+      </div>
     </DataLoader>
   );
 }
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
index 838a8da0..1b45d5e6 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
@@ -1,6 +1,7 @@
 'use client';
 
-import { useLayoutEffect, useMemo, useState } from 'react';
+import clsx from 'clsx';
+import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 
 import { urls } from '@/app/urls';
@@ -9,6 +10,7 @@ import BadgeLocation from '@/components/info/BadgeLocation';
 import { CProps } from '@/components/props';
 import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '@/components/ui/DataTable';
 import FlexColumn from '@/components/ui/FlexColumn';
+import MiniButton from '@/components/ui/MiniButton';
 import TextURL from '@/components/ui/TextURL';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { useConceptOptions } from '@/context/OptionsContext';
@@ -21,11 +23,13 @@ import { storage } from '@/utils/constants';
 interface LibraryTableProps {
   items: ILibraryItem[];
   resetQuery: () => void;
+  folderMode: boolean;
+  toggleFolderMode: () => void;
 }
 
 const columnHelper = createColumnHelper<ILibraryItem>();
 
-function LibraryTable({ items, resetQuery }: LibraryTableProps) {
+function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: LibraryTableProps) {
   const router = useConceptNavigation();
   const intl = useIntl();
   const { getUserLabel } = useUsers();
@@ -50,22 +54,42 @@ function LibraryTable({ items, resetQuery }: LibraryTableProps) {
     });
   }, [windowSize]);
 
+  const handleToggleFolder = useCallback(
+    (event: CProps.EventMouse) => {
+      if (event.ctrlKey) {
+        event.preventDefault();
+        event.stopPropagation();
+        toggleFolderMode();
+      }
+    },
+    [toggleFolderMode]
+  );
+
   const columns = useMemo(
     () => [
-      columnHelper.accessor('location', {
-        id: 'location',
-        header: () => (
-          <div className='pl-2 max-h-[1rem] translate-y-[-0.125rem]'>
-            <IconFolder size='1.25rem' className='clr-text-controls' />
-          </div>
-        ),
-        size: 50,
-        minSize: 50,
-        maxSize: 50,
-        enableSorting: true,
-        cell: props => <BadgeLocation location={props.getValue()} />,
-        sortingFn: 'text'
-      }),
+      ...(folderMode
+        ? []
+        : [
+            columnHelper.accessor('location', {
+              id: 'location',
+              header: () => (
+                <MiniButton
+                  noHover
+                  noPadding
+                  className='pl-2 max-h-[1rem] translate-y-[-0.125rem]'
+                  onClick={handleToggleFolder}
+                  titleHtml='Ctrl + клик для переключения </br>в режим папок'
+                  icon={<IconFolder size='1.25rem' className='clr-text-controls' />}
+                />
+              ),
+              size: 50,
+              minSize: 50,
+              maxSize: 50,
+              enableSorting: true,
+              cell: props => <BadgeLocation location={props.getValue()} />,
+              sortingFn: 'text'
+            })
+          ]),
       columnHelper.accessor('alias', {
         id: 'alias',
         header: 'Шифр',
@@ -116,7 +140,7 @@ function LibraryTable({ items, resetQuery }: LibraryTableProps) {
         sortDescFirst: true
       })
     ],
-    [intl, getUserLabel, windowSize]
+    [intl, getUserLabel, windowSize, handleToggleFolder, folderMode]
   );
 
   const tableHeight = useMemo(() => calculateHeight('2.2rem'), [calculateHeight]);
@@ -139,7 +163,7 @@ function LibraryTable({ items, resetQuery }: LibraryTableProps) {
       columns={columns}
       data={items}
       headPosition='0'
-      className='text-xs sm:text-sm cc-scroll-y'
+      className={clsx('text-xs sm:text-sm cc-scroll-y', { 'border-l border-b': folderMode })}
       style={{ maxHeight: tableHeight }}
       noDataComponent={
         <FlexColumn className='p-3 items-center min-h-[6rem]'>
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index 70cc528d..9f9846e0 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -4,8 +4,9 @@ import clsx from 'clsx';
 import { useCallback } from 'react';
 
 import { LocationIcon, SubscribeIcon, VisibilityIcon } from '@/components/DomainIcons';
-import { IconEditor, IconFilterReset, IconFolder, IconOwner } from '@/components/Icons';
+import { IconEditor, IconFilterReset, IconFolder, IconFolderTree, IconOwner } from '@/components/Icons';
 import BadgeHelp from '@/components/info/BadgeHelp';
+import { CProps } from '@/components/props';
 import Dropdown from '@/components/ui/Dropdown';
 import DropdownButton from '@/components/ui/DropdownButton';
 import MiniButton from '@/components/ui/MiniButton';
@@ -32,6 +33,9 @@ interface SearchPanelProps {
   head: LocationHead | undefined;
   setHead: React.Dispatch<React.SetStateAction<LocationHead | undefined>>;
 
+  folderMode: boolean;
+  toggleFolderMode: () => void;
+
   isVisible: boolean | undefined;
   toggleVisible: () => void;
   isOwned: boolean | undefined;
@@ -55,6 +59,9 @@ function SearchPanel({
   head,
   setHead,
 
+  folderMode,
+  toggleFolderMode,
+
   isVisible,
   toggleVisible,
   isOwned,
@@ -76,6 +83,22 @@ function SearchPanel({
     [headMenu, setHead]
   );
 
+  const handleToggleFolder = useCallback(() => {
+    headMenu.hide();
+    toggleFolderMode();
+  }, [headMenu, toggleFolderMode]);
+
+  const handleFolderClick = useCallback(
+    (event: CProps.EventMouse) => {
+      if (event.ctrlKey) {
+        toggleFolderMode();
+      } else {
+        headMenu.toggle();
+      }
+    },
+    [headMenu, toggleFolderMode]
+  );
+
   return (
     <div
       className={clsx(
@@ -134,58 +157,70 @@ function SearchPanel({
           value={query}
           onChange={setQuery}
         />
+        {!folderMode ? (
+          <div ref={headMenu.ref} className='flex items-center h-full py-1 select-none'>
+            <SelectorButton
+              transparent
+              className='h-full rounded-lg'
+              titleHtml={(head ? describeLocationHead(head) : 'Выберите каталог') + '<br/>Ctrl + клик - Проводник'}
+              hideTitle={headMenu.isOpen}
+              icon={
+                head ? (
+                  <LocationIcon value={head} size='1.25rem' />
+                ) : (
+                  <IconFolder size='1.25rem' className='clr-text-controls' />
+                )
+              }
+              onClick={handleFolderClick}
+              text={head ?? '//'}
+            />
 
-        <div ref={headMenu.ref} className='flex items-center h-full py-1 select-none'>
-          <SelectorButton
-            transparent
-            className='h-full rounded-lg'
-            title={head ? describeLocationHead(head) : 'Выберите каталог'}
-            hideTitle={headMenu.isOpen}
-            icon={
-              head ? (
-                <LocationIcon value={head} size='1.25rem' />
-              ) : (
-                <IconFolder size='1.25rem' className='clr-text-controls' />
-              )
-            }
-            onClick={headMenu.toggle}
-            text={head ?? '//'}
+            <Dropdown isOpen={headMenu.isOpen} stretchLeft className='z-modalTooltip'>
+              <DropdownButton className='w-[10rem]' onClick={() => handleChange(undefined)}>
+                <div className='inline-flex items-center gap-3'>
+                  <IconFolder size='1rem' className='clr-text-controls' />
+                  <span>отображать все</span>
+                </div>
+              </DropdownButton>
+              {Object.values(LocationHead).map((head, index) => {
+                return (
+                  <DropdownButton
+                    className='w-[10rem]'
+                    key={`${prefixes.location_head_list}${index}`}
+                    onClick={() => handleChange(head)}
+                    title={describeLocationHead(head)}
+                  >
+                    <div className='inline-flex items-center gap-3'>
+                      <LocationIcon value={head} size='1rem' />
+                      {labelLocationHead(head)}
+                    </div>
+                  </DropdownButton>
+                );
+              })}
+              <DropdownButton
+                className='w-[10rem]'
+                title='переключение в режим выбора папок'
+                onClick={handleToggleFolder}
+              >
+                <div className='inline-flex items-center gap-3'>
+                  <IconFolderTree size='1rem' className='clr-text-controls' />
+                  <span>проводник...</span>
+                </div>
+              </DropdownButton>
+            </Dropdown>
+          </div>
+        ) : null}
+        {!folderMode ? (
+          <SearchBar
+            id='path_search'
+            placeholder='Путь'
+            noIcon
+            noBorder
+            className='min-w-[4.5rem] sm:min-w-[5rem]'
+            value={path}
+            onChange={setPath}
           />
-
-          <Dropdown isOpen={headMenu.isOpen} stretchLeft className='z-modalTooltip'>
-            <DropdownButton className='w-[10rem]' onClick={() => handleChange(undefined)}>
-              <div className='inline-flex items-center gap-3'>
-                <IconFolder size='1rem' className='clr-text-controls' />
-                <span>отображать все</span>
-              </div>
-            </DropdownButton>
-            {Object.values(LocationHead).map((head, index) => {
-              return (
-                <DropdownButton
-                  className='w-[10rem]'
-                  key={`${prefixes.location_head_list}${index}`}
-                  onClick={() => handleChange(head)}
-                  title={describeLocationHead(head)}
-                >
-                  <div className='inline-flex items-center gap-3'>
-                    <LocationIcon value={head} size='1rem' />
-                    {labelLocationHead(head)}
-                  </div>
-                </DropdownButton>
-              );
-            })}
-          </Dropdown>
-        </div>
-
-        <SearchBar
-          id='path_search'
-          placeholder='Путь'
-          noIcon
-          noBorder
-          className='min-w-[4.5rem] sm:min-w-[5rem]'
-          value={path}
-          onChange={setPath}
-        />
+        ) : null}
       </div>
       <Overlay position='top-[-0.75rem] right-0'>
         <BadgeHelp
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
index b32e8f5c..c0a1ceb9 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
@@ -59,7 +59,7 @@ function EditorLibraryItem({ item, isModified, controller }: EditorLibraryItemPr
           />
         </Overlay>
       ) : null}
-      <LabeledValue className='sm:mb-1 text-ellipsis' label='Путь' text={item?.location ?? ''} />
+      <LabeledValue className='max-w-[30rem] sm:mb-1 text-ellipsis' label='Путь' text={item?.location ?? ''} />
 
       {accessLevel >= UserLevel.OWNER ? (
         <Overlay position='top-[-0.5rem] left-[5.5rem] cc-icons'>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
index 64a337d3..479ec0d6 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
@@ -54,7 +54,7 @@ function EditorRSFormCard({ isModified, onDestroy, setIsModified }: EditorRSForm
         onKeyDown={handleInput}
         className={clsx('sm:w-fit sm:max-w-fit max-w-[32rem]', 'mx-auto ', 'flex flex-col sm:flex-row px-6')}
       >
-        <FlexColumn>
+        <FlexColumn className='flex-shrink'>
           <FormRSForm id={globals.library_item_editor} isModified={isModified} setIsModified={setIsModified} />
           <EditorLibraryItem item={schema} isModified={isModified} controller={controller} />
         </FlexColumn>
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index c8b01617..038531ca 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -94,6 +94,8 @@ export const storage = {
   rseditShowControls: 'rsedit.show_controls',
 
   librarySearchHead: 'library.search.head',
+  librarySearchFolderMode: 'library.search.folder_mode',
+  librarySearchFolder: 'library.search.folder',
   librarySearchVisible: 'library.search.visible',
   librarySearchOwned: 'library.search.owned',
   librarySearchSubscribed: 'library.search.subscribed',
@@ -144,6 +146,7 @@ export const prefixes = {
   policy_list: 'policy_list_',
   library_filters_list: 'library_filters_list_',
   location_head_list: 'location_head_list_',
+  folders_list: 'folders_list_',
   topic_list: 'topic_list_',
   topic_item: 'topic_item_',
   library_list: 'library_list_',
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index 9e1c5be1..7f5f267b 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -5,6 +5,7 @@
  * Description is a long description used in tooltips.
  */
 import { GraphLayout } from '@/components/ui/GraphUI';
+import { FolderNode } from '@/models/FolderTree';
 import { GramData, Grammeme, ReferenceType } from '@/models/language';
 import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
 import { CstMatchMode, DependencyMode, GraphColoring, GraphSizing, HelpTopic } from '@/models/miscellaneous';
@@ -820,6 +821,20 @@ export function describeAccessMode(mode: UserLevel): string {
   }
 }
 
+/**
+ * Retrieves label for {@link FolderNode}.
+ */
+export function labelFolderNode(node: FolderNode): string {
+  return node.text;
+}
+
+/**
+ * Retrieves description for {@link FolderNode}.
+ */
+export function describeFolderNode(node: FolderNode): string {
+  return `${node.filesInside} | ${node.filesTotal}`;
+}
+
 /**
  * Retrieves label for {@link AccessPolicy}.
  */

From 92f11ae211f4e7e6c0a372f4bdd0cdb96d998559 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 19 Jun 2024 22:32:15 +0300
Subject: [PATCH 31/45] Fix animations

---
 rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx | 4 ++--
 rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
index b9189b2c..3d09984a 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
@@ -23,7 +23,7 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
   const activeNode = useMemo(() => folders.at(currentFolder), [folders, currentFolder]);
 
   const items = useMemo(() => folders.getTree(), [folders]);
-  const [folded, setFolded] = useState<FolderNode[]>([]);
+  const [folded, setFolded] = useState<FolderNode[]>(items);
 
   useLayoutEffect(() => {
     setFolded(items.filter(item => item !== activeNode && (!activeNode || !activeNode.hasPredecessor(item))));
@@ -86,7 +86,7 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
           'cc-scroll-y'
         )}
       >
-        <AnimatePresence initial={false}>
+        <AnimatePresence>
           {items.map((item, index) =>
             !item.parent || !folded.includes(item.parent) ? (
               <motion.div
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
index a1b82dbf..0e167167 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx
@@ -127,7 +127,7 @@ function LibraryPage() {
       />
 
       <div className='flex'>
-        <AnimatePresence>
+        <AnimatePresence initial={false}>
           {folderMode ? (
             <LibraryFolders
               currentFolder={folder} // prettier: split-lines

From 09f72326870f62a98dca2454ad18dcde9bc36c06 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 11:07:29 +0300
Subject: [PATCH 32/45] Fix folder naming

---
 rsconcept/frontend/src/context/LibraryContext.tsx |  3 ++-
 rsconcept/frontend/src/models/FolderTree.ts       |  4 +++-
 rsconcept/frontend/src/utils/labels.ts            | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/rsconcept/frontend/src/context/LibraryContext.tsx b/rsconcept/frontend/src/context/LibraryContext.tsx
index 48e81743..16e2c11d 100644
--- a/rsconcept/frontend/src/context/LibraryContext.tsx
+++ b/rsconcept/frontend/src/context/LibraryContext.tsx
@@ -77,11 +77,12 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
   const [cachedTemplates, setCachedTemplates] = useState<IRSForm[]>([]);
 
   const folders = useMemo(() => {
-    const result = new FolderTree(items.map(item => item.location));
+    const result = new FolderTree();
     result.addPath(LocationHead.USER, 0);
     result.addPath(LocationHead.COMMON, 0);
     result.addPath(LocationHead.LIBRARY, 0);
     result.addPath(LocationHead.PROJECTS, 0);
+    items.forEach(item => result.addPath(item.location));
     return result;
   }, [items]);
 
diff --git a/rsconcept/frontend/src/models/FolderTree.ts b/rsconcept/frontend/src/models/FolderTree.ts
index ca9d6702..d60a7fe4 100644
--- a/rsconcept/frontend/src/models/FolderTree.ts
+++ b/rsconcept/frontend/src/models/FolderTree.ts
@@ -102,7 +102,9 @@ export class FolderTree {
 
   private visitNode(target: FolderNode, result: FolderNode[]) {
     result.push(target);
-    target.children.forEach(child => this.visitNode(child, result));
+    [...target.children.keys()]
+      .sort((a, b) => a.localeCompare(b))
+      .forEach(key => this.visitNode(target.children.get(key)!, result));
   }
 
   addPath(path: string, filesCount: number = 1): FolderNode {
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index 7f5f267b..ce766cf7 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -8,6 +8,7 @@ import { GraphLayout } from '@/components/ui/GraphUI';
 import { FolderNode } from '@/models/FolderTree';
 import { GramData, Grammeme, ReferenceType } from '@/models/language';
 import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
+import { validateLocation } from '@/models/libraryAPI';
 import { CstMatchMode, DependencyMode, GraphColoring, GraphSizing, HelpTopic } from '@/models/miscellaneous';
 import { CstClass, CstType, ExpressionStatus, IConstituenta, IRSForm } from '@/models/rsform';
 import {
@@ -271,10 +272,10 @@ export function describeCstSource(mode: DependencyMode): string {
 export function labelLocationHead(head: LocationHead): string {
   // prettier-ignore
   switch (head) {
-    case LocationHead.USER:      return 'личные (/U)';
-    case LocationHead.COMMON:    return 'общие (/S)';
-    case LocationHead.LIBRARY:   return 'примеры (/L)';
-    case LocationHead.PROJECTS:  return 'проекты (/P)';
+    case LocationHead.USER:      return '/U : личные';
+    case LocationHead.COMMON:    return '/S : общие';
+    case LocationHead.LIBRARY:   return '/L : примеры';
+    case LocationHead.PROJECTS:  return '/P : проекты';
   }
 }
 
@@ -825,7 +826,11 @@ export function describeAccessMode(mode: UserLevel): string {
  * Retrieves label for {@link FolderNode}.
  */
 export function labelFolderNode(node: FolderNode): string {
-  return node.text;
+  if (node.parent || !validateLocation('/' + node.text)) {
+    return node.text;
+  } else {
+    return labelLocationHead(('/' + node.text) as LocationHead);
+  }
 }
 
 /**

From c046ac300f525762fe371ec4b847b10abf42fddc Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 11:28:35 +0300
Subject: [PATCH 33/45] Update icons and help

---
 rsconcept/frontend/src/components/Icons.tsx   |  7 +++--
 .../src/pages/LibraryPage/LibraryFolders.tsx  | 26 +++++++++++++---
 .../pages/ManualsPage/items/HelpLibrary.tsx   | 31 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/rsconcept/frontend/src/components/Icons.tsx b/rsconcept/frontend/src/components/Icons.tsx
index 202423d4..d2ff8d31 100644
--- a/rsconcept/frontend/src/components/Icons.tsx
+++ b/rsconcept/frontend/src/components/Icons.tsx
@@ -32,9 +32,10 @@ export { RiMenuUnfoldFill as IconMenuUnfold }     from 'react-icons/ri';
 export { LuMoon           as IconDarkTheme }      from 'react-icons/lu';
 export { LuSun            as IconLightTheme }     from 'react-icons/lu';
 export { LuFolderTree     as IconFolderTree }     from 'react-icons/lu';
-export { FaRegFolder      as IconFolder }         from 'react-icons/fa6';
-export { FaRegFolderOpen  as IconFolderOpened }   from 'react-icons/fa6';
-export { FaRegFolderClosed as IconFolderClosed }  from 'react-icons/fa6';
+export { LuFolder         as IconFolder }         from 'react-icons/lu';
+export { LuFolderOpen     as IconFolderOpened }   from 'react-icons/lu';
+export { LuFolderClosed   as IconFolderClosed }   from 'react-icons/lu';
+export { LuFolderDot      as IconFolderEmpty }    from 'react-icons/lu';
 export { LuLightbulb      as IconHelp }           from 'react-icons/lu';
 export { LuLightbulbOff   as IconHelpOff }        from 'react-icons/lu';
 export { RiPushpinFill    as IconPin }            from 'react-icons/ri';
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
index 3d09984a..7536ead5 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
@@ -4,12 +4,14 @@ import clsx from 'clsx';
 import { AnimatePresence, motion } from 'framer-motion';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
-import { IconFolder, IconFolderClosed, IconFolderOpened, IconFolderTree } from '@/components/Icons';
+import { IconFolder, IconFolderClosed, IconFolderEmpty, IconFolderOpened, IconFolderTree } from '@/components/Icons';
+import BadgeHelp from '@/components/info/BadgeHelp';
 import { CProps } from '@/components/props';
 import MiniButton from '@/components/ui/MiniButton';
 import { FolderNode, FolderTree } from '@/models/FolderTree';
+import { HelpTopic } from '@/models/miscellaneous';
 import { animateSideAppear, animateSideView } from '@/styling/animations';
-import { globals, prefixes } from '@/utils/constants';
+import { globals, PARAMETER, prefixes } from '@/utils/constants';
 import { describeFolderNode, labelFolderNode } from '@/utils/labels';
 
 interface LibraryTableProps {
@@ -72,7 +74,13 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
       animate={{ ...animateSideView.animate }}
       exit={{ ...animateSideView.exit }}
     >
-      <div className='h-[2.08rem] flex justify-end pr-1'>
+      <div className='h-[2.08rem] flex justify-between items-center pr-1'>
+        <BadgeHelp
+          topic={HelpTopic.UI_LIBRARY}
+          className={clsx(PARAMETER.TOOLTIP_WIDTH, 'text-sm')}
+          offset={5}
+          place='right-start'
+        />
         <MiniButton
           icon={<IconFolderTree size='1.25rem' className='icon-green' />}
           title='Режим: проводник'
@@ -114,7 +122,11 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
                     noHover
                     icon={
                       folded.includes(item) ? (
-                        <IconFolderClosed size='1rem' className='icon-primary' />
+                        item.filesInside ? (
+                          <IconFolderClosed size='1rem' className='icon-primary' />
+                        ) : (
+                          <IconFolderEmpty size='1rem' className='icon-primary' />
+                        )
                       ) : (
                         <IconFolderOpened size='1rem' className='icon-green' />
                       )
@@ -123,7 +135,11 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
                   />
                 ) : (
                   <div>
-                    <IconFolder size='1rem' />
+                    {item.filesInside ? (
+                      <IconFolder size='1rem' className='clr-text-default' />
+                    ) : (
+                      <IconFolderEmpty size='1rem' className='clr-text-controls' />
+                    )}
                   </div>
                 )}
                 <div className='self-center'>{labelFolderNode(item)}</div>
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
index 3a4ea93c..6c4bfe80 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
@@ -1,4 +1,14 @@
-import { IconFolder, IconSearch, IconShow, IconSortAsc, IconSortDesc } from '@/components/Icons';
+import {
+  IconFolder,
+  IconFolderClosed,
+  IconFolderEmpty,
+  IconFolderOpened,
+  IconFolderTree,
+  IconSearch,
+  IconShow,
+  IconSortAsc,
+  IconSortDesc
+} from '@/components/Icons';
 
 function HelpLibrary() {
   return (
@@ -21,6 +31,25 @@ function HelpLibrary() {
       <li>
         <IconFolder size='1rem' className='inline-icon' /> фильтр по расположению
       </li>
+
+      <h2>Проводник</h2>
+      <li>клик по папке отображает справа файлы в ней</li>
+      <li>клик по иконке сворачивает/разворачивает вложенные</li>
+      <li>
+        <IconFolderTree size='1rem' className='inline-icon' /> скрыть / отобразить Проводник
+      </li>
+      <li>
+        <IconFolderEmpty size='1rem' className='inline-icon' /> папка без файлов
+      </li>
+      <li>
+        <IconFolder size='1rem' className='inline-icon' /> папка без вложенных
+      </li>
+      <li>
+        <IconFolderClosed size='1rem' className='inline-icon' /> папка с вложенными
+      </li>
+      <li>
+        <IconFolderOpened size='1rem' className='inline-icon icon-green' /> развернутая папка
+      </li>
     </div>
   );
 }

From 3cc5b5373782c184b2a3d2b3a57426def39a3cf6 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 11:50:37 +0300
Subject: [PATCH 34/45] Fix folder switch

---
 .../src/pages/LibraryPage/LibraryFolders.tsx     |  2 +-
 .../src/pages/LibraryPage/LibraryTable.tsx       | 16 +++++++---------
 .../src/pages/LibraryPage/SearchPanel.tsx        | 16 ++++++----------
 .../src/pages/ManualsPage/items/HelpLibrary.tsx  |  9 ++++++---
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
index 7536ead5..5ed6ca76 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
@@ -83,7 +83,7 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
         />
         <MiniButton
           icon={<IconFolderTree size='1.25rem' className='icon-green' />}
-          title='Режим: проводник'
+          title='Переключение в режим Поиск'
           onClick={toggleFolderMode}
         />
       </div>
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
index 1b45d5e6..88cfa3a8 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
@@ -5,7 +5,7 @@ import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 
 import { urls } from '@/app/urls';
-import { IconFolder } from '@/components/Icons';
+import { IconFolderTree } from '@/components/Icons';
 import BadgeLocation from '@/components/info/BadgeLocation';
 import { CProps } from '@/components/props';
 import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '@/components/ui/DataTable';
@@ -56,11 +56,9 @@ function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: Libra
 
   const handleToggleFolder = useCallback(
     (event: CProps.EventMouse) => {
-      if (event.ctrlKey) {
-        event.preventDefault();
-        event.stopPropagation();
-        toggleFolderMode();
-      }
+      event.preventDefault();
+      event.stopPropagation();
+      toggleFolderMode();
     },
     [toggleFolderMode]
   );
@@ -74,12 +72,12 @@ function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: Libra
               id: 'location',
               header: () => (
                 <MiniButton
-                  noHover
                   noPadding
+                  noHover
                   className='pl-2 max-h-[1rem] translate-y-[-0.125rem]'
                   onClick={handleToggleFolder}
-                  titleHtml='Ctrl + клик для переключения </br>в режим папок'
-                  icon={<IconFolder size='1.25rem' className='clr-text-controls' />}
+                  titleHtml='Переключение в режим Проводник'
+                  icon={<IconFolderTree size='1.25rem' className='clr-text-controls' />}
                 />
               ),
               size: 50,
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index 9f9846e0..9175f409 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -176,6 +176,12 @@ function SearchPanel({
             />
 
             <Dropdown isOpen={headMenu.isOpen} stretchLeft className='z-modalTooltip'>
+              <DropdownButton className='w-[10rem]' title='Переключение в режим Проводник' onClick={handleToggleFolder}>
+                <div className='inline-flex items-center gap-3'>
+                  <IconFolderTree size='1rem' className='clr-text-controls' />
+                  <span>проводник...</span>
+                </div>
+              </DropdownButton>
               <DropdownButton className='w-[10rem]' onClick={() => handleChange(undefined)}>
                 <div className='inline-flex items-center gap-3'>
                   <IconFolder size='1rem' className='clr-text-controls' />
@@ -197,16 +203,6 @@ function SearchPanel({
                   </DropdownButton>
                 );
               })}
-              <DropdownButton
-                className='w-[10rem]'
-                title='переключение в режим выбора папок'
-                onClick={handleToggleFolder}
-              >
-                <div className='inline-flex items-center gap-3'>
-                  <IconFolderTree size='1rem' className='clr-text-controls' />
-                  <span>проводник...</span>
-                </div>
-              </DropdownButton>
             </Dropdown>
           </div>
         ) : null}
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
index 6c4bfe80..37f2ddc7 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
@@ -36,16 +36,19 @@ function HelpLibrary() {
       <li>клик по папке отображает справа файлы в ней</li>
       <li>клик по иконке сворачивает/разворачивает вложенные</li>
       <li>
-        <IconFolderTree size='1rem' className='inline-icon' /> скрыть / отобразить Проводник
+        <IconFolderTree size='1rem' className='inline-icon' /> переключение между Проводник и Поиск
       </li>
       <li>
-        <IconFolderEmpty size='1rem' className='inline-icon' /> папка без файлов
+        <IconFolderEmpty size='1rem' className='inline-icon clr-text-default' /> папка без файлов
+      </li>
+      <li>
+        <IconFolderEmpty size='1rem' className='inline-icon' /> папка с вложенными без файлов
       </li>
       <li>
         <IconFolder size='1rem' className='inline-icon' /> папка без вложенных
       </li>
       <li>
-        <IconFolderClosed size='1rem' className='inline-icon' /> папка с вложенными
+        <IconFolderClosed size='1rem' className='inline-icon' /> папка с вложенными и файлами
       </li>
       <li>
         <IconFolderOpened size='1rem' className='inline-icon icon-green' /> развернутая папка

From 8adea52d4b148666d0767ce8b0217bfa6ea6c214 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 14:35:25 +0300
Subject: [PATCH 35/45] Fix centering when list is hidden

---
 .../pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 6fa0d46f..20662235 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -125,7 +125,7 @@ function FormConstituenta({
   }
 
   return (
-    <AnimateFade>
+    <AnimateFade className='mx-0 md:mx-auto'>
       <ControlsOverlay
         disabled={disabled}
         modified={isModified}

From 18a293e7d7d3500016725dda8adde9b190cda4e5 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 19:47:34 +0300
Subject: [PATCH 36/45] Improve side animation

---
 rsconcept/frontend/src/styling/animations.ts | 28 +++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/rsconcept/frontend/src/styling/animations.ts b/rsconcept/frontend/src/styling/animations.ts
index e6b141e6..6fcd1800 100644
--- a/rsconcept/frontend/src/styling/animations.ts
+++ b/rsconcept/frontend/src/styling/animations.ts
@@ -188,22 +188,32 @@ export const animateParseResults: Variants = {
 
 export const animateSideView = {
   initial: {
-    clipPath: 'inset(0% 100% 0% 0%)'
+    width: 0,
+    opacity: 0
   },
   animate: {
-    clipPath: 'inset(0% 0% 0% 0%)',
+    width: 'auto',
+    opacity: 1,
     transition: {
-      type: 'spring',
-      bounce: 0,
-      duration: 1
+      width: {
+        duration: 0.4
+      },
+      opacity: {
+        delay: 0.4,
+        duration: 0
+      }
     }
   },
   exit: {
-    clipPath: 'inset(0% 100% 0% 0%)',
+    width: 0,
+    opacity: 0,
     transition: {
-      type: 'spring',
-      bounce: 0,
-      duration: 1
+      width: {
+        duration: 0.4
+      },
+      opacity: {
+        duration: 0
+      }
     }
   }
 };

From 329599e672e2634d366258f8731e9cdf33c9ceb5 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 19:56:23 +0300
Subject: [PATCH 37/45] Fix initial animation

---
 .../pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
index f52321ab..285ea3e8 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
@@ -115,7 +115,7 @@ function EditorConstituenta({ activeCst, isModified, setIsModified, onOpenEdit }
           onRename={controller.renameCst}
           onOpenEdit={onOpenEdit}
         />
-        <AnimatePresence>
+        <AnimatePresence initial={false}>
           {showList ? (
             <ViewConstituents
               schema={controller.schema}

From c36b5dd500472438b59e7f6eb07749597d279905 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 21:11:40 +0300
Subject: [PATCH 38/45] Add path copy functionality

---
 .../src/pages/LibraryPage/LibraryFolders.tsx   | 18 +++++++++++++-----
 .../pages/ManualsPage/items/HelpLibrary.tsx    |  1 +
 rsconcept/frontend/src/utils/labels.ts         |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
index 5ed6ca76..52573f0b 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
@@ -3,6 +3,7 @@
 import clsx from 'clsx';
 import { AnimatePresence, motion } from 'framer-motion';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
+import { toast } from 'react-toastify';
 
 import { IconFolder, IconFolderClosed, IconFolderEmpty, IconFolderOpened, IconFolderTree } from '@/components/Icons';
 import BadgeHelp from '@/components/info/BadgeHelp';
@@ -12,7 +13,7 @@ import { FolderNode, FolderTree } from '@/models/FolderTree';
 import { HelpTopic } from '@/models/miscellaneous';
 import { animateSideAppear, animateSideView } from '@/styling/animations';
 import { globals, PARAMETER, prefixes } from '@/utils/constants';
-import { describeFolderNode, labelFolderNode } from '@/utils/labels';
+import { describeFolderNode, information, labelFolderNode } from '@/utils/labels';
 
 interface LibraryTableProps {
   folders: FolderTree;
@@ -49,11 +50,18 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
     [items]
   );
 
-  const handleSetValue = useCallback(
+  const handleClickFolder = useCallback(
     (event: CProps.EventMouse, target: FolderNode) => {
       event.preventDefault();
       event.stopPropagation();
-      setFolder(target.getPath());
+      if (event.ctrlKey) {
+        navigator.clipboard
+          .writeText(target.getPath())
+          .then(() => toast.success(information.pathReady))
+          .catch(console.error);
+      } else {
+        setFolder(target.getPath());
+      }
     },
     [setFolder]
   );
@@ -69,7 +77,7 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
 
   return (
     <motion.div
-      className='flex flex-col text:xs sm:text-sm'
+      className='flex flex-col select-none text:xs sm:text-sm'
       initial={{ ...animateSideView.initial }}
       animate={{ ...animateSideView.animate }}
       exit={{ ...animateSideView.exit }}
@@ -111,7 +119,7 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
                 style={{ paddingLeft: `${(item.rank > 5 ? 5 : item.rank) * 0.5 + 0.5}rem` }}
                 data-tooltip-id={globals.tooltip}
                 data-tooltip-html={describeFolderNode(item)}
-                onClick={event => handleSetValue(event, item)}
+                onClick={event => handleClickFolder(event, item)}
                 initial={{ ...animateSideAppear.initial }}
                 animate={{ ...animateSideAppear.animate }}
                 exit={{ ...animateSideAppear.exit }}
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
index 37f2ddc7..858a5c6f 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
@@ -34,6 +34,7 @@ function HelpLibrary() {
 
       <h2>Проводник</h2>
       <li>клик по папке отображает справа файлы в ней</li>
+      <li>Ctrl + клик по папке копирует путь в буфер обмена</li>
       <li>клик по иконке сворачивает/разворачивает вложенные</li>
       <li>
         <IconFolderTree size='1rem' className='inline-icon' /> переключение между Проводник и Поиск
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index ce766cf7..5a2b39b6 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -898,6 +898,7 @@ export const information = {
   subscribed: 'Отслеживание отключено',
   unsubscribed: 'Отслеживание выключено',
 
+  pathReady: 'Путь скопирован',
   substituteSingle: 'Отождествление завершено',
   reorderComplete: 'Упорядочение завершено',
   reindexComplete: 'Имена конституент обновлены',

From 6d3a1e926b619c3e8cddd025e46082dd9932ac98 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 21:35:51 +0300
Subject: [PATCH 39/45] Improve library help

---
 .../pages/ManualsPage/items/HelpLibrary.tsx    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
index 858a5c6f..dee3a364 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
@@ -1,4 +1,5 @@
 import {
+  IconFilterReset,
   IconFolder,
   IconFolderClosed,
   IconFolderEmpty,
@@ -16,8 +17,9 @@ function HelpLibrary() {
       <h1>Библиотека схем</h1>
       <p>В библиотеке собраны концептуальные схемы, эксплицированные в родоструктурном аппарате</p>
 
-      <h2>Интерфейс</h2>
+      <li>клик по строке - переход к редактированию схемы</li>
       <li>Ctrl + клик по строке откроет схему в новой вкладке</li>
+      <li>Фильтры атрибутов три позиции: да/нет/не применять</li>
       <li>
         <IconShow size='1rem' className='inline-icon' /> фильтры атрибутов применяются по клику
       </li>
@@ -31,14 +33,18 @@ function HelpLibrary() {
       <li>
         <IconFolder size='1rem' className='inline-icon' /> фильтр по расположению
       </li>
-
-      <h2>Проводник</h2>
-      <li>клик по папке отображает справа файлы в ней</li>
-      <li>Ctrl + клик по папке копирует путь в буфер обмена</li>
-      <li>клик по иконке сворачивает/разворачивает вложенные</li>
+      <li>
+        <IconFilterReset size='1rem' className='inline-icon' /> сбросить фильтры
+      </li>
       <li>
         <IconFolderTree size='1rem' className='inline-icon' /> переключение между Проводник и Поиск
       </li>
+
+      <h2>Режим: Проводник</h2>
+      <li>клик по папке отображает справа файлы в ней</li>
+      <li>Ctrl + клик по папке копирует путь в буфер обмена</li>
+      <li>клик по иконке сворачивает/разворачивает вложенные</li>
+      <li>при наведении: количество файлов в папке | в поддереве</li>
       <li>
         <IconFolderEmpty size='1rem' className='inline-icon clr-text-default' /> папка без файлов
       </li>

From a66f73ef6602ea7028fcae3cda8ba5af8ba72faf Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:06:35 +0300
Subject: [PATCH 40/45] Update LibraryFolders.tsx

---
 rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx | 6 ++----
 .../frontend/src/pages/ManualsPage/items/HelpLibrary.tsx    | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
index 52573f0b..269a758d 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
@@ -12,8 +12,8 @@ import MiniButton from '@/components/ui/MiniButton';
 import { FolderNode, FolderTree } from '@/models/FolderTree';
 import { HelpTopic } from '@/models/miscellaneous';
 import { animateSideAppear, animateSideView } from '@/styling/animations';
-import { globals, PARAMETER, prefixes } from '@/utils/constants';
-import { describeFolderNode, information, labelFolderNode } from '@/utils/labels';
+import { PARAMETER, prefixes } from '@/utils/constants';
+import { information, labelFolderNode } from '@/utils/labels';
 
 interface LibraryTableProps {
   folders: FolderTree;
@@ -117,8 +117,6 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
                   activeNode === item && 'clr-selected'
                 )}
                 style={{ paddingLeft: `${(item.rank > 5 ? 5 : item.rank) * 0.5 + 0.5}rem` }}
-                data-tooltip-id={globals.tooltip}
-                data-tooltip-html={describeFolderNode(item)}
                 onClick={event => handleClickFolder(event, item)}
                 initial={{ ...animateSideAppear.initial }}
                 animate={{ ...animateSideAppear.animate }}
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
index dee3a364..c95465fd 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx
@@ -44,7 +44,6 @@ function HelpLibrary() {
       <li>клик по папке отображает справа файлы в ней</li>
       <li>Ctrl + клик по папке копирует путь в буфер обмена</li>
       <li>клик по иконке сворачивает/разворачивает вложенные</li>
-      <li>при наведении: количество файлов в папке | в поддереве</li>
       <li>
         <IconFolderEmpty size='1rem' className='inline-icon clr-text-default' /> папка без файлов
       </li>

From fde030a1524ff3133e8a48fb3892cc9a6b2823ed Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:17:13 +0300
Subject: [PATCH 41/45] Remove redundant animation

---
 .../src/pages/LibraryPage/LibraryFolders.tsx  | 95 +++++++++----------
 1 file changed, 45 insertions(+), 50 deletions(-)

diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
index 269a758d..14d58be9 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import clsx from 'clsx';
-import { AnimatePresence, motion } from 'framer-motion';
+import { motion } from 'framer-motion';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { toast } from 'react-toastify';
 
@@ -11,7 +11,7 @@ import { CProps } from '@/components/props';
 import MiniButton from '@/components/ui/MiniButton';
 import { FolderNode, FolderTree } from '@/models/FolderTree';
 import { HelpTopic } from '@/models/miscellaneous';
-import { animateSideAppear, animateSideView } from '@/styling/animations';
+import { animateSideView } from '@/styling/animations';
 import { PARAMETER, prefixes } from '@/utils/constants';
 import { information, labelFolderNode } from '@/utils/labels';
 
@@ -102,57 +102,52 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
           'cc-scroll-y'
         )}
       >
-        <AnimatePresence>
-          {items.map((item, index) =>
-            !item.parent || !folded.includes(item.parent) ? (
-              <motion.div
-                tabIndex={-1}
-                key={`${prefixes.folders_list}${index}`}
-                className={clsx(
-                  'min-h-[2.0825rem] sm:min-h-[2.3125rem]',
-                  'pr-3 flex items-center gap-2',
-                  'cc-scroll-row',
-                  'clr-hover',
-                  'cursor-pointer',
-                  activeNode === item && 'clr-selected'
-                )}
-                style={{ paddingLeft: `${(item.rank > 5 ? 5 : item.rank) * 0.5 + 0.5}rem` }}
-                onClick={event => handleClickFolder(event, item)}
-                initial={{ ...animateSideAppear.initial }}
-                animate={{ ...animateSideAppear.animate }}
-                exit={{ ...animateSideAppear.exit }}
-              >
-                {item.children.size > 0 ? (
-                  <MiniButton
-                    noPadding
-                    noHover
-                    icon={
-                      folded.includes(item) ? (
-                        item.filesInside ? (
-                          <IconFolderClosed size='1rem' className='icon-primary' />
-                        ) : (
-                          <IconFolderEmpty size='1rem' className='icon-primary' />
-                        )
+        {items.map((item, index) =>
+          !item.parent || !folded.includes(item.parent) ? (
+            <div
+              tabIndex={-1}
+              key={`${prefixes.folders_list}${index}`}
+              className={clsx(
+                'min-h-[2.0825rem] sm:min-h-[2.3125rem]',
+                'pr-3 flex items-center gap-2',
+                'cc-scroll-row',
+                'clr-hover',
+                'cursor-pointer',
+                activeNode === item && 'clr-selected'
+              )}
+              style={{ paddingLeft: `${(item.rank > 5 ? 5 : item.rank) * 0.5 + 0.5}rem` }}
+              onClick={event => handleClickFolder(event, item)}
+            >
+              {item.children.size > 0 ? (
+                <MiniButton
+                  noPadding
+                  noHover
+                  icon={
+                    folded.includes(item) ? (
+                      item.filesInside ? (
+                        <IconFolderClosed size='1rem' className='icon-primary' />
                       ) : (
-                        <IconFolderOpened size='1rem' className='icon-green' />
+                        <IconFolderEmpty size='1rem' className='icon-primary' />
                       )
-                    }
-                    onClick={event => handleClickFold(event, item, folded.includes(item))}
-                  />
-                ) : (
-                  <div>
-                    {item.filesInside ? (
-                      <IconFolder size='1rem' className='clr-text-default' />
                     ) : (
-                      <IconFolderEmpty size='1rem' className='clr-text-controls' />
-                    )}
-                  </div>
-                )}
-                <div className='self-center'>{labelFolderNode(item)}</div>
-              </motion.div>
-            ) : null
-          )}
-        </AnimatePresence>
+                      <IconFolderOpened size='1rem' className='icon-green' />
+                    )
+                  }
+                  onClick={event => handleClickFold(event, item, folded.includes(item))}
+                />
+              ) : (
+                <div>
+                  {item.filesInside ? (
+                    <IconFolder size='1rem' className='clr-text-default' />
+                  ) : (
+                    <IconFolderEmpty size='1rem' className='clr-text-controls' />
+                  )}
+                </div>
+              )}
+              <div className='self-center'>{labelFolderNode(item)}</div>
+            </div>
+          ) : null
+        )}
       </div>
     </motion.div>
   );

From 4f59ad2b8a39992821d64667b073a89f671f5563 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 21 Jun 2024 11:17:50 +0300
Subject: [PATCH 42/45] Minor UI fixes

---
 .../src/app/Navigation/ToggleNavigationButton.tsx |  5 +++--
 .../src/components/RSInput/clickNavigation.ts     |  2 +-
 .../src/components/RefsInput/clickNavigation.ts   |  2 +-
 .../src/pages/LibraryPage/LibraryFolders.tsx      |  2 +-
 .../src/pages/LibraryPage/SearchPanel.tsx         | 15 ++-------------
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx b/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx
index 556b1acb..ce564c40 100644
--- a/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx
+++ b/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx
@@ -14,8 +14,9 @@ function ToggleNavigationButton() {
       tabIndex={-1}
       className={clsx(
         'absolute top-0 right-0 z-navigation flex items-center justify-center',
-        'clr-btn-nav',
-        'select-none'
+        'clr-hover',
+        'select-none',
+        'min-h-[2rem]'
       )}
       onClick={toggleNoNavigation}
       initial={false}
diff --git a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts b/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
index 9e26ac92..8379a783 100644
--- a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
+++ b/rsconcept/frontend/src/components/RSInput/clickNavigation.ts
@@ -7,7 +7,7 @@ import { findAliasAt } from '@/utils/codemirror';
 const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
   return EditorView.domEventHandlers({
     click: (event: MouseEvent, view: EditorView) => {
-      if (!event.ctrlKey) {
+      if (!event.ctrlKey && !event.metaKey) {
         return;
       }
 
diff --git a/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts b/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts
index 3a3a4a14..48cbad4b 100644
--- a/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts
+++ b/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts
@@ -7,7 +7,7 @@ import { findReferenceAt } from '@/utils/codemirror';
 const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
   return EditorView.domEventHandlers({
     click: (event: MouseEvent, view: EditorView) => {
-      if (!event.ctrlKey) {
+      if (!event.ctrlKey && !event.metaKey) {
         return;
       }
 
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
index 14d58be9..05a407d0 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx
@@ -54,7 +54,7 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }:
     (event: CProps.EventMouse, target: FolderNode) => {
       event.preventDefault();
       event.stopPropagation();
-      if (event.ctrlKey) {
+      if (event.ctrlKey || event.metaKey) {
         navigator.clipboard
           .writeText(target.getPath())
           .then(() => toast.success(information.pathReady))
diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index 9175f409..89810182 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -5,19 +5,16 @@ import { useCallback } from 'react';
 
 import { LocationIcon, SubscribeIcon, VisibilityIcon } from '@/components/DomainIcons';
 import { IconEditor, IconFilterReset, IconFolder, IconFolderTree, IconOwner } from '@/components/Icons';
-import BadgeHelp from '@/components/info/BadgeHelp';
 import { CProps } from '@/components/props';
 import Dropdown from '@/components/ui/Dropdown';
 import DropdownButton from '@/components/ui/DropdownButton';
 import MiniButton from '@/components/ui/MiniButton';
-import Overlay from '@/components/ui/Overlay';
 import SearchBar from '@/components/ui/SearchBar';
 import SelectorButton from '@/components/ui/SelectorButton';
 import { useAuth } from '@/context/AuthContext';
 import useDropdown from '@/hooks/useDropdown';
 import { LocationHead } from '@/models/library';
-import { HelpTopic } from '@/models/miscellaneous';
-import { PARAMETER, prefixes } from '@/utils/constants';
+import { prefixes } from '@/utils/constants';
 import { describeLocationHead, labelLocationHead } from '@/utils/labels';
 import { tripleToggleColor } from '@/utils/utils';
 
@@ -90,7 +87,7 @@ function SearchPanel({
 
   const handleFolderClick = useCallback(
     (event: CProps.EventMouse) => {
-      if (event.ctrlKey) {
+      if (event.ctrlKey || event.metaKey) {
         toggleFolderMode();
       } else {
         headMenu.toggle();
@@ -218,14 +215,6 @@ function SearchPanel({
           />
         ) : null}
       </div>
-      <Overlay position='top-[-0.75rem] right-0'>
-        <BadgeHelp
-          topic={HelpTopic.UI_LIBRARY}
-          className={clsx(PARAMETER.TOOLTIP_WIDTH, 'text-sm')}
-          offset={5}
-          place='right-start'
-        />
-      </Overlay>
     </div>
   );
 }

From fa8e38b2ad30e9c9539ea9fe633534397a321134 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 21 Jun 2024 17:14:14 +0300
Subject: [PATCH 43/45] Remove redundant cursor overrides

---
 rsconcept/frontend/src/components/select/SelectAccessPolicy.tsx | 2 +-
 rsconcept/frontend/src/components/select/SelectItemType.tsx     | 2 +-
 rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx          | 1 -
 .../src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx     | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/rsconcept/frontend/src/components/select/SelectAccessPolicy.tsx b/rsconcept/frontend/src/components/select/SelectAccessPolicy.tsx
index 635cc4f6..d3bba2f9 100644
--- a/rsconcept/frontend/src/components/select/SelectAccessPolicy.tsx
+++ b/rsconcept/frontend/src/components/select/SelectAccessPolicy.tsx
@@ -37,7 +37,7 @@ function SelectAccessPolicy({ value, disabled, stretchLeft, onChange }: SelectAc
       <MiniButton
         title={`Доступ: ${labelAccessPolicy(value)}`}
         hideTitle={menu.isOpen}
-        className='h-full disabled:cursor-auto'
+        className='h-full'
         icon={<PolicyIcon value={value} size='1.25rem' />}
         onClick={menu.toggle}
         disabled={disabled}
diff --git a/rsconcept/frontend/src/components/select/SelectItemType.tsx b/rsconcept/frontend/src/components/select/SelectItemType.tsx
index 35d4f466..d0e13d03 100644
--- a/rsconcept/frontend/src/components/select/SelectItemType.tsx
+++ b/rsconcept/frontend/src/components/select/SelectItemType.tsx
@@ -38,7 +38,7 @@ function SelectItemType({ value, disabled, stretchLeft, onChange }: SelectItemTy
         transparent
         title={describeLibraryItemType(value)}
         hideTitle={menu.isOpen}
-        className='h-full py-1 px-2 disabled:cursor-auto rounded-lg'
+        className='h-full px-2 py-1 rounded-lg'
         icon={<ItemTypeIcon value={value} size='1.25rem' />}
         text={labelLibraryItemType(value)}
         onClick={menu.toggle}
diff --git a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
index bc78f010..6e8bb711 100644
--- a/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCloneLibraryItem.tsx
@@ -101,7 +101,6 @@ function DlgCloneLibraryItem({ hideWindow, base, initialLocation, selected, tota
             />
 
             <MiniButton
-              className='disabled:cursor-auto'
               title={visible ? 'Библиотека: отображать' : 'Библиотека: скрывать'}
               icon={<VisibilityIcon value={visible} />}
               onClick={() => setVisible(prev => !prev)}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx
index 034eaab6..79ab54a6 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/AccessToolbar.tsx
@@ -39,7 +39,6 @@ function AccessToolbar({ visible, toggleVisible, readOnly, toggleReadOnly, contr
         />
 
         <MiniButton
-          className='disabled:cursor-auto'
           title={visible ? 'Библиотека: отображать' : 'Библиотека: скрывать'}
           icon={<VisibilityIcon value={visible} />}
           onClick={toggleVisible}
@@ -47,7 +46,6 @@ function AccessToolbar({ visible, toggleVisible, readOnly, toggleReadOnly, contr
         />
 
         <MiniButton
-          className='disabled:cursor-auto'
           title={readOnly ? 'Изменение: запрещено' : 'Изменение: разрешено'}
           icon={
             readOnly ? (

From 100abf082da565299b4a50fd0de3df97caa473ae Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 21 Jun 2024 19:27:36 +0300
Subject: [PATCH 44/45] Minor UI refactoring

---
 .../components/select/PickConstituenta.tsx    |  6 ++--
 .../select/PickMultiConstituenta.tsx          |  6 ++--
 .../src/components/select/PickSchema.tsx      |  2 +-
 .../components/select/PickSubstitutions.tsx   |  5 +--
 .../components/select/SelectLocationHead.tsx  |  2 +-
 .../frontend/src/components/ui/FlexColumn.tsx |  4 +--
 .../frontend/src/components/ui/NoData.tsx     | 13 ++++++++
 .../frontend/src/components/ui/TextURL.tsx    |  4 +--
 .../DlgConstituentaTemplate/ArgumentsTab.tsx  |  3 +-
 .../DlgEditWordForms/WordFormsTable.tsx       |  5 +--
 .../src/pages/LibraryPage/LibraryTable.tsx    |  2 +-
 .../EditorConstituenta/FormConstituenta.tsx   |  2 +-
 .../EditorRSFormCard/EditorLibraryItem.tsx    | 33 ++++++++++++++-----
 .../pages/RSFormPage/EditorRSList/RSTable.tsx | 11 ++++---
 .../RSFormPage/EditorTermGraph/ViewHidden.tsx |  7 ++--
 .../ViewConstituents/ConstituentsTable.tsx    |  6 ++--
 .../UserProfilePage/ViewSubscriptions.tsx     |  3 +-
 rsconcept/frontend/src/utils/labels.ts        |  4 ++-
 18 files changed, 76 insertions(+), 42 deletions(-)
 create mode 100644 rsconcept/frontend/src/components/ui/NoData.tsx

diff --git a/rsconcept/frontend/src/components/select/PickConstituenta.tsx b/rsconcept/frontend/src/components/select/PickConstituenta.tsx
index fce1d5be..5f656280 100644
--- a/rsconcept/frontend/src/components/select/PickConstituenta.tsx
+++ b/rsconcept/frontend/src/components/select/PickConstituenta.tsx
@@ -12,7 +12,7 @@ import { prefixes } from '@/utils/constants';
 import { describeConstituenta } from '@/utils/labels';
 
 import BadgeConstituenta from '../info/BadgeConstituenta';
-import FlexColumn from '../ui/FlexColumn';
+import NoData from '../ui/NoData';
 
 interface PickConstituentaProps {
   id?: string;
@@ -106,10 +106,10 @@ function PickConstituenta({
         columns={columns}
         conditionalRowStyles={conditionalRowStyles}
         noDataComponent={
-          <FlexColumn className='p-3 items-center min-h-[6rem]'>
+          <NoData className='min-h-[6rem]'>
             <p>Список конституент пуст</p>
             <p>Измените параметры фильтра</p>
-          </FlexColumn>
+          </NoData>
         }
         onRowClicked={onSelectValue}
       />
diff --git a/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx b/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx
index e9f679df..ab1e216f 100644
--- a/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx
+++ b/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx
@@ -10,7 +10,7 @@ import { isBasicConcept } from '@/models/rsformAPI';
 import { describeConstituenta } from '@/utils/labels';
 
 import BadgeConstituenta from '../info/BadgeConstituenta';
-import FlexColumn from '../ui/FlexColumn';
+import NoData from '../ui/NoData';
 import GraphSelectionToolbar from './GraphSelectionToolbar';
 
 interface PickMultiConstituentaProps {
@@ -103,9 +103,9 @@ function PickMultiConstituenta({ id, schema, prefixID, rows, selected, setSelect
         rowSelection={rowSelection}
         onRowSelectionChange={handleRowSelection}
         noDataComponent={
-          <FlexColumn className='items-center p-3'>
+          <NoData>
             <p>Список пуст</p>
-          </FlexColumn>
+          </NoData>
         }
       />
     </div>
diff --git a/rsconcept/frontend/src/components/select/PickSchema.tsx b/rsconcept/frontend/src/components/select/PickSchema.tsx
index 6117235d..a7f8b897 100644
--- a/rsconcept/frontend/src/components/select/PickSchema.tsx
+++ b/rsconcept/frontend/src/components/select/PickSchema.tsx
@@ -104,7 +104,7 @@ function PickSchema({ id, initialFilter = '', rows = 4, value, onSelectValue }:
         columns={columns}
         conditionalRowStyles={conditionalRowStyles}
         noDataComponent={
-          <FlexColumn className='p-3 items-center min-h-[6rem]'>
+          <FlexColumn className='dense p-3 items-center min-h-[6rem]'>
             <p>Список схем пуст</p>
             <p>Измените параметры фильтра</p>
           </FlexColumn>
diff --git a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx b/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
index c6fdcba1..c66a73af 100644
--- a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
+++ b/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
@@ -23,6 +23,7 @@ import {
   IconRemove,
   IconReplace
 } from '../Icons';
+import NoData from '../ui/NoData';
 
 interface PickSubstitutionsProps {
   prefixID: string;
@@ -259,10 +260,10 @@ function PickSubstitutions({
         columns={columns}
         headPosition='0'
         noDataComponent={
-          <span className='p-2 text-center min-h-[2rem]'>
+          <NoData className='min-h-[2rem]'>
             <p>Список пуст</p>
             <p>Добавьте отождествление</p>
-          </span>
+          </NoData>
         }
       />
     </div>
diff --git a/rsconcept/frontend/src/components/select/SelectLocationHead.tsx b/rsconcept/frontend/src/components/select/SelectLocationHead.tsx
index bc6038c4..b8d415d0 100644
--- a/rsconcept/frontend/src/components/select/SelectLocationHead.tsx
+++ b/rsconcept/frontend/src/components/select/SelectLocationHead.tsx
@@ -14,7 +14,7 @@ import DropdownButton from '../ui/DropdownButton';
 
 interface SelectLocationHeadProps {
   value: LocationHead;
-  onChange: (value: LocationHead) => void;
+  onChange: (newValue: LocationHead) => void;
   excluded?: LocationHead[];
 }
 
diff --git a/rsconcept/frontend/src/components/ui/FlexColumn.tsx b/rsconcept/frontend/src/components/ui/FlexColumn.tsx
index dd822a2e..c5782130 100644
--- a/rsconcept/frontend/src/components/ui/FlexColumn.tsx
+++ b/rsconcept/frontend/src/components/ui/FlexColumn.tsx
@@ -2,9 +2,7 @@ import clsx from 'clsx';
 
 import { CProps } from '../props';
 
-export interface FlexColumnProps extends CProps.Div {}
-
-function FlexColumn({ className, children, ...restProps }: FlexColumnProps) {
+function FlexColumn({ className, children, ...restProps }: CProps.Div) {
   return (
     <div className={clsx('cc-column', className)} {...restProps}>
       {children}
diff --git a/rsconcept/frontend/src/components/ui/NoData.tsx b/rsconcept/frontend/src/components/ui/NoData.tsx
new file mode 100644
index 00000000..9b69ab37
--- /dev/null
+++ b/rsconcept/frontend/src/components/ui/NoData.tsx
@@ -0,0 +1,13 @@
+import clsx from 'clsx';
+
+import { CProps } from '../props';
+
+function NoData({ className, children, ...restProps }: CProps.Div) {
+  return (
+    <div className={clsx('p-3 flex flex-col items-center text-center select-none w-full', className)} {...restProps}>
+      {children}
+    </div>
+  );
+}
+
+export default NoData;
diff --git a/rsconcept/frontend/src/components/ui/TextURL.tsx b/rsconcept/frontend/src/components/ui/TextURL.tsx
index 3c9ffcb3..09d617d3 100644
--- a/rsconcept/frontend/src/components/ui/TextURL.tsx
+++ b/rsconcept/frontend/src/components/ui/TextURL.tsx
@@ -18,9 +18,9 @@ function TextURL({ text, href, title, color = 'clr-text-url', onClick }: TextURL
     );
   } else if (onClick) {
     return (
-      <span tabIndex={-1} className={design} onClick={onClick}>
+      <button type='button' tabIndex={-1} className={design} onClick={onClick}>
         {text}
-      </span>
+      </button>
     );
   } else {
     return null;
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
index 4c83957d..4790146d 100644
--- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx
@@ -9,6 +9,7 @@ import RSInput from '@/components/RSInput';
 import PickConstituenta from '@/components/select/PickConstituenta';
 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 { IConstituenta, IRSForm } from '@/models/rsform';
@@ -160,7 +161,7 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) {
         data={state.arguments}
         columns={columns}
         conditionalRowStyles={conditionalRowStyles}
-        noDataComponent={<p className={clsx('min-h-[3.6rem]', 'p-2', 'text-center')}>Аргументы отсутствуют</p>}
+        noDataComponent={<NoData className='min-h-[3.6rem]'>Аргументы отсутствуют</NoData>}
         onRowClicked={handleSelectArgument}
       />
 
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
index c1109937..8bc65c0b 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/WordFormsTable.tsx
@@ -7,6 +7,7 @@ import { IconRemove } from '@/components/Icons';
 import BadgeWordForm from '@/components/info/BadgeWordForm';
 import DataTable, { createColumnHelper } from '@/components/ui/DataTable';
 import MiniButton from '@/components/ui/MiniButton';
+import NoData from '@/components/ui/NoData';
 import { IWordForm } from '@/models/language';
 
 interface WordFormsTableProps {
@@ -78,10 +79,10 @@ function WordFormsTable({ forms, setForms, onFormSelect }: WordFormsTableProps)
       columns={columns}
       headPosition='0'
       noDataComponent={
-        <span className='p-2 text-center min-h-[2rem]'>
+        <NoData className='min-h-[2rem]'>
           <p>Список пуст</p>
           <p>Добавьте словоформу</p>
-        </span>
+        </NoData>
       }
       onRowClicked={onFormSelect}
     />
diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
index 88cfa3a8..e8155336 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx
@@ -164,7 +164,7 @@ function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: Libra
       className={clsx('text-xs sm:text-sm cc-scroll-y', { 'border-l border-b': folderMode })}
       style={{ maxHeight: tableHeight }}
       noDataComponent={
-        <FlexColumn className='p-3 items-center min-h-[6rem]'>
+        <FlexColumn className='dense p-3 items-center min-h-[6rem]'>
           <p>Список схем пуст</p>
           <p className='flex gap-6'>
             <TextURL text='Создать схему' href='/library/create' />
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
index 20662235..80bfbc90 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@@ -221,8 +221,8 @@ function FormConstituenta({
             <button
               key='cst_disable_comment'
               id='cst_disable_comment'
-              tabIndex={-1}
               type='button'
+              tabIndex={-1}
               className='self-start cc-label clr-text-url hover:underline'
               onClick={() => setForceComment(true)}
             >
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
index c0a1ceb9..97d26b97 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx
@@ -13,6 +13,7 @@ import useDropdown from '@/hooks/useDropdown';
 import { ILibraryItemData, ILibraryItemEditor } from '@/models/library';
 import { UserID, UserLevel } from '@/models/user';
 import { prefixes } from '@/utils/constants';
+import { prompts } from '@/utils/labels';
 
 import LabeledValue from '../../../components/ui/LabeledValue';
 
@@ -34,11 +35,7 @@ function EditorLibraryItem({ item, isModified, controller }: EditorLibraryItemPr
       if (newValue === item?.owner) {
         return;
       }
-      if (
-        !window.confirm(
-          'Вы уверены, что хотите изменить владельца? Вы потеряете право управления данной схемой. Данное действие отменить нельзя'
-        )
-      ) {
+      if (!window.confirm(prompts.ownerChange)) {
         return;
       }
       controller.setOwner(newValue);
@@ -59,7 +56,11 @@ function EditorLibraryItem({ item, isModified, controller }: EditorLibraryItemPr
           />
         </Overlay>
       ) : null}
-      <LabeledValue className='max-w-[30rem] sm:mb-1 text-ellipsis' label='Путь' text={item?.location ?? ''} />
+      <LabeledValue
+        className='max-w-[30rem] sm:mb-1 text-ellipsis' //
+        label='Путь'
+        text={item?.location ?? ''}
+      />
 
       {accessLevel >= UserLevel.OWNER ? (
         <Overlay position='top-[-0.5rem] left-[5.5rem] cc-icons'>
@@ -82,7 +83,11 @@ function EditorLibraryItem({ item, isModified, controller }: EditorLibraryItemPr
           </div>
         </Overlay>
       ) : null}
-      <LabeledValue className='sm:mb-1' label='Владелец' text={getUserLabel(item?.owner ?? null)} />
+      <LabeledValue
+        className='sm:mb-1' //
+        label='Владелец'
+        text={getUserLabel(item?.owner ?? null)}
+      />
 
       {accessLevel >= UserLevel.OWNER ? (
         <Overlay position='top-[-0.5rem] left-[5.5rem] cc-icons'>
@@ -97,12 +102,22 @@ function EditorLibraryItem({ item, isModified, controller }: EditorLibraryItemPr
           </div>
         </Overlay>
       ) : null}
-      <LabeledValue id='editor_stats' className='sm:mb-1' label='Редакторы' text={item?.editors.length ?? 0} />
+      <LabeledValue
+        id='editor_stats' //
+        className='sm:mb-1'
+        label='Редакторы'
+        text={item?.editors.length ?? 0}
+      />
       <Tooltip anchorSelect='#editor_stats' layer='z-modalTooltip'>
         <InfoUsers items={item?.editors ?? []} prefix={prefixes.user_editors} />
       </Tooltip>
 
-      <LabeledValue id='sub_stats' className='sm:mb-1' label='Отслеживают' text={item?.subscribers.length ?? 0} />
+      <LabeledValue
+        id='sub_stats' //
+        className='sm:mb-1'
+        label='Отслеживают'
+        text={item?.subscribers.length ?? 0}
+      />
       <Tooltip anchorSelect='#sub_stats' layer='z-modalTooltip'>
         <InfoUsers items={item?.subscribers ?? []} prefix={prefixes.user_subs} />
       </Tooltip>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
index 991bec09..d67c106f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSList/RSTable.tsx
@@ -6,7 +6,8 @@ import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import BadgeConstituenta from '@/components/info/BadgeConstituenta';
 import { CProps } from '@/components/props';
 import DataTable, { createColumnHelper, RowSelectionState, VisibilityState } from '@/components/ui/DataTable';
-import FlexColumn from '@/components/ui/FlexColumn';
+import NoData from '@/components/ui/NoData';
+import TextURL from '@/components/ui/TextURL';
 import { useConceptOptions } from '@/context/OptionsContext';
 import useWindowSize from '@/hooks/useWindowSize';
 import { ConstituentaID, IConstituenta } from '@/models/rsform';
@@ -135,12 +136,12 @@ function RSTable({ items, maxHeight, enableSelection, selected, setSelected, onE
       rowSelection={selected}
       onRowSelectionChange={setSelected}
       noDataComponent={
-        <FlexColumn className='items-center p-3'>
+        <NoData>
           <p>Список пуст</p>
-          <p className='cursor-pointer clr-text-primary hover:underline' onClick={() => onCreateNew()}>
-            Создать новую конституенту
+          <p>
+            <TextURL text='Создать конституенту...' onClick={onCreateNew} />
           </p>
-        </FlexColumn>
+        </NoData>
       }
     />
   );
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
index bb142b29..c3dd5cd0 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
@@ -98,10 +98,11 @@ function ViewHidden({ items, selected, toggleSelection, setFocus, schema, colori
           const id = `${prefixes.cst_hidden_list}${cst.alias}`;
           return (
             <div key={`wrap-${id}`}>
-              <div
+              <button
+                type='button'
                 key={id}
                 id={id}
-                className='min-w-[3rem] rounded-md text-center cursor-pointer select-none'
+                className='min-w-[3rem] rounded-md text-center select-none'
                 style={{
                   backgroundColor: colorBgGraphNode(cst, adjustedColoring, colors),
                   ...(localSelected.includes(cstID) ? { outlineWidth: '2px', outlineStyle: 'solid' } : {})
@@ -110,7 +111,7 @@ function ViewHidden({ items, selected, toggleSelection, setFocus, schema, colori
                 onDoubleClick={() => onEdit(cstID)}
               >
                 {cst.alias}
-              </div>
+              </button>
               <ConstituentaTooltip data={cst} anchor={`#${id}`} />
             </div>
           );
diff --git a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
index 606a6ce5..cb357f1f 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsTable.tsx
@@ -1,10 +1,10 @@
 'use client';
 
-import clsx from 'clsx';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
 import BadgeConstituenta from '@/components/info/BadgeConstituenta';
 import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '@/components/ui/DataTable';
+import NoData from '@/components/ui/NoData';
 import { useConceptOptions } from '@/context/OptionsContext';
 import useWindowSize from '@/hooks/useWindowSize';
 import { ConstituentaID, IConstituenta } from '@/models/rsform';
@@ -155,10 +155,10 @@ function ConstituentsTable({ items, activeCst, onOpenEdit, maxHeight, denseThres
       columnVisibility={columnVisibility}
       onColumnVisibilityChange={setColumnVisibility}
       noDataComponent={
-        <div className={clsx('min-h-[5rem]', 'p-3', 'text-center', 'select-none')}>
+        <NoData className='min-h-[5rem]'>
           <p>Список конституент пуст</p>
           <p>Измените параметры фильтра</p>
-        </div>
+        </NoData>
       }
       onRowClicked={handleRowClicked}
     />
diff --git a/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx b/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx
index fcb2b0ca..33c20da7 100644
--- a/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx
+++ b/rsconcept/frontend/src/pages/UserProfilePage/ViewSubscriptions.tsx
@@ -6,6 +6,7 @@ import { useIntl } from 'react-intl';
 
 import { urls } from '@/app/urls';
 import DataTable, { createColumnHelper } from '@/components/ui/DataTable';
+import NoData from '@/components/ui/NoData';
 import { useConceptNavigation } from '@/context/NavigationContext';
 import { ILibraryItem } from '@/models/library';
 import { animateSideView } from '@/styling/animations';
@@ -74,7 +75,7 @@ function ViewSubscriptions({ items }: ViewSubscriptionsProps) {
           id: 'time_update',
           desc: true
         }}
-        noDataComponent={<div className='h-[10rem]'>Отслеживаемые схемы отсутствуют</div>}
+        noDataComponent={<NoData className='h-[10rem]'>Отслеживаемые схемы отсутствуют</NoData>}
         onRowClicked={openRSForm}
       />
     </motion.div>
diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts
index 5a2b39b6..0a189366 100644
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@@ -942,7 +942,9 @@ export const prompts = {
   promptUnsaved: 'Присутствуют несохраненные изменения. Продолжить без их учета?',
   deleteLibraryItem: 'Вы уверены, что хотите удалить данную схему?',
   generateWordforms: 'Данное действие приведет к перезаписи словоформ при совпадении граммем. Продолжить?',
-  restoreArchive: 'При восстановлении архивной версии актуальная схему будет заменена. Продолжить?'
+  restoreArchive: 'При восстановлении архивной версии актуальная схему будет заменена. Продолжить?',
+  ownerChange:
+    'Вы уверены, что хотите изменить владельца? Вы потеряете право управления данной схемой. Данное действие отменить нельзя'
 };
 
 // ============== INTERNAL LABELS FOR DEVELOPERS TEXT ================

From fcbe2f7909bd672fd44ce991e71eb09ded5825ba Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 21 Jun 2024 19:34:16 +0300
Subject: [PATCH 45/45] Implementing SelectLocation pt1

---
 .../src/components/select/SelectLocation.tsx  | 42 +++++++++++++++++++
 .../pages/CreateItemPage/FormCreateItem.tsx   | 16 +++++--
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 rsconcept/frontend/src/components/select/SelectLocation.tsx

diff --git a/rsconcept/frontend/src/components/select/SelectLocation.tsx b/rsconcept/frontend/src/components/select/SelectLocation.tsx
new file mode 100644
index 00000000..43cbcd66
--- /dev/null
+++ b/rsconcept/frontend/src/components/select/SelectLocation.tsx
@@ -0,0 +1,42 @@
+'use client';
+
+import { useCallback } from 'react';
+
+import useDropdown from '@/hooks/useDropdown';
+import { FolderTree } from '@/models/FolderTree';
+
+import { IconFolderTree } from '../Icons';
+import MiniButton from '../ui/MiniButton';
+
+interface SelectLocationProps {
+  value: string;
+  onChange: (newValue: string) => void;
+
+  folderTree: FolderTree;
+}
+
+function SelectLocation({ value, onChange, folderTree }: SelectLocationProps) {
+  const menu = useDropdown();
+
+  const handleChange = useCallback(
+    (newValue: string) => {
+      console.log(folderTree.roots.size);
+      console.log(value);
+      menu.hide();
+      onChange(newValue);
+    },
+    [menu, onChange, value, folderTree]
+  );
+
+  return (
+    <div ref={menu.ref} className='h-full text-right'>
+      <MiniButton
+        title='Проводник...'
+        icon={<IconFolderTree size='1.25rem' className='icon-green' />}
+        onClick={() => handleChange('/U/test')}
+      />
+    </div>
+  );
+}
+
+export default SelectLocation;
diff --git a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx b/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
index 78eb2998..b5ab8e23 100644
--- a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
+++ b/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import clsx from 'clsx';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { toast } from 'react-toastify';
 
 import { urls } from '@/app/urls';
@@ -10,6 +10,7 @@ import { IconDownload } from '@/components/Icons';
 import InfoError from '@/components/info/InfoError';
 import SelectAccessPolicy from '@/components/select/SelectAccessPolicy';
 import SelectItemType from '@/components/select/SelectItemType';
+import SelectLocation from '@/components/select/SelectLocation';
 import SelectLocationHead from '@/components/select/SelectLocationHead';
 import Button from '@/components/ui/Button';
 import Label from '@/components/ui/Label';
@@ -30,7 +31,7 @@ import { information } from '@/utils/labels';
 function FormCreateItem() {
   const router = useConceptNavigation();
   const { user } = useAuth();
-  const { createItem, processingError, setProcessingError, processing } = useLibrary();
+  const { createItem, processingError, setProcessingError, processing, folders } = useLibrary();
 
   const [itemType, setItemType] = useState(LibraryItemType.RSFORM);
   const [title, setTitle] = useState('');
@@ -98,6 +99,11 @@ function FormCreateItem() {
     }
   }
 
+  const handleSelectLocation = useCallback((newValue: string) => {
+    setHead(newValue.substring(0, 2) as LocationHead);
+    setBody(newValue.length > 3 ? newValue.substring(3) : '');
+  }, []);
+
   return (
     <form className={clsx('cc-column', 'min-w-[30rem] max-w-[30rem] mx-auto', 'px-6 py-3')} onSubmit={handleSubmit}>
       <h1>
@@ -154,7 +160,6 @@ function FormCreateItem() {
           <div className='ml-auto cc-icons'>
             <SelectAccessPolicy value={policy} onChange={setPolicy} />
             <MiniButton
-              className='disabled:cursor-auto'
               title={visible ? 'Библиотека: отображать' : 'Библиотека: скрывать'}
               icon={<VisibilityIcon value={visible} />}
               onClick={() => setVisible(prev => !prev)}
@@ -180,6 +185,11 @@ function FormCreateItem() {
             excluded={!user?.is_staff ? [LocationHead.LIBRARY] : []}
           />
         </div>
+        {user?.is_staff ? (
+          <div className='self-start mt-[-0.25rem] ml-[-1.5rem]'>
+            <SelectLocation folderTree={folders} value={location} onChange={handleSelectLocation} />
+          </div>
+        ) : null}
         <TextArea
           id='dlg_cst_body'
           label='Путь'