-
}
- onClick={() => handleChange('/U/test')}
- />
+
+ {items.map((item, index) =>
+ !item.parent || !folded.includes(item.parent) ? (
+
5 ? 5 : item.rank) * 0.5 + 0.5}rem` }}
+ onClick={event => onClick(event, item)}
+ >
+ {item.children.size > 0 ? (
+
+ ) : (
+
+ )
+ ) : (
+
+ )
+ }
+ onClick={event => handleClickFold(event, item, folded.includes(item))}
+ />
+ ) : (
+
+ {item.filesInside ? (
+
+ ) : (
+
+ )}
+
+ )}
+
{labelFolderNode(item)}
+
+ ) : null
+ )}
);
}
diff --git a/rsconcept/frontend/src/components/select/SelectLocationContext.tsx b/rsconcept/frontend/src/components/select/SelectLocationContext.tsx
new file mode 100644
index 00000000..91e260a8
--- /dev/null
+++ b/rsconcept/frontend/src/components/select/SelectLocationContext.tsx
@@ -0,0 +1,62 @@
+'use client';
+
+import clsx from 'clsx';
+import { useCallback } from 'react';
+
+import useDropdown from '@/hooks/useDropdown';
+import { FolderTree } from '@/models/FolderTree';
+import { prefixes } from '@/utils/constants';
+
+import { IconFolderTree } from '../Icons';
+import { CProps } from '../props';
+import Dropdown from '../ui/Dropdown';
+import MiniButton from '../ui/MiniButton';
+import SelectLocation from './SelectLocation';
+
+interface SelectLocationContextProps extends CProps.Styling {
+ value: string;
+ folderTree: FolderTree;
+ stretchTop?: boolean;
+
+ onChange: (newValue: string) => void;
+}
+
+function SelectLocationContext({ value, folderTree, onChange, className, style }: SelectLocationContextProps) {
+ const menu = useDropdown();
+
+ const handleClick = useCallback(
+ (event: CProps.EventMouse, newValue: string) => {
+ event.preventDefault();
+ event.stopPropagation();
+ menu.hide();
+ onChange(newValue);
+ },
+ [menu, onChange]
+ );
+
+ return (
+
+ }
+ onClick={() => menu.toggle()}
+ />
+
+ handleClick(event, target.getPath())}
+ />
+
+
+ );
+}
+
+export default SelectLocationContext;
diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx b/rsconcept/frontend/src/components/select/SelectWordForm.tsx
similarity index 93%
rename from rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx
rename to rsconcept/frontend/src/components/select/SelectWordForm.tsx
index 1db8c129..7f385da0 100644
--- a/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx
+++ b/rsconcept/frontend/src/components/select/SelectWordForm.tsx
@@ -6,7 +6,7 @@ import { Grammeme } from '@/models/language';
import { prefixes } from '@/utils/constants';
import { DefaultWordForms, IGrammemeOption, SelectorGrammemes } from '@/utils/selectors';
-import WordformButton from './WordformButton';
+import WordformButton from '../../dialogs/DlgEditReference/WordformButton';
interface SelectWordFormProps {
selected: IGrammemeOption[];
diff --git a/rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx b/rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx
similarity index 93%
rename from rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx
rename to rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx
index ec06db95..3a074964 100644
--- a/rsconcept/frontend/src/components/select/GraphSelectionToolbar.tsx
+++ b/rsconcept/frontend/src/components/select/ToolbarGraphSelection.tsx
@@ -14,21 +14,21 @@ import {
import { CProps } from '../props';
import MiniButton from '../ui/MiniButton';
-interface GraphSelectionToolbarProps extends CProps.Styling {
+interface ToolbarGraphSelectionProps extends CProps.Styling {
graph: Graph;
core: number[];
setSelected: React.Dispatch
>;
emptySelection?: boolean;
}
-function GraphSelectionToolbar({
+function ToolbarGraphSelection({
className,
graph,
core,
setSelected,
emptySelection,
...restProps
-}: GraphSelectionToolbarProps) {
+}: ToolbarGraphSelectionProps) {
return (
{!isLoading && !error && !hasNoData ? (
-
+
{children}
) : null}
{!isLoading && !error && hasNoData ? (
-
+
Данные не загружены
) : null}
diff --git a/rsconcept/frontend/src/context/OptionsContext.tsx b/rsconcept/frontend/src/context/ConceptOptionsContext.tsx
similarity index 100%
rename from rsconcept/frontend/src/context/OptionsContext.tsx
rename to rsconcept/frontend/src/context/ConceptOptionsContext.tsx
diff --git a/rsconcept/frontend/src/context/LibraryContext.tsx b/rsconcept/frontend/src/context/LibraryContext.tsx
index 16e2c11d..3561ecd0 100644
--- a/rsconcept/frontend/src/context/LibraryContext.tsx
+++ b/rsconcept/frontend/src/context/LibraryContext.tsx
@@ -24,7 +24,7 @@ import { RSFormLoader } from '@/models/RSFormLoader';
import { contextOutsideScope } from '@/utils/labels';
import { useAuth } from './AuthContext';
-import { useConceptOptions } from './OptionsContext';
+import { useConceptOptions } from './ConceptOptionsContext';
interface ILibraryContext {
items: ILibraryItem[];
@@ -65,12 +65,12 @@ interface LibraryStateProps {
}
export const LibraryState = ({ children }: LibraryStateProps) => {
- const { user } = useAuth();
+ const { user, loading: userLoading } = useAuth();
const { adminMode } = useConceptOptions();
const [items, setItems] = useState([]);
const [templates, setTemplates] = useState([]);
- const [loading, setLoading] = useState(false);
+ const [loading, setLoading] = useState(true);
const [processing, setProcessing] = useState(false);
const [loadingError, setLoadingError] = useState(undefined);
const [processingError, setProcessingError] = useState(undefined);
@@ -92,8 +92,8 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
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.folderMode && filter.location) {
+ result = result.filter(item => item.location == filter.location);
}
if (filter.type) {
result = result.filter(item => item.item_type === filter.type);
@@ -175,16 +175,18 @@ export const LibraryState = ({ children }: LibraryStateProps) => {
const reloadTemplates = useCallback(() => {
setTemplates([]);
getTemplates({
- setLoading: setLoading,
- onError: setLoadingError,
+ setLoading: setProcessing,
+ onError: setProcessingError,
showError: true,
onSuccess: newData => setTemplates(newData)
});
}, []);
useEffect(() => {
- reloadItems();
- }, [reloadItems]);
+ if (!userLoading) {
+ reloadItems();
+ }
+ }, [reloadItems, userLoading]);
useEffect(() => {
reloadTemplates();
diff --git a/rsconcept/frontend/src/context/UserProfileContext.tsx b/rsconcept/frontend/src/context/UserProfileContext.tsx
index 7185a553..7c39352e 100644
--- a/rsconcept/frontend/src/context/UserProfileContext.tsx
+++ b/rsconcept/frontend/src/context/UserProfileContext.tsx
@@ -36,7 +36,7 @@ interface UserProfileStateProps {
export const UserProfileState = ({ children }: UserProfileStateProps) => {
const { users } = useUsers();
const [user, setUser] = useState(undefined);
- const [loading, setLoading] = useState(false);
+ const [loading, setLoading] = useState(true);
const [processing, setProcessing] = useState(false);
const [error, setError] = useState(undefined);
const [errorProcessing, setErrorProcessing] = useState(undefined);
diff --git a/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx b/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx
index f6768572..82ef4bf3 100644
--- a/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgChangeLocation.tsx
@@ -1,13 +1,15 @@
'use client';
import clsx from 'clsx';
-import { useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import SelectLocationContext from '@/components/select/SelectLocationContext';
import SelectLocationHead from '@/components/select/SelectLocationHead';
import Label from '@/components/ui/Label';
import Modal, { ModalProps } from '@/components/ui/Modal';
import TextArea from '@/components/ui/TextArea';
import { useAuth } from '@/context/AuthContext';
+import { useLibrary } from '@/context/LibraryContext';
import { LocationHead } from '@/models/library';
import { combineLocation, validateLocation } from '@/models/libraryAPI';
import { limits } from '@/utils/constants';
@@ -22,9 +24,16 @@ function DlgChangeLocation({ hideWindow, initial, onChangeLocation }: DlgChangeL
const [head, setHead] = useState(initial.substring(0, 2) as LocationHead);
const [body, setBody] = useState(initial.substring(3));
+ const { folders } = useLibrary();
+
const location = useMemo(() => combineLocation(head, body), [head, body]);
const isValid = useMemo(() => initial !== location && validateLocation(location), [initial, location]);
+ const handleSelectLocation = useCallback((newValue: string) => {
+ setHead(newValue.substring(0, 2) as LocationHead);
+ setBody(newValue.length > 3 ? newValue.substring(3) : '');
+ }, []);
+
function handleSubmit() {
onChangeLocation(location);
}
@@ -41,13 +50,19 @@ function DlgChangeLocation({ hideWindow, initial, onChangeLocation }: DlgChangeL
className={clsx('w-[35rem]', 'pb-3 px-6 flex gap-3')}
>
-
+
+