From bddf587a7133a0655535328d7c7e615b192a6370 Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Fri, 21 Oct 2022 20:46:22 +0200
Subject: [PATCH] fixed info panel
---
.../analysis-panel/analysis-panel.component.ts | 3 ---
src/app/components/info-tile/info-tile.component.html | 7 +++----
src/app/components/info-tile/info-tile.component.ts | 9 +++++++--
src/app/pages/explorer-page/explorer-page.component.html | 3 ++-
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts
index 4919047a..ec0e09a7 100644
--- a/src/app/components/analysis-panel/analysis-panel.component.ts
+++ b/src/app/components/analysis-panel/analysis-panel.component.ts
@@ -48,9 +48,6 @@ interface Seeded {
isSeed: boolean;
}
-// interface Baited {
-// closestDistance: number;
-// }
@Component({
selector: 'app-analysis-panel',
diff --git a/src/app/components/info-tile/info-tile.component.html b/src/app/components/info-tile/info-tile.component.html
index 1b74adc1..2c6af49c 100644
--- a/src/app/components/info-tile/info-tile.component.html
+++ b/src/app/components/info-tile/info-tile.component.html
@@ -2,8 +2,7 @@
<div>
<p
*ngIf="
- !wrapper.data.drugId &&
- wrapper.data.detailShowLabel &&
+ !wrapper.data.drugstoneId &&
wrapper.data.label
"
[ngClass]="{ 'text-normal': drugstoneConfig.smallStyle }"
@@ -52,9 +51,9 @@
<span class="is-capitalized"> {{ entrez }}</span>
</a>
</p>
- <p *ngIf="wrapper.expression" [ngClass]="{ 'text-normal': drugstoneConfig.smallStyle }">
+ <p *ngIf="getExpressionScore()!=null" [ngClass]="{ 'text-normal': drugstoneConfig.smallStyle }">
<b><span>Expression:</span></b>
- <span class="is-capitalized"> {{ wrapper.expression | number }}</span>
+ <span class="is-capitalized"> {{ getExpressionScore() | number }}</span>
<span
class="icon has-text-info"
pTooltip="Tissue expression data is provided by the GTEx project. Unit is transcript per million."
diff --git a/src/app/components/info-tile/info-tile.component.ts b/src/app/components/info-tile/info-tile.component.ts
index a6e99fad..eca03802 100644
--- a/src/app/components/info-tile/info-tile.component.ts
+++ b/src/app/components/info-tile/info-tile.component.ts
@@ -1,5 +1,5 @@
import {Component, Input, OnInit} from '@angular/core';
-import { DrugstoneConfigService } from 'src/app/services/drugstone-config/drugstone-config.service';
+import {DrugstoneConfigService} from 'src/app/services/drugstone-config/drugstone-config.service';
import {Wrapper} from '../../interfaces';
import {AnalysisService} from '../../services/analysis/analysis.service';
@@ -10,15 +10,20 @@ import {AnalysisService} from '../../services/analysis/analysis.service';
styleUrls: ['./info-tile.component.scss', '../../pages/explorer-page/explorer-page.component.scss']
})
export class InfoTileComponent implements OnInit {
-
@Input() public wrapper: Wrapper;
+ @Input() public expressions: any;
constructor(public drugstoneConfig: DrugstoneConfigService, public analysis: AnalysisService) {
+
}
ngOnInit(): void {
}
+ public getExpressionScore() {
+ return this.expressions[this.wrapper.id]
+ }
+
public beautify(url: string): string {
if (url.startsWith('https://')) {
url = url.substr('https://'.length);
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index ec992fda..ce3a46ea 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -52,7 +52,7 @@
*ngIf="networkHandler.activeNetwork.selectedWrapper"
>
<span>
- {{ networkHandler.activeNetwork.selectedWrapper.data.group }}
+ {{ drugstoneConfig.config.nodeGroups[networkHandler.activeNetwork.selectedWrapper.data.group].groupName }}
</span>
</ng-container>
</p>
@@ -73,6 +73,7 @@
<div *ngIf="collapseDetails">
<div class="card-content">
<app-info-tile
+ [expressions]="networkHandler.activeNetwork.expressionMap"
[wrapper]="networkHandler.activeNetwork.selectedWrapper"
></app-info-tile>
</div>
--
GitLab