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 af08aff3e935d0a4bbf0bc47d34bda7dc0042151..79d4fb92956ffef2c79336dddd583ac0c8597c2f 100644 --- a/src/app/pages/explorer-page/explorer-page.component.html +++ b/src/app/pages/explorer-page/explorer-page.component.html @@ -641,17 +641,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."> @@ -662,11 +668,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."> @@ -732,7 +738,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 01c4d5155c7f6194a027b4fc0af17b43dd85d5ff..5a633121e7217773623213d25d3a0848cb05f2b1 100644 --- a/src/app/pages/explorer-page/explorer-page.component.ts +++ b/src/app/pages/explorer-page/explorer-page.component.ts @@ -366,6 +366,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); @@ -373,6 +374,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) { @@ -382,6 +384,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/styles.scss b/src/styles.scss index 271fd576f1e7288a4682512c1cc89df0119bdcea..2f17c519c7bfbc5043b809117436ace541e6e8de 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -222,7 +222,6 @@ div.field.has-addons.add-remove-toggle { } .toolbar { - padding: 5px; border-top: 2px solid #d0d0d0; .field {