rsconcept/frontend/src/components/Icons.tsx

@@ -31,10 +31,7 @@ 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 { LuFolderTree     as IconFolderTree }     from 'react-icons/lu';
+export { FaRegFolder      as IconFolder }         from 'react-icons/fa';
-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';

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' : cursor }, // 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
@@ -92,7 +92,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
             { tag: tags.brace, color: colors.fgPurple, fontWeight: '600' } // braces (curly brackets)
           ]
         }),
-      [disabled, colors, darkMode, schema, cursor]
+      [disabled, colors, darkMode, schema]
     );
 
     const editorExtensions = useMemo(
@@ -101,7 +101,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
         RSLanguage,
         ccBracketMatching(darkMode),
         ...(!schema || !onOpenEdit ? [] : [rsNavigation(schema, onOpenEdit)]),
-        ...(noTooltip || !schema ? [] : [rsHoverTooltip(schema, onOpenEdit !== undefined)])
+        ...(noTooltip || !schema ? [] : [rsHoverTooltip(schema)])
       ],
       [darkMode, schema, noTooltip, onOpenEdit]
     );

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 navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
+const globalsNavigation = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => {
   return EditorView.domEventHandlers({
     click: (event: MouseEvent, view: EditorView) => {
       if (!event.ctrlKey) {
@@ -34,5 +34,5 @@ const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID)
 };
 
 export function rsNavigation(schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void): Extension {
-  return [navigationProducer(schema, onOpenEdit)];
+  return [globalsNavigation(schema, onOpenEdit)];
 }

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 tooltipProducer = (schema: IRSForm, canClick?: boolean) => {
+const globalsHoverTooltip = (schema: IRSForm) => {
   return hoverTooltip((view, pos) => {
     const { alias, start, end } = findAliasAt(pos, view.state);
     if (!alias) {
@@ -16,11 +16,11 @@ const tooltipProducer = (schema: IRSForm, canClick?: boolean) => {
       pos: start,
       end: end,
       above: false,
-      create: () => domTooltipConstituenta(cst, canClick)
+      create: () => domTooltipConstituenta(cst)
     };
   });
 };
 
-export function rsHoverTooltip(schema: IRSForm, canClick?: boolean): Extension {
+export function rsHoverTooltip(schema: IRSForm): Extension {
-  return [tooltipProducer(schema, canClick)];
+  return [globalsHoverTooltip(schema)];
 }

rsconcept/frontend/src/components/RefsInput/RefsInput.tsx

@@ -13,11 +13,10 @@ import Label from '@/components/ui/Label';
 import { useConceptOptions } from '@/context/OptionsContext';
 import DlgEditReference from '@/dialogs/DlgEditReference';
 import { ReferenceType } from '@/models/language';
-import { ConstituentaID, IRSForm } from '@/models/rsform';
+import { 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';
@@ -66,7 +65,6 @@ interface RefsInputInputProps
   label?: string;
   onChange?: (newValue: string) => void;
   schema?: IRSForm;
-  onOpenEdit?: (cstID: ConstituentaID) => void;
   disabled?: boolean;
 
   initialValue?: string;
@@ -75,23 +73,7 @@ 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);
@@ -132,10 +114,9 @@ const RefsInput = forwardRef<ReactCodeMirrorRef, RefsInputInputProps>(
         EditorView.lineWrapping,
         EditorView.contentAttributes.of({ spellcheck: 'true' }),
         NaturalLanguage,
-        ...(!schema || !onOpenEdit ? [] : [refsNavigation(schema, onOpenEdit)]),
+        ...(schema ? [refsHoverTooltip(schema, colors)] : [])
-        ...(schema ? [refsHoverTooltip(schema, colors, onOpenEdit !== undefined)] : [])
       ],
-      [schema, colors, onOpenEdit]
+      [schema, colors]
     );
 
     function handleChange(newValue: string) {

rsconcept/frontend/src/components/RefsInput/clickNavigation.ts

@@ -1,38 +0,0 @@
-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)];
-}

rsconcept/frontend/src/components/RefsInput/tooltip.ts

@@ -2,58 +2,65 @@ import { syntaxTree } from '@codemirror/language';
 import { Extension } from '@codemirror/state';
 import { hoverTooltip } from '@codemirror/view';
 
-import { IEntityReference, ISyntacticReference } from '@/models/language';
+import { parseEntityReference, parseSyntacticReference } from '@/models/languageAPI';
 import { IRSForm } from '@/models/rsform';
 import { IColorTheme } from '@/styling/color';
 import {
   domTooltipEntityReference,
   domTooltipSyntacticReference,
   findContainedNodes,
-  findReferenceAt
+  findEnvelopingNodes
 } from '@/utils/codemirror';
 
-import { RefEntity } from './parse/parser.terms';
+import { ReferenceTokens } from './parse';
+import { RefEntity, RefSyntactic } from './parse/parser.terms';
 
-export const tooltipProducer = (schema: IRSForm, colors: IColorTheme, canClick?: boolean) => {
+export const globalsHoverTooltip = (schema: IRSForm, colors: IColorTheme) => {
   return hoverTooltip((view, pos) => {
-    const parse = findReferenceAt(pos, view.state);
+    const nodes = findEnvelopingNodes(pos, pos, syntaxTree(view.state), ReferenceTokens);
-    if (!parse) {
+    if (nodes.length !== 1) {
       return null;
     }
-
+    const start = nodes[0].from;
-    if ('entity' in parse.ref) {
+    const end = nodes[0].to;
-      const cst = schema.cstByAlias.get(parse.ref.entity);
+    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);
       return {
-        pos: parse.start,
+        pos: start,
-        end: parse.end,
+        end: end,
         above: false,
-        create: () => domTooltipEntityReference(parse.ref as IEntityReference, cst, colors, canClick)
+        create: () => domTooltipEntityReference(ref, cst, colors)
       };
-    } else {
+    } else if (nodes[0].type.id === RefSyntactic) {
+      const ref = parseSyntacticReference(text);
       let masterText: string | undefined = undefined;
-      if (parse.ref.offset > 0) {
+      if (ref.offset > 0) {
-        const entities = findContainedNodes(parse.end, view.state.doc.length, syntaxTree(view.state), [RefEntity]);
+        const entities = findContainedNodes(end, view.state.doc.length, syntaxTree(view.state), [RefEntity]);
-        if (parse.ref.offset <= entities.length) {
+        if (ref.offset <= entities.length) {
-          const master = entities[parse.ref.offset - 1];
+          const master = entities[ref.offset - 1];
           masterText = view.state.doc.sliceString(master.from, master.to);
         }
       } else {
-        const entities = findContainedNodes(0, parse.start, syntaxTree(view.state), [RefEntity]);
+        const entities = findContainedNodes(0, start, syntaxTree(view.state), [RefEntity]);
-        if (-parse.ref.offset <= entities.length) {
+        if (-ref.offset <= entities.length) {
-          const master = entities[-parse.ref.offset - 1];
+          const master = entities[-ref.offset - 1];
           masterText = view.state.doc.sliceString(master.from, master.to);
         }
       }
       return {
-        pos: parse.start,
+        pos: start,
-        end: parse.end,
+        end: end,
         above: false,
-        create: () => domTooltipSyntacticReference(parse.ref as ISyntacticReference, masterText, canClick)
+        create: () => domTooltipSyntacticReference(ref, masterText)
       };
+    } else {
+      return null;
     }
   });
 };
 
-export function refsHoverTooltip(schema: IRSForm, colors: IColorTheme, canClick?: boolean): Extension {
+export function refsHoverTooltip(schema: IRSForm, colors: IColorTheme): Extension {
-  return [tooltipProducer(schema, colors, canClick)];
+  return [globalsHoverTooltip(schema, colors)];
 }

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, LibraryItemType } from '@/models/library';
+import { ILibraryItem, LibraryItemID } from '@/models/library';
 import { ILibraryFilter } from '@/models/miscellaneous';
 
 import FlexColumn from '../ui/FlexColumn';
@@ -32,8 +32,7 @@ function PickSchema({ id, initialFilter = '', rows = 4, value, onSelectValue }:
 
   useLayoutEffect(() => {
     setFilter({
-      query: filterText,
+      query: filterText
-      type: LibraryItemType.RSFORM
     });
   }, [filterText]);
 

rsconcept/frontend/src/context/LibraryContext.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import { createContext, useCallback, useContext, useEffect, useState } from 'react';
 
 import {
   DataCallback,
@@ -14,8 +14,7 @@ import {
   postRSFormFromFile
 } from '@/app/backendAPI';
 import { ErrorData } from '@/components/info/InfoError';
-import { FolderTree } from '@/models/FolderTree';
+import { ILibraryItem, LibraryItemID } from '@/models/library';
-import { ILibraryItem, LibraryItemID, LocationHead } from '@/models/library';
 import { ILibraryCreateData } from '@/models/library';
 import { matchLibraryItem, matchLibraryItemLocation } from '@/models/libraryAPI';
 import { ILibraryFilter } from '@/models/miscellaneous';
@@ -29,17 +28,10 @@ import { useConceptOptions } from './OptionsContext';
 interface ILibraryContext {
   items: ILibraryItem[];
   templates: ILibraryItem[];
-  folders: FolderTree;
-
   loading: boolean;
-  loadingError: ErrorData;
-  setLoadingError: (error: ErrorData) => void;
-
   processing: boolean;
-  processingError: ErrorData;
+  error: ErrorData;
-  setProcessingError: (error: ErrorData) => void;
+  setError: (error: ErrorData) => void;
-
-  reloadItems: (callback?: () => void) => void;
 
   applyFilter: (params: ILibraryFilter) => ILibraryItem[];
   retrieveTemplate: (templateID: LibraryItemID, callback: (schema: IRSForm) => void) => void;
@@ -72,31 +64,15 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
   const [templates, setTemplates] = useState<ILibraryItem[]>([]);
   const [loading, setLoading] = useState(false);
   const [processing, setProcessing] = useState(false);
-  const [loadingError, setLoadingError] = useState<ErrorData>(undefined);
+  const [error, setError] = 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.folderMode && filter.head) {
+      if (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);
       }
@@ -109,12 +85,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]
@@ -127,11 +103,11 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
         callback(cached);
         return;
       }
-      setProcessingError(undefined);
+      setError(undefined);
       getRSFormDetails(String(templateID), '', {
         showError: true,
         setLoading: setProcessing,
-        onError: setProcessingError,
+        onError: setError,
         onSuccess: data => {
           const schema = new RSFormLoader(data).produceRSForm();
           setCachedTemplates(prev => [...prev, schema]);
@@ -145,12 +121,12 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
   const reloadItems = useCallback(
     (callback?: () => void) => {
       setItems([]);
-      setLoadingError(undefined);
+      setError(undefined);
       if (user?.is_staff && adminMode) {
         getAdminLibrary({
           setLoading: setLoading,
           showError: true,
-          onError: setLoadingError,
+          onError: setError,
           onSuccess: newData => {
             setItems(newData);
             if (callback) callback();
@@ -160,7 +136,7 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
         getLibrary({
           setLoading: setLoading,
           showError: true,
-          onError: setLoadingError,
+          onError: setError,
           onSuccess: newData => {
             setItems(newData);
             if (callback) callback();
@@ -174,8 +150,6 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
   const reloadTemplates = useCallback(() => {
     setTemplates([]);
     getTemplates({
-      setLoading: setLoading,
-      onError: setLoadingError,
       showError: true,
       onSuccess: newData => setTemplates(newData)
     });
@@ -216,13 +190,13 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
           }
           if (callback) callback(newSchema);
         });
-      setProcessingError(undefined);
+      setError(undefined);
       if (data.file) {
         postRSFormFromFile({
           data: data,
           showError: true,
           setLoading: setProcessing,
-          onError: setProcessingError,
+          onError: setError,
           onSuccess: onSuccess
         });
       } else {
@@ -230,7 +204,7 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
           data: data,
           showError: true,
           setLoading: setProcessing,
-          onError: setProcessingError,
+          onError: setError,
           onSuccess: onSuccess
         });
       }
@@ -240,11 +214,11 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
 
   const destroyItem = useCallback(
     (target: LibraryItemID, callback?: () => void) => {
-      setProcessingError(undefined);
+      setError(undefined);
       deleteLibraryItem(String(target), {
         showError: true,
         setLoading: setProcessing,
-        onError: setProcessingError,
+        onError: setError,
         onSuccess: () =>
           reloadItems(() => {
             if (user && user.subscriptions.includes(target)) {
@@ -257,7 +231,7 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
           })
       });
     },
-    [reloadItems, user]
+    [setError, reloadItems, user]
   );
 
   const cloneItem = useCallback(
@@ -265,12 +239,12 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
       if (!user) {
         return;
       }
-      setProcessingError(undefined);
+      setError(undefined);
       postCloneLibraryItem(String(target), {
         data: data,
         showError: true,
         setLoading: setProcessing,
-        onError: setProcessingError,
+        onError: setError,
         onSuccess: newSchema =>
           reloadItems(() => {
             if (user && !user.subscriptions.includes(newSchema.id)) {
@@ -280,26 +254,18 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
           })
       });
     },
-    [reloadItems, user]
+    [reloadItems, setError, user]
   );
 
   return (
     <LibraryContext.Provider
       value={{
         items,
-        folders,
         templates,
-
         loading,
-        loadingError,
-        setLoadingError,
-
         processing,
-        processingError,
+        error,
-        setProcessingError,
+        setError,
-
-        reloadItems,
-
         applyFilter,
         createItem,
         cloneItem,

rsconcept/frontend/src/context/RSFormContext.tsx

@@ -296,7 +296,8 @@ export const RSFormState = ({ itemID, versionID, children }: RSFormStateProps) =
         onError: setProcessingError,
         onSuccess: () => {
           schema.location = newLocation;
-          library.reloadItems(callback);
+          library.localUpdateItem(schema);
+          if (callback) callback();
         }
       });
     },

rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/TemplateTab.tsx

@@ -24,7 +24,7 @@ interface TemplateTabProps {
 
 function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
   const { templates, retrieveTemplate } = useLibrary();
-  const [templateSchema, setTemplateSchema] = useState<IRSForm | undefined>(undefined);
+  const [category, setCategory] = 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 (!templateSchema) {
+    if (!category) {
       return [];
     }
-    return templateSchema.items
+    return category.items
       .filter(cst => cst.cst_type === CATEGORY_CST_TYPE)
       .map(cst => ({
         value: cst.id,
         label: cst.term_raw
       }));
-  }, [templateSchema]);
+  }, [category]);
 
   useEffect(() => {
     if (templates.length > 0 && !state.templateID) {
@@ -67,22 +67,22 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
 
   useEffect(() => {
     if (!state.templateID) {
-      setTemplateSchema(undefined);
+      setCategory(undefined);
     } else {
-      retrieveTemplate(state.templateID, setTemplateSchema);
+      retrieveTemplate(state.templateID, setCategory);
     }
   }, [state.templateID, retrieveTemplate]);
 
   useEffect(() => {
-    if (!templateSchema) {
+    if (!category) {
       return;
     }
-    let data = templateSchema.items;
+    let data = category.items;
     if (state.filterCategory) {
-      data = applyFilterCategory(state.filterCategory, templateSchema);
+      data = applyFilterCategory(state.filterCategory, category);
     }
     setFilteredData(data);
-  }, [state.filterCategory, templateSchema]);
+  }, [state.filterCategory, category]);
 
   return (
     <AnimateFade>
@@ -93,16 +93,14 @@ function TemplateTab({ state, partialUpdate }: TemplateTabProps) {
           className='flex-grow border-none'
           options={categorySelector}
           value={
-            state.filterCategory && templateSchema
+            state.filterCategory && category
               ? {
                   value: state.filterCategory.id,
                   label: state.filterCategory.term_raw
                 }
               : null
           }
-          onChange={data =>
+          onChange={data => partialUpdate({ filterCategory: data ? category?.cstByID.get(data?.value) : undefined })}
-            partialUpdate({ filterCategory: data ? templateSchema?.cstByID.get(data?.value) : undefined })
-          }
           isClearable
         />
         <SelectSingle

rsconcept/frontend/src/models/FolderTree.test.ts

@@ -1,47 +0,0 @@
-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);
-  });
-});

rsconcept/frontend/src/models/FolderTree.ts

@@ -1,157 +0,0 @@
-/**
- * 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)
-    };
-  }
-}

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'
 }
 
 /**

rsconcept/frontend/src/models/miscellaneous.ts

@@ -2,7 +2,7 @@
  * Module: Miscellaneous frontend model types. Future targets for refactoring aimed at extracting modules.
  */
 
-import { LibraryItemType, LocationHead } from './library';
+import { LocationHead } from './library';
 
 /**
  * Represents graph dependency mode.
@@ -141,15 +141,10 @@ 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;

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, processingError, setProcessingError, processing } = useLibrary();
+  const { createItem, error, setError, 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(() => {
-    setProcessingError(undefined);
+    setError(undefined);
-  }, [title, alias, setProcessingError]);
+  }, [title, alias, setError]);
 
   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>
-      {processingError ? <InfoError error={processingError} /> : null}
+      {error ? <InfoError error={error} /> : null}
     </form>
   );
 }

rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx

@@ -1,139 +0,0 @@
-'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;

rsconcept/frontend/src/pages/LibraryPage/LibraryPage.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { AnimatePresence } from 'framer-motion';
 import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
 import DataLoader from '@/components/wrap/DataLoader';
@@ -12,7 +11,6 @@ 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';
 
@@ -25,8 +23,6 @@ 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,
@@ -43,11 +39,9 @@ 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, folderMode, folder]
+    [head, path, query, isEditor, isOwned, isSubscribed, isVisible, user]
   );
 
   const hasCustomFilter = useMemo(
@@ -58,8 +52,7 @@ function LibraryPage() {
       filter.isEditor !== undefined ||
       filter.isOwned !== undefined ||
       filter.isSubscribed !== undefined ||
-      filter.isVisible !== true ||
+      filter.isVisible !== true,
-      !!filter.folder,
     [filter]
   );
 
@@ -71,7 +64,6 @@ 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('');
@@ -81,26 +73,23 @@ function LibraryPage() {
     setIsSubscribed(undefined);
     setIsOwned(undefined);
     setIsEditor(undefined);
-    setFolder('');
+  }, [setHead, setIsVisible, setIsSubscribed, setIsOwned, setIsEditor]);
-  }, [setHead, setIsVisible, setIsSubscribed, setIsOwned, setIsEditor, setFolder]);
 
   const view = useMemo(
     () => (
       <LibraryTable
         resetQuery={resetFilter} // prettier: split lines
         items={items}
-        folderMode={folderMode}
-        toggleFolderMode={toggleFolderMode}
       />
     ),
-    [resetFilter, items, folderMode, toggleFolderMode]
+    [resetFilter, items]
   );
 
   return (
     <DataLoader
       id='library-page' // prettier: split lines
       isLoading={library.loading}
-      error={library.loadingError}
+      error={library.error}
       hasNoData={library.items.length === 0}
     >
       <SearchPanel
@@ -122,23 +111,8 @@ 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>
   );
 }

rsconcept/frontend/src/pages/LibraryPage/LibraryTable.tsx

@@ -1,7 +1,6 @@
 'use client';
 
-import clsx from 'clsx';
+import { useLayoutEffect, useMemo, useState } from 'react';
-import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 
 import { urls } from '@/app/urls';
@@ -10,7 +9,6 @@ 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';
@@ -23,13 +21,11 @@ import { storage } from '@/utils/constants';
 interface LibraryTableProps {
   items: ILibraryItem[];
   resetQuery: () => void;
-  folderMode: boolean;
-  toggleFolderMode: () => void;
 }
 
 const columnHelper = createColumnHelper<ILibraryItem>();
 
-function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: LibraryTableProps) {
+function LibraryTable({ items, resetQuery }: LibraryTableProps) {
   const router = useConceptNavigation();
   const intl = useIntl();
   const { getUserLabel } = useUsers();
@@ -54,42 +50,22 @@ function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: Libra
     });
   }, [windowSize]);
 
-  const handleToggleFolder = useCallback(
-    (event: CProps.EventMouse) => {
-      if (event.ctrlKey) {
-        event.preventDefault();
-        event.stopPropagation();
-        toggleFolderMode();
-      }
-    },
-    [toggleFolderMode]
-  );
-
   const columns = useMemo(
     () => [
-      ...(folderMode
+      columnHelper.accessor('location', {
-        ? []
+        id: 'location',
-        : [
+        header: () => (
-            columnHelper.accessor('location', {
+          <div className='pl-2 max-h-[1rem] translate-y-[-0.125rem]'>
-              id: 'location',
+            <IconFolder size='1.25rem' className='clr-text-controls' />
-              header: () => (
+          </div>
-                <MiniButton
+        ),
-                  noHover
+        size: 50,
-                  noPadding
+        minSize: 50,
-                  className='pl-2 max-h-[1rem] translate-y-[-0.125rem]'
+        maxSize: 50,
-                  onClick={handleToggleFolder}
+        enableSorting: true,
-                  titleHtml='Ctrl + клик для переключения </br>в режим папок'
+        cell: props => <BadgeLocation location={props.getValue()} />,
-                  icon={<IconFolder size='1.25rem' className='clr-text-controls' />}
+        sortingFn: 'text'
-                />
+      }),
-              ),
-              size: 50,
-              minSize: 50,
-              maxSize: 50,
-              enableSorting: true,
-              cell: props => <BadgeLocation location={props.getValue()} />,
-              sortingFn: 'text'
-            })
-          ]),
       columnHelper.accessor('alias', {
         id: 'alias',
         header: 'Шифр',
@@ -140,7 +116,7 @@ function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: Libra
         sortDescFirst: true
       })
     ],
-    [intl, getUserLabel, windowSize, handleToggleFolder, folderMode]
+    [intl, getUserLabel, windowSize]
   );
 
   const tableHeight = useMemo(() => calculateHeight('2.2rem'), [calculateHeight]);
@@ -163,7 +139,7 @@ function LibraryTable({ items, resetQuery, folderMode, toggleFolderMode }: Libra
       columns={columns}
       data={items}
       headPosition='0'
-      className={clsx('text-xs sm:text-sm cc-scroll-y', { 'border-l border-b': folderMode })}
+      className='text-xs sm:text-sm cc-scroll-y'
       style={{ maxHeight: tableHeight }}
       noDataComponent={
         <FlexColumn className='p-3 items-center min-h-[6rem]'>

rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx

@@ -4,9 +4,8 @@ import clsx from 'clsx';
 import { useCallback } from 'react';
 
 import { LocationIcon, SubscribeIcon, VisibilityIcon } from '@/components/DomainIcons';
-import { IconEditor, IconFilterReset, IconFolder, IconFolderTree, IconOwner } from '@/components/Icons';
+import { IconEditor, IconFilterReset, IconFolder, 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';
@@ -33,9 +32,6 @@ interface SearchPanelProps {
   head: LocationHead | undefined;
   setHead: React.Dispatch<React.SetStateAction<LocationHead | undefined>>;
 
-  folderMode: boolean;
-  toggleFolderMode: () => void;
-
   isVisible: boolean | undefined;
   toggleVisible: () => void;
   isOwned: boolean | undefined;
@@ -59,9 +55,6 @@ function SearchPanel({
   head,
   setHead,
 
-  folderMode,
-  toggleFolderMode,
-
   isVisible,
   toggleVisible,
   isOwned,
@@ -83,22 +76,6 @@ 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(
@@ -157,70 +134,58 @@ 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 ?? '//'}
-            />
 
-            <Dropdown isOpen={headMenu.isOpen} stretchLeft className='z-modalTooltip'>
+        <div ref={headMenu.ref} className='flex items-center h-full py-1 select-none'>
-              <DropdownButton className='w-[10rem]' onClick={() => handleChange(undefined)}>
+          <SelectorButton
-                <div className='inline-flex items-center gap-3'>
+            transparent
-                  <IconFolder size='1rem' className='clr-text-controls' />
+            className='h-full rounded-lg'
-                  <span>отображать все</span>
+            title={head ? describeLocationHead(head) : 'Выберите каталог'}
-                </div>
+            hideTitle={headMenu.isOpen}
-              </DropdownButton>
+            icon={
-              {Object.values(LocationHead).map((head, index) => {
+              head ? (
-                return (
+                <LocationIcon value={head} size='1.25rem' />
-                  <DropdownButton
+              ) : (
-                    className='w-[10rem]'
+                <IconFolder size='1.25rem' className='clr-text-controls' />
-                    key={`${prefixes.location_head_list}${index}`}
+              )
-                    onClick={() => handleChange(head)}
+            }
-                    title={describeLocationHead(head)}
+            onClick={headMenu.toggle}
-                  >
+            text={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}
           />
-        ) : null}
+
+          <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}
+        />
       </div>
       <Overlay position='top-[-0.75rem] right-0'>
         <BadgeHelp

rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx

@@ -146,7 +146,6 @@ function FormConstituenta({
           maxHeight='8rem'
           placeholder='Обозначение, используемое в текстовых определениях'
           schema={schema}
-          onOpenEdit={onOpenEdit}
           value={term}
           initialValue={state?.term_raw ?? ''}
           resolved={state?.term_resolved ?? ''}
@@ -197,7 +196,6 @@ function FormConstituenta({
               minHeight='3.75rem'
               maxHeight='8rem'
               schema={schema}
-              onOpenEdit={onOpenEdit}
               value={textDefinition}
               initialValue={state?.definition_raw ?? ''}
               resolved={state?.definition_resolved ?? ''}

rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/EditorLibraryItem.tsx

@@ -59,7 +59,7 @@ function EditorLibraryItem({ item, isModified, controller }: EditorLibraryItemPr
           />
         </Overlay>
       ) : null}
-      <LabeledValue className='max-w-[30rem] sm:mb-1 text-ellipsis' label='Путь' text={item?.location ?? ''} />
+      <LabeledValue className='sm:mb-1 text-ellipsis' label='Путь' text={item?.location ?? ''} />
 
       {accessLevel >= UserLevel.OWNER ? (
         <Overlay position='top-[-0.5rem] left-[5.5rem] cc-icons'>

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 className='flex-shrink'>
+        <FlexColumn>
           <FormRSForm id={globals.library_item_editor} isModified={isModified} setIsModified={setIsModified} />
           <EditorLibraryItem item={schema} isModified={isModified} controller={controller} />
         </FlexColumn>

rsconcept/frontend/src/utils/codemirror.ts

@@ -6,11 +6,9 @@ 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 { parseEntityReference, parseGrammemes, parseSyntacticReference } from '@/models/languageAPI';
+import { parseGrammemes } from '@/models/languageAPI';
 import { IConstituenta } from '@/models/rsform';
 import { isBasicConcept } from '@/models/rsformAPI';
 
@@ -144,30 +142,13 @@ 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, canClick?: boolean) {
+export function domTooltipConstituenta(cst?: IConstituenta) {
   const dom = document.createElement('div');
   dom.className = clsx(
+    'z-modalTooltip',
     'max-h-[25rem] max-w-[25rem] min-w-[10rem]',
     'dense',
     'p-2',
@@ -225,12 +206,10 @@ export function domTooltipConstituenta(cst?: IConstituenta, canClick?: boolean)
       dom.appendChild(children);
     }
 
-    if (canClick) {
+    const clickTip = document.createElement('p');
-      const clickTip = document.createElement('p');
+    clickTip.className = 'w-full text-center text-xs mt-2';
-      clickTip.className = 'w-full text-center text-xs mt-2';
+    clickTip.innerText = 'Ctrl + клик для перехода';
-      clickTip.innerText = 'Ctrl + клик для перехода';
+    dom.appendChild(clickTip);
-      dom.appendChild(clickTip);
-    }
   }
   return { dom: dom };
 }
@@ -238,14 +217,10 @@ export function domTooltipConstituenta(cst?: IConstituenta, canClick?: boolean)
 /**
  * Create DOM tooltip for {@link IEntityReference}.
  */
-export function domTooltipEntityReference(
+export function domTooltipEntityReference(ref: IEntityReference, cst: IConstituenta | undefined, colors: IColorTheme) {
-  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',
@@ -283,27 +258,16 @@ export function domTooltipEntityReference(
     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(
+export function domTooltipSyntacticReference(ref: ISyntacticReference, masterRef: string | undefined) {
-  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',
@@ -329,13 +293,6 @@ export function domTooltipSyntacticReference(
   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 };
 }
 

rsconcept/frontend/src/utils/constants.ts

@@ -94,8 +94,6 @@ 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',
@@ -146,7 +144,6 @@ 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_',

rsconcept/frontend/src/utils/labels.ts

@@ -5,7 +5,6 @@
  * 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';
@@ -821,20 +820,6 @@ 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}.
  */