From 0e0fe28aea0e19f6608f2a7a611a5e7bfdcd4d44 Mon Sep 17 00:00:00 2001
From: "Hartung, Michael" <michael.hartung@uni-hamburg.de>
Date: Tue, 4 Apr 2023 11:44:00 +0200
Subject: [PATCH] close analysis view when component is reloaded
---
src/app/components/analysis-panel/analysis-panel.component.ts | 3 +--
src/app/components/network/network.component.ts | 2 +-
src/app/pages/explorer-page/explorer-page.component.ts | 4 +++-
src/index.html | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts
index 19dacd1c..df824311 100644
--- a/src/app/components/analysis-panel/analysis-panel.component.ts
+++ b/src/app/components/analysis-panel/analysis-panel.component.ts
@@ -223,7 +223,6 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit
this.drugstoneConfig.config.physicsOn = !isBig;
}
this.networkHandler.activeNetwork.networkInternal = new vis.Network(container, this.nodeData, options);
-
if (isBig) {
resolve(nodes);
}
@@ -320,6 +319,7 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit
if (!node) {
continue;
}
+
const pos = this.networkHandler.activeNetwork.networkInternal.getPositions([item.id]);
node.x = pos[item.id].x;
node.y = pos[item.id].y;
@@ -468,7 +468,6 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit
})
if ('score' in data[0]) {
- console.log('sorting')
data = data.sort((a, b) => b['score'] - a['score']);
}
diff --git a/src/app/components/network/network.component.ts b/src/app/components/network/network.component.ts
index 4c962835..6e02d409 100644
--- a/src/app/components/network/network.component.ts
+++ b/src/app/components/network/network.component.ts
@@ -642,7 +642,7 @@ export class NetworkComponent implements OnInit {
if (!node) {
continue;
}
- const pos = this.networkHandler.activeNetwork.networkInternal.getPositions([node.id]);
+ const pos = this.networkInternal.getPositions([node.id]);
node.x = pos[node.id].x;
node.y = pos[node.id].y;
const isSeed = this.highlightSeeds ? this.seedMap[node.id] : false;
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index e28cb8eb..c6fa80a3 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -202,6 +202,9 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
}
public activateConfig(updateNetworkFlag = false) {
+ // remove analysis panel when loading config
+ this.selectedAnalysisToken = null;
+
let configObj = {};
let groupsObj = {};
try {
@@ -375,7 +378,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
// // skip network options for selecting nodes when there are no options to use it
// return;
// }
-
this.networkHandler.activeNetwork.networkInternal.on('doubleClick', (properties) => {
const nodeIds: Array<string> = properties.nodes;
if (nodeIds != null && nodeIds.length > 0) {
diff --git a/src/index.html b/src/index.html
index f0c3b54e..d4703eb1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -112,6 +112,7 @@ menu<br>
<div style="max-width: 80vw; width: 1276px; height: 500px">
+ <!-- task-id="ks38WxeCSdbXk2cajKACinnUnCHWbf4I" -->
<drugst-one id="netexp1"
config='{"activateNetworkMenuButtonAdjacentDisorders":false,"activateNetworkMenuButtonAdjacentDrugs":false, "activateNetworkMenuButtonAdjacentDisordersDrugs": false, "licensedDatasets":true}'
groups='{"nodeGroups":{"protein":{"type":"protein","color":"#4da300","font":{"color":"#f0f0f0"},"groupName":"Protein","shape":"circle"},"foundDrug":{"type":"drug","color":"#F12590","font":{"color":"#000000"},"groupName":"Drug","shape":"diamond"}},"edgeGroups":{"default":{"color":"#000000","groupName":"default edge"}}}'
--
GitLab