Skip to content

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

chore: reenabling treeviz perspective with echarts

Ilian Sapundshiev1bda7a75962d
diff --git a/package-lock.json b/package-lock.json
index ca74bd8a7..ddb619597 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,6 +32,7 @@
"crypto-js": "^4.1.1",
"date-fns": "^2.29.3",
"dompurify": "^2.3.3",
+ "echarts": "^5.4.3",
"electron-context-menu": "^3.6.1",
"electron-debug": "^3.2.0",
"electron-log": "^4.4.8",
@@ -19656,6 +19657,20 @@
"safe-buffer": "^5.0.1"
}
},
+ "node_modules/echarts": {
+ "version": "5.4.3",
+ "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
+ "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+ "dependencies": {
+ "tslib": "2.3.0",
+ "zrender": "5.4.4"
+ }
+ },
+ "node_modules/echarts/node_modules/tslib": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+ },
"node_modules/ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -43276,6 +43291,19 @@
"resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.7.1.tgz",
"integrity": "sha512-OI6VMSe0yeqaouIXtedC+F55Sr6r9ppS7+wTbSexkYdHbdt4ctTuPNXP/rwm7GTVI63YBc+EBT0b0tl7YnJLRg=="
},
+ "node_modules/zrender": {
+ "version": "5.4.4",
+ "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
+ "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+ "dependencies": {
+ "tslib": "2.3.0"
+ }
+ },
+ "node_modules/zrender/node_modules/tslib": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+ },
"node_modules/zwitch": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
diff --git a/package.json b/package.json
index 7836e5271..77eff4672 100644
--- a/package.json
+++ b/package.json
@@ -168,6 +168,7 @@
"crypto-js": "^4.1.1",
"date-fns": "^2.29.3",
"dompurify": "^2.3.3",
+ "echarts": "^5.4.3",
"electron-context-menu": "^3.6.1",
"electron-debug": "^3.2.0",
"electron-log": "^4.4.8",
@@ -190,6 +191,7 @@
"open-location-code-typescript": "^1.5.0",
"papaparse": "^5.4.1",
"pdfjs-dist": "2.4.456",
+ "picomatch": "^3.0.1",
"qrcode.react": "^3.1.0",
"rc-table": "^7.8.0",
"react": "18.2.0",
@@ -218,8 +220,7 @@
"ts-react-splitter": "^3.0.0",
"use-state-with-callback": "^2.0.3",
"utif": "github:photopea/UTIF.js",
- "uuid": "^9.0.0",
- "picomatch": "^3.0.1"
+ "uuid": "^9.0.0"
},
"devDependencies": {
"@electron/notarize": "^2.2.0",
diff --git a/src/renderer/components/RenderPerspective.tsx b/src/renderer/components/RenderPerspective.tsx
index e30c19eda..77dad163d 100644
--- a/src/renderer/components/RenderPerspective.tsx
+++ b/src/renderer/components/RenderPerspective.tsx
@@ -113,6 +113,20 @@ function KanBanPerspectiveAsync(props) {
);
}
+let TreeVizPerspective = React.Fragment;
+if (Pro && Pro.Perspectives && Pro.Perspectives.TreeVizPerspective) {
+ TreeVizPerspective = Pro.Perspectives.TreeVizPerspective;
+}
+function TreeVizPerspectiveAsync(props) {
+ return (
+ <React.Suspense fallback={<LoadingLazy />}>
+ <ThumbGenerationContextProvider>
+ <TreeVizPerspective {...props} />
+ </ThumbGenerationContextProvider>
+ </React.Suspense>
+ );
+}
+
const WelcomePanel = React.lazy(
() => import(/* webpackChunkName: "WelcomePanel" */ './WelcomePanel'),
);
@@ -167,6 +181,9 @@ function RenderPerspective(props: Props) {
<KanBanPerspectiveAsync openRenameEntryDialog={openRenameEntryDialog} />
);
}
+ if (Pro && currentPerspective === PerspectiveIDs.TREEVIZ) {
+ return <TreeVizPerspective />;
+ }
return <GridPerspectiveAsync openRenameEntryDialog={openRenameEntryDialog} />;
}
diff --git a/src/renderer/perspectives/index.tsx b/src/renderer/perspectives/index.tsx
index bb47f7fe8..c1b312449 100644
--- a/src/renderer/perspectives/index.tsx
+++ b/src/renderer/perspectives/index.tsx
@@ -21,13 +21,14 @@ import MapiquePerspectiveIcon from '@mui/icons-material/Map';
import GalleryPerspectiveIcon from '@mui/icons-material/Camera';
import ListPerspectiveIcon from '@mui/icons-material/ViewList';
import GridPerspectiveIcon from '@mui/icons-material/ViewModule';
+import TreeVizPerspectiveIcon from '@mui/icons-material/ForestRounded';
export const PerspectiveIDs = {
UNSPECIFIED: 'unspecified',
GRID: 'grid',
LIST: 'list',
GALLERY: 'gallery',
- // TREEVIZ: 'treeviz',
+ TREEVIZ: 'treeviz',
MAPIQUE: 'mapique',
KANBAN: 'kanban',
// WIKI: 'wiki'
@@ -80,10 +81,20 @@ export const GalleryPerspectiveMeta = {
title: 'Gallery Perspective',
};
+export const TreeVizPerspectiveMeta = {
+ id: PerspectiveIDs.TREEVIZ,
+ key: 'openTreeVizPerspective',
+ pro: true,
+ beta: true,
+ icon: <TreeVizPerspectiveIcon />,
+ title: 'TreeViz Perspective',
+};
+
export const AvailablePerspectives = [];
AvailablePerspectives.push(GridPerspectiveMeta);
AvailablePerspectives.push(ListPerspectiveMeta);
AvailablePerspectives.push(GalleryPerspectiveMeta);
AvailablePerspectives.push(MapiquePerspectiveMeta);
AvailablePerspectives.push(KanbanPerspectiveMeta);
+AvailablePerspectives.push(TreeVizPerspectiveMeta);
// AvailablePerspectives.push(WikiPerspectiveMeta);