From 5541cdb007a3d8e488f671ce571290edcfa188af Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Mon, 10 Apr 2023 16:09:46 +0300
Subject: [PATCH] UI: Fixed show edge details panel

---
 .../home/pages/edge/edge.component.html       | 65 ++++++++++---------
 .../assets/locale/locale.constant-en_US.json  | 10 +--
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/edge/edge.component.html b/ui-ngx/src/app/modules/home/pages/edge/edge.component.html
index 89bd77151d..ef0c452a7b 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edge.component.html
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge.component.html
@@ -40,49 +40,48 @@
           [fxShow]="!isEdit && (edgeScope === 'customer' || edgeScope === 'tenant') && isAssignedToCustomer(entity)">
     {{ (entity?.customerIsPublic ? 'edge.make-private' : 'edge.unassign-from-customer') | translate }}
   </button>
+  <button mat-raised-button color="primary"
+          [disabled]="(isLoading$ | async)"
+          (click)="onEntityAction($event, 'openEdgeAssets')"
+          [fxShow]="!isEdit && edgeScope !== 'customer'">
+    {{'edge.manage-assets' | translate }}
+  </button>
+  <button mat-raised-button color="primary"
+          [disabled]="(isLoading$ | async)"
+          (click)="onEntityAction($event, 'openEdgeDevices')"
+          [fxShow]="!isEdit && edgeScope !== 'customer'">
+    {{'edge.manage-devices' | translate }}
+  </button>
+  <button mat-raised-button color="primary"
+          [disabled]="(isLoading$ | async)"
+          (click)="onEntityAction($event, 'openEdgeEntityViews')"
+          [fxShow]="!isEdit && edgeScope !== 'customer'">
+    {{'edge.manage-entity-views' | translate }}
+  </button>
+  <button mat-raised-button color="primary"
+          [disabled]="(isLoading$ | async)"
+          (click)="onEntityAction($event, 'openEdgeDashboards')"
+          [fxShow]="!isEdit && edgeScope !== 'customer'">
+    {{'edge.manage-dashboards' | translate }}
+  </button>
+  <button mat-raised-button color="primary"
+          [disabled]="(isLoading$ | async)"
+          (click)="onEntityAction($event, 'openEdgeRuleChains')"
+          [fxShow]="!isEdit && edgeScope === 'tenant'">
+    {{'edge.manage-rulechains' | translate }}
+  </button>
   <button mat-raised-button color="primary" fxFlex.xs
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'delete')"
           [fxShow]="!hideDelete() && !isEdit">
     {{'edge.delete' | translate }}
   </button>
-  <div fxLayout="row wrap" fxLayout.xs="column">
-    <button mat-raised-button color="primary"
-            [disabled]="(isLoading$ | async)"
-            (click)="onEntityAction($event, 'openEdgeAssets')"
-            [fxShow]="!isEdit && edgeScope !== 'customer'">
-      {{'edge.edge-assets' | translate }}
-    </button>
-    <button mat-raised-button color="primary"
-            [disabled]="(isLoading$ | async)"
-            (click)="onEntityAction($event, 'openEdgeDevices')"
-            [fxShow]="!isEdit && edgeScope !== 'customer'">
-      {{'edge.edge-devices' | translate }}
-    </button>
-    <button mat-raised-button color="primary"
-            [disabled]="(isLoading$ | async)"
-            (click)="onEntityAction($event, 'openEdgeEntityViews')"
-            [fxShow]="!isEdit && edgeScope !== 'customer'">
-      {{'edge.edge-entity-views' | translate }}
-    </button>
-    <button mat-raised-button color="primary"
-            [disabled]="(isLoading$ | async)"
-            (click)="onEntityAction($event, 'openEdgeDashboards')"
-            [fxShow]="!isEdit && edgeScope !== 'customer'">
-      {{'edge.edge-dashboards' | translate }}
-    </button>
-    <button mat-raised-button color="primary"
-            [disabled]="(isLoading$ | async)"
-            (click)="onEntityAction($event, 'openEdgeRuleChains')"
-            [fxShow]="!isEdit && edgeScope === 'tenant'">
-      {{'edge.edge-rulechains' | translate }}
-    </button>
-  </div>
   <div fxLayout="row wrap" fxLayout.xs="column">
     <button mat-raised-button
             ngxClipboard
             (cbOnSuccess)="onEdgeIdCopied($event)"
             [cbContent]="entity?.id?.id"
+            [disabled]="(isLoading$ | async)"
             [fxShow]="!isEdit">
       <mat-icon svgIcon="mdi:clipboard-arrow-left"></mat-icon>
       <span translate>edge.copy-id</span>
@@ -91,6 +90,7 @@
             ngxClipboard
             (cbOnSuccess)="onEdgeInfoCopied('key')"
             [cbContent]="entity?.routingKey"
+            [disabled]="(isLoading$ | async)"
             [fxShow]="!isEdit && edgeScope !== 'customer_user'">
       <mat-icon svgIcon="mdi:clipboard-arrow-left"></mat-icon>
       <span translate>edge.copy-edge-key</span>
@@ -99,6 +99,7 @@
             ngxClipboard
             (cbOnSuccess)="onEdgeInfoCopied('secret')"
             [cbContent]="entity?.secret"
+            [disabled]="(isLoading$ | async)"
             [fxShow]="!isEdit && edgeScope !== 'customer_user'">
       <mat-icon svgIcon="mdi:clipboard-arrow-left"></mat-icon>
       <span translate>edge.copy-edge-secret</span>
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index b8b7e81c44..2402944a55 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1820,11 +1820,11 @@
         "edge-secret": "Edge secret",
         "copy-edge-secret": "Copy Edge secret",
         "edge-secret-copied-message": "Edge secret has been copied to clipboard",
-        "edge-assets": "Edge assets",
-        "edge-devices": "Edge devices",
-        "edge-entity-views": "Edge entity views",
-        "edge-dashboards": "Edge dashboards",
-        "edge-rulechains": "Edge rule chains",
+        "manage-assets": "Manage assets",
+        "manage-devices": "Manage devices",
+        "manage-entity-views": "Manage entity views",
+        "manage-dashboards": "Manage dashboards",
+        "manage-rulechains": "Manage rule chains",
         "assets": "Edge assets",
         "devices": "Edge devices",
         "entity-views": "Edge entity views",