Tree View on frontend now correctly loads the previously saved boolea…

…n transformations "nodeLabel" and "linkLabel".
phyloviz · Jul 3, 2023 · 44478c5 · 44478c5
1 parent 73257cc
commit 44478c5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/frontend/src/Pages/Project/TreeView/Layouts/ForceDirectedLayout/utils/useGraph.ts b/src/frontend/src/Pages/Project/TreeView/Layouts/ForceDirectedLayout/utils/useGraph.ts
@@ -8,8 +8,10 @@ import VisualizationService from "../../../../../../Services/Visualization/Visua
 import {findClusters} from "./useClusterCalculation";
 import {defaultConfig, VizLink, VizNode} from "../useForceDirectedLayout";
 import {
+    DEFAULT_LINK_LABEL_CHECKED,
     DEFAULT_LINK_LABEL_SIZE,
     DEFAULT_LINK_LABEL_TYPE,
+    DEFAULT_NODE_LABEL_CHECKED,
     DEFAULT_NODE_LABEL_SIZE,
     useGraphTransformationsConfig
 } from "./useGraphTransformationsConfig";
@@ -82,16 +84,16 @@ export function useGraph(projectId: string, datasetId: string, treeViewId: strin
 
         const config = {
             ...defaultConfig,
-            nodeSize: graphRef.current ? graphTransformationsConfig.nodeSize : (data.transformations?.nodeSize || defaultConfig.nodeSize),
-            linkWidth: graphRef.current ? graphTransformationsConfig.linkWidth : (data.transformations?.linkWidth || defaultConfig.linkWidth),
+            nodeSize: graphRef.current ? graphTransformationsConfig.nodeSize : (data.transformations?.nodeSize ?? defaultConfig.nodeSize),
+            linkWidth: graphRef.current ? graphTransformationsConfig.linkWidth : (data.transformations?.linkWidth ?? defaultConfig.linkWidth),
             simulation: {
-                linkSpring: graphRef.current ? simulationConfig.linkSpring : (data.transformations?.linkSpring || defaultConfig.simulation?.linkSpring),
-                linkDistance: graphRef.current ? simulationConfig.linkDistance : (data.transformations?.linkDistance || defaultConfig.simulation?.linkDistance),
-                gravity: graphRef.current ? simulationConfig.gravity : (data.transformations?.gravity || defaultConfig.simulation?.gravity),
-                repulsion: graphRef.current ? simulationConfig.repulsion : (data.transformations?.repulsion || defaultConfig.simulation?.repulsion),
-                friction: graphRef.current ? simulationConfig.friction : (data.transformations?.friction || defaultConfig.simulation?.friction),
-                repulsionTheta: graphRef.current ? simulationConfig.repulsionTheta : (data.transformations?.repulsionTheta || defaultConfig.simulation?.repulsionTheta),
-                decay: graphRef.current ? simulationConfig.decay : (data.transformations?.decay || defaultConfig.simulation?.decay)
+                linkSpring: graphRef.current ? simulationConfig.linkSpring : (data.transformations?.linkSpring ?? defaultConfig.simulation?.linkSpring),
+                linkDistance: graphRef.current ? simulationConfig.linkDistance : (data.transformations?.linkDistance ?? defaultConfig.simulation?.linkDistance),
+                gravity: graphRef.current ? simulationConfig.gravity : (data.transformations?.gravity ?? defaultConfig.simulation?.gravity),
+                repulsion: graphRef.current ? simulationConfig.repulsion : (data.transformations?.repulsion ?? defaultConfig.simulation?.repulsion),
+                friction: graphRef.current ? simulationConfig.friction : (data.transformations?.friction ?? defaultConfig.simulation?.friction),
+                repulsionTheta: graphRef.current ? simulationConfig.repulsionTheta : (data.transformations?.repulsionTheta ?? defaultConfig.simulation?.repulsionTheta),
+                decay: graphRef.current ? simulationConfig.decay : (data.transformations?.decay ?? defaultConfig.simulation?.decay)
             }
         }
         //
@@ -106,7 +108,10 @@ export function useGraph(projectId: string, datasetId: string, treeViewId: strin
 
         const treeViewGraph = new TreeViewGraph<VizNode, VizLink>(canvasRef.current!, config)
 
+        let firstClusterRendered = true
+
         if (graphRef.current) {
+            firstClusterRendered = false
             graphRef.current.destroy()
         }
 
@@ -129,9 +134,9 @@ export function useGraph(projectId: string, datasetId: string, treeViewId: strin
         })
 
         await graphRef.current!.setData(nodes, links)
-        graphRef.current?.renderNodeLabels(graphTransformationsConfig.nodeLabel)
-        graphRef.current?.renderLinkLabels(graphTransformationsConfig.linkLabel)
-        if(!simulationConfig.simulationRunning) {
+        graphRef.current?.renderNodeLabels(!firstClusterRendered ? graphTransformationsConfig.nodeLabel : (data.transformations?.nodeLabel ?? DEFAULT_NODE_LABEL_CHECKED))
+        graphRef.current?.renderLinkLabels(!firstClusterRendered ? graphTransformationsConfig.linkLabel : (data.transformations?.linkLabel ?? DEFAULT_LINK_LABEL_CHECKED))
+        if (!simulationConfig.simulationRunning) {
             graphRef.current?.pause()
         }
 

diff --git a/...Pages/Project/TreeView/Layouts/ForceDirectedLayout/utils/useGraphTransformationsConfig.ts b/...Pages/Project/TreeView/Layouts/ForceDirectedLayout/utils/useGraphTransformationsConfig.ts
@@ -26,10 +26,10 @@ export interface GraphTransformationsConfig {
     resetAll: () => void;
 }
 
-const DEFAULT_NODE_LABEL_CHECKED = true
+export const DEFAULT_NODE_LABEL_CHECKED = true
 export const DEFAULT_NODE_LABEL_SIZE = 0
 
-const DEFAULT_LINK_LABEL_CHECKED = false
+export const DEFAULT_LINK_LABEL_CHECKED = false
 export const DEFAULT_LINK_LABEL_SIZE = 0
 export const DEFAULT_LINK_LABEL_TYPE = ""