diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts index 73d7e1d0d67065c4fd771f02b0a2c330d4fd678d..23ed1cd4d68c3c3e8df5f55cb902c84dc4190829 100644 --- a/src/app/components/analysis-panel/analysis-panel.component.ts +++ b/src/app/components/analysis-panel/analysis-panel.component.ts @@ -187,28 +187,22 @@ export class AnalysisPanelComponent implements OnInit, OnChanges { this.network = new vis.Network(container, this.nodeData, options); - const promises: Promise<any>[] = []; - promises.push(this.http.get<any>(`${environment.backend}task_result/?token=${this.token}&view=drugs`).toPromise() - .then((table) => { - this.tableDrugs = table; - this.tableDrugs.forEach((r) => { - r.rawScore = r.score; - }); - })); - promises.push(this.http.get<any>(`${environment.backend}task_result/?token=${this.token}&view=proteins`).toPromise() - .then((table) => { - this.tableProteins = table; - this.tableSelectedProteins = []; - this.tableProteins.forEach((r) => { - r.rawScore = r.score; - r.isSeed = this.seedMap[r.id]; - const wrapper = getWrapperFromNode(r); - if (this.analysis.inSelection(wrapper)) { - this.tableSelectedProteins.push(r); - } - }); - })); - await Promise.all(promises); + this.tableDrugs = nodes.filter( e => e.netexId && e.netexId.startsWith('d'));; + this.tableDrugs.forEach((r) => { + r.rawScore = r.score; + }); + + this.tableProteins = nodes.filter( e => e.netexId && e.netexId.startsWith('p')); + this.tableSelectedProteins = []; + this.tableProteins.forEach((r) => { + r.rawScore = r.score; + r.isSeed = this.seedMap[r.id]; + const wrapper = getWrapperFromNode(r); + if (this.analysis.inSelection(wrapper)) { + this.tableSelectedProteins.push(r); + } + }); + this.tableHasScores = ['trustrank', 'closeness', 'degree', 'proximity', 'betweenness', 'quick', 'super'] .indexOf(this.task.info.algorithm) !== -1; @@ -496,6 +490,7 @@ export class AnalysisPanelComponent implements OnInit, OnChanges { nodeDetails.group = nodeDetails.group ? nodeDetails.group : 'default'; nodeDetails.label = nodeDetails.label ? nodeDetails.label : nodeDetails[identifier] } + console.log(nodeDetails) // IMPORTANT we set seeds to "selected" and not to seeds. The user should be inspired to run // further analysis and the button function can be used to highlight seeds // option to use scores[node] as gradient, but sccores are very small @@ -626,6 +621,8 @@ export class AnalysisPanelComponent implements OnInit, OnChanges { this.tableSelectedProteins = e; const addItems = []; const removeItems = []; + console.log(e) + for (const i of this.tableSelectedProteins) { const wrapper = getWrapperFromNode(i); if (oldSelection.indexOf(i) === -1) { diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts index ad427a9ba299dde7c96964e018a41154aa6291ff..5a1deefb73365683b418f9743b44f0d2d8d39ead 100644 --- a/src/app/pages/explorer-page/explorer-page.component.ts +++ b/src/app/pages/explorer-page/explorer-page.component.ts @@ -365,7 +365,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { this.proteinData.linkNodes(); const {nodes, edges} = this.proteinData.mapDataToNetworkInput(this.myConfig); - console.log('first item nodes', nodes[0]) this.nodeData.nodes = new vis.DataSet(nodes); this.nodeData.edges = new vis.DataSet(edges); diff --git a/src/stylesheets/theme-styles.scss b/src/stylesheets/theme-styles.scss index f74f3986972cd20962433a4b93fa574147e01eb9..55967b6c8174a346f13780dd0f4a73f8eec46605 100644 --- a/src/stylesheets/theme-styles.scss +++ b/src/stylesheets/theme-styles.scss @@ -64,6 +64,11 @@ background-color: var(--drgstn-border) !important; } + // legend styles + .legend { + color: var(--drgstn-text-primary); + } + .modal-card-body { .label { color: var(--drgstn-text-primary) !important; @@ -246,14 +251,7 @@ network-expander { --thumbBG: var(--drgstn-primary); --scrollbarBG: var(--drgstn-background); -} -network-expander { scrollbar-width: thin; scrollbar-color: var(--thumbBG) var(--scrollbarBG); } - - - - -