From 0ef1711b28d29218e208db563d91e6abe5941849 Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Tue, 20 Oct 2020 16:08:59 +0300
Subject: [PATCH 1/8] Replaced copy edge id and key buttons

---
 ui/package-lock.json                   |  2 +-
 ui/src/app/edge/edge-fieldset.tpl.html | 38 ++++++++++----------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 6bc1035b88..bbaf0f3bd3 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "thingsboard",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/ui/src/app/edge/edge-fieldset.tpl.html b/ui/src/app/edge/edge-fieldset.tpl.html
index bf0f09d972..2ef04b16ac 100644
--- a/ui/src/app/edge/edge-fieldset.tpl.html
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
@@ -48,6 +48,20 @@
         <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
         <span translate>edge.copy-id</span>
     </md-button>
+    <md-button ngclipboard data-clipboard-action="copy"
+               ngclipboard-success="onEdgeInfoCopied('key')"
+               data-clipboard-text="{{edge.routingKey}}" ng-show="!isEdit"
+               class="md-raised">
+        <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
+        <span translate>edge.copy-edge-key</span>
+    </md-button>
+    <md-button ngclipboard data-clipboard-action="copy"
+               ngclipboard-success="onEdgeInfoCopied('secret')"
+               data-clipboard-text="{{edge.secret}}" ng-show="!isEdit"
+               class="md-raised">
+        <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
+        <span translate>edge.copy-edge-secret</span>
+    </md-button>
     <md-button ng-click="onEdgeSync(edge.id)"
                ng-show="!isEdit"
                class="md-raised">
@@ -103,35 +117,13 @@
                 <div translate ng-message="required">edge.cloud-endpoint-required</div>
             </div>
         </md-input-container>
-    </fieldset>
-    <div layout="row">
         <md-input-container class="md-block" flex>
             <label translate>edge.edge-key</label>
             <input ng-model="edge.routingKey" disabled>
         </md-input-container>
-        <md-button class="md-icon-button" style="margin-top: 14px;"
-                   ngclipboard data-clipboard-action="copy"
-                   ngclipboard-success="onEdgeInfoCopied('key')"
-                   data-clipboard-text="{{edge.routingKey}}">
-            <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
-            <md-tooltip md-direction="top">
-                {{ 'edge.copy-edge-key' | translate }}
-            </md-tooltip>
-        </md-button>
-    </div>
-    <div layout="row">
         <md-input-container class="md-block" flex>
             <label translate>edge.edge-secret</label>
             <input ng-model="edge.secret" disabled>
         </md-input-container>
-        <md-button class="md-icon-button" style="margin-top: 14px;"
-                   ngclipboard data-clipboard-action="copy"
-                   data-clipboard-text="{{edge.secret}}"
-                   ngclipboard-success="onEdgeInfoCopied('secret')">
-            <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
-            <md-tooltip md-direction="top">
-                {{ 'edge.copy-edge-secret' | translate }}
-            </md-tooltip>
-        </md-button>
-    </div>
+    </fieldset>
 </md-content>

From 7b5060fc81973a5d78971ce8e94298659c1279c0 Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Thu, 22 Oct 2020 15:32:44 +0300
Subject: [PATCH 2/8] Removed 2 scope.loadEdgeInfo() lines

---
 ui/src/app/event/event-table.directive.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ui/src/app/event/event-table.directive.js b/ui/src/app/event/event-table.directive.js
