UI: Add dashboard logo sanitizer url; Added dashboard logo cache

@@ -128,6 +128,7 @@ import {
   DashboardImageDialogComponent,
   DashboardImageDialogComponent,
   DashboardImageDialogData, DashboardImageDialogResult
   DashboardImageDialogData, DashboardImageDialogResult
 } from '@home/components/dashboard-page/dashboard-image-dialog.component';
 } from '@home/components/dashboard-page/dashboard-image-dialog.component';
+import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
 
 
 // @dynamic
 // @dynamic
 @Component({
 @Component({
@@ -211,7 +212,8 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
 
 
   addingLayoutCtx: DashboardPageLayoutContext;
   addingLayoutCtx: DashboardPageLayoutContext;
 
 
-  logo = 'assets/logo_title_white.svg';
+  private dashboardLogoCache: SafeUrl;
+  private defaultDashboardLogo = 'assets/logo_title_white.svg';
 
 
   dashboardCtx: DashboardContext = {
   dashboardCtx: DashboardContext = {
     instanceId: this.utils.guid(),
     instanceId: this.utils.guid(),
@@ -312,7 +314,8 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
               private ngZone: NgZone,
               private ngZone: NgZone,
               private overlay: Overlay,
               private overlay: Overlay,
               private viewContainerRef: ViewContainerRef,
               private viewContainerRef: ViewContainerRef,
-              private cd: ChangeDetectorRef) {
+              private cd: ChangeDetectorRef,
+              private sanitizer: DomSanitizer) {
     super(store);
     super(store);
 
 
   }
   }
@@ -413,6 +416,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
   private reset() {
   private reset() {
     this.dashboard = null;
     this.dashboard = null;
     this.dashboardConfiguration = null;
     this.dashboardConfiguration = null;
+    this.dashboardLogoCache = undefined;
     this.prevDashboard = null;
     this.prevDashboard = null;
 
 
     this.widgetEditMode = false;
     this.widgetEditMode = false;
@@ -570,8 +574,12 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
     }
     }
   }
   }
 
 
-  public get dashboardLogo(): string {
-    return this.dashboard.configuration.settings.dashboardLogoUrl || this.logo;
+  public get dashboardLogo(): SafeUrl {
+    if (!this.dashboardLogoCache) {
+      const logo = this.dashboard.configuration.settings.dashboardLogoUrl || this.defaultDashboardLogo;
+      this.dashboardLogoCache = this.sanitizer.bypassSecurityTrustUrl(logo);
+    }
+    return this.dashboardLogoCache;
   }
   }
 
 
   public showRightLayoutSwitch(): boolean {
   public showRightLayoutSwitch(): boolean {
@@ -702,6 +710,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
     }).afterClosed().subscribe((data) => {
     }).afterClosed().subscribe((data) => {
       if (data) {
       if (data) {
         this.dashboard.configuration.settings = data.settings;
         this.dashboard.configuration.settings = data.settings;
+        this.dashboardLogoCache = undefined;
         const newGridSettings = data.gridSettings;
         const newGridSettings = data.gridSettings;
         if (newGridSettings) {
         if (newGridSettings) {
           const layout = this.dashboard.configuration.states[layoutKeys.state].layouts[layoutKeys.layout];
           const layout = this.dashboard.configuration.states[layoutKeys.state].layouts[layoutKeys.layout];
@@ -855,11 +864,13 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
       if (this.widgetEditMode) {
       if (this.widgetEditMode) {
         if (revert) {
         if (revert) {
           this.dashboard = this.prevDashboard;
           this.dashboard = this.prevDashboard;
+          this.dashboardLogoCache = undefined;
         }
         }
       } else {
       } else {
         this.resetHighlight();
         this.resetHighlight();
         if (revert) {
         if (revert) {
           this.dashboard = this.prevDashboard;
           this.dashboard = this.prevDashboard;
+          this.dashboardLogoCache = undefined;
           this.dashboardConfiguration = this.dashboard.configuration;
           this.dashboardConfiguration = this.dashboard.configuration;
           this.dashboardCtx.dashboardTimewindow = this.dashboardConfiguration.timewindow;
           this.dashboardCtx.dashboardTimewindow = this.dashboardConfiguration.timewindow;
           this.entityAliasesUpdated();
           this.entityAliasesUpdated();