From e3c9849a6f5f04fe2631ac042dd53e7d7d09ca64 Mon Sep 17 00:00:00 2001
From: "Hartung, Michael" <michael.hartung@uni-hamburg.de>
Date: Thu, 23 Jun 2022 20:22:55 +0200
Subject: [PATCH] remove console logs and fix bug with gene group not
displaying after selecting node
---
.../analysis-panel.component.ts | 1 -
.../components/network/network.component.ts | 2 +-
.../explorer-page.component.html | 52 ++++++++++++-------
.../explorer-page/explorer-page.component.ts | 5 --
src/app/services/analysis/analysis.service.ts | 38 --------------
5 files changed, 35 insertions(+), 63 deletions(-)
diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts
index 7bc6f282..a8c9d3f9 100644
--- a/src/app/components/analysis-panel/analysis-panel.component.ts
+++ b/src/app/components/analysis-panel/analysis-panel.component.ts
@@ -131,7 +131,6 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit
}
ngAfterViewInit() {
- console.log(this.networkHandler.networks)
this.networkHandler.setActiveNetwork('analysis');
}
diff --git a/src/app/components/network/network.component.ts b/src/app/components/network/network.component.ts
index c2ab9473..2265d5c9 100644
--- a/src/app/components/network/network.component.ts
+++ b/src/app/components/network/network.component.ts
@@ -334,7 +334,7 @@ export class NetworkComponent implements OnInit {
this.analysis.inSelection(wrapper),
gradient));
- // try out custom ctx renderer
+ // custom ctx renderer for pie chart
node.shape = 'custom';
node.ctxRenderer = pieChartContextRenderer;
updatedNodes.push(node);
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index 699e0865..c6df3dde 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -33,7 +33,10 @@
}"
>
<!-- Start left sidebar -->
- <div class="drugstone sidebar column" *ngIf="drugstoneConfig.config.showSidebar">
+ <div
+ class="drugstone sidebar column"
+ *ngIf="drugstoneConfig.config.showSidebar"
+ >
<div
*ngIf="drugstoneConfig.config.showItemSelector"
class="card bar-large mt-0"
@@ -43,20 +46,21 @@
[ngClass]="{ 'b-text-small': drugstoneConfig.smallStyle }"
>
<p class="card-header-title">
- <span
+ <ng-container
*ngIf="!networkHandler.activeNetwork.selectedWrapper"
- class="icon"
>
- <i class="fas fa-info" aria-hidden="true"></i>
- </span>
- <span *ngIf="!networkHandler.activeNetwork.selectedWrapper"
- >No item selected</span
+ <span class="icon">
+ <i class="fas fa-info" aria-hidden="true"></i>
+ </span>
+ <span> No item selected </span>
+ </ng-container>
+ <ng-container
+ *ngIf="networkHandler.activeNetwork.selectedWrapper"
>
- <span *ngIf="networkHandler.activeNetwork.selectedWrapper">
- <span>{{
- networkHandler.activeNetwork.selectedWrapper.data.type
- }}</span>
- </span>
+ <span>
+ {{ networkHandler.activeNetwork.selectedWrapper.data.group }}
+ </span>
+ </ng-container>
</p>
<a
(click)="collapseDetails = !collapseDetails"
@@ -250,7 +254,9 @@
[disabled]="analysis.isLaunchingQuick()"
class="button is-white is-rounded has-tooltip quick-start-btn"
pTooltip="Find drugs for all proteins."
- [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'"
+ [tooltipStyleClass]="
+ 'drgstn drgstn-tooltip drgstn-tooltip-top'
+ "
tooltipPosition="top"
>
<span class="icon quick-icon">
@@ -342,7 +348,9 @@
"
class="button is-white is-rounded quick-start-btn drugs-btn"
pTooltip="Find drugs for the selected proteins."
- [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'"
+ [tooltipStyleClass]="
+ 'drgstn drgstn-tooltip drgstn-tooltip-top'
+ "
tooltipPosition="top"
>
<span class="icon quick-icon">
@@ -404,7 +412,9 @@
<div
class="control"
pTooltip="Find drug targets for the selected proteins."
- [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'"
+ [tooltipStyleClass]="
+ 'drgstn drgstn-tooltip drgstn-tooltip-top'
+ "
tooltipPosition="top"
>
<button
@@ -427,7 +437,9 @@
<div
class="control"
pTooltip="Find drugs for the selected proteins."
- [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'"
+ [tooltipStyleClass]="
+ 'drgstn drgstn-tooltip drgstn-tooltip-top'
+ "
tooltipPosition="top"
>
<button
@@ -455,7 +467,9 @@
target="_blank"
class="button is-primary is-fullwidth is-rounded has-tooltip"
pTooltip="Use enrichment analysis via g:Profiler (external)."
- [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'"
+ [tooltipStyleClass]="
+ 'drgstn drgstn-tooltip drgstn-tooltip-top'
+ "
tooltipPosition="top"
>
<span class="icon">
@@ -472,7 +486,9 @@
disabled
class="button is-primary is-fullwidth is-rounded has-tooltip"
pTooltip="Use enrichment analysis via g:Profiler (external)."
- [tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'"
+ [tooltipStyleClass]="
+ 'drgstn drgstn-tooltip drgstn-tooltip-top'
+ "
tooltipPosition="top"
>
<span class="icon">
diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts
index a76ec4ad..32cfb478 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -62,8 +62,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
@Input()
public set network(network: string | undefined) {
- console.log('setting network data', network)
-
if (network == null) {
return;
}
@@ -182,7 +180,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
}
async ngAfterViewInit() {
- console.log(this.networkHandler.networks)
this.networkHandler.setActiveNetwork('explorer');
if (this.onload) {
@@ -328,7 +325,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
private async getNetwork() {
const network = JSON.parse(this.networkJSON);
- console.log('network', network)
if (this.drugstoneConfig.config.identifier === 'ensg') {
// @ts-ignore
network.nodes.forEach(node => {
@@ -343,7 +339,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
}
// map data to nodes in backend
- console.log('network.nodes', network.nodes)
if (network.nodes != null && network.nodes.length) {
network.nodes = await this.netex.mapNodes(network.nodes, this.drugstoneConfig.config.identifier);
}
diff --git a/src/app/services/analysis/analysis.service.ts b/src/app/services/analysis/analysis.service.ts
index 0752bd50..70038a40 100644
--- a/src/app/services/analysis/analysis.service.ts
+++ b/src/app/services/analysis/analysis.service.ts
@@ -179,44 +179,6 @@ export class AnalysisService {
this.selectListSubject.next({items: newSelection, selected: null});
}
- /*public addExpressedHostProteins(nodes, proteins: Node[], threshold: number): number {
- const items: Wrapper[] = [];
- const visibleIds = new Set<string>(nodes.getIds());
- for (const protein of proteins) {
- const wrapper = getWrapperFromNode(protein);
- const found = visibleIds.has(wrapper.nodeId);
- if (found && !this.inSelection(wrapper) && protein.expressionLevel > threshold) {
- items.push(wrapper);
- this.selectedItems.set(wrapper.nodeId, wrapper);
- }
- }
- this.selectListSubject.next({items, selected: true});
- return items.length;
- }
-
- public addVisibleHostProteins(nodes, proteins: Node[]): number {
- const items: Wrapper[] = [];
- const visibleIds = new Set<string>(nodes.getIds());
- for (const protein of proteins) {
- const wrapper = getWrapperFromNode(protein);
- const found = visibleIds.has(wrapper.nodeId);
- if (found && !this.inSelection(wrapper)) {
- items.push(wrapper);
- this.selectedItems.set(wrapper.nodeId, wrapper);
- }
- }
- this.selectListSubject.next({items, selected: true});
- return items.length;
- }
-
- public removeAllHostProteins() {
- const items: Wrapper[] = Array.from(this.selectedItems.values()).filter(p => p.type === 'protein');
- for (const wrapper of items) {
- this.selectedItems.delete(wrapper.nodeId);
- }
- this.selectListSubject.next({items, selected: false});
- }*/
-
resetSelection() {
this.selectListSubject.next({items: Array.from(this.selectedItems.values()), selected: false});
this.selectedItems.clear();
--
GitLab