diff --git a/package-lock.json b/package-lock.json index 0aabbcaf81db54bc15a537d7f55217e4fe49676b..88f12eb3da8aa107a64fb704e8d42deee2662126 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "netex", - "version": "1.1.2", + "version": "1.1.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "netex", - "version": "1.1.2", + "version": "1.1.4", "dependencies": { "@angular/animations": "^12.2.16", "@angular/cdk": "^12.2.13", diff --git a/package.json b/package.json index 1cb2fef3bb2c4746a7207328eecbc204a313ceb5..2fe4f338ab62c551f0257649aeac0f33b2d5c6a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "netex", - "version": "1.1.2", + "version": "1.1.4", "scripts": { "ng": "ng", "start:dev": "ng serve --configuration=dev", diff --git a/releases/latest b/releases/latest index 45a1b3f44523206e2b1e6a7ca0e279026c3a2b55..65087b4f5ecea6cde723520ad02722f600ab7f49 100644 --- a/releases/latest +++ b/releases/latest @@ -1 +1 @@ -1.1.2 +1.1.4 diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts index b278a0b21a308536014e40cc2121afb1875933b3..5ef84d3e8e77772071a5012f62be3ebeea4619a8 100644 --- a/src/app/components/analysis-panel/analysis-panel.component.ts +++ b/src/app/components/analysis-panel/analysis-panel.component.ts @@ -11,13 +11,10 @@ import { ViewChild, } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { environment } from '../../../environments/environment'; import { algorithmNames, AnalysisService } from '../../services/analysis/analysis.service'; import { Drug, - EdgeType, NodeAttributeMap, - getDrugNodeId, getProteinNodeId, getWrapperFromNode, LegendContext, @@ -27,12 +24,9 @@ import { Wrapper, NodeInteraction, } from '../../interfaces'; -import domtoimage from 'dom-to-image'; import { NetworkSettings } from '../../network-settings'; import { NetexControllerService } from 'src/app/services/netex-controller/netex-controller.service'; -import { defaultConfig, IConfig } from 'src/app/config'; -import { mapCustomEdge, mapCustomNode } from 'src/app/main-network'; -import { downLoadFile, pieChartContextRenderer, removeDuplicateObjectsFromList } from 'src/app/utils'; +import { mapCustomEdge } from 'src/app/main-network'; import { DrugstoneConfigService } from 'src/app/services/drugstone-config/drugstone-config.service'; import { NetworkHandlerService } from 'src/app/services/network-handler/network-handler.service'; import { LegendService } from 'src/app/services/legend-service/legend-service.service'; diff --git a/src/app/components/analysis-panel/drug-table/drug-table.component.html b/src/app/components/analysis-panel/drug-table/drug-table.component.html index 4bba0b25eefe47d8d765edab663deef5d27aa879..799e1e091af5dcff6352f9a9c04187848e98cbde 100644 --- a/src/app/components/analysis-panel/drug-table/drug-table.component.html +++ b/src/app/components/analysis-panel/drug-table/drug-table.component.html @@ -18,14 +18,14 @@ Approved <p-sortIcon [field]="'status'"></p-sortIcon> </th> - <th [pSortableColumn]="'inTrial'"> + <!-- <th [pSortableColumn]="'inTrial'"> In Trial <p-sortIcon [field]="'inTrial'"></p-sortIcon> </th> <th [pSortableColumn]="'inLiterature'"> In Literature <p-sortIcon [field]="'inLiterature'"></p-sortIcon> - </th> + </th> --> <th *ngIf="tableHasScores" [pSortableColumn]="'score'"> Score <span @@ -66,9 +66,10 @@ classString="icon has-text-danger" icon="times" ></app-fa-solid-icon> + Unapproved </span> </td> - <td> + <!-- <td> <span *ngIf="e.inTrial"> <app-fa-solid-icon classString="icon text-primary" @@ -97,7 +98,7 @@ icon="times" ></app-fa-solid-icon> </span> - </td> + </td> --> <td *ngIf="tableHasScores">{{ e.score.toString() | number }}</td> </tr> </ng-template> diff --git a/src/app/dialogs/launch-analysis/launch-analysis.component.ts b/src/app/dialogs/launch-analysis/launch-analysis.component.ts index 9099770f0372d713397fa81c60b4814e981c807d..138fabaddae67a474c0e107493c49ddc4891bf6c 100644 --- a/src/app/dialogs/launch-analysis/launch-analysis.component.ts +++ b/src/app/dialogs/launch-analysis/launch-analysis.component.ts @@ -119,8 +119,6 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges { parameters.ppi_dataset = this.drugstoneConfig.config.interactionProteinProtein; parameters.pdi_dataset = this.drugstoneConfig.config.interactionDrugProtein; parameters.licenced = this.drugstoneConfig.config.licensedDatasets; - - 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 diff --git a/src/app/services/analysis/analysis.service.ts b/src/app/services/analysis/analysis.service.ts index 38ff9a9053258d0fc7e6d358e9bcdd85d4a0be17..a479a1cc6f68768755b7281d30cdef23eaf63e8c 100644 --- a/src/app/services/analysis/analysis.service.ts +++ b/src/app/services/analysis/analysis.service.ts @@ -279,9 +279,9 @@ export class AnalysisService { num_trees: 5, tolerance: 10, custom_edges: this.drugstoneConfig.currentConfig().customEdges.default, + licenced: this.drugstoneConfig.config.licensedDatasets }; - const resp = await this.http.post<any>(`${this.netex.getBackend()}task/`, { algorithm: algorithm, target: target, diff --git a/src/stylesheets/styles-no-prefix.scss b/src/stylesheets/styles-no-prefix.scss index 8f73e02d58090408a83056855a094e54b84c08b1..16f3417bec10d57a46d057eeff026d0838492a94 100644 --- a/src/stylesheets/styles-no-prefix.scss +++ b/src/stylesheets/styles-no-prefix.scss @@ -4,6 +4,6 @@ width: 100vw !important; top: 0 !important; left: 0 !important; - z-index: $fullscreen-z; + z-index: $fullscreen-z !important; }