From 411a10e4d85f864b3c640fe187f2fee708f548ba Mon Sep 17 00:00:00 2001 From: rusikv Date: Mon, 22 Apr 2024 13:11:44 +0300 Subject: [PATCH 1/2] UI: removed deprecated composite operation support from lwm2m settings --- ...2m-device-profile-transport-configuration.component.html | 2 -- ...wm2m-device-profile-transport-configuration.component.ts | 6 ++---- ui-ngx/src/assets/locale/locale.constant-en_US.json | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.html index 677d45c6b0..4dc332afa1 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.html @@ -91,8 +91,6 @@ - {{ 'device-profile.lwm2m.composite-operations-support' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts index b3516501cb..6d4fe85fd5 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts +++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts @@ -116,8 +116,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro powerMode: [PowerMode.DRX, Validators.required], edrxCycle: [{disabled: true, value: 0}, Validators.required], psmActivityTimer: [{disabled: true, value: 0}, Validators.required], - pagingTransmissionWindow: [{disabled: true, value: 0}, Validators.required], - compositeOperationsSupport: [false] + pagingTransmissionWindow: [{disabled: true, value: 0}, Validators.required] }) }); @@ -275,8 +274,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro edrxCycle: this.configurationValue.clientLwM2mSettings.edrxCycle || DEFAULT_EDRX_CYCLE, pagingTransmissionWindow: this.configurationValue.clientLwM2mSettings.pagingTransmissionWindow || DEFAULT_PAGING_TRANSMISSION_WINDOW, - psmActivityTimer: this.configurationValue.clientLwM2mSettings.psmActivityTimer || DEFAULT_PSM_ACTIVITY_TIMER, - compositeOperationsSupport: this.configurationValue.clientLwM2mSettings.compositeOperationsSupport || false + psmActivityTimer: this.configurationValue.clientLwM2mSettings.psmActivityTimer || DEFAULT_PSM_ACTIVITY_TIMER } }, {emitEvent: false}); 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 35f48dfc0c..0353f0b58d 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -1901,8 +1901,7 @@ "step": "Step", "min-evaluation-period": "Minimum evaluation period", "max-evaluation-period": "Maximum evaluation period" - }, - "composite-operations-support": "Supports composite Read/Write/Observe operations" + } }, "snmp": { "add-communication-config": "Add communication config", From d42979da19b5ea2d1314c4df580e26e0d29c89a1 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Wed, 1 May 2024 14:03:16 +0300 Subject: [PATCH 2/2] UI: Remove unused translation --- ui-ngx/src/assets/locale/locale.constant-ca_ES.json | 3 +-- ui-ngx/src/assets/locale/locale.constant-cs_CZ.json | 3 +-- ui-ngx/src/assets/locale/locale.constant-es_ES.json | 3 +-- ui-ngx/src/assets/locale/locale.constant-nl_BE.json | 3 +-- ui-ngx/src/assets/locale/locale.constant-pl_PL.json | 3 +-- ui-ngx/src/assets/locale/locale.constant-tr_TR.json | 3 +-- ui-ngx/src/assets/locale/locale.constant-zh_CN.json | 3 +-- ui-ngx/src/assets/locale/locale.constant-zh_TW.json | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) 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 d530dae430..b2da56974f 100644 --- a/ui-ngx/src/assets/locale/locale.constant-ca_ES.json +++ b/ui-ngx/src/assets/locale/locale.constant-ca_ES.json @@ -1710,8 +1710,7 @@ "step": "Pas", "min-evaluation-period": "Període mínim d'avaluació", "max-evaluation-period": "Període màxim d'avaluació" - }, - "composite-operations-support": "Admet operacions compostes de lectura/escriptura/observació" + } }, "snmp": { "add-communication-config": "Afegeix la configuració de comunicació", 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 fa23dddb45..f371a19f29 100644 --- a/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json +++ b/ui-ngx/src/assets/locale/locale.constant-cs_CZ.json @@ -1301,8 +1301,7 @@ "step": "Krok", "min-evaluation-period": "Minimální interval evaluace", "max-evaluation-period": "Maximální interval evaluace" - }, - "composite-operations-support": "Podporuje kompozitní Read/Write/Observe operace" + } }, "snmp": { "add-communication-config": "Přidat konfiguraci komunikace", 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 e80fbf6c3e..4dd93cad1d 100644 --- a/ui-ngx/src/assets/locale/locale.constant-es_ES.json +++ b/ui-ngx/src/assets/locale/locale.constant-es_ES.json @@ -1835,8 +1835,7 @@ "step": "Paso", "min-evaluation-period": "Período mínimo de evaluación", "max-evaluation-period": "Período máximo de evaluación" - }, - "composite-operations-support": "Soporta operaciones Lectura/Escritura/Observación Compuestas" + } }, "snmp": { "add-communication-config": "Añadir configuración de comunicaciones", diff --git a/ui-ngx/src/assets/locale/locale.constant-nl_BE.json b/ui-ngx/src/assets/locale/locale.constant-nl_BE.json index 4cd3bb1e49..ed74dfe7fb 100644 --- a/ui-ngx/src/assets/locale/locale.constant-nl_BE.json +++ b/ui-ngx/src/assets/locale/locale.constant-nl_BE.json @@ -1935,8 +1935,7 @@ "step": "Stap", "min-evaluation-period": "Minimale evaluatieperiode", "max-evaluation-period": "Maximale evaluatieperiode" - }, - "composite-operations-support": "Ondersteunt samengestelde lees-/schrijf-/observatiebewerkingen" + } }, "snmp": { "add-communication-config": "Communicatieconfiguratie toevoegen", diff --git a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json index 58d4a0168f..d30d36b42d 100644 --- a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json +++ b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json @@ -1872,8 +1872,7 @@ "step":"Krok", "min-evaluation-period":"Minimalny okres oceny", "max-evaluation-period":"Maksymalny okres oceny" - }, - "composite-operations-support":"Obsługuje operacje złożone Odczyt/Zapis/Obserwacja" + } }, "snmp":{ "add-communication-config":"Dodaj konfigurację komunikacji", 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 e516196b28..a8098a7153 100644 --- a/ui-ngx/src/assets/locale/locale.constant-tr_TR.json +++ b/ui-ngx/src/assets/locale/locale.constant-tr_TR.json @@ -1316,8 +1316,7 @@ "step": "Adım", "min-evaluation-period": "Minimum değerlendirme süresi", "max-evaluation-period": "Maksimum değerlendirme süresi" - }, - "composite-operations-support": "İç içe Okuma/Yazma/Gözlemleme işlemlerini destekler" + } }, "snmp": { "add-communication-config": "İletişim yapılandırması ekle", 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 886151fdf2..541d5a0ed6 100644 --- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json +++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json @@ -1872,8 +1872,7 @@ "step": "步长", "min-evaluation-period": "最小评估周期", "max-evaluation-period": "最大评估周期" - }, - "composite-operations-support": "支持复合读取/写入/观察操作" + } }, "snmp": { "add-communication-config": "添加通信配置", diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json index eafc22498f..51f02e7855 100644 --- a/ui-ngx/src/assets/locale/locale.constant-zh_TW.json +++ b/ui-ngx/src/assets/locale/locale.constant-zh_TW.json @@ -1510,8 +1510,7 @@ "step": "步", "min-evaluation-period": "最小評估期間", "max-evaluation-period": "最大評估期間" - }, - "composite-operations-support": "支持複合讀/寫/觀察 操作" + } }, "snmp": { "add-communication-config": "新增通訊配置",