From 83e68b7c621e860faed7e2230aea210fc798f54b Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Thu, 21 Dec 2023 18:16:02 +0200
Subject: [PATCH 1/2] Changes to be in sync with PE

---
 .../pages/rulechain/rulechains-table-config.resolver.ts     | 6 +++---
 ui-ngx/src/assets/locale/locale.constant-ca_ES.json         | 3 +--
 ui-ngx/src/assets/locale/locale.constant-cs_CZ.json         | 1 -
 ui-ngx/src/assets/locale/locale.constant-de_DE.json         | 1 -
 ui-ngx/src/assets/locale/locale.constant-en_US.json         | 1 -
 ui-ngx/src/assets/locale/locale.constant-es_ES.json         | 1 -
 ui-ngx/src/assets/locale/locale.constant-fr_FR.json         | 1 -
 ui-ngx/src/assets/locale/locale.constant-tr_TR.json         | 1 -
 ui-ngx/src/assets/locale/locale.constant-zh_CN.json         | 1 -
 9 files changed, 4 insertions(+), 12 deletions(-)

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 bcbf1b8844..c39b4bf573 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
@@ -172,10 +172,10 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
     if (ruleChainScope === 'edge') {
       actions.push(
         {
-          name: this.translate.instant('rulechain.assign-new-rulechain'),
+          name: this.translate.instant('edge.assign-to-edge'),
           icon: 'add',
           isEnabled: () => true,
-          onAction: ($event) => this.addRuleChainsToEdge($event)
+          onAction: ($event) => this.assignRuleChainsToEdge($event)
         }
       );
     }
@@ -442,7 +442,7 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
     );
   }
 
-  addRuleChainsToEdge($event: Event) {
+  assignRuleChainsToEdge($event: Event) {
     if ($event) {
       $event.stopPropagation();
     }
diff --git a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
index e6a2523fd3..db7d6b06ce 100644
--- a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json
@@ -3646,8 +3646,7 @@
         "assign-rulechains": "Assignar cadenes de regles",
         "delete-rulechains": "Eliminar cadenes de regles",
         "unassign-rulechain": "Anul·lar assignació de cadena de regles",
-        "unassign-rulechains-from-edge-action-title": "Anul·lar assignació {count, plural, =1 {1 cadena de regles} other {# cadenes de regles} } des vores",
-        "assign-new-rulechain": "Assignar nova cadena de regles"
+        "unassign-rulechains-from-edge-action-title": "Anul·lar assignació {count, plural, =1 {1 cadena de regles} other {# cadenes de regles} } des vores"
     },
     "rulenode": {
         "details": "Detalls",
diff --git a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
index c0950bb047..7402aedc5c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
+++ b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
@@ -2411,7 +2411,6 @@
         "search": "Vyhledat řetězy pravidel",
         "selected-rulechains": "Vybráno { count, plural, =1 {1 řetězů pravidel} other {# řetězů pravidel} }",
         "open-rulechain": "Otevřít řetěz pravidel",
-        "assign-new-rulechain": "Přiřadit nový řetěz pravidel",
         "edge-template-root": "Hlavní šablona",
         "assign-to-edge": "Přiřadit k edge",
         "edge-rulechain": "Řetěz pravidel edge",
diff --git a/ui-ngx/src/assets/locale/locale.constant-de_DE.json b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
index a636d05ca6..582e3e2902 100644
--- a/ui-ngx/src/assets/locale/locale.constant-de_DE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-de_DE.json
@@ -1552,7 +1552,6 @@
     "management": "Regelverwaltung",
     "debug-mode": "Modus zur Fehlersuche",
     "assign-rulechains": "Regelketten zuweisen",
-    "assign-new-rulechain": "Neues Regelkette zuweisen",
     "delete-rulechains": "Regelketten löschen",
     "unassign-rulechain": "Nicht zugeordnete Regelkette",
     "unassign-rulechains": "Nicht zugeordnete Regelketten",
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 e1ad56730c..85658c885c 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3754,7 +3754,6 @@
         "search": "Search rule chains",
         "selected-rulechains": "{ count, plural, =1 {1 rule chain} other {# rule chains} } selected",
         "open-rulechain": "Open rule chain",
-        "assign-new-rulechain": "Assign new rulechain",
         "edge-template-root": "Template root",
         "assign-to-edge": "Assign to edge",
         "edge-rulechain": "Edge rule chain",
diff --git a/ui-ngx/src/assets/locale/locale.constant-es_ES.json b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
index 25c98f3ce1..8727339851 100644
--- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json
+++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json
@@ -3679,7 +3679,6 @@
         "search": "Buscar cadenas de reglas",
         "selected-rulechains": "{ count, plural, =1 {1 cadena de reglas} other {# cadenas de reglas} } seleccionadas",
         "open-rulechain": "Abrir cadena de reglas",
-        "assign-new-rulechain": "Asignar nueva cadena de reglas",
         "edge-template-root": "Raíz de plantilla",
         "assign-to-edge": "Asignar a Edge",
         "edge-rulechain": "Cadena de reglas de Edge",
diff --git a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
index 9fbdfef9f4..7e678d9ed9 100644
--- a/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-fr_FR.json
@@ -1866,7 +1866,6 @@
         "set-root-rulechain-title": "Voulez-vous vraiment que la chaîne de règles '{{ruleChainName}} soit racine  (root) ?",
         "system": "Système",
         "assign-rulechains": "Attribuer aux chaînes de règles",
-        "assign-new-rulechain": "Attribuer une nouvele chaînes de règles",
         "delete-rulechains": "Supprimer une chaînes de règles",
         "unassign-rulechain": "Retirer chaîne de règles",
         "unassign-rulechains": "Retirer chaînes de règles",
diff --git a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
index e9be2e691a..b5b70cd8f9 100644
--- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
+++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json
@@ -2430,7 +2430,6 @@
     "search": "Kural Ara",
     "selected-rulechains": "{ count, plural, =1 {1 kural} other {# kural} } seçildi",
     "open-rulechain": "Kuralı Aç",
-    "assign-new-rulechain": "Yeni kural zinciri atayın",
     "edge-template-root": "Şablon Kökü",
     "assign-to-edge": "Uca Ata",
     "edge-rulechain": "Uç kuralı zinciri",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
index aaf90d3db0..f0d07fa506 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -3681,7 +3681,6 @@
         "search": "查找规则链",
         "selected-rulechains": "已选择 { count, plural, =1 {1 个规则链} other {# 个规则链} }",
         "open-rulechain": "打开规则链",
-        "assign-new-rulechain": "分配新的规则链",
         "edge-template-root": "模版根链",
         "assign-to-edge": "分配给边缘",
         "edge-rulechain": "边缘规则链",

From 49d38fa11e0e3bd6d18d9b77e355e2263d29d548 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Thu, 21 Dec 2023 18:31:09 +0200
Subject: [PATCH 2/2] Fixed assign to edge label

---
 .../home/pages/rulechain/rulechains-table-config.resolver.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c39b4bf573..72ec5ea8e6 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
@@ -172,7 +172,7 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
     if (ruleChainScope === 'edge') {
       actions.push(
         {
-          name: this.translate.instant('edge.assign-to-edge'),
+          name: this.translate.instant('rulechain.assign-to-edge'),
           icon: 'add',
           isEnabled: () => true,
           onAction: ($event) => this.assignRuleChainsToEdge($event)