@denevads/dnv-smo 1.0.26 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@denevads/dnv-smo",
-    "version": "1.0.26",
+    "version": "1.0.28",
     "description": "SMO module",
     "main": "./src/index.js",
     "types": "./src/index.d.ts",

package/src/smo.ts

@@ -11,10 +11,7 @@ import {
     GetRecursosRelleno
 } from "./interfaces/callbacks";
 import {interval, Subject, Subscription} from 'rxjs';
-interface Window {
-    external:ObjJSType;
-    objJS:ObjJSType;
-}
+
 // @ts-ignore
 
 export  class SMO  {
@@ -46,7 +43,9 @@ export  class SMO  {
             this.vars[decode(match[1])] = decode(match[2]);
         }
         // @ts-ignore
-        if(window.objJS){
+        if(window.objJS && window.self === window.top){
+            // @ts-ignore
+            console.log("Existe objJS en window -->" + JSON.stringify(window.objJS));
             // @ts-ignore
             window.sendToIframefromNet = (target, iframeID, objData) => {
                 console.log("sendToIframefromNet->",JSON.stringify(target));
@@ -58,10 +57,8 @@ export  class SMO  {
                          this.events.checkHealthPrinter.next(objData);
                          break;
                     }
-
-
             }
-
+            // @ts-ignore
             window.external = {
                 // @ts-ignore
                 URLNext: window.objJS.urlNext,
@@ -129,6 +126,7 @@ export  class SMO  {
                 CheckHealth: window.objJS.checkHealth
             };
         }else{
+            console.log("No existe objJS en window");
             if (this.vars.idSmo) {
                 this.id = this.vars.idSmo;
                 if(this.vars["LowPower"] == "true" && (this.vars["url"] != undefined || this.vars["LocalData"] != undefined)){
@@ -152,6 +150,7 @@ export  class SMO  {
                 return;
             }
             console.warn("No idSmo found in URL");
+            return;
         }
 
         if (this.vars.idSmo) {
@@ -192,7 +191,7 @@ export  class SMO  {
                 return;
             }
             if(func ==SMO_EVENT_TYPE.updatefromsalida){
-                selft.updatefromsalida(e.data.objdata);
+                selft.updatefromsalida(e.data.objData);
                 return;
             }
             if(func == SMO_EVENT_TYPE.getRecursosByCodigo){
@@ -743,38 +742,45 @@ class Utils{
         window.parent.postMessage(obj, dest);
     }
     setJsonObj(xml: any) {
-        let js_obj = {} as any;
+        let jsonObj = {} as any;
+    
         if (xml.nodeType == 1) { // Element
             if (xml.attributes.length > 0) {
-                js_obj["@attributes"] = {};
+                jsonObj["attributes"] = {};
                 for (let j = 0; j < xml.attributes.length; j++) {
                     let attribute = xml.attributes.item(j);
-                    js_obj["@attributes"][attribute.nodeName] = attribute.nodeValue;
+                    jsonObj["attributes"][attribute.nodeName] = attribute.nodeValue;
                 }
             }
         } else if (xml.nodeType == 3) { // Text
-            js_obj = xml.nodeValue;
+            jsonObj = xml.nodeValue.trim();
         } else if (xml.nodeType == 4) { // CDATA
-            js_obj = xml.nodeValue;
+            jsonObj = xml.nodeValue.trim();
         }
+    
         if (xml.hasChildNodes()) {
             for (let i = 0; i < xml.childNodes.length; i++) {
-                let item = xml.childNodes.item(i);
+                let item = xml.childNodes[i];
                 let nodeName = item.nodeName;
-                if (typeof (js_obj[nodeName]) == "undefined") {
-                    js_obj[nodeName] = this.setJsonObj(item);
+    
+                if (nodeName == "#text" && item.nodeType == 3) {
+                    jsonObj = item.nodeValue.trim();
+                }else if (nodeName == "#cdata-section" && (item.nodeType == 4 || item.nodeType == 3)) { //Para que quede bonito
+                    jsonObj["cdata"] = this.setJsonObj(item);
+                } else if (typeof jsonObj[nodeName] === "undefined") {
+                    jsonObj[nodeName] = this.setJsonObj(item);
                 } else {
-                    if (typeof (js_obj[nodeName].push) == "undefined") {
-                        let old = js_obj[nodeName];
-                        js_obj[nodeName] = [];
-                        js_obj[nodeName].push(old);
+                    if (!Array.isArray(jsonObj[nodeName])) {
+                        jsonObj[nodeName] = [jsonObj[nodeName]];
                     }
-                    js_obj[nodeName].push(this.setJsonObj(item));
+                    jsonObj[nodeName].push(this.setJsonObj(item));
                 }
             }
         }
-        return js_obj;
+    
+        return jsonObj;
     }
+
     dataToJSON(data:setDatasource):any {
         try {
             var parser = new DOMParser();