diff --git a/angular.json b/angular.json index 5fdf66a2b9ca3c902d9170cd1537ae8834fee895..76d1bb49daf428ce68f6ba7cc41a61c16f42abdc 100644 --- a/angular.json +++ b/angular.json @@ -196,8 +196,8 @@ "browserTarget": "netex:build:remote" }, "production": { - "browserTarget": "netex:build:uhh-production" - }, + "browserTarget": "netex:build:dock1-production" + } } }, "extract-i18n": { diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts index afe093d57629d9de90afa929588ba70b618aeede..c95513c66267a242b5b3fbba70901dce01431d55 100644 --- a/src/app/components/analysis-panel/analysis-panel.component.ts +++ b/src/app/components/analysis-panel/analysis-panel.component.ts @@ -72,6 +72,7 @@ export class AnalysisPanelComponent implements OnInit, OnChanges { } @Output() tokenChange = new EventEmitter<string | null>(); @Output() showDetailsChange = new EventEmitter<Wrapper>(); + @Output() setInputNetwork = new EventEmitter<any>(); @Output() visibleItems = new EventEmitter<[any[], [Node[], Tissue], NodeInteraction[]]>(); public task: Task | null = null; public result: any = null; @@ -184,9 +185,9 @@ export class AnalysisPanelComponent implements OnInit, OnChanges { // Create const {nodes, edges} = this.createNetwork(this.result); + this.setInputNetwork.emit({nodes: nodes, edges: edges}); this.nodeData.nodes = new vis.DataSet(nodes); this.nodeData.edges = new vis.DataSet(edges); - const container = this.networkEl.nativeElement; const isBig = nodes.length > 100 || edges.length > 100; const options = NetworkSettings.getOptions(isBig ? 'analysis-big' : 'analysis'); @@ -194,7 +195,7 @@ export class AnalysisPanelComponent implements OnInit, OnChanges { this.network = new vis.Network(container, this.nodeData, options); - this.tableDrugs = nodes.filter( e => e.netexId && e.netexId.startsWith('d'));; + this.tableDrugs = nodes.filter( e => e.netexId && e.netexId.startsWith('d')); this.tableDrugs.forEach((r) => { r.rawScore = r.score; }); @@ -361,6 +362,7 @@ export class AnalysisPanelComponent implements OnInit, OnChanges { this.analysis.switchSelection('main'); this.token = null; this.tokenChange.emit(this.token); + this.setInputNetwork.emit(undefined); this.emitVisibleItems(false); } diff --git a/src/app/dialogs/launch-analysis/launch-analysis.component.ts b/src/app/dialogs/launch-analysis/launch-analysis.component.ts index 38ef3ecd0f03eec458368d5dba22a0e63ce6937e..a4436c8fdaa3898ff1e392b01070df460ba6e90f 100644 --- a/src/app/dialogs/launch-analysis/launch-analysis.component.ts +++ b/src/app/dialogs/launch-analysis/launch-analysis.component.ts @@ -120,9 +120,9 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges { parameters.target = this.target === 'drug' ? 'drug' : 'drug-target'; // pass network data to reconstruct network in analysis result to connect non-proteins to results // drop interactions in nodes beforehand to no cause cyclic error, information is contained in edges - this.inputNetwork.nodes.forEach(node => { - delete node.interactions - }); + // this.inputNetwork.nodes.forEach(node => { + // delete node.interactions + // }); if (this.algorithm === 'trustrank') { parameters.damping_factor = this.trustrankDampingFactor; diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html index fa896d6caa202aae263d25f8d8386c285d055b8d..2bf03cafffd4eb6143f9e78b7f5040bcc712d63d 100644 --- a/src/app/pages/explorer-page/explorer-page.component.html +++ b/src/app/pages/explorer-page/explorer-page.component.html @@ -7,7 +7,7 @@ [(show)]="showAnalysisDialog" [target]="analysisDialogTarget" [config]="myConfig" - [inputNetwork]="{ nodes: proteins, edges: edges }" + [inputNetwork]="inputNetwork" (taskEvent)="emitTaskEvent($event)" > </app-launch-analysis> @@ -140,6 +140,7 @@ [(token)]="selectedAnalysisToken" (showDetailsChange)="selectedWrapper = $event" (visibleItems)="analysisWindowChanged($event)" + (setInputNetwork)="setInputNetwork($event)" [config]="myConfig" [smallStyle]="smallStyle" ></app-analysis-panel> diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts index ecdf48178b6f20d36dac94bda67ecbccd53c91b8..1fec33d43616df8f1670647c651d4059106325d3 100644 --- a/src/app/pages/explorer-page/explorer-page.component.ts +++ b/src/app/pages/explorer-page/explorer-page.component.ts @@ -174,6 +174,8 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { public selectedAnalysisToken: string | null = null; + @Input() inputNetwork = { }; + @Input() set taskId(token: string | null) { if (token == null || token.length === 0) this.selectedAnalysisToken = null @@ -335,7 +337,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { }); // remove edges without endpoints network.edges = edges; - + this.inputNetwork = network; this.proteins = network.nodes; this.edges = network.edges; } @@ -837,4 +839,11 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { return false; return this.nodeData.nodes.get().filter((node: Node) => node.drugId && node.netexId.startsWith('dr')).length > 0; } + + setInputNetwork(network: any) { + if(network == null) + this.inputNetwork={nodes: this.proteins, edges : this.edges} + else + this.inputNetwork = network; + } }