extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-23 19:22:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

tighten up the graph merging code a little bit more (#107)

Browse Source
This commit is contained in:
Michael Quigley 2022-12-21 21:39:06 -05:00
parent 25ee45f460
commit bbb4fd0656
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/src/console/visualizer/graph.js
View File

@ -51,18 +51,23 @@ export const mergeGraph = (oldGraph, newOverview) => {
newGraph.nodes = sortNodes(newGraph.nodes); newGraph.nodes = sortNodes(newGraph.nodes);
if(nodesEqual(oldGraph.nodes, newGraph.nodes)) { if(nodesEqual(oldGraph.nodes, newGraph.nodes)) {
// if the list of nodes is equal, the graph hasn't changed; we can just return the oldGraph and save the
// physics headaches in the visualizer.
return oldGraph; return oldGraph;
} }
console.log("nodes not equal"); // we're going to need to recompute a new graph... but we want to maintain the instances that already exist...
// we want to preserve nodes that exist in the new graph, and remove those that don't. // we want to preserve nodes that exist in the new graph, and remove those that don't.
let outputNodes = oldGraph.nodes.filter(oldNode => newGraph.nodes.find(newNode => newNode.id === oldNode.id)); let outputNodes = oldGraph.nodes.filter(oldNode => newGraph.nodes.find(newNode => newNode.id === oldNode.id));
let outputLinks = oldGraph.nodes.filter(oldLink => newGraph.links.find(newLink => newLink.target === oldLink.target && newLink.source === oldLink.source)); let outputLinks = oldGraph.nodes.filter(oldLink => newGraph.links.find(newLink => newLink.target === oldLink.target && newLink.source === oldLink.source));
// and then do the opposite; add any nodes that are in newGraph that are missing from oldGraph. // and then do the opposite; add any nodes that are in newGraph that are missing from oldGraph.
outputNodes.push(...newGraph.nodes.filter(newNode => !outputNodes.find(oldNode => oldNode.id === newNode.id))); outputNodes.push(...newGraph.nodes.filter(newNode => !outputNodes.find(oldNode => oldNode.id === newNode.id)));
outputLinks.push(...newGraph.links.filter(newLink => !outputLinks.find(oldLink => oldLink.target === newLink.target && oldLink.source === newLink.source))); outputLinks.push(...newGraph.links.filter(newLink => !outputLinks.find(oldLink => oldLink.target === newLink.target && oldLink.source === newLink.source)));
return { return {
// we need a new outer object, to trigger react to refresh the view correctly.
nodes: sortNodes(outputNodes), nodes: sortNodes(outputNodes),
links: outputLinks links: outputLinks
}; };