Graph component #1

Scobiform · Apr 20, 2024 · 65af7ba · 65af7ba
1 parent a1deb55
commit 65af7ba
Showing 1 changed file with 22 additions and 21 deletions.
diff --git a/templates/graph.html b/templates/graph.html
@@ -343,32 +343,33 @@
 
     // Filter links to include only those whose source and target are in visibleNodes
     const filteredLinks = graphData.links.filter(link => {
+        let sourceId = (typeof link.source === 'object') ? link.source.id : link.source;
+        let targetId = (typeof link.target === 'object') ? link.target.id : link.target;
+        return visibleNodes.has(sourceId) && visibleNodes.has(targetId);
+    });
+
+    // Ensure that nodes linked to visible 'instance' nodes also become visible, if relevant
+    if (filterType === 'follower-and-instances' || filterType === 'following-and-instances' || filterType === 'instances') {
+        filteredLinks.forEach(link => {
             let sourceId = (typeof link.source === 'object') ? link.source.id : link.source;
             let targetId = (typeof link.target === 'object') ? link.target.id : link.target;
-            return visibleNodes.has(sourceId) && visibleNodes.has(targetId);
+            if (graphData.nodes.find(node => node.id === sourceId && node.type === 'instance') ||
+                graphData.nodes.find(node => node.id === targetId && node.type === 'instance')) {
+                visibleNodes.add(sourceId);
+                visibleNodes.add(targetId);
+            }
         });
+    }
 
-        // Ensure that nodes linked to visible 'instance' nodes also become visible, if relevant
-        if (filterType === 'follower-and-instances' || filterType === 'following-and-instances' || filterType === 'instances') {
-            filteredLinks.forEach(link => {
-                let sourceId = (typeof link.source === 'object') ? link.source.id : link.source;
-                let targetId = (typeof link.target === 'object') ? link.target.id : link.target;
-                if (graphData.nodes.find(node => node.id === sourceId && node.type === 'instance') ||
-                    graphData.nodes.find(node => node.id === targetId && node.type === 'instance')) {
-                    visibleNodes.add(sourceId);
-                    visibleNodes.add(targetId);
-                }
-            });
-        }
-
-        // Prepare the filtered data for nodes and links
-        const filteredData = {
-            nodes: graphData.nodes.filter(node => visibleNodes.has(node.id)),
-            links: filteredLinks
-        };
+    // Prepare the filtered data for nodes and links
+    const filteredData = {
+        nodes: graphData.nodes.filter(node => visibleNodes.has(node.id)),
+        links: filteredLinks
+    };
 
-        graph.graphData(filteredData);
-    }
+    // Update the graph with the filtered data
+    graph.graphData(filteredData);
+}
 
 
     // Prepare the filtered data for nodes and links.