From 4e8af4a15dfdcdb1319e862179b8a8f0557b45dc Mon Sep 17 00:00:00 2001
From: deaflynx <artemio.babak@gmail.com>
Date: Wed, 4 Nov 2020 06:47:16 +0200
Subject: [PATCH] Code review: added 'edge' in AssetScope, refactored
 assets-table-config.resolver.ts for edge's assets title

---
 ui-ngx/src/app/modules/home/pages/asset/asset.component.ts   | 2 +-
 .../modules/home/pages/asset/assets-table-config.resolver.ts | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/asset/asset.component.ts b/ui-ngx/src/app/modules/home/pages/asset/asset.component.ts
index 5c3fd44a8e..ee79b58d45 100644
--- a/ui-ngx/src/app/modules/home/pages/asset/asset.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/asset/asset.component.ts
@@ -35,7 +35,7 @@ export class AssetComponent extends EntityComponent<AssetInfo> {
 
   entityType = EntityType;
 
-  assetScope: 'tenant' | 'customer' | 'customer_user';
+  assetScope: 'tenant' | 'customer' | 'customer_user' | 'edge';
 
   constructor(protected store: Store<AppState>,
               protected translate: TranslateService,
diff --git a/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts
index 5b48a5c36c..f6cc059a76 100644
--- a/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts
@@ -137,8 +137,9 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
             this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('asset.assets');
           }
         } else if (this.config.componentsData.assetScope === 'edge') {
-          this.edgeService.getEdge(this.edgeId).pipe(map(edge =>
-            this.config.tableTitle = edge.name + ': ' + this.translate.instant('asset.assets'))).subscribe();
+          this.edgeService.getEdge(this.edgeId).subscribe(
+            edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('asset.assets')
+          );
         } else {
           this.config.tableTitle = this.translate.instant('asset.assets');
         }