From 83d525aa92e3a16903ca0067fc9b7795aa0a032d Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 25 Jul 2023 10:35:14 +0300
Subject: [PATCH] UI: Clear code after merge

---
 ui-ngx/src/app/app.component.ts             | 9 ++++-----
 ui-ngx/src/app/shared/models/icon.models.ts | 9 ++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/app.component.ts b/ui-ngx/src/app/app.component.ts
index 8f6ab35590..a3b4657120 100644
--- a/ui-ngx/src/app/app.component.ts
+++ b/ui-ngx/src/app/app.component.ts
@@ -30,7 +30,7 @@ import { combineLatest } from 'rxjs';
 import { selectIsAuthenticated, selectIsUserLoaded } from '@core/auth/auth.selectors';
 import { distinctUntilChanged, filter, map, skip } from 'rxjs/operators';
 import { AuthService } from '@core/auth/auth.service';
-import { svgIcons } from '@shared/models/icon.models';
+import { svgIcons, svgIconsUrl } from '@shared/models/icon.models';
 
 @Component({
   selector: 'tb-root',
@@ -65,10 +65,9 @@ export class AppComponent implements OnInit {
       );
     }
 
-    this.matIconRegistry.addSvgIcon('windows', this.domSanitizer.bypassSecurityTrustResourceUrl('/assets/windows.svg'));
-    this.matIconRegistry.addSvgIcon('macos', this.domSanitizer.bypassSecurityTrustResourceUrl('/assets/macos.svg'));
-    this.matIconRegistry.addSvgIcon('linux', this.domSanitizer.bypassSecurityTrustResourceUrl('/assets/linux.svg'));
-    this.matIconRegistry.addSvgIcon('docker', this.domSanitizer.bypassSecurityTrustResourceUrl('/assets/docker.svg'));
+    for (const svgIcon of Object.keys(svgIconsUrl)) {
+      this.matIconRegistry.addSvgIcon(svgIcon, this.domSanitizer.bypassSecurityTrustResourceUrl(svgIcons[svgIcon]));
+    }
 
     this.storageService.testLocalStorage();
 
diff --git a/ui-ngx/src/app/shared/models/icon.models.ts b/ui-ngx/src/app/shared/models/icon.models.ts
index 8d7d4f65bd..85c6617aa1 100644
--- a/ui-ngx/src/app/shared/models/icon.models.ts
+++ b/ui-ngx/src/app/shared/models/icon.models.ts
@@ -56,8 +56,15 @@ export const svgIcons: {[key: string]: string} = {
     '</svg>'
 };
 
+export const svgIconsUrl: { [key: string]: string } = {
+  windows: '/assets/windows.svg',
+  macos: '/assets/macos.svg',
+  linux: '/assets/linux.svg',
+  docker: '/assets/docker.svg'
+};
+
 const svgIconNamespaces: string[] = ['mdi'];
-const svgIconNames = Object.keys(svgIcons);
+const svgIconNames = [...Object.keys(svgIcons), ...Object.keys(svgIconsUrl)];
 
 export const splitIconName = (iconName: string): [string, string] => {
   if (!iconName) {