diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts index 4919047aac27aac1000f0e2e1990f1c81c7a6e80..ec0e09a761ceeab008045ce59e8b9707c1f9b8ed 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 1b74adc157819d6c9669ae61ef900ff72bc974c0..2c6af49c4cfe5d8ccb540bd85392dcbe592e4ffc 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 a6e99fad252d20de04df5dc1428391ddebfcc8a1..eca0380297456eea7622f525671cb0e6917adee5 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 ec992fdaa904a640c26626dcf295461a83465e97..ce3a46ea7b390b3a281a643be44df33a38922bd0 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>