From 0be81ae7fea070059c086024b4e82471deb28bde Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Thu, 5 Nov 2020 12:18:46 +0200
Subject: [PATCH] Refactored method get edge name for title in edge's assigned
 entities

---
 .run/[CE Edge] Server.run.xml                               | 1 +
 .../pages/dashboard/dashboards-table-config.resolver.ts     | 5 +++--
 .../home/pages/device/devices-table-config.resolver.ts      | 5 +++--
 .../pages/entity-view/entity-views-table-config.resolver.ts | 5 +++--
 .../pages/rulechain/rulechains-table-config.resolver.ts     | 6 +++---
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.run/[CE Edge] Server.run.xml b/.run/[CE Edge] Server.run.xml
index 89667da5db..e13a1b0574 100644
--- a/.run/[CE Edge] Server.run.xml	
+++ b/.run/[CE Edge] Server.run.xml	
@@ -9,6 +9,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.thingsboard.server.ThingsboardServerApplication" />
     <module name="application" />
+    <option name="PROGRAM_PARAMETERS" value="$ContentRoot$" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="org.thingsboard.server.*" />
diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/dashboards-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/dashboard/dashboards-table-config.resolver.ts
index 0c4d68d435..7ea931f3ab 100644
--- a/ui-ngx/src/app/modules/home/pages/dashboard/dashboards-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/dashboard/dashboards-table-config.resolver.ts
@@ -132,8 +132,9 @@ export class DashboardsTableConfigResolver implements Resolve<EntityTableConfig<
             this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('dashboard.dashboards');
           }
         } else if (this.config.componentsData.dashboardScope === 'edge') {
-          this.edgeService.getEdge(this.config.componentsData.edgeId).pipe(map(edge =>
-            this.config.tableTitle = edge.name + ': ' + this.translate.instant('dashboard.dashboards'))).subscribe();
+          this.edgeService.getEdge(this.config.componentsData.edgeId).subscribe(
+            edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('dashboard.dashboards')
+          );
         } else {
           this.config.tableTitle = this.translate.instant('dashboard.dashboards');
         }
diff --git a/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
index 8c6e237b43..ccf0a34437 100644
--- a/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
@@ -142,8 +142,9 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
             this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('device.devices');
           }
         } else if (this.config.componentsData.deviceScope === 'edge') {
-          this.edgeService.getEdge(this.edgeId).pipe(map(edge =>
-            this.config.tableTitle = edge.name + ': ' + this.translate.instant('device.devices'))).subscribe();
+          this.edgeService.getEdge(this.edgeId).subscribe(
+            edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('device.devices')
+          );
         } else {
           this.config.tableTitle = this.translate.instant('device.devices');
         }
diff --git a/ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
index d0c6102288..60342a0bb3 100644
--- a/ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
@@ -137,8 +137,9 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
             this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('entity-view.entity-views');
           }
         } else if (this.config.componentsData.entityViewScope === 'edge') {
-          this.edgeService.getEdge(this.edgeId).pipe(map(edge =>
-            this.config.tableTitle = edge.name + ': ' + this.translate.instant('entity-view.entity-views'))).subscribe();
+          this.edgeService.getEdge(this.edgeId).subscribe(
+            edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('entity-view.entity-views')
+          );
         }
         else {
           this.config.tableTitle = this.translate.instant('entity-view.entity-views');
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
index bd8c9b8e1a..c6a842dc7c 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
@@ -155,11 +155,11 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
       this.config.entitiesFetchFunction = pageLink => this.fetchEdgeRuleChains(pageLink);
     } else if (ruleChainScope === 'edge') {
       if (isDefined(this.edgeId) && this.edgeId != null) {
-        this.edgeService.getEdge(this.edgeId)
-          .pipe(map(edge => {
+        this.edgeService.getEdge(this.edgeId).subscribe(
+            edge => {
             this.edge = edge;
             this.config.tableTitle = edge.name + ': ' + this.translate.instant('rulechain.edge-rulechains')
-          })).subscribe();
+          });
       }
       this.config.entitiesFetchFunction = pageLink => this.ruleChainService.getEdgeRuleChains(this.edgeId, pageLink);
     }