Merge branch 'refactor-rename' into 'master'

Rename several component, add trial column to analysis panel

See merge request covid-19/frontend!129

src/app/app.module.ts

@@ -12,14 +12,14 @@ import {AppRoutingModule} from './app-routing.module';
 import {ExplorerPageComponent} from './pages/explorer-page/explorer-page.component';
 import {AboutPageComponent} from './pages/about-page/about-page.component';
 import {HomePageComponent} from './pages/home-page/home-page.component';
-import {QueryComponent} from './components/query/query.component';
-import {LaunchAnalysisComponent} from './components/launch-analysis/launch-analysis.component';
-import {SelectDatasetComponent} from './components/select-dataset/select-dataset.component';
-import {AnalysisWindowComponent} from './components/analysis-window/analysis-window.component';
+import {QueryTileComponent} from './components/query-tile/query-tile.component';
+import {LaunchAnalysisComponent} from './dialogs/launch-analysis/launch-analysis.component';
+import {DatasetTileComponent} from './components/dataset-tile/dataset-tile.component';
+import {AnalysisPanelComponent} from './components/analysis-panel/analysis-panel.component';
 import {TaskListComponent} from './components/task-list/task-list.component';
 import {ToggleComponent} from './components/toggle/toggle.component';
-import {InfoBoxComponent} from './components/info-box/info-box.component';
-import {CustomProteinsComponent} from './components/custom-proteins/custom-proteins.component';
+import {InfoTileComponent} from './components/info-tile/info-tile.component';
+import {CustomProteinsComponent} from './dialogs/custom-proteins/custom-proteins.component';
 
 import {AnalysisService} from './analysis.service';
 
@@ -30,13 +30,13 @@ import {AnalysisService} from './analysis.service';
     ExplorerPageComponent,
     AboutPageComponent,
     HomePageComponent,
-    QueryComponent,
+    QueryTileComponent,
     LaunchAnalysisComponent,
-    SelectDatasetComponent,
-    AnalysisWindowComponent,
+    DatasetTileComponent,
+    AnalysisPanelComponent,
     TaskListComponent,
     ToggleComponent,
