From 9a2f095749c76d35f4ceebff3b85bb611aa014c6 Mon Sep 17 00:00:00 2001 From: Nyck Date: Mon, 3 Jul 2023 19:47:01 +0100 Subject: [PATCH] Tree View now doesn't respect node coordinates from the backend (coordinates now start fresh and clean from cosmos, in the center of the canvas). This is ok because saving tree view coordinates isn't possible in the backend yet. --- .../ForceDirectedLayout/utils/useGraph.ts | 22 +++++++++---------- .../getTreeView/GetTreeViewOutputModel.ts | 2 +- 2 files changed, 12 insertions(+), 12 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 index c49ba2b..06e2da6 100644 --- a/src/frontend/src/Pages/Project/TreeView/Layouts/ForceDirectedLayout/utils/useGraph.ts +++ b/src/frontend/src/Pages/Project/TreeView/Layouts/ForceDirectedLayout/utils/useGraph.ts @@ -82,16 +82,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) } } // @@ -123,8 +123,8 @@ export function useGraph(projectId: string, datasetId: string, treeViewId: strin const nodes = graph.nodes.map(node => { return { id: node.st, - x: node.coordinates[0], - y: node.coordinates[1], + //x: node.coordinates[0], + //y: node.coordinates[1], } }) diff --git a/src/frontend/src/Services/Visualization/models/getTreeView/GetTreeViewOutputModel.ts b/src/frontend/src/Services/Visualization/models/getTreeView/GetTreeViewOutputModel.ts index 8b8e96a..a041d25 100644 --- a/src/frontend/src/Services/Visualization/models/getTreeView/GetTreeViewOutputModel.ts +++ b/src/frontend/src/Services/Visualization/models/getTreeView/GetTreeViewOutputModel.ts @@ -3,7 +3,7 @@ export interface GetTreeViewOutputModel { nodesTotalCount: number edges: Edge[] edgesTotalCount: number - transformations: Transformations + transformations: Transformations | undefined } export interface Edge {