Skip to content

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

chore: finetunning perspective switching

Ilian Sapundshiev2639b70e5966
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsx
index 73824da9c..f094bde64 100644
--- a/app/components/EntryProperties.tsx
+++ b/app/components/EntryProperties.tsx
@@ -1215,16 +1215,19 @@ const EntryProperties = (props: Props) => {
</Typography>
</div>
</div>
- <FormControl fullWidth={true} className={classes.formControl}>
- <Select
- data-tid="changePerspectiveTID"
- defaultValue={perspectiveDefault}
- onChange={changePerspective}
- input={<Input id="changePerspectiveId" />}
- >
- {perspectiveSelectorMenuItems}
- </Select>
- </FormControl>
+ <ProTooltip tooltip={i18n.t('core:choosePerspective')}>
+ <FormControl fullWidth={true} className={classes.formControl}>
+ <Select
+ disabled={!Pro}
+ data-tid="changePerspectiveTID"
+ defaultValue={perspectiveDefault}
+ onChange={changePerspective}
+ input={<Input id="changePerspectiveId" />}
+ >
+ {perspectiveSelectorMenuItems}
+ </Select>
+ </FormControl>
+ </ProTooltip>
</Grid>
)}
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsx
index 6997d55e0..09ec03c23 100644
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@ -443,52 +443,43 @@ const FolderContainer = (props: Props) => {
const switchPerspective = (perspectiveId: string) => {
if (
+ Pro ||
perspectiveId === PerspectiveIDs.DEFAULT ||
perspectiveId === PerspectiveIDs.LIST
) {
props.setCurrentDirectoryPerspective(perspectiveId);
return;
} else if (perspectiveId === PerspectiveIDs.GALLERY) {
- if (Pro) {
- props.setCurrentDirectoryPerspective(perspectiveId);
- } else {
- const openPersDocs = window.confirm(
- 'Gallery is part of TagSpaces Pro. Do you want to learn more about this perspective?'
+ const openPersDocs = window.confirm(i18n.t('perspectiveInPro'));
+ if (openPersDocs) {
+ props.openURLExternally(
+ Links.documentationLinks.galleryPerspective,
+ true
);
- if (openPersDocs) {
- props.openURLExternally(
- Links.documentationLinks.galleryPerspective,
- true
- );
- }
}
} else if (perspectiveId === PerspectiveIDs.MAPIQUE) {
- if (Pro) {
- props.setCurrentDirectoryPerspective(perspectiveId);
- } else {
- const openPersDocs = window.confirm(
- 'Mapique is part of TagSpaces Pro. Do you want to learn more about this perspective?'
+ const openPersDocs = window.confirm(i18n.t('perspectiveInPro'));
+ if (openPersDocs) {
+ props.openURLExternally(
+ Links.documentationLinks.mapiquePerspective,
+ true
);
- if (openPersDocs) {
- props.openURLExternally(
- Links.documentationLinks.mapiquePerspective,
- true
- );
- }
}
} else if (perspectiveId === PerspectiveIDs.KANBAN) {
- if (Pro) {
- props.setCurrentDirectoryPerspective(perspectiveId);
- } else {
- const openPersDocs = window.confirm(
- 'Kanban is part of TagSpaces Pro. Do you want to learn more about this perspective?'
+ const openPersDocs = window.confirm(i18n.t('perspectiveInPro'));
+ if (openPersDocs) {
+ props.openURLExternally(
+ Links.documentationLinks.kanbanPerspective,
+ true
+ );
+ }
+ } else if (perspectiveId === PerspectiveIDs.WIKI) {
+ const openPersDocs = window.confirm(i18n.t('perspectiveInPro'));
+ if (openPersDocs) {
+ props.openURLExternally(
+ Links.documentationLinks.kanbanPerspective,
+ true
);
- if (openPersDocs) {
- props.openURLExternally(
- Links.documentationLinks.kanbanPerspective,
- true
- );
- }
}
}
};
diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsx
index ed4ee12ec..cb82d090e 100644
--- a/app/components/menus/DirectoryMenu.tsx
+++ b/app/components/menus/DirectoryMenu.tsx
@@ -190,16 +190,18 @@ const DirectoryMenu = (props: Props) => {
function switchPerspective(perspectiveId) {
onClose();
- if (Pro) {
+ if (
+ Pro ||
+ perspectiveId === PerspectiveIDs.DEFAULT ||
+ perspectiveId === PerspectiveIDs.LIST
+ ) {
if (props.switchPerspective) {
props.switchPerspective(perspectiveId);
} else {
props.setCurrentDirectoryPerspective(perspectiveId);
}
} else if (perspectiveId === PerspectiveIDs.GALLERY) {
- const openPersDocs = window.confirm(
- 'Gallery is part of TagSpaces Pro. Do you want to learn more about this perspective?'
- );
+ const openPersDocs = window.confirm(i18n.t('perspectiveInPro'));
if (openPersDocs) {
props.openURLExternally(
Links.documentationLinks.galleryPerspective,
@@ -207,9 +209,7 @@ const DirectoryMenu = (props: Props) => {
);
}
} else if (perspectiveId === PerspectiveIDs.MAPIQUE) {
- const openPersDocs = window.confirm(
- 'Mapique is part of TagSpaces Pro. Do you want to learn more about this perspective?'
- );
+ const openPersDocs = window.confirm(i18n.t('perspectiveInPro'));
if (openPersDocs) {
props.openURLExternally(
Links.documentationLinks.mapiquePerspective,
@@ -217,9 +217,15 @@ const DirectoryMenu = (props: Props) => {
);
}
} else if (perspectiveId === PerspectiveIDs.KANBAN) {
- const openPersDocs = window.confirm(
- 'Kanban is part of TagSpaces Pro. Do you want to learn more about this perspective?'
- );
+ const openPersDocs = window.confirm(i18n.t('perspectiveInPro'));
+ if (openPersDocs) {
+ props.openURLExternally(
+ Links.documentationLinks.kanbanPerspective,
+ true
+ );
+ }
+ } else if (perspectiveId === PerspectiveIDs.WIKI) {
+ const openPersDocs = window.confirm(i18n.t('perspectiveInPro'));
if (openPersDocs) {
props.openURLExternally(
Links.documentationLinks.kanbanPerspective,
diff --git a/app/locales/en/core.json b/app/locales/en/core.json
index 4451e9058..090ce444b 100644
--- a/app/locales/en/core.json
+++ b/app/locales/en/core.json
@@ -635,5 +635,6 @@
"print": "Print",
"advancedSearch": "Advanced Search",
"new": "New",
+ "perspectiveInPro": "This perspective is part of TagSpaces Pro. Do you want to learn more about it?",
"-": "-"
}