From 0c1e608051ac4e77cade38a27587635351e54737 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Thu, 17 Jun 2021 16:35:30 +0300
Subject: [PATCH] UI: Refactoring lwm2m object list

---
 .../device/lwm2m/lwm2m-object-list.component.ts     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
index ae7c3ccdc6..62d96b69e0 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
@@ -89,6 +89,13 @@ export class Lwm2mObjectListComponent implements ControlValueAccessor, OnInit, V
       objectsList: [this.objectsList],
       objectLwm2m: ['']
     });
+    this.lwm2mListFormGroup.valueChanges.subscribe((value) => {
+      let formValue = null;
+      if (this.lwm2mListFormGroup.valid) {
+        formValue = value;
+      }
+      this.propagateChange(formValue);
+    });
   }
 
   private updateValidators = (): void => {
@@ -142,7 +149,7 @@ export class Lwm2mObjectListComponent implements ControlValueAccessor, OnInit, V
         this.objectsList = [];
         this.modelValue = [];
       }
-      this.lwm2mListFormGroup.get('objectsList').setValue(this.objectsList, {emitEvents: false});
+      this.lwm2mListFormGroup.patchValue({objectsList: this.objectsList}, {emitEvent: false});
       this.dirty = false;
     }
   }
@@ -195,9 +202,9 @@ export class Lwm2mObjectListComponent implements ControlValueAccessor, OnInit, V
     }
   }
 
-  private clear = (): void => {
+  private clear() {
     this.searchText = '';
-    this.lwm2mListFormGroup.get('objectLwm2m').patchValue(null);
+    this.lwm2mListFormGroup.get('objectLwm2m').patchValue(null, {emitEvent: false});
     setTimeout(() => {
       this.objectInput.nativeElement.blur();
       this.objectInput.nativeElement.focus();