Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix folder settings

sytolk688fcdc52566
diff --git a/src/renderer/components/RenderPerspective.tsx b/src/renderer/components/RenderPerspective.tsx
index 639c48fca..f87fd9de3 100644
--- a/src/renderer/components/RenderPerspective.tsx
+++ b/src/renderer/components/RenderPerspective.tsx
@@ -37,17 +37,17 @@ const GridPerspective = React.lazy(
function GridPerspectiveAsync(props) {
return (
<React.Suspense fallback={<LoadingLazy />}>
- <SortedDirContextProvider>
- <RendererListenerContextProvider>
- <PaginationContextProvider>
- <ThumbGenerationContextProvider>
- <PerspectiveSettingsContextProvider>
+ <PerspectiveSettingsContextProvider>
+ <SortedDirContextProvider>
+ <RendererListenerContextProvider>
+ <PaginationContextProvider>
+ <ThumbGenerationContextProvider>
<GridPerspective {...props} />
- </PerspectiveSettingsContextProvider>
- </ThumbGenerationContextProvider>
- </PaginationContextProvider>
- </RendererListenerContextProvider>
- </SortedDirContextProvider>
+ </ThumbGenerationContextProvider>
+ </PaginationContextProvider>
+ </RendererListenerContextProvider>
+ </SortedDirContextProvider>
+ </PerspectiveSettingsContextProvider>
</React.Suspense>
);
}
@@ -59,17 +59,17 @@ const ListPerspective = React.lazy(
function ListPerspectiveAsync(props) {
return (
<React.Suspense fallback={<LoadingLazy />}>
- <SortedDirContextProvider>
- <RendererListenerContextProvider>
- <PaginationContextProvider>
- <ThumbGenerationContextProvider>
- <PerspectiveSettingsContextProvider>
+ <PerspectiveSettingsContextProvider>
+ <SortedDirContextProvider>
+ <RendererListenerContextProvider>
+ <PaginationContextProvider>
+ <ThumbGenerationContextProvider>
<ListPerspective {...props} />
- </PerspectiveSettingsContextProvider>
- </ThumbGenerationContextProvider>
- </PaginationContextProvider>
- </RendererListenerContextProvider>
- </SortedDirContextProvider>
+ </ThumbGenerationContextProvider>
+ </PaginationContextProvider>
+ </RendererListenerContextProvider>
+ </SortedDirContextProvider>
+ </PerspectiveSettingsContextProvider>
</React.Suspense>
);
}
diff --git a/src/renderer/hooks/PaginationContextProvider.tsx b/src/renderer/hooks/PaginationContextProvider.tsx
index ef1d692c8..5ff79d12c 100644
--- a/src/renderer/hooks/PaginationContextProvider.tsx
+++ b/src/renderer/hooks/PaginationContextProvider.tsx
@@ -21,6 +21,7 @@ import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
import { defaultSettings } from '-/perspectives/grid';
import { useSortedDirContext } from '-/perspectives/grid/hooks/useSortedDirContext';
import { TS } from '-/tagspaces.namespace';
+import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
type PaginationContextData = {
page: number;
@@ -43,7 +44,8 @@ export const PaginationContextProvider = ({
}: PaginationContextProviderProps) => {
const initPage = 1;
const { currentDirectoryPath, isSearchMode } = useDirectoryContentContext();
- const { settings, sortedDirContent } = useSortedDirContext();
+ const { settings } = usePerspectiveSettingsContext();
+ const { sortedDirContent } = useSortedDirContext();
const [page, setPage] = useState<number>(initPage);
// const firstRender = useFirstRender();
@@ -100,7 +102,7 @@ export const PaginationContextProvider = ({
pageFiles,
setCurrentPage,
};
- }, [page, pageFiles, currentDirectoryPath]);
+ }, [page, pageFiles, currentDirectoryPath, settings]);
return (
<PaginationContext.Provider value={context}>
diff --git a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
index 45bde4848..76956eb1b 100644
--- a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
+++ b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
@@ -31,6 +31,7 @@ import { mergeFsEntryMeta } from '-/services/utils-io';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
type PerspectiveSettingsContextData = {
+ settings: TS.FolderSettings;
orderBy: boolean;
sortBy: string;
singleClickAction: string;
@@ -54,6 +55,7 @@ type PerspectiveSettingsContextData = {
export const PerspectiveSettingsContext =
createContext<PerspectiveSettingsContextData>({
+ settings: undefined,
orderBy: true,
sortBy: 'byName',
singleClickAction: 'openInternal', // openInternal openExternal
@@ -187,32 +189,31 @@ export const PerspectiveSettingsContextProvider = ({
perspective: string,
folderSettings?: TS.FolderSettings,
): Promise<TS.FileSystemEntryMeta> {
- return new Promise((resolve, reject) => {
- currentLocation
- .loadMetaDataPromise(path, true)
- .then((fsEntryMeta: TS.FileSystemEntryMeta) => {
- return {
- ...(fsEntryMeta && fsEntryMeta),
- perspectiveSettings: {
- ...(fsEntryMeta &&
- fsEntryMeta.perspectiveSettings &&
- fsEntryMeta.perspectiveSettings),
- [perspective]: folderSettings,
- },
- };
- })
- .catch(() => {
- return mergeFsEntryMeta({
- perspectiveSettings: {
- [perspective]: folderSettings,
- },
- });
+ return currentLocation
+ .loadMetaDataPromise(path, true)
+ .then((fsEntryMeta: TS.FileSystemEntryMeta) => {
+ return {
+ ...(fsEntryMeta && fsEntryMeta),
+ perspectiveSettings: {
+ ...(fsEntryMeta &&
+ fsEntryMeta.perspectiveSettings &&
+ fsEntryMeta.perspectiveSettings),
+ [perspective]: folderSettings,
+ },
+ };
+ })
+ .catch(() => {
+ return mergeFsEntryMeta({
+ perspectiveSettings: {
+ [perspective]: folderSettings,
+ },
});
- });
+ });
}
const context = useMemo(() => {
return {
+ settings: settings.current,
showDirectories: settings.current.showDirectories,
showDescription: settings.current.showDescription,
showEntriesDescription: settings.current.showEntriesDescription,
diff --git a/src/renderer/perspectives/grid/hooks/SortedDirContextProvider.tsx b/src/renderer/perspectives/grid/hooks/SortedDirContextProvider.tsx
index dd9ed239b..8df149006 100644
--- a/src/renderer/perspectives/grid/hooks/SortedDirContextProvider.tsx
+++ b/src/renderer/perspectives/grid/hooks/SortedDirContextProvider.tsx
@@ -21,14 +21,12 @@ import { useSelector } from 'react-redux';
import { getSearchFilter } from '-/reducers/app';
import { TS } from '-/tagspaces.namespace';
import { sortByCriteria } from '@tagspaces/tagspaces-common/misc';
-import { Pro } from '-/pro';
-import { PerspectiveIDs } from '-/perspectives';
import { defaultSettings } from '-/perspectives/grid';
import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
+import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
type SortedDirContextData = {
sortedDirContent: TS.FileSystemEntry[];
- settings: TS.FolderSettings;
sortBy: string;
orderBy: null | boolean;
setSortBy: (sort: string) => void;
@@ -37,7 +35,6 @@ type SortedDirContextData = {
export const SortedDirContext = createContext<SortedDirContextData>({
sortedDirContent: undefined,
- settings: undefined,
sortBy: undefined,
orderBy: undefined,
setSortBy: () => {},
@@ -51,13 +48,12 @@ export type SortedDirContextProviderProps = {
export const SortedDirContextProvider = ({
children,
}: SortedDirContextProviderProps) => {
- const { currentDirectoryEntries, directoryMeta, perspective } =
- useDirectoryContentContext();
+ const { currentDirectoryEntries } = useDirectoryContentContext();
+ const { settings } = usePerspectiveSettingsContext();
const searchFilter: string = useSelector(getSearchFilter);
-
- const settings: TS.FolderSettings = useMemo(() => {
+ /*const settings: TS.FolderSettings = useMemo(() => {
return getSettings(directoryMeta, perspective);
- }, [directoryMeta, perspective]);
+ }, [directoryMeta, perspective]);*/
const [sortBy, setSortBy] = useState<string>(
settings && settings.sortBy ? settings.sortBy : defaultSettings.sortBy,
@@ -68,7 +64,7 @@ export const SortedDirContextProvider = ({
: defaultSettings.orderBy,
);
- function getSettings(meta, persp = PerspectiveIDs.GRID): TS.FolderSettings {
+ /*function getSettings(meta, persp = PerspectiveIDs.GRID): TS.FolderSettings {
if (persp === PerspectiveIDs.UNSPECIFIED) {
persp = PerspectiveIDs.GRID;
}
@@ -83,17 +79,10 @@ export const SortedDirContextProvider = ({
// loading settings for not Pro
return JSON.parse(localStorage.getItem(defaultSettings.settingsKey));
}
- }
+ }*/
const sortedDirContent = useMemo(() => {
if (searchFilter) {
- /*if (lastSearchTimestamp) {
- return GlobalSearch.getInstance()
- .getResults()
- .filter(entry =>
- entry.name.toLowerCase().includes(searchFilter.toLowerCase())
- );
- } else {*/
return sortByCriteria(currentDirectoryEntries, sortBy, orderBy).filter(
(entry) =>
entry.name.toLowerCase().includes(searchFilter.toLowerCase()),
@@ -116,13 +105,12 @@ export const SortedDirContextProvider = ({
const context = useMemo(() => {
return {
sortedDirContent,
- settings,
sortBy,
orderBy,
setSortBy,
setOrderBy,
};
- }, [sortedDirContent, settings, sortBy, orderBy]);
+ }, [sortedDirContent, sortBy, orderBy]);
return (
<SortedDirContext.Provider value={context}>