#SDSV-30 - Fix tree interaction

Author: jrmartin

src/components/GraphViewer/GraphViewer.js

@@ -70,14 +70,10 @@ const GraphViewer = (props) => {
 
   const handleNodeLeftClick = (node, event) => {
     if ( node.type === rdfTypes.Subject.key || node.type === rdfTypes.Sample.key || node.type === rdfTypes.Collection.key ) {
-      node.collapsed = !node.collapsed;
       collapseSubLevels(node, node.collapsed, { links : 0 });
+      node.collapsed = !node.collapsed;
       let updatedData = getPrunedTree(props.graph_id, selectedLayout.layout);
       setData(updatedData);
-
-      collapseSubLevels(node, true, { links : 0 });
-      updatedData = getPrunedTree(props.graph_id, selectedLayout.layout);
-      setData(updatedData);
     } 
     handleNodeHover(node);
 
@@ -121,7 +117,7 @@ const GraphViewer = (props) => {
     setCollapsed(!collapsed)
     setTimeout( () => {
       resetCamera();
-    },200)
+    },10)
   }
 
   /**
@@ -174,10 +170,7 @@ const GraphViewer = (props) => {
 
   const onEngineStop = () => {
     setForce();
-    if ( triggerCenter ) {
-      graphRef?.current?.ggv?.current.centerAt(selectedNode.x, selectedNode.y, ONE_SECOND);
-      triggerCenter = false;
-    }
+    graphRef?.current?.ggv?.current.centerAt(selectedNode.x, selectedNode.y, ONE_SECOND);
   }
 
   useEffect(() => {
@@ -234,8 +227,10 @@ const GraphViewer = (props) => {
   }, [selectedNode]);
 
   useEffect(() => {
-    if ( nodeSelected && ( nodeSelected?.tree_reference?.dataset_id?.includes(props.graph_id) || 
-        nodeSelected?.dataset_id?.includes(props.graph_id) )) { 
+    let sameDataset = nodeSelected?.tree_reference?.dataset_id?.includes(props.graph_id) || 
+                        nodeSelected?.dataset_id?.includes(props.graph_id) 
+                        || nodeSelected?.attributes?.dataset_id?.includes(props.graph_id);
+    if ( nodeSelected && sameDataset) { 
       if ( nodeSelected?.id !== selectedNode?.id ){
         let node = nodeSelected;
         let collapsed = node.collapsed

src/utils/Splinter.js

@@ -799,6 +799,7 @@ class Splinter {
                 }
 
                 if (node.attributes?.relativePath !== undefined) {
+                    node.attributes.dataset_id = this.dataset_id;
                     node.attributes.publishedURI = 
                         Array.from(this.nodes)[0][1].attributes.hasUriPublished[0] + 
                         "?datasetDetailsTab=files&path=files/" +
@@ -1097,6 +1098,14 @@ class Splinter {
             if ( node.graph_reference === undefined ) {
                 node.graph_reference = this.findReference(node.uri_api);
             }
+            if ( node.graph_reference === undefined ) {
+                const fn = (hashMap, str) => [...hashMap.keys()].find(k => k.includes(str))
+                const graph_reference = fn(this.nodes, node.id)
+
+                if ( graph_reference ) {
+                    node.graph_reference = this.findReference(graph_reference);
+                }
+            }
             this.tree_map.set(node.id, node);
             const newNode = {
                 id: node.uri_api,