Skip to content

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

TSN401---Improve-Gallery-perspective (#2324)

Stanimir771d15ffe5c4
diff --git a/src/renderer/components/RenderPerspective.tsx b/src/renderer/components/RenderPerspective.tsx
index a459abaa9..0eba0bc36 100644
--- a/src/renderer/components/RenderPerspective.tsx
+++ b/src/renderer/components/RenderPerspective.tsx
@@ -85,9 +85,11 @@ if (Pro && Pro.Perspectives && Pro.Perspectives.GalleryPerspective) {
function GalleryPerspectiveAsync(props) {
return (
<React.Suspense fallback={<LoadingLazy />}>
- <ThumbGenerationContextProvider>
- <GalleryPerspective {...props} />
- </ThumbGenerationContextProvider>
+ <PerspectiveSettingsContextProvider>
+ <ThumbGenerationContextProvider>
+ <GalleryPerspective {...props} />
+ </ThumbGenerationContextProvider>
+ </PerspectiveSettingsContextProvider>
</React.Suspense>
);
}
diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsx
index 840bc46a8..8e7f41806 100644
--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx
+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx
@@ -70,6 +70,10 @@ import {
useCancelablePerLocation,
makeCancelable,
} from '-/utils/useCancelablePerLocation';
+import {
+ galleryDefaultSettings,
+ mapiqueDefaultSettings,
+} from '../../../tagspacespro/modules/perspectives';
type DirectoryContentContextData = {
currentLocationPath: string;
@@ -630,6 +634,10 @@ export const DirectoryContentContextProvider = ({
return defaultGridSettings;
} else if (perspective === PerspectiveIDs.LIST) {
return defaultListSettings;
+ } else if (perspective === PerspectiveIDs.GALLERY) {
+ return Pro.Perspectives.galleryDefaultSettings;
+ } else if (perspective === PerspectiveIDs.MAPIQUE) {
+ return Pro.Perspectives.mapiqueDefaultSettings;
} else if (perspective === PerspectiveIDs.KANBAN && Pro) {
return Pro.Perspectives.KanBanPerspectiveSettings;
}
diff --git a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
index 4c232e36e..2d0f8e916 100644
--- a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
+++ b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
@@ -184,11 +184,12 @@ export const PerspectiveSettingsContextProvider = ({
if (isDefaultSetting === undefined) {
isDefaultSetting = !haveLocalSetting();
}
+ const { settingsKey, ...cleanSettings } = settings.current;
if (Pro && !isDefaultSetting) {
setPerspectiveSettings(
currentDirectoryPath,
currentPerspective,
- settings.current,
+ cleanSettings,
).then((updatedFsEntryMeta: TS.FileSystemEntryMeta) => {
saveCurrentLocationMetaData(currentDirectoryPath, updatedFsEntryMeta);
setDirectoryMeta(updatedFsEntryMeta);
@@ -197,7 +198,7 @@ export const PerspectiveSettingsContextProvider = ({
const defaultSettings = getDefaultPerspectiveSettings(currentPerspective);
localStorage.setItem(
defaultSettings.settingsKey,
- JSON.stringify(settings.current),
+ JSON.stringify(cleanSettings),
);
}
}
diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.json
index 8afb47f01..87d992d10 100644
--- a/src/renderer/locales/en/core.json
+++ b/src/renderer/locales/en/core.json
@@ -253,9 +253,11 @@
"searchNotes": "Notes",
"searchAudio": "Audio",
"searchVideoFiles": "Videos",
+ "mediaFiles": "Audio and Video",
"searchArchives": "Archives",
"searchBookmarks": "Bookmarks",
"searchEbooks": "eBooks",
+ "searchImages": "Images",
"searchEmails": "Emails",
"searchFolders": "Folders",
"searchFiles": "Files",
diff --git a/src/renderer/perspectives/grid/components/MainContainer.tsx b/src/renderer/perspectives/grid/components/MainContainer.tsx
index d3099a244..f3a262dac 100644
--- a/src/renderer/perspectives/grid/components/MainContainer.tsx
+++ b/src/renderer/perspectives/grid/components/MainContainer.tsx
@@ -32,7 +32,6 @@ import AddTagToTagGroupDialog from '-/components/dialogs/AddTagToTagGroupDialog'
import { TS } from '-/tagspaces.namespace';
import { Pro } from '-/pro';
import Links from 'assets/links';
-import { defaultSettings } from '../index';
import { fileOperationsEnabled } from '-/perspectives/common/main-container';
import { openURLExternally } from '-/services/utils-io';
import { useSortedDirContext } from '-/perspectives/grid/hooks/useSortedDirContext';
@@ -316,7 +315,7 @@ function GridPerspective(props: Props) {
style={{
height: '100%', // 'calc(100% - 47px)'
}}
- data-tid={defaultSettings.testID}
+ data-tid="gridPerspectiveContainer"
>
<MainToolbar
prefixDataTID={'grid'}
diff --git a/src/renderer/perspectives/grid/index.tsx b/src/renderer/perspectives/grid/index.tsx
index dac483375..3d3e3e6bf 100644
--- a/src/renderer/perspectives/grid/index.tsx
+++ b/src/renderer/perspectives/grid/index.tsx
@@ -14,7 +14,6 @@ export { default } from './components/MainContainer';
// }
export const defaultSettings = {
- testID: 'gridPerspectiveContainer',
settingsKey: 'tsPerspectiveGrid',
orderBy: true,
sortBy: 'byName',
diff --git a/src/renderer/perspectives/list/components/MainContainer.tsx b/src/renderer/perspectives/list/components/MainContainer.tsx
index cf96e89a1..dce438cbe 100644
--- a/src/renderer/perspectives/list/components/MainContainer.tsx
+++ b/src/renderer/perspectives/list/components/MainContainer.tsx
@@ -32,7 +32,6 @@ import AddTagToTagGroupDialog from '-/components/dialogs/AddTagToTagGroupDialog'
import { TS } from '-/tagspaces.namespace';
import { Pro } from '-/pro';
import Links from 'assets/links';
-import { defaultSettings } from '../index';
import { fileOperationsEnabled } from '-/perspectives/common/main-container';
import { openURLExternally } from '-/services/utils-io';
import { useSortedDirContext } from '-/perspectives/grid/hooks/useSortedDirContext';
@@ -316,7 +315,7 @@ function ListPerspective(props: Props) {
style={{
height: '100%', // 'calc(100% - 47px)'
}}
- data-tid={defaultSettings.testID}
+ data-tid="listPerspectiveContainer"
>
<MainToolbar
prefixDataTID={'list'}
diff --git a/src/renderer/perspectives/list/index.tsx b/src/renderer/perspectives/list/index.tsx
index 196af3310..e12a332f2 100644
--- a/src/renderer/perspectives/list/index.tsx
+++ b/src/renderer/perspectives/list/index.tsx
@@ -15,7 +15,6 @@ export { default } from './components/MainContainer';
// }
export const defaultSettings = {
- testID: 'listPerspectiveContainer',
settingsKey: 'tsPerspectiveList',
orderBy: true,
sortBy: 'byName',
diff --git a/src/renderer/tagspaces.namespace.d.ts b/src/renderer/tagspaces.namespace.d.ts
index fc3290b90..4ef5bbb41 100644
--- a/src/renderer/tagspaces.namespace.d.ts
+++ b/src/renderer/tagspaces.namespace.d.ts
@@ -364,7 +364,7 @@ export namespace TS {
}
interface FolderSettings {
- settingsKey: string;
+ settingsKey?: string;
showDirectories?: boolean;
showTags?: boolean;
showDetails?: boolean;
@@ -382,6 +382,7 @@ export namespace TS {
entrySize?: EntrySizes;
thumbnailMode?: ThumbnailMode;
gridPageLimit?: number;
+ galleryTypeGroup?: string[];
// isLocal?: boolean;
}