From a0c504ade6ff4871fca8155f9374e718bfb1ef7e Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Wed, 30 Jun 2021 12:06:30 +0300
Subject: [PATCH] UI: LwM2M device profile add new setting
 compositeOperationsSupport

---
 ...2m-device-profile-transport-configuration.component.html | 2 ++
 ...2m-device-profile-transport-configuration.component.scss | 4 ++++
 ...wm2m-device-profile-transport-configuration.component.ts | 6 ++++--
 .../profile/device/lwm2m/lwm2m-profile-config.models.ts     | 4 +++-
 ui-ngx/src/assets/locale/locale.constant-en_US.json         | 3 ++-
 5 files changed, 15 insertions(+), 4 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 a54a33733d..571820acb2 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
@@ -168,6 +168,8 @@
               </mat-select>
             </mat-form-field>
           </fieldset>
+          <mat-slide-toggle class="mat-slider"
+           formControlName="compositeOperationsSupport">{{ 'device-profile.lwm2m.composite-operations-support' | translate }}</mat-slide-toggle>
 <!--          <mat-accordion multi="true">-->
 <!--            <div *ngIf="false">-->
 <!--              <mat-expansion-panel>-->
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.scss b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.scss
index 25532ec165..c096e5462a 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.scss
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.scss
@@ -24,4 +24,8 @@
       color: rgba(0, 0, 0, .7);
     }
   }
+
+  .mat-slider {
+    margin: 8px 0 8px 10px;
+  }
 }
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 90f68bb92c..777431ea3a 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
@@ -117,7 +117,8 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
         swUpdateStrategy: [1, []],
         fwUpdateResource: [{value: '', disabled: true}, []],
         swUpdateResource: [{value: '', disabled: true}, []],
-        powerMode: [null, Validators.required]
+        powerMode: [PowerMode.DRX, Validators.required],
+        compositeOperationsSupport: [false]
       })
     });
     this.lwm2mDeviceConfigFormGroup = this.fb.group({
@@ -258,7 +259,8 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
           swUpdateStrategy: this.configurationValue.clientLwM2mSettings.swUpdateStrategy || 1,
           fwUpdateResource: fwResource,
           swUpdateResource: swResource,
-          powerMode: this.configurationValue.clientLwM2mSettings.powerMode
+          powerMode: this.configurationValue.clientLwM2mSettings.powerMode || PowerMode.DRX,
+          compositeOperationsSupport: this.configurationValue.clientLwM2mSettings.compositeOperationsSupport || false
         }
       },
       {emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-config.models.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-config.models.ts
index bc48182e9d..b550e4f5ae 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-config.models.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-config.models.ts
@@ -175,6 +175,7 @@ export interface ClientLwM2mSettings {
   fwUpdateResource: string;
   swUpdateResource: string;
   powerMode: PowerMode;
+  compositeOperationsSupport: boolean;
 }
 
 export interface ObservableAttributes {
@@ -231,7 +232,8 @@ export function getDefaultProfileClientLwM2mSettingsConfig(): ClientLwM2mSetting
     swUpdateStrategy: 1,
     fwUpdateResource: DEFAULT_FW_UPDATE_RESOURCE,
     swUpdateResource: DEFAULT_SW_UPDATE_RESOURCE,
-    powerMode: PowerMode.DRX
+    powerMode: PowerMode.DRX,
+    compositeOperationsSupport: 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 89c31a70c2..bf6b576952 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1328,7 +1328,8 @@
                 "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",