Merge pull request #4 from coverbeck/firecloud-icon

Add FireCloud button
ucsc-cgp · Mar 21, 2018 · 748bc58 · 748bc58
2 parents 7bc73a7 + 174a74c
commit 748bc58
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/spa/src/app/files/files.component.html b/spa/src/app/files/files.component.html
@@ -14,7 +14,7 @@
             matTooltip="Export to FireCloud"
             [matTooltipPosition]="'before'"
             (click)="onExportToFireCloud()">
-        <mat-icon>cloud_upload</mat-icon>
+        <mat-icon svgIcon="firecloud"></mat-icon>
     </button>
     <bw-table></bw-table>
 </div>
diff --git a/spa/src/app/files/files.component.ts b/spa/src/app/files/files.component.ts
@@ -22,11 +22,12 @@ import {
 import { selectFileFacetsFileFacets, selectFileSummary } from "./_ngrx/file.selectors";
 import { AppState } from "../_ngrx/app.state";
 import { FetchFileFacetsRequestAction } from "./_ngrx/file-facet-list/file-facet-list.actions";
-import { MatDialog } from "@angular/material";
+import { MatDialog, MatIconRegistry } from "@angular/material";
 import { FileExportComponent } from "./file-export/file-export.component";
 import { FileExportManifestState } from "./_ngrx/file-export/file-export.state";
 import { FireCloudDAO } from "./file-export/fire-cloud-dao";
 import { CCAlertDialogComponent } from "../shared/cc-alert-dialog/cc-alert-dialog.component";
+import { DomSanitizer } from "@angular/platform-browser";
 
 @Component({
     selector: "bw-files",
@@ -51,10 +52,14 @@ export class FilesComponent implements OnInit {
     constructor(route: ActivatedRoute,
                 store: Store<AppState>,
                 private dialog: MatDialog,
-                private fireCloudDAO: FireCloudDAO) {
+                private fireCloudDAO: FireCloudDAO,
+                private iconRegistry: MatIconRegistry,
+                private sanitizer: DomSanitizer) {
 
         this.route = route;
         this.store = store;
+        iconRegistry.addSvgIcon("firecloud",
+            sanitizer.bypassSecurityTrustResourceUrl("/assets/images/thirdparty/FireCloud-white-icon.svg"));
     }
 
     /**

diff --git a/spa/src/app/files/files.module.ts b/spa/src/app/files/files.module.ts
@@ -54,6 +54,7 @@ import { TableComponent } from "./table/table.component";
 import { FileExportComponent } from "./file-export/file-export.component";
 import { FireCloudDAO } from "./file-export/fire-cloud-dao";
 import { CCAlertDialogComponent } from "../shared/cc-alert-dialog/cc-alert-dialog.component";
+import { HttpClientModule } from "@angular/common/http";
 
 @NgModule({
     imports: [
@@ -80,6 +81,9 @@ import { CCAlertDialogComponent } from "../shared/cc-alert-dialog/cc-alert-dialo
         CCStopPropagationModule,
         CcTypeaheadModule,
 
+        // Needed for icon registry
+        HttpClientModule,
+
         KeywordsModule
 
         // EffectsModule.run(FilesEffects)

diff --git a/spa/src/assets/images/thirdparty/FireCloud-white-icon.svg b/spa/src/assets/images/thirdparty/FireCloud-white-icon.svg