From e32e90932bc9d87051124c802f5ac703d3c39692 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@avalr.com.ua>
Date: Thu, 28 Jan 2021 19:27:24 +0200
Subject: [PATCH] Lwm2m: front: fix bug updateObserve...ToJson

---
 ...ofile-transport-configuration.component.ts | 66 +++++--------------
 1 file changed, 17 insertions(+), 49 deletions(-)

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 c77cdbf8c0..5277c791cc 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
@@ -264,59 +264,27 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
     const telemetryArray: Array<string> = [];
     const keyNameNew = {};
     const observeJson: ObjectLwM2M[] = JSON.parse(JSON.stringify(val));
-    const paths = new Set<string>();
-    let pathObj;
-    let pathInst;
-    let pathRes;
     observeJson.forEach(obj => {
-      for (const [key, value] of Object.entries(obj)) {
-        if (key === ID) {
-          pathObj = value;
-        }
-        if (key === INSTANCES) {
-          const instancesJson = value as Instance[];
-          if (instancesJson.length > 0) {
-            instancesJson.forEach(instance => {
-              for (const [instanceKey, instanceValue] of Object.entries(instance)) {
-                if (instanceKey === ID) {
-                  pathInst = instanceValue;
-                }
-                if (instanceKey === RESOURCES) {
-                  const resourcesJson = instanceValue as ResourceLwM2M[];
-                  if (resourcesJson.length > 0) {
-                    resourcesJson.forEach(res => {
-                      for (const [resourceKey, value] of Object.entries(res)) {
-                        if (resourceKey === ID) {
-                          pathRes = `/${pathObj}/${pathInst}/${value}`;
-                        } else if (resourceKey === ATTRIBUTE && value) {
-                          attributeArray.push(pathRes);
-                          paths.add(pathRes);
-                        } else if (resourceKey === TELEMETRY && value) {
-                          telemetryArray.push(pathRes);
-                          paths.add(pathRes);
-                        }
-                      }
-                    });
-                    /**
-                     * only if these paths are marked in ATTRIBUTE or TELEMETRY
-                     */
-                    resourcesJson.forEach(res => {
-                      for (const [resourceKey, value] of Object.entries(res)) {
-                        if (resourceKey === ID) {
-                          pathRes = `/${pathObj}/${pathInst}/${value}`;
-                        } else if (resourceKey === OBSERVE && paths.has(pathRes) && value) {
-                          observeArray.push(pathRes);
-                        } else if (resourceKey === KEY_NAME && paths.has(pathRes)) {
-                          keyNameNew[pathRes] = value;
-                        }
-                      }
-                    });
-                  }
+      if (obj.hasOwnProperty(INSTANCES) && Array.isArray(obj.instances)) {
+        obj.instances.forEach(instance => {
+          if (instance.hasOwnProperty(RESOURCES) && Array.isArray(instance.resources)) {
+            instance.resources.forEach(resource => {
+              let pathRes = `/${obj.id}/${instance.id}/${resource.id}`;
+              if (resource.attribute) {
+                attributeArray.push(pathRes);
+              }
+              if (resource.telemetry) {
+                telemetryArray.push(pathRes);
+              }
+              if (resource.attribute || resource.telemetry) {
+                keyNameNew[pathRes] = resource.keyName;
+                if (resource.observe) {
+                  observeArray.push(pathRes);
                 }
               }
-            });
+            })
           }
-        }
+        })
       }
     });
     if (isUndefined(this.configurationValue.observeAttr)) {