index 9c7c57d5d7..d5d70d879b 100644
--- a/ui/src/app/event/event-table.directive.js
+++ b/ui/src/app/event/event-table.directive.js
@@ -112,7 +112,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
                                 scope.eventType, scope.tenantId, scope.events.nextPageLink);
                         } else {
                             promise = edgeService.getEdgeEvents(scope.entityId, scope.events.nextPageLink);
-                            scope.loadEdgeInfo();
                         }
                         if (promise) {
                             scope.events.pending = true;
@@ -142,7 +141,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
 
         scope.$watch("entityId", function(newVal, prevVal) {
             if (newVal && !angular.equals(newVal, prevVal)) {
-                scope.loadEdgeInfo();
                 scope.resetFilter();
                 scope.reload();
             }

From a0c7e68ee32931c421031ae1a03c323f97e415ee Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Thu, 22 Oct 2020 15:50:19 +0300
Subject: [PATCH 3/8] Modified edge-fieldset.tpl.html

---
 ui/src/app/edge/edge-fieldset.tpl.html | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ui/src/app/edge/edge-fieldset.tpl.html b/ui/src/app/edge/edge-fieldset.tpl.html
index a5ac3424dc..2ef04b16ac 100644
--- a/ui/src/app/edge/edge-fieldset.tpl.html
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
@@ -68,20 +68,6 @@
         <md-icon md-svg-icon="mdi:sync"></md-icon>
         <span translate>edge.sync</span>
     </md-button>
-    <md-button ngclipboard data-clipboard-action="copy"
-               ngclipboard-success="onEdgeInfoCopied('key')"
-               data-clipboard-text="{{edge.routingKey}}" ng-show="!isEdit"
-               class="md-raised">
-        <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
-        <span translate>edge.copy-edge-key</span>
-    </md-button>
-    <md-button ngclipboard data-clipboard-action="copy"
-               ngclipboard-success="onEdgeInfoCopied('secret')"
-               data-clipboard-text="{{edge.secret}}" ng-show="!isEdit"
-               class="md-raised">
-        <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
-        <span translate>edge.copy-edge-secret</span>
-    </md-button>
 </div>
 
 <md-content class="md-padding" layout="column">

From 99bd0ece91ae9d0fa25ff38cab7fe1eab6055a0f Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Thu, 22 Oct 2020 16:06:20 +0300
Subject: [PATCH 4/8] fixed isPublic issue with assets and edges

---
 .../app/customer/customer-fieldset.tpl.html   |  4 +--
 ui/src/app/edge/edge-fieldset.tpl.html        | 25 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/customer/customer-fieldset.tpl.html b/ui/src/app/customer/customer-fieldset.tpl.html
index a23959ef96..a67a4391df 100644
--- a/ui/src/app/customer/customer-fieldset.tpl.html
+++ b/ui/src/app/customer/customer-fieldset.tpl.html
@@ -16,10 +16,10 @@
 
 -->
 <md-button ng-click="onManageUsers({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.manage-users' | translate }}</md-button>
-<md-button ng-click="onManageAssets({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.manage-assets' | translate }}</md-button>
+<md-button ng-click="onManageAssets({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-assets' | translate }}</md-button>
 <md-button ng-click="onManageDevices({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-devices' | translate }}</md-button>
 <md-button ng-click="onManageDashboards({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-dashboards' | translate }}</md-button>
-<md-button ng-click="onManageEdges({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.manage-edges' | translate }}</md-button>
+<md-button ng-click="onManageEdges({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-edges' | translate }}</md-button>
 <md-button ng-click="onDeleteCustomer({event: $event})" ng-show="!isEdit && !isPublic" class="md-raised md-primary">{{ 'customer.delete' | translate }}</md-button>
 
 <div layout="row">
diff --git a/ui/src/app/edge/edge-fieldset.tpl.html b/ui/src/app/edge/edge-fieldset.tpl.html
index 2ef04b16ac..ddc109a2cc 100644
--- a/ui/src/app/edge/edge-fieldset.tpl.html
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
@@ -117,13 +117,36 @@
                 <div translate ng-message="required">edge.cloud-endpoint-required</div>
             </div>
         </md-input-container>
+    </fieldset>
+    <div layout="row">
+
         <md-input-container class="md-block" flex>
             <label translate>edge.edge-key</label>
             <input ng-model="edge.routingKey" disabled>
         </md-input-container>
+        <md-button class="md-icon-button" style="margin-top: 14px;"
+                   ngclipboard data-clipboard-action="copy"
+                   ngclipboard-success="onEdgeInfoCopied('key')"
+                   data-clipboard-text="{{edge.routingKey}}">
+            <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
+            <md-tooltip md-direction="top">
+                {{ 'edge.copy-edge-key' | translate }}
+            </md-tooltip>
+        </md-button>
+    </div>
+    <div layout="row">
         <md-input-container class="md-block" flex>
             <label translate>edge.edge-secret</label>
             <input ng-model="edge.secret" disabled>
         </md-input-container>
-    </fieldset>
+        <md-button class="md-icon-button" style="margin-top: 14px;"
+                   ngclipboard data-clipboard-action="copy"
+                   data-clipboard-text="{{edge.secret}}"
+                   ngclipboard-success="onEdgeInfoCopied('secret')">
+            <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
+            <md-tooltip md-direction="top">
+                {{ 'edge.copy-edge-secret' | translate }}
+            </md-tooltip>
+        </md-button>
+    </div>
 </md-content>

From 032655c8391f114446186e2b9cfb76e8ed555560 Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Fri, 23 Oct 2020 05:09:21 +0300
Subject: [PATCH 5/8] LoadEdgeInfo() removed 1 usage

---
 ui/server.js                              | 4 ++--
 ui/src/app/event/event-table.directive.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/server.js b/ui/server.js
index e6cb1d650d..c52b378e01 100644
--- a/ui/server.js
+++ b/ui/server.js
@@ -28,10 +28,10 @@ const express = require('express');
 const http = require('http');
 const httpProxy = require('http-proxy');
 const forwardHost = 'localhost';
-const forwardPort = 8080;
+const forwardPort = 8085;
 
 const ruleNodeUiforwardHost = 'localhost';
-const ruleNodeUiforwardPort = 8080;
+const ruleNodeUiforwardPort = 8085;
 
 const app = express();
 const server = http.createServer(app);
diff --git a/ui/src/app/event/event-table.directive.js b/ui/src/app/event/event-table.directive.js
index d5d70d879b..93a425a200 100644
--- a/ui/src/app/event/event-table.directive.js
+++ b/ui/src/app/event/event-table.directive.js
@@ -112,6 +112,7 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
                                 scope.eventType, scope.tenantId, scope.events.nextPageLink);
                         } else {
                             promise = edgeService.getEdgeEvents(scope.entityId, scope.events.nextPageLink);
+                            scope.loadEdgeInfo();
                         }
                         if (promise) {
                             scope.events.pending = true;

From 2836de1bb1d94877b9a8cae404cb6e975fac7566 Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Fri, 23 Oct 2020 05:11:56 +0300
Subject: [PATCH 6/8] server.js

---
 ui/server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/server.js b/ui/server.js
index c52b378e01..e6cb1d650d 100644
--- a/ui/server.js
+++ b/ui/server.js
@@ -28,10 +28,10 @@ const express = require('express');
 const http = require('http');
 const httpProxy = require('http-proxy');
 const forwardHost = 'localhost';
-const forwardPort = 8085;
+const forwardPort = 8080;
 
 const ruleNodeUiforwardHost = 'localhost';
-const ruleNodeUiforwardPort = 8085;
+const ruleNodeUiforwardPort = 8080;
 
 const app = express();
 const server = http.createServer(app);

From 9ee792cac39a3fbf71fe0b33d4d58a91ae7b633b Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Thu, 5 Nov 2020 09:31:05 +0200
Subject: [PATCH 7/8] Edge events fixed queueStartTs attribute

---
 ui/src/app/event/event-row-edge-event.tpl.html |  2 +-
 ui/src/app/event/event-row.directive.js        | 18 ++++++++----------
 ui/src/app/event/event-table.directive.js      | 10 ++++------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/ui/src/app/event/event-row-edge-event.tpl.html b/ui/src/app/event/event-row-edge-event.tpl.html
index 6cc06d0cc3..e8773d34ca 100644
--- a/ui/src/app/event/event-row-edge-event.tpl.html
+++ b/ui/src/app/event/event-row-edge-event.tpl.html
@@ -19,7 +19,7 @@
 <div class="tb-cell" flex="20">{{ event.type }}</div>
 <div class="tb-cell" flex="40">{{ event.action }}</div>
 <div class="tb-cell" flex="20">{{ event.entityId }}</div>
-<div class="tb-cell" flex="15" ng-style="isPending ? {'color': 'rgba(0, 0, 0, .38)'} : {'color': '#000'}">{{ updateStatus(event.createdTime) | translate }}</div>
+<div class="tb-cell" flex="15" ng-style="{'color': statusColor}">{{ updateStatus(event.createdTime) | translate }}</div>
 <div class="tb-cell" flex="10">
     <md-button ng-if="checkEdgeEventType(event.type)" class="md-icon-button md-primary"
                ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')"
diff --git a/ui/src/app/event/event-row.directive.js b/ui/src/app/event/event-row.directive.js
index 39f3f46622..817b2456ab 100644
--- a/ui/src/app/event/event-row.directive.js
+++ b/ui/src/app/event/event-row.directive.js
@@ -167,17 +167,15 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $
         $compile(element.contents())(scope);
 
         scope.updateStatus = function(eventCreatedTime) {
-            if (scope.queueStartTs) {
-                var status;
-                if (eventCreatedTime < scope.queueStartTs) {
-                    status = $translate.instant('edge.success');
-                    scope.isPending = false;
-                } else {
-                    status = $translate.instant('edge.failed');
-                    scope.isPending = true;
-                }
-                return status;
+            var status;
+            if (eventCreatedTime < scope.queueStartTs) {
+                status = $translate.instant('edge.success');
+                scope.statusColor = '#000';
+            } else {
+                status = $translate.instant('edge.failed');
+                scope.statusColor = 'rgba(0, 0, 0, .38)';
             }
+            return status;
         }
     }
 
diff --git a/ui/src/app/event/event-table.directive.js b/ui/src/app/event/event-table.directive.js
index 762d4f308d..746f82c405 100644
--- a/ui/src/app/event/event-table.directive.js
+++ b/ui/src/app/event/event-table.directive.js
@@ -220,7 +220,6 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
         }
 
         scope.subscriptionId = null;
-        scope.queueStartTs = 0;
 
         scope.loadEdgeInfo = function() {
             attributeService.getEntityAttributesValues(
@@ -228,11 +227,10 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
                 scope.entityId,
                 types.attributesScope.server.value,
                 types.edgeAttributeKeys.queueStartTs,
-                {})
-                .then(function success(attributes) {
-                    scope.onEdgeAttributesUpdate(attributes);
-                });
-
+                null).then(
+                    function success(attributes) {
+                        attributes.length > 0 ? scope.onEdgeAttributesUpdate(attributes) : scope.queueStartTs = 0;
+                    });
             scope.checkSubscription();
         }
 

