dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9893 from volodymyr-babak/edge-ui-fixes

Browse Source 
Changes to be in sync with PE
This commit is contained in:
Igor Kulikov 2023-12-22 17:31:22 +02:00 committed by GitHub
commit 73f443f65d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
View File

@ -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('rulechain.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();
}

3
ui-ngx/src/assets/locale/locale.constant-ca_ES.json
View File

@ -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",

1
ui-ngx/src/assets/locale/locale.constant-cs_CZ.json
View File

@ -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",

1
ui-ngx/src/assets/locale/locale.constant-de_DE.json
View File

@ -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",

1
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -3757,7 +3757,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",

1
ui-ngx/src/assets/locale/locale.constant-es_ES.json
View File

@ -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",

1
ui-ngx/src/assets/locale/locale.constant-fr_FR.json
View File

@ -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",

1
ui-ngx/src/assets/locale/locale.constant-tr_TR.json
View File

@ -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",

1
ui-ngx/src/assets/locale/locale.constant-zh_CN.json
View File

@ -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": "边缘规则链",