diff --git a/src/app/components/network/network.component.ts b/src/app/components/network/network.component.ts index 21760f0e010a713a88e268bcebe56b7c1869cdb8..5be2c33c93bc3ff7624ffce882308d0318e7cfe5 100644 --- a/src/app/components/network/network.component.ts +++ b/src/app/components/network/network.component.ts @@ -100,6 +100,7 @@ export class NetworkComponent implements OnInit { this.currentViewNodes.forEach((protein) => { this.queryItems.push(getWrapperFromNode(protein)); }); + console.log(this.queryItems) } public saveAddNodes(nodeList: Node[]) { @@ -111,7 +112,7 @@ export class NetworkComponent implements OnInit { public updateAdjacentProteinDisorders(bool: boolean) { this.adjacentDisordersProtein = bool; if (this.adjacentDisordersProtein) { - this.netex.adjacentDisorders(this.nodeData.nodes, 'proteins').subscribe(response => { + this.netex.adjacentDisorders(this.nodeData.nodes, 'proteins', this.drugstoneConfig.config.associatedProteinDisorder).subscribe(response => { for (const interaction of response.edges) { const edge = { from: interaction.protein, to: interaction.disorder }; this.adjacentProteinDisorderEdgesList.push(mapCustomEdge(edge, this.drugstoneConfig.config)); @@ -139,7 +140,7 @@ export class NetworkComponent implements OnInit { public updateAdjacentDrugDisorders(bool: boolean) { this.adjacentDisordersDrug = bool; if (this.adjacentDisordersDrug) { - this.netex.adjacentDisorders(this.nodeData.nodes, 'drugs').subscribe(response => { + this.netex.adjacentDisorders(this.nodeData.nodes, 'drugs', this.drugstoneConfig.config.indicationDrugDisorder).subscribe(response => { for (const interaction of response.edges) { const edge = { from: interaction.drug, to: interaction.disorder }; this.adjacentDrugDisorderEdgesList.push(mapCustomEdge(edge, this.drugstoneConfig.config)); diff --git a/src/app/services/netex-controller/netex-controller.service.ts b/src/app/services/netex-controller/netex-controller.service.ts index bce39cb133098d227fc03de62e4b62722dfe842f..bfb08c8243cf4500ec505c8e7239fb8c859a9cc3 100644 --- a/src/app/services/netex-controller/netex-controller.service.ts +++ b/src/app/services/netex-controller/netex-controller.service.ts @@ -96,9 +96,9 @@ export class NetexControllerService { return this.http.get(`${environment.backend}tissue_expression/`, {params}); } - public adjacentDisorders(nodes: Node[], nodeType: string): Observable<any> { + public adjacentDisorders(nodes: Node[], nodeType: string, dataset: string): Observable<any> { - const params = {}; + const params = {dataset:dataset}; if (nodeType === 'proteins') { // @ts-ignore params.proteins = nodes.map((node: Node) => node.drugstoneId && node.drugstoneId.startsWith('p') ? node.drugstoneId.slice(1) : undefined).filter(id => id != null);