Skip to content

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

Sorting for folder not persisted in the custom settings (#2129)

Stanimire855701d0fe9
diff --git a/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx b/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx
index d3e91e6b2..6af5ca45f 100644
--- a/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx
+++ b/src/renderer/perspectives/grid/components/GridSettingsDialog.tsx
@@ -16,7 +16,7 @@
*
*/
-import React, { useReducer, useRef } from 'react';
+import React, { useEffect, useReducer } from 'react';
import {
Dialog,
DialogActions,
@@ -49,6 +49,7 @@ import { useTranslation } from 'react-i18next';
import { useSortedDirContext } from '-/perspectives/grid/hooks/useSortedDirContext';
import ZoomComponent from '-/components/ZoomComponent';
import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
+import useFirstRender from '-/utils/useFirstRender';
interface Props {
open: boolean;
@@ -74,11 +75,21 @@ function GridSettingsDialog(props: Props) {
saveSettings,
} = usePerspectiveSettingsContext();
const { sortBy, orderBy } = useSortedDirContext();
+ const firstRender = useFirstRender();
const [ignored, forceUpdate] = useReducer((x: number) => x + 1, 0, undefined);
const theme = useTheme();
const { open, onClose, openHelpWebPage } = props;
+ useEffect(() => {
+ if (!firstRender) {
+ setSettings({
+ sortBy: sortBy,
+ orderBy: orderBy,
+ });
+ }
+ }, [sortBy, orderBy]);
+
const handleGridPaginationLimit = (
event: React.ChangeEvent<HTMLInputElement>,
) => {
@@ -262,63 +273,6 @@ function GridSettingsDialog(props: Props) {
}
/>
</MenuItem>
- {/* <MenuItem
- data-tid="gridPerspectiveEntrySizeSmall"
- title={t('core:entrySizeSmall')}
- aria-label={t('core:entrySizeSmall')}
- onClick={() => {
- changeEntrySize('small');
- entrySize.current = EntrySizes.small;
- forceUpdate();
- }}
- >
- <ListItemIcon>
- {entrySize.current === 'small' ? (
- <RadioCheckedIcon />
- ) : (
- <RadioUncheckedIcon />
- )}
- </ListItemIcon>
- <ListItemText primary={t('core:entrySizeSmall')} />
- </MenuItem>
- <MenuItem
- data-tid="gridPerspectiveEntrySizeNormal"
- title={t('core:entrySizeNormal')}
- aria-label={t('core:entrySizeNormal')}
- onClick={() => {
- changeEntrySize('normal');
- entrySize.current = EntrySizes.normal;
- forceUpdate();
- }}
- >
- <ListItemIcon>
- {entrySize.current === 'normal' ? (
- <RadioCheckedIcon />
- ) : (
- <RadioUncheckedIcon />
- )}
- </ListItemIcon>
- <ListItemText primary={t('core:entrySizeNormal')} />
- </MenuItem>
- <MenuItem
- data-tid="gridPerspectiveEntrySizeBig"
- title={t('core:entrySizeBig')}
- aria-label={t('core:entrySizeBig')}
- onClick={() => {
- changeEntrySize('big');
- entrySize.current = EntrySizes.big;
- forceUpdate();
- }}
- >
- <ListItemIcon>
- {entrySize.current === 'big' ? (
- <RadioCheckedIcon />
- ) : (
- <RadioUncheckedIcon />
- )}
- </ListItemIcon>
- <ListItemText primary={t('core:entrySizeBig')} />
- </MenuItem> */}
<Divider />
<MenuItem
data-tid="gridPerspectiveSingleClickOpenInternally"
diff --git a/src/renderer/perspectives/grid/hooks/SortedDirContextProvider.tsx b/src/renderer/perspectives/grid/hooks/SortedDirContextProvider.tsx
index 8df149006..3d284a6e5 100644
--- a/src/renderer/perspectives/grid/hooks/SortedDirContextProvider.tsx
+++ b/src/renderer/perspectives/grid/hooks/SortedDirContextProvider.tsx
@@ -16,7 +16,7 @@
*
*/
-import React, { createContext, useMemo, useState } from 'react';
+import React, { createContext, useEffect, useMemo, useState } from 'react';
import { useSelector } from 'react-redux';
import { getSearchFilter } from '-/reducers/app';
import { TS } from '-/tagspaces.namespace';
@@ -55,6 +55,15 @@ export const SortedDirContextProvider = ({
return getSettings(directoryMeta, perspective);
}, [directoryMeta, perspective]);*/
+ useEffect(() => {
+ if (settings.sortBy !== sortBy) {
+ setSortBy(settings.sortBy);
+ }
+ if (settings.orderBy !== orderBy) {
+ setOrderBy(settings.orderBy);
+ }
+ }, [settings]);
+
const [sortBy, setSortBy] = useState<string>(
settings && settings.sortBy ? settings.sortBy : defaultSettings.sortBy,
);