Skip to content

fix: use currentNodeParams from NetworkNavigation and fix ESLint warnings #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fraxken merged 1 commit into from
Dec 4, 2023
Merged

fix: use currentNodeParams from NetworkNavigation and fix ESLint warnings #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions public/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ document.addEventListener("DOMContentLoaded", async() => {
new HomeView(secureDataSet, nsn);

window.addEventListener("package-info-closed", () => {
currentNodeParams = null;
networkNavigation.currentNodeParams = null;
packageInfoOpened = false;
});

Expand Down Expand Up @@ -76,8 +76,8 @@ document.addEventListener("DOMContentLoaded", async() => {

if (networkNavigation.currentNodeParams !== null) {
window.navigation.setNavByName("network--view");
nsn.neighbourHighlight(currentNodeParams);
updateShowInfoMenu(currentNodeParams);
nsn.neighbourHighlight(networkNavigation.currentNodeParams);
updateShowInfoMenu(networkNavigation.currentNodeParams);
}
});

Expand Down
17 changes: 9 additions & 8 deletions workspaces/vis-network/src/network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ export default class NodeSecureNetwork {
* @returns {boolean}
*/
focusNodeByNameAndVersion(packageName, version) {
if (!version || !version.trim()){
if (!version || !version.trim()) {
return this.focusNodeByName(packageName);
}

let wantedId = null;
for (const [id, opt] of this.linker) {
if (opt.name === packageName && opt.version === version) {
Expand Down Expand Up @@ -203,7 +203,7 @@ export default class NodeSecureNetwork {
const allEdges = this.edges.get();

// reset all edge labels - even if user clicks on empty space
for(let id = 0; id < allEdges.length; id++) {
for (let id = 0; id < allEdges.length; id++) {
Object.assign(allEdges[id], CONSTANTS.LABELS.NONE);
}

Expand Down Expand Up @@ -244,17 +244,18 @@ export default class NodeSecureNetwork {
const connectedEdges = this.network.getConnectedEdges(selectedNode);
this.network.selectEdges(connectedEdges);
for (let id = 0; id < connectedEdges.length; id++) {
const edgeIndex = allEdges.findIndex(edge => edge.id === connectedEdges[id]);
const edgeIndex = allEdges.findIndex((edge) => edge.id === connectedEdges[id]);
// the arrow on the edge is set to point into the 'from' node
if(allEdges[edgeIndex].from === selectedNode) {
if (allEdges[edgeIndex].from === selectedNode) {
Object.assign(allEdges[edgeIndex], CONSTANTS.LABELS.INCOMING);
} else if(allEdges[edgeIndex].to === selectedNode){
}
else if (allEdges[edgeIndex].to === selectedNode) {
Object.assign(allEdges[edgeIndex], CONSTANTS.LABELS.OUTGOING);
}
}
}

// offset set to 250 to compensate for the package info slide in on the left of screen
this.network.focus(selectedNode, { animation: true, scale: 0.35, offset: { x:250, y:0 }});
this.network.focus(selectedNode, { animation: true, scale: 0.35, offset: { x: 250, y: 0 } });
}
else if (this.highlightEnabled) {
this.highlightEnabled = false;
Expand Down