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

we really only need to check to see if the _nodes_ are different (#107)

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

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

@ -10,38 +10,11 @@ const sortNodes = (nodes) => {
}) })
} }
const sortLinks = (links) => {
return links.sort((a, b) => {
if(a.target.id+a.source.id > b.target.id+b.source.id) {
return 1;
}
if(a.target.id+a.source.id < b.target.id+b.source.id) {
return -1;
}
return 0;
})
}
const graphsEqual = (a, b) => {
let nodes = nodesEqual(a.nodes, b.nodes);
let links = linksEqual(a.links, b.links);
if(!links) {
console.log("a", a.links.map(l => l.target + ' ' + l.source));
console.log("b", b.links.map(l => l.target + ' ' + l.source))
}
return nodes && links;
}
const nodesEqual = (a, b) => { const nodesEqual = (a, b) => {
if(a.length !== b.length) return false; if(a.length !== b.length) return false;
return a.every((e, i) => e.id === b[i].id); return a.every((e, i) => e.id === b[i].id);
} }
const linksEqual = (a, b) => {
if(a.length !== b.length) return false;
return a.every((e, i) => e.target === b[i].target.id && e.source === b[i].source.id);
}
export const mergeGraph = (oldGraph, newOverview) => { export const mergeGraph = (oldGraph, newOverview) => {
let newGraph = { let newGraph = {
nodes: [], nodes: [],
@ -76,12 +49,13 @@ export const mergeGraph = (oldGraph, newOverview) => {
} }
}); });
newGraph.nodes = sortNodes(newGraph.nodes); newGraph.nodes = sortNodes(newGraph.nodes);
newGraph.links = sortLinks(newGraph.links);
if(graphsEqual(newGraph, oldGraph)) { if(nodesEqual(oldGraph.nodes, newGraph.nodes)) {
return oldGraph; return oldGraph;
} }
console.log("nodes not equal");
// 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));
@ -89,7 +63,7 @@ export const mergeGraph = (oldGraph, newOverview) => {
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 {
nodes: outputNodes, nodes: sortNodes(outputNodes),
links: outputLinks links: outputLinks
}; };
}; };