From 4b5ade990e119307ff2ec55f36b3c3f472b9e840 Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Mon, 21 Dec 2020 13:28:53 +0200
Subject: [PATCH] Added Manage edge for customers and filter by type

---
 .../app/modules/home/pages/customer/customer.component.html | 6 ++++++
 .../home/pages/customer/customers-table-config.resolver.ts  | 3 +++
 .../pages/dashboard/dashboards-table-config.resolver.ts     | 2 +-
 .../modules/home/pages/edge/edges-table-config.resolver.ts  | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/customer/customer.component.html b/ui-ngx/src/app/modules/home/pages/customer/customer.component.html
index bb75d81fbd..750be237c3 100644
--- a/ui-ngx/src/app/modules/home/pages/customer/customer.component.html
+++ b/ui-ngx/src/app/modules/home/pages/customer/customer.component.html
@@ -40,6 +40,12 @@
           [fxShow]="!isEdit">
     {{'customer.manage-dashboards' | translate }}
   </button>
+  <button mat-raised-button color="primary"
+          [disabled]="(isLoading$ | async)"
+          (click)="onEntityAction($event, 'manageEdges')"
+          [fxShow]="!isEdit">
+    {{'customer.manage-edges' | translate }}
+  </button>
   <button mat-raised-button color="primary"
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'delete')"
diff --git a/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
index dccad6bd2a..d523dcf9a5 100644
--- a/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
@@ -179,6 +179,9 @@ export class CustomersTableConfigResolver implements Resolve<EntityTableConfig<C
       case 'manageDashboards':
         this.manageCustomerDashboards(action.event, action.entity);
         return true;
+      case 'manageEdges':
+        this.manageCustomerEdges(action.event, action.entity);
+        return true;
     }
     return false;
   }
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 afda43e54c..9fabd38d5c 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
@@ -300,7 +300,7 @@ export class DashboardsTableConfigResolver implements Resolve<EntityTableConfig<
     if (dashboardScope === 'edge') {
       actions.push(
         {
-          name: this.translate.instant('dashboard.unassign-dashboards-from-edge'),
+          name: this.translate.instant('dashboard.unassign-dashboards'),
           icon: 'portable_wifi_off',
           isEnabled: true,
           onAction: ($event, entities) => this.unassignDashboardsFromEdge($event, entities)
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
index 9fe8c9b77e..46e0fb6c33 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
@@ -167,7 +167,7 @@ export class EdgesTableConfigResolver implements Resolve<EntityTableConfig<EdgeI
     }
     if (edgeScope === 'customer') {
       this.config.entitiesFetchFunction = pageLink =>
-        this.edgeService.getCustomerEdgeInfos(this.customerId, pageLink);
+        this.edgeService.getCustomerEdgeInfos(this.customerId, pageLink, this.config.componentsData.edgeType);
       this.config.deleteEntity = id => this.edgeService.unassignEdgeFromCustomer(id.id);
     }
   }