-    InfoBoxComponent,
+    InfoTileComponent,
     CustomProteinsComponent,
   ],
   imports: [

src/app/components/analysis-window/analysis-window.component.html → src/app/components/analysis-panel/analysis-panel.component.html

@@ -231,6 +231,10 @@
                 Status
                 <p-sortIcon [field]="'status'"></p-sortIcon>
               </th>
+              <th [pSortableColumn]="'inTrial'">
+                Trial
+                <p-sortIcon [field]="'inTrial'"></p-sortIcon>
+              </th>
               <th *ngIf="tableHasScores" [pSortableColumn]="'score'">
                 Score
                 <p-sortIcon [field]="'score'"></p-sortIcon>
@@ -241,7 +245,22 @@
             <tr>
               <td><a href="https://www.drugbank.ca/drugs/{{ e.drugId }}" target="_blank">{{ e.drugId }}</a></td>
               <td>{{e.name}}</td>
-              <td>{{e.status}}</td>
+              <td>
+                <span *ngIf="e.status === 'approved'">
+                  <i class="fa fa-check"></i>
+                  approved
+                </span>
+                <span *ngIf="e.status === 'unapproved'">
+                  <i class="fa fa-times"></i>
+                  not approved
+                </span>
+              </td>
+              <td>
+                <span *ngIf="e.inTrial">
+                  <i class="fa fa-microscope has-text-primary"></i>
+                  in Trial
+                </span>
+              </td>
               <td *ngIf="tableHasScores">{{e.score | number}}</td>
             </tr>
           </ng-template>

src/app/components/analysis-window/analysis-window.component.spec.ts → src/app/components/analysis-panel/analysis-panel.component.spec.ts

 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 
-import {AnalysisWindowComponent} from './analysis-window.component';
+import {AnalysisPanelComponent} from './analysis-panel.component';
 import {HttpClientModule} from '@angular/common/http';
 
 describe('AnalysisWindowComponent', () => {
-  let component: AnalysisWindowComponent;
-  let fixture: ComponentFixture<AnalysisWindowComponent>;
+  let component: AnalysisPanelComponent;
+  let fixture: ComponentFixture<AnalysisPanelComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [AnalysisWindowComponent],
+      declarations: [AnalysisPanelComponent],
       imports: [HttpClientModule],
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(AnalysisWindowComponent);
+    fixture = TestBed.createComponent(AnalysisPanelComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/components/analysis-window/analysis-window.component.ts → src/app/components/analysis-panel/analysis-panel.component.ts

@@ -39,11 +39,11 @@ interface Scored {
 }
 
 @Component({
-  selector: 'app-analysis-window',
-  templateUrl: './analysis-window.component.html',
-  styleUrls: ['./analysis-window.component.scss'],
+  selector: 'app-analysis-panel',
+  templateUrl: './analysis-panel.component.html',
+  styleUrls: ['./analysis-panel.component.scss'],
 })
-export class AnalysisWindowComponent implements OnInit, OnChanges {
+export class AnalysisPanelComponent implements OnInit, OnChanges {
 
   @ViewChild('network', {static: false}) networkEl: ElementRef;
 

src/app/components/select-dataset/select-dataset.component.spec.ts → src/app/components/dataset-tile/dataset-tile.component.spec.ts

 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SelectDatasetComponent } from './select-dataset.component';
+import { DatasetTileComponent } from './dataset-tile.component';
 
 describe('SelectDatasetComponent', () => {
-  let component: SelectDatasetComponent;
-  let fixture: ComponentFixture<SelectDatasetComponent>;
+  let component: DatasetTileComponent;
+  let fixture: ComponentFixture<DatasetTileComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SelectDatasetComponent ]
+      declarations: [ DatasetTileComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SelectDatasetComponent);
+    fixture = TestBed.createComponent(DatasetTileComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/components/select-dataset/select-dataset.component.ts → src/app/components/dataset-tile/dataset-tile.component.ts

@@ -2,12 +2,12 @@ import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {Dataset} from '../../interfaces';
 
 @Component({
-  selector: 'app-select-dataset',
-  templateUrl: './select-dataset.component.html',
-  styleUrls: ['./select-dataset.component.scss']
+  selector: 'app-dataset-tile',
+  templateUrl: './dataset-tile.component.html',
+  styleUrls: ['./dataset-tile.component.scss']
 })
 
-export class SelectDatasetComponent {
+export class DatasetTileComponent {
 
   @Input() selectedDataset: Dataset;
   @Output() selectedDatasetChange: EventEmitter<any> = new EventEmitter();

src/app/components/info-box/info-box.component.spec.ts → src/app/components/info-tile/info-tile.component.spec.ts

 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { InfoBoxComponent } from './info-box.component';
+import { InfoTileComponent } from './info-tile.component';
 import {HttpClientModule} from '@angular/common/http';
 
 describe('InfoBoxComponent', () => {
-  let component: InfoBoxComponent;
-  let fixture: ComponentFixture<InfoBoxComponent>;
+  let component: InfoTileComponent;
+  let fixture: ComponentFixture<InfoTileComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ InfoBoxComponent ],
+      declarations: [ InfoTileComponent ],
       imports: [HttpClientModule],
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(InfoBoxComponent);
+    fixture = TestBed.createComponent(InfoTileComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/components/info-box/info-box.component.ts → src/app/components/info-tile/info-tile.component.ts

@@ -3,11 +3,11 @@ import {Wrapper} from '../../interfaces';
 import {AnalysisService} from '../../analysis.service';
 
 @Component({
-  selector: 'app-info-box',
-  templateUrl: './info-box.component.html',
-  styleUrls: ['./info-box.component.scss']
+  selector: 'app-info-tile',
+  templateUrl: './info-tile.component.html',
+  styleUrls: ['./info-tile.component.scss']
 })
-export class InfoBoxComponent implements OnInit {
+export class InfoTileComponent implements OnInit {
 
   @Input()
   public wrapper: Wrapper;

src/app/components/query/query.component.spec.ts → src/app/components/query-tile/query-tile.component.spec.ts

 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { QueryComponent } from './query.component';
+import { QueryTileComponent } from './query-tile.component';
 
 describe('QueryComponent', () => {
-  let component: QueryComponent;
-  let fixture: ComponentFixture<QueryComponent>;
+  let component: QueryTileComponent;
+  let fixture: ComponentFixture<QueryTileComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ QueryComponent ]
+      declarations: [ QueryTileComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(QueryComponent);
+    fixture = TestBed.createComponent(QueryTileComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/components/query/query.component.ts → src/app/components/query-tile/query-tile.component.ts

@@ -2,11 +2,11 @@ import {Component, Input, Output, EventEmitter} from '@angular/core';
 import {Protein, Wrapper, ViralProtein} from '../../interfaces';
 
 @Component({
-  selector: 'app-query-component',
-  templateUrl: './query.component.html',
-  styleUrls: ['./query.component.scss']
+  selector: 'app-query-tile-component',
+  templateUrl: './query-tile.component.html',
+  styleUrls: ['./query-tile.component.scss']
 })
-export class QueryComponent {
+export class QueryTileComponent {
 
 
   @Output() selectItem: EventEmitter<any> = new EventEmitter();