From 7582d503fbb27f4b6fa46d7502c82dadd64bcb33 Mon Sep 17 00:00:00 2001
From: Artem Babak <artemio.babak@gmail.com>
Date: Wed, 11 Nov 2020 15:52:14 +0200
Subject: [PATCH 8/8] edgeEvents refactoring

---
 ui/src/app/common/types.constant.js            | 12 ++++++++++++
 ui/src/app/event/event-row-edge-event.tpl.html |  2 +-
 ui/src/app/event/event-row.directive.js        |  8 ++++----
 ui/src/app/locale/locale.constant-de_DE.json   |  4 ++--
 ui/src/app/locale/locale.constant-en_US.json   |  6 +++---
 ui/src/app/locale/locale.constant-es_ES.json   |  4 ++--
 ui/src/app/locale/locale.constant-fr_FR.json   |  4 ++--
 7 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js
index 5d5e85ab9e..998e2b612e 100644
--- a/ui/src/app/common/types.constant.js
+++ b/ui/src/app/common/types.constant.js
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { grey300, grey900 } from 'material-ui/styles/colors';
+
 export default angular.module('thingsboard.types', [])
     .constant('types',
         {
@@ -403,6 +405,16 @@ export default angular.module('thingsboard.types', [])
                 widgetType: "WIDGET_TYPE",
                 adminSettings: "ADMIN_SETTINGS"
             },
+            edgeEventStatus: {
+                "DEPLOYED": {
+                    name: "edge.deployed",
+                    color: grey900
+                },
+                "PENDING": {
+                    name: "edge.pending",
+                    color: grey300
+                }
+            },
             edgeAttributeKeys: {
                 active: "active",
                 lastConnectTime: "lastConnectTime",
diff --git a/ui/src/app/event/event-row-edge-event.tpl.html b/ui/src/app/event/event-row-edge-event.tpl.html
index e8773d34ca..01b6c6e261 100644
--- a/ui/src/app/event/event-row-edge-event.tpl.html
+++ b/ui/src/app/event/event-row-edge-event.tpl.html
@@ -19,7 +19,7 @@
 <div class="tb-cell" flex="20">{{ event.type }}</div>
 <div class="tb-cell" flex="40">{{ event.action }}</div>
 <div class="tb-cell" flex="20">{{ event.entityId }}</div>
-<div class="tb-cell" flex="15" ng-style="{'color': statusColor}">{{ updateStatus(event.createdTime) | translate }}</div>
+<div class="tb-cell" flex="15" ng-style="{'color': statusColor}">{{ updateStatus(event.createdTime) }}</div>
 <div class="tb-cell" flex="10">
     <md-button ng-if="checkEdgeEventType(event.type)" class="md-icon-button md-primary"
                ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')"
diff --git a/ui/src/app/event/event-row.directive.js b/ui/src/app/event/event-row.directive.js
index 817b2456ab..77718a5968 100644
--- a/ui/src/app/event/event-row.directive.js
+++ b/ui/src/app/event/event-row.directive.js
@@ -169,11 +169,11 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $
         scope.updateStatus = function(eventCreatedTime) {
             var status;
             if (eventCreatedTime < scope.queueStartTs) {
-                status = $translate.instant('edge.success');
-                scope.statusColor = '#000';
+                status = $translate.instant(types.edgeEventStatus.DEPLOYED.name);
+                scope.statusColor = types.edgeEventStatus.DEPLOYED.color;
             } else {
-                status = $translate.instant('edge.failed');
-                scope.statusColor = 'rgba(0, 0, 0, .38)';
+                status = $translate.instant(types.edgeEventStatus.PENDING.name);
+                scope.statusColor = types.edgeEventStatus.PENDING.color;
             }
             return status;
         }
diff --git a/ui/src/app/locale/locale.constant-de_DE.json b/ui/src/app/locale/locale.constant-de_DE.json
index 582b7b72c2..81558e7ab2 100644
--- a/ui/src/app/locale/locale.constant-de_DE.json
+++ b/ui/src/app/locale/locale.constant-de_DE.json
@@ -805,8 +805,8 @@
     "set-root-rule-chain-to-edges": "Regelkette zur Wurzel machen für die Rand",
     "set-root-rule-chain-to-edges-text": "Die Regelkette zur Wurzel für { count, plural, 1 {1 Rand} other {# Rand} } machen",
     "status": "Von Rand empfangen",
-    "success": "Bereitgestellt",
-    "failed": "Steht aus",
+    "deployed": "Bereitgestellt",
+    "pending": "Steht aus",
     "entity-id": "Entität ID",
     "entity-info": "Entitätsinfo",
     "event-action": "Ereignisaktion",
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 412280603c..bb8661a841 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -817,7 +817,7 @@
         "make-private-edge-text": "After the confirmation the edge and all its data will be made private and won't be accessible by others.",
         "import": "Import edge",
         "label": "Label",
-        "load-entity-error": "Entity not found. Failed to load info",
+        "load-entity-error": "Failed to load data. Entity not found or has been deleted.",
         "assign-new-edge": "Assign new edge",
         "manage-edge-dashboards": "Manage edge dashboards",
         "unassign-from-edge": "Unassign from edge",
@@ -841,8 +841,8 @@
         "set-root-rule-chain-to-edges": "Set root rule chain for Edge(s)",
         "set-root-rule-chain-to-edges-text": "Set root rule chain for { count, plural, 1 {1 edge} other {# edges} }",
         "status": "Received by edge",
-        "success": "Deployed",
-        "failed": "Pending"
+        "deployed": "Deployed",
+        "pending": "Pending"
     },
     "error": {
         "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",
diff --git a/ui/src/app/locale/locale.constant-es_ES.json b/ui/src/app/locale/locale.constant-es_ES.json
index 3eea48845f..060c762fec 100644
--- a/ui/src/app/locale/locale.constant-es_ES.json
+++ b/ui/src/app/locale/locale.constant-es_ES.json
@@ -818,8 +818,8 @@
         "set-root-rule-chain-to-edges": "Establecer la cadena de reglas raíz para Edge (s)",
         "set-root-rule-chain-to-edges-text": "Establecer la cadena de la regla raíz para {count, plural, 1 {1 borde} other {# bordes}}",
         "status": "Recibido por borde",
-        "success": "Desplegada",
-        "failed": "Pendiente",
+        "deployed": "Desplegada",
+        "pending": "Pendiente",
         "entity-id": "ID de entidad",
         "entity-info": "Entity info",
         "event-action": "Información de la entidad",
diff --git a/ui/src/app/locale/locale.constant-fr_FR.json b/ui/src/app/locale/locale.constant-fr_FR.json
index ffd4e05896..fcd2bc4d22 100644
--- a/ui/src/app/locale/locale.constant-fr_FR.json
+++ b/ui/src/app/locale/locale.constant-fr_FR.json
@@ -823,8 +823,8 @@
         "set-root-rule-chain-to-edges": "Définir la chaîne de règles racine pour bordure(s)",
         "set-root-rule-chain-to-edges-text": "Définir la chaîne de règles racine pour {count, plural, 1 {1 bordure} other {# bordures} }",
         "status": "Reçu par bord",
-        "success": "Déployée",
-        "failed": "En attente",
+        "deployed": "Déployée",
+        "pending": "En attente",
         "entity-id": "ID d'entité",
         "entity-info": "Informations sur l'entité",
         "event-action": "Action d'événement",