diff --git a/src/app/components/info-tile/info-tile.component.html b/src/app/components/info-tile/info-tile.component.html index 7dc776064a8ca5599b5b6a9cf9420a44c556494b..0642dc229f09f3a9e52e7797814fbb4841f063a1 100644 --- a/src/app/components/info-tile/info-tile.component.html +++ b/src/app/components/info-tile/info-tile.component.html @@ -27,7 +27,7 @@ <span class="is-capitalized"> {{ wrapper.data.groupName }}</span> </p> <p *ngIf="wrapper.data.uniprotAc" [ngClass]="{'text-normal':smallStyle}"> - <b><span>Access:</span></b> + <b><span>Uniprot:</span></b> <a href="https://www.uniprot.org/uniprot/{{ wrapper.data.uniprotAc }}" target="_blank"> <span class="is-capitalized"> {{ wrapper.data.uniprotAc }}</span> </a> diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html index ba2291863121f2a1798afe28b6b4b8f187fb8f92..ae09a08e724639ca1a2bfe5358c016ec09cb99e0 100644 --- a/src/app/pages/explorer-page/explorer-page.component.html +++ b/src/app/pages/explorer-page/explorer-page.component.html @@ -650,17 +650,23 @@ class="seed-selection" [ngClass]="{ 'text-normal': 'smallStyle' }" > - <!-- <div class="card-content overflow"> + <div class="card-content overflow"> <table class="table selection-table" *ngIf="analysis.getCount() > 0"> <thead> <tr> <td>Label</td> + <td>Group</td> + <td *ngIf="myConfig.identifier !== 'symbol'">Symbol</td> + <td *ngIf="myConfig.identifier !== 'uniprot'">Uniprot</td> <td>Actions</td> </tr> </thead> <tbody> <tr *ngFor="let p of analysis.getSelection()"> <td><p class="is-capitalized">{{p.data.label}}</p></td> + <td><p>{{myConfig.nodeGroups[p.data.group]['groupName']}}</p></td> + <td *ngIf="myConfig.identifier !== 'symbol'"><p>{{p.data.symbol}}</p></td> + <td *ngIf="myConfig.identifier !== 'uniprot'"><p>{{p.data.uniprotAc}}</p></td> <td> <button (click)="analysis.removeItems([p])" class="button is-small is-danger is-outlined has-tooltip" tooltipPosition="top" pTooltip="Remove from selection."> @@ -671,11 +677,11 @@ </tbody> </table> <i *ngIf="analysis.getCount() === 0"> - Double-click on a protein to select it for the analysis. + Double-click on a node to select it for the analysis. </i> </div> - <footer class="card-footer" *ngIf="selectedAnalysisToken"> + <!-- <footer class="card-footer" *ngIf="selectedAnalysisToken"> <a (click)="analysis.addSeeds(currentViewNodes)" class="card-footer-item has-text-success" tooltipPosition="top" pTooltip="Add all visible seeds."> @@ -741,7 +747,7 @@ </a> </footer> --> - <!-- </div> --> + <!-- </div> --> <!-- </div> --> </div> </div> diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts index d425ac302fe96be527b230daf60d31cf288e8442..ad427a9ba299dde7c96964e018a41154aa6291ff 100644 --- a/src/app/pages/explorer-page/explorer-page.component.ts +++ b/src/app/pages/explorer-page/explorer-page.component.ts @@ -365,6 +365,7 @@ 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); @@ -372,6 +373,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { const options = NetworkSettings.getOptions('main'); this.networkInternal = new vis.Network(container, this.nodeData, options); + this.networkInternal.on('doubleClick', (properties) => { const nodeIds: Array<string> = properties.nodes; if (nodeIds.length > 0) { @@ -381,6 +383,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { // skip if node is not a protein mapped to backend return; } + console.log(node) const wrapper = getWrapperFromNode(node); if (this.analysis.inSelection(node)) { this.analysis.removeItems([wrapper]); diff --git a/src/stylesheets/styles.scss b/src/styles.scss similarity index 99% rename from src/stylesheets/styles.scss rename to src/styles.scss index d488e0be97b6de306e02996b6b40f7234504c429..a155108ae730a371837fa0d328b5fe0ce7923445 100644 --- a/src/stylesheets/styles.scss +++ b/src/styles.scss @@ -100,6 +100,7 @@ margin-left: 15px; } + div.covex.sidebar { height: $height; overflow-y: auto; @@ -148,11 +149,13 @@ max-height: 600px; } + div.card-content.overflow { overflow: auto; max-height: 350px; } + div.covex.network { height: 100%; float: left;