reneco-hierarchized-picker 0.2.2-beta.3 → 0.2.2-beta.6

package/dist/cjs/reneco-hierarchized-picker.cjs.entry.js

@@ -214,7 +214,9 @@ Tree.prototype.bindEvent = function (ele) {
       this.onSwitcherClick(target);
     }
     //CUSTOM
-    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span'));
+    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span.treejs-label')).filter((ele) => {
+      return ele.parentNode.parentNode.parentNode === e.target.parentNode;
+    });
     let hasUndefinedchild = [];
     //This may be a problem the day a node value is "undefined"
     hasUndefinedchild = childspans.filter(ele => {
@@ -444,7 +446,10 @@ Tree.prototype.walkUp = function (node, changeState) {
         return;
       parent.status = pStatus;
       if (parent.parent) {
-        parent.parent.children.find(item => item.id === parent.id).status = pStatus;
+        let parentparentchild = parent.parent.children.find(item => item.id === parent.id);
+        if (parentparentchild) {
+          parentparentchild.status = pStatus;
+        }
       }
     }
     else {
@@ -18208,6 +18213,38 @@ const HierarchizedPickerComponent = class {
     });
     return source;
   }
+  searchAndMergeDataClassification(source, toadd) {
+    let terminate = false;
+    source.children.forEach((element, index) => {
+      if (terminate) {
+        return source;
+      }
+      if (source.ID == toadd.ID) {
+        let subterminate = false;
+        toadd.children.forEach((taelement, index) => {
+          if (subterminate) {
+            return;
+          }
+          if (element.ID == taelement.ID) {
+            element = this.mergeData(element, taelement);
+            subterminate = true;
+            return;
+          }
+        });
+      }
+      else {
+        if (element.ID == toadd.ID) {
+          element = this.mergeData(element, toadd);
+          terminate = true;
+          return source;
+        }
+        else {
+          this.searchAndMergeDataClassification(element, toadd);
+        }
+      }
+    });
+    return source;
+  }
   getNodeIdFromFullpath(fullpath) {
     return new Promise((resolve, reject) => {
       let token = this.theOptions.token;
@@ -18313,7 +18350,7 @@ const HierarchizedPickerComponent = class {
             if (xhr.status === 200) {
               that.mylog('XHR 200', JSON.parse(xhr.responseText));
               if (that.rawData) {
-                that.rawData = that.searchAndMergeData(that.rawData, JSON.parse(xhr.responseText));
+                that.rawData = that.searchAndMergeDataClassification(that.rawData, JSON.parse(xhr.responseText));
               }
               else {
                 that.rawData = JSON.parse(xhr.responseText);
@@ -18559,10 +18596,10 @@ const HierarchizedPickerComponent = class {
           .then(displayResults)
           .catch((error) => {
           try {
-            this.errorToLog = "getDataFromSource rejected:" + JSON.stringify(error, replacer, 2);
+            this.errorToLog = "getDataFromSource 1 rejected:" + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error("getDataFromSource rejected:", JSON.stringify(error, replacer, 2));
+            console.error("getDataFromSource 2 rejected:", JSON.stringify(error, replacer, 2));
           }
         });
       }
@@ -19176,8 +19213,9 @@ const HierarchizedPickerComponent = class {
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
-    if (this.theOptions.mode == 'input') {
-      document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input').classList.remove('fieldError');
+    let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
+    if (this.theOptions.mode == 'input' && searchinput) {
+      searchinput.classList.remove('fieldError');
     }
     if (searched.length > 2) {
       this.searchToDisplay += 1;
@@ -19283,10 +19321,10 @@ const HierarchizedPickerComponent = class {
         })
           .catch((error) => {
           try {
-            this.errorToLog = "getDataFromSource rejected:" + JSON.stringify(error, replacer, 2);
+            this.errorToLog = "getDataFromSource 3 rejected:" + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error("getDataFromSource rejected:", JSON.stringify(error, replacer, 2));
+            console.error("getDataFromSource 4 rejected:", JSON.stringify(error, replacer, 2));
           }
         });
       }
@@ -19345,7 +19383,7 @@ const HierarchizedPickerComponent = class {
           if (typeof dfValue == 'string' && isNumeric(dfValue)) {
             dfValue = parseInt(dfValue);
           }
-          if (that.options.origin == 'classification') {
+          if (that.theOptions.origin == 'classification') {
             if ((typeof dfValue == 'string' && that.getPropertyFromNode(element, 'Properties.FullPath') == dfValue) ||
               (typeof dfValue == 'number' && that.getPropertyFromNode(element, 'ID') == dfValue)) {
               element.nodeid = element.id;

package/dist/collection/components/hierarchized-picker/hierarchized-picker.js

@@ -439,6 +439,38 @@ export class HierarchizedPickerComponent {
     });
     return source;
   }
+  searchAndMergeDataClassification(source, toadd) {
+    let terminate = false;
+    source.children.forEach((element, index) => {
+      if (terminate) {
+        return source;
+      }
+      if (source.ID == toadd.ID) {
+        let subterminate = false;
+        toadd.children.forEach((taelement, index) => {
+          if (subterminate) {
+            return;
+          }
+          if (element.ID == taelement.ID) {
+            element = this.mergeData(element, taelement);
+            subterminate = true;
+            return;
+          }
+        });
+      }
+      else {
+        if (element.ID == toadd.ID) {
+          element = this.mergeData(element, toadd);
+          terminate = true;
+          return source;
+        }
+        else {
+          this.searchAndMergeDataClassification(element, toadd);
+        }
+      }
+    });
+    return source;
+  }
   getNodeIdFromFullpath(fullpath) {
     return new Promise((resolve, reject) => {
       let token = this.theOptions.token;
@@ -544,7 +576,7 @@ export class HierarchizedPickerComponent {
             if (xhr.status === 200) {
               that.mylog('XHR 200', JSON.parse(xhr.responseText));
               if (that.rawData) {
-                that.rawData = that.searchAndMergeData(that.rawData, JSON.parse(xhr.responseText));
+                that.rawData = that.searchAndMergeDataClassification(that.rawData, JSON.parse(xhr.responseText));
               }
               else {
                 that.rawData = JSON.parse(xhr.responseText);
@@ -790,10 +822,10 @@ export class HierarchizedPickerComponent {
           .then(displayResults)
           .catch((error) => {
           try {
-            this.errorToLog = "getDataFromSource rejected:" + JSON.stringify(error, replacer, 2);
+            this.errorToLog = "getDataFromSource 1 rejected:" + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error("getDataFromSource rejected:", JSON.stringify(error, replacer, 2));
+            console.error("getDataFromSource 2 rejected:", JSON.stringify(error, replacer, 2));
           }
         });
       }
@@ -1407,8 +1439,9 @@ export class HierarchizedPickerComponent {
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
-    if (this.theOptions.mode == 'input') {
-      document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input').classList.remove('fieldError');
+    let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
+    if (this.theOptions.mode == 'input' && searchinput) {
+      searchinput.classList.remove('fieldError');
     }
     if (searched.length > 2) {
       this.searchToDisplay += 1;
@@ -1514,10 +1547,10 @@ export class HierarchizedPickerComponent {
         })
           .catch((error) => {
           try {
-            this.errorToLog = "getDataFromSource rejected:" + JSON.stringify(error, replacer, 2);
+            this.errorToLog = "getDataFromSource 3 rejected:" + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error("getDataFromSource rejected:", JSON.stringify(error, replacer, 2));
+            console.error("getDataFromSource 4 rejected:", JSON.stringify(error, replacer, 2));
           }
         });
       }
@@ -1576,7 +1609,7 @@ export class HierarchizedPickerComponent {
           if (typeof dfValue == 'string' && isNumeric(dfValue)) {
             dfValue = parseInt(dfValue);
           }
-          if (that.options.origin == 'classification') {
+          if (that.theOptions.origin == 'classification') {
             if ((typeof dfValue == 'string' && that.getPropertyFromNode(element, 'Properties.FullPath') == dfValue) ||
               (typeof dfValue == 'number' && that.getPropertyFromNode(element, 'ID') == dfValue)) {
               element.nodeid = element.id;

package/dist/collection/components/hierarchized-picker/treejs/index.js

@@ -182,7 +182,9 @@ Tree.prototype.bindEvent = function (ele) {
       this.onSwitcherClick(target);
     }
     //CUSTOM
-    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span'));
+    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span.treejs-label')).filter((ele) => {
+      return ele.parentNode.parentNode.parentNode === e.target.parentNode;
+    });
     let hasUndefinedchild = [];
     //This may be a problem the day a node value is "undefined"
     hasUndefinedchild = childspans.filter(ele => {
@@ -412,7 +414,10 @@ Tree.prototype.walkUp = function (node, changeState) {
         return;
       parent.status = pStatus;
       if (parent.parent) {
-        parent.parent.children.find(item => item.id === parent.id).status = pStatus;
+        let parentparentchild = parent.parent.children.find(item => item.id === parent.id);
+        if (parentparentchild) {
+          parentparentchild.status = pStatus;
+        }
       }
     }
     else {

package/dist/custom-elements/index.js

@@ -211,7 +211,9 @@ Tree.prototype.bindEvent = function (ele) {
       this.onSwitcherClick(target);
     }
     //CUSTOM
-    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span'));
+    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span.treejs-label')).filter((ele) => {
+      return ele.parentNode.parentNode.parentNode === e.target.parentNode;
+    });
     let hasUndefinedchild = [];
     //This may be a problem the day a node value is "undefined"
     hasUndefinedchild = childspans.filter(ele => {
@@ -441,7 +443,10 @@ Tree.prototype.walkUp = function (node, changeState) {
         return;
       parent.status = pStatus;
       if (parent.parent) {
-        parent.parent.children.find(item => item.id === parent.id).status = pStatus;
+        let parentparentchild = parent.parent.children.find(item => item.id === parent.id);
+        if (parentparentchild) {
+          parentparentchild.status = pStatus;
+        }
       }
     }
     else {
@@ -18206,6 +18211,38 @@ const HierarchizedPickerComponent = class extends HTMLElement {
     });
     return source;
   }
+  searchAndMergeDataClassification(source, toadd) {
+    let terminate = false;
+    source.children.forEach((element, index) => {
+      if (terminate) {
+        return source;
+      }
+      if (source.ID == toadd.ID) {
+        let subterminate = false;
+        toadd.children.forEach((taelement, index) => {
+          if (subterminate) {
+            return;
+          }
+          if (element.ID == taelement.ID) {
+            element = this.mergeData(element, taelement);
+            subterminate = true;
+            return;
+          }
+        });
+      }
+      else {
+        if (element.ID == toadd.ID) {
+          element = this.mergeData(element, toadd);
+          terminate = true;
+          return source;
+        }
+        else {
+          this.searchAndMergeDataClassification(element, toadd);
+        }
+      }
+    });
+    return source;
+  }
   getNodeIdFromFullpath(fullpath) {
     return new Promise((resolve, reject) => {
       let token = this.theOptions.token;
@@ -18311,7 +18348,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
             if (xhr.status === 200) {
               that.mylog('XHR 200', JSON.parse(xhr.responseText));
               if (that.rawData) {
-                that.rawData = that.searchAndMergeData(that.rawData, JSON.parse(xhr.responseText));
+                that.rawData = that.searchAndMergeDataClassification(that.rawData, JSON.parse(xhr.responseText));
               }
               else {
                 that.rawData = JSON.parse(xhr.responseText);
@@ -18557,10 +18594,10 @@ const HierarchizedPickerComponent = class extends HTMLElement {
           .then(displayResults)
           .catch((error) => {
           try {
-            this.errorToLog = "getDataFromSource rejected:" + JSON.stringify(error, replacer, 2);
+            this.errorToLog = "getDataFromSource 1 rejected:" + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error("getDataFromSource rejected:", JSON.stringify(error, replacer, 2));
+            console.error("getDataFromSource 2 rejected:", JSON.stringify(error, replacer, 2));
           }
         });
       }
@@ -19174,8 +19211,9 @@ const HierarchizedPickerComponent = class extends HTMLElement {
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
-    if (this.theOptions.mode == 'input') {
-      document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input').classList.remove('fieldError');
+    let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
+    if (this.theOptions.mode == 'input' && searchinput) {
+      searchinput.classList.remove('fieldError');
     }
     if (searched.length > 2) {
       this.searchToDisplay += 1;
@@ -19281,10 +19319,10 @@ const HierarchizedPickerComponent = class extends HTMLElement {
         })
           .catch((error) => {
           try {
-            this.errorToLog = "getDataFromSource rejected:" + JSON.stringify(error, replacer, 2);
+            this.errorToLog = "getDataFromSource 3 rejected:" + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error("getDataFromSource rejected:", JSON.stringify(error, replacer, 2));
+            console.error("getDataFromSource 4 rejected:", JSON.stringify(error, replacer, 2));
           }
         });
       }
@@ -19343,7 +19381,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
           if (typeof dfValue == 'string' && isNumeric(dfValue)) {
             dfValue = parseInt(dfValue);
           }
-          if (that.options.origin == 'classification') {
+          if (that.theOptions.origin == 'classification') {
             if ((typeof dfValue == 'string' && that.getPropertyFromNode(element, 'Properties.FullPath') == dfValue) ||
               (typeof dfValue == 'number' && that.getPropertyFromNode(element, 'ID') == dfValue)) {
               element.nodeid = element.id;

package/dist/esm/reneco-hierarchized-picker.entry.js

@@ -210,7 +210,9 @@ Tree.prototype.bindEvent = function (ele) {
       this.onSwitcherClick(target);
     }
     //CUSTOM
-    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span'));
+    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span.treejs-label')).filter((ele) => {
+      return ele.parentNode.parentNode.parentNode === e.target.parentNode;
+    });
     let hasUndefinedchild = [];
     //This may be a problem the day a node value is "undefined"
     hasUndefinedchild = childspans.filter(ele => {
@@ -440,7 +442,10 @@ Tree.prototype.walkUp = function (node, changeState) {
         return;
       parent.status = pStatus;
       if (parent.parent) {
-        parent.parent.children.find(item => item.id === parent.id).status = pStatus;
+        let parentparentchild = parent.parent.children.find(item => item.id === parent.id);
+        if (parentparentchild) {
+          parentparentchild.status = pStatus;
+        }
       }
     }
     else {
@@ -18204,6 +18209,38 @@ const HierarchizedPickerComponent = class {
     });
     return source;
   }
+  searchAndMergeDataClassification(source, toadd) {
+    let terminate = false;
+    source.children.forEach((element, index) => {
+      if (terminate) {
+        return source;
+      }
+      if (source.ID == toadd.ID) {
+        let subterminate = false;
+        toadd.children.forEach((taelement, index) => {
+          if (subterminate) {
+            return;
+          }
+          if (element.ID == taelement.ID) {
+            element = this.mergeData(element, taelement);
+            subterminate = true;
+            return;
+          }
+        });
+      }
+      else {
+        if (element.ID == toadd.ID) {
+          element = this.mergeData(element, toadd);
+          terminate = true;
+          return source;
+        }
+        else {
+          this.searchAndMergeDataClassification(element, toadd);
+        }
+      }
+    });
+    return source;
+  }
   getNodeIdFromFullpath(fullpath) {
     return new Promise((resolve, reject) => {
       let token = this.theOptions.token;
@@ -18309,7 +18346,7 @@ const HierarchizedPickerComponent = class {
             if (xhr.status === 200) {
               that.mylog('XHR 200', JSON.parse(xhr.responseText));
               if (that.rawData) {
-                that.rawData = that.searchAndMergeData(that.rawData, JSON.parse(xhr.responseText));
+                that.rawData = that.searchAndMergeDataClassification(that.rawData, JSON.parse(xhr.responseText));
               }
               else {
                 that.rawData = JSON.parse(xhr.responseText);
@@ -18555,10 +18592,10 @@ const HierarchizedPickerComponent = class {
           .then(displayResults)
           .catch((error) => {
           try {
-            this.errorToLog = "getDataFromSource rejected:" + JSON.stringify(error, replacer, 2);
+            this.errorToLog = "getDataFromSource 1 rejected:" + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error("getDataFromSource rejected:", JSON.stringify(error, replacer, 2));
+            console.error("getDataFromSource 2 rejected:", JSON.stringify(error, replacer, 2));
           }
         });
       }
@@ -19172,8 +19209,9 @@ const HierarchizedPickerComponent = class {
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
-    if (this.theOptions.mode == 'input') {
-      document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input').classList.remove('fieldError');
+    let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
+    if (this.theOptions.mode == 'input' && searchinput) {
+      searchinput.classList.remove('fieldError');
     }
     if (searched.length > 2) {
       this.searchToDisplay += 1;
@@ -19279,10 +19317,10 @@ const HierarchizedPickerComponent = class {
         })
           .catch((error) => {
           try {
-            this.errorToLog = "getDataFromSource rejected:" + JSON.stringify(error, replacer, 2);
+            this.errorToLog = "getDataFromSource 3 rejected:" + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error("getDataFromSource rejected:", JSON.stringify(error, replacer, 2));
+            console.error("getDataFromSource 4 rejected:", JSON.stringify(error, replacer, 2));
           }
         });
       }
@@ -19341,7 +19379,7 @@ const HierarchizedPickerComponent = class {
           if (typeof dfValue == 'string' && isNumeric(dfValue)) {
             dfValue = parseInt(dfValue);
           }
-          if (that.options.origin == 'classification') {
+          if (that.theOptions.origin == 'classification') {
             if ((typeof dfValue == 'string' && that.getPropertyFromNode(element, 'Properties.FullPath') == dfValue) ||
               (typeof dfValue == 'number' && that.getPropertyFromNode(element, 'ID') == dfValue)) {
               element.nodeid = element.id;