reneco-hierarchized-picker 0.4.0-beta.5 → 0.4.0-beta.7

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

@@ -18068,31 +18068,27 @@ class RawDataManager {
   }
   // Fetch data from classification
   async getFromClassification(endpoint, options, loader) {
-    const urlParams = new URLSearchParams(options);
-    //------------
     let pathSegment = '';
-    let keyToRemove = '';
-    for (const [key, value] of urlParams.entries()) {
+    const queryParams = [];
+    for (const key in options) {
+      if (!options.hasOwnProperty(key))
+        continue;
+      const value = options[key];
       const lowerKey = key.toLowerCase();
-      if (lowerKey === 'startnode' || lowerKey === 'startnodeid') {
-        pathSegment = value;
-        keyToRemove = key;
-        break;
+      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+        pathSegment = encodeURIComponent(value);
+        continue; // Skip adding this to the query string
       }
+      // Add other keys to query string
+      queryParams.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
     }
-    if (keyToRemove) {
-      urlParams.delete(keyToRemove);
-    }
-    //------------
+    const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
     const newUrl = pathSegment
-      ? `${endpoint}/${pathSegment}?${urlParams.toString()}`
-      : `${endpoint}/?${urlParams.toString()}`;
+      ? `${endpoint}/${pathSegment}/${queryString}`
+      : `${endpoint}/${queryString}`;
     await this.makeRequest('GET', newUrl, null, loader).then((data) => {
       this.loadData(data);
     });
-    // await this.makeRequest('GET', `${endpoint}/?${urlParams.toString()}`, null, loader).then((data) => {
-    //     this.loadData(data);
-    // });
     return;
   }
   // Fetch data from a generic source
@@ -19341,7 +19337,21 @@ const HierarchizedPickerComponent = class {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
         console.log("FLAG 02", this.optionsManager.getOptions());
-        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader);
+        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader).then((data) => {
+          this.rawData = data;
+          if (init) {
+            this.formatDefaultValue();
+            this.showSelectedNodes();
+          }
+        })
+          .catch(error => {
+          try {
+            this.errorToLog = 'getDataFromSource 3 classification rejected:' + JSON.stringify(error, replacer, 2);
+          }
+          catch (_a) {
+            console.error('getDataFromSource 4 classification rejected:', JSON.stringify(error, replacer, 2));
+          }
+        });
       }
       else {
         this.rawDataManager.getFromSource(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader)
@@ -19354,10 +19364,10 @@ const HierarchizedPickerComponent = class {
         })
           .catch(error => {
           try {
-            this.errorToLog = 'getDataFromSource 3 rejected:' + JSON.stringify(error, replacer, 2);
+            this.errorToLog = 'getDataFromSource 3 legacy rejected:' + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error('getDataFromSource 4 rejected:', JSON.stringify(error, replacer, 2));
+            console.error('getDataFromSource 4 legacy rejected:', JSON.stringify(error, replacer, 2));
           }
         });
       }

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

@@ -819,7 +819,21 @@ export class HierarchizedPickerComponent {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
         console.log("FLAG 02", this.optionsManager.getOptions());
-        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader);
+        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader).then((data) => {
+          this.rawData = data;
+          if (init) {
+            this.formatDefaultValue();
+            this.showSelectedNodes();
+          }
+        })
+          .catch(error => {
+          try {
+            this.errorToLog = 'getDataFromSource 3 classification rejected:' + JSON.stringify(error, replacer, 2);
+          }
+          catch (_a) {
+            console.error('getDataFromSource 4 classification rejected:', JSON.stringify(error, replacer, 2));
+          }
+        });
       }
       else {
         this.rawDataManager.getFromSource(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader)
@@ -832,10 +846,10 @@ export class HierarchizedPickerComponent {
         })
           .catch(error => {
           try {
-            this.errorToLog = 'getDataFromSource 3 rejected:' + JSON.stringify(error, replacer, 2);
+            this.errorToLog = 'getDataFromSource 3 legacy rejected:' + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error('getDataFromSource 4 rejected:', JSON.stringify(error, replacer, 2));
+            console.error('getDataFromSource 4 legacy rejected:', JSON.stringify(error, replacer, 2));
           }
         });
       }

package/dist/collection/core/raw-data-manager.js

@@ -42,31 +42,27 @@ export class RawDataManager {
   }
   // Fetch data from classification
   async getFromClassification(endpoint, options, loader) {
-    const urlParams = new URLSearchParams(options);
-    //------------
     let pathSegment = '';
-    let keyToRemove = '';
-    for (const [key, value] of urlParams.entries()) {
+    const queryParams = [];
+    for (const key in options) {
+      if (!options.hasOwnProperty(key))
+        continue;
+      const value = options[key];
       const lowerKey = key.toLowerCase();
-      if (lowerKey === 'startnode' || lowerKey === 'startnodeid') {
-        pathSegment = value;
-        keyToRemove = key;
-        break;
+      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+        pathSegment = encodeURIComponent(value);
+        continue; // Skip adding this to the query string
       }
+      // Add other keys to query string
+      queryParams.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
     }
-    if (keyToRemove) {
-      urlParams.delete(keyToRemove);
-    }
-    //------------
+    const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
     const newUrl = pathSegment
-      ? `${endpoint}/${pathSegment}?${urlParams.toString()}`
-      : `${endpoint}/?${urlParams.toString()}`;
+      ? `${endpoint}/${pathSegment}/${queryString}`
+      : `${endpoint}/${queryString}`;
     await this.makeRequest('GET', newUrl, null, loader).then((data) => {
       this.loadData(data);
     });
-    // await this.makeRequest('GET', `${endpoint}/?${urlParams.toString()}`, null, loader).then((data) => {
-    //     this.loadData(data);
-    // });
     return;
   }
   // Fetch data from a generic source

package/dist/custom-elements/index.js

@@ -18065,31 +18065,27 @@ class RawDataManager {
   }
   // Fetch data from classification
   async getFromClassification(endpoint, options, loader) {
-    const urlParams = new URLSearchParams(options);
-    //------------
     let pathSegment = '';
-    let keyToRemove = '';
-    for (const [key, value] of urlParams.entries()) {
+    const queryParams = [];
+    for (const key in options) {
+      if (!options.hasOwnProperty(key))
+        continue;
+      const value = options[key];
       const lowerKey = key.toLowerCase();
-      if (lowerKey === 'startnode' || lowerKey === 'startnodeid') {
-        pathSegment = value;
-        keyToRemove = key;
-        break;
+      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+        pathSegment = encodeURIComponent(value);
+        continue; // Skip adding this to the query string
       }
+      // Add other keys to query string
+      queryParams.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
     }
-    if (keyToRemove) {
-      urlParams.delete(keyToRemove);
-    }
-    //------------
+    const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
     const newUrl = pathSegment
-      ? `${endpoint}/${pathSegment}?${urlParams.toString()}`
-      : `${endpoint}/?${urlParams.toString()}`;
+      ? `${endpoint}/${pathSegment}/${queryString}`
+      : `${endpoint}/${queryString}`;
     await this.makeRequest('GET', newUrl, null, loader).then((data) => {
       this.loadData(data);
     });
-    // await this.makeRequest('GET', `${endpoint}/?${urlParams.toString()}`, null, loader).then((data) => {
-    //     this.loadData(data);
-    // });
     return;
   }
   // Fetch data from a generic source
@@ -19339,7 +19335,21 @@ const HierarchizedPickerComponent = class extends HTMLElement {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
         console.log("FLAG 02", this.optionsManager.getOptions());
-        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader);
+        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader).then((data) => {
+          this.rawData = data;
+          if (init) {
+            this.formatDefaultValue();
+            this.showSelectedNodes();
+          }
+        })
+          .catch(error => {
+          try {
+            this.errorToLog = 'getDataFromSource 3 classification rejected:' + JSON.stringify(error, replacer, 2);
+          }
+          catch (_a) {
+            console.error('getDataFromSource 4 classification rejected:', JSON.stringify(error, replacer, 2));
+          }
+        });
       }
       else {
         this.rawDataManager.getFromSource(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader)
@@ -19352,10 +19362,10 @@ const HierarchizedPickerComponent = class extends HTMLElement {
         })
           .catch(error => {
           try {
-            this.errorToLog = 'getDataFromSource 3 rejected:' + JSON.stringify(error, replacer, 2);
+            this.errorToLog = 'getDataFromSource 3 legacy rejected:' + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error('getDataFromSource 4 rejected:', JSON.stringify(error, replacer, 2));
+            console.error('getDataFromSource 4 legacy rejected:', JSON.stringify(error, replacer, 2));
           }
         });
       }

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

@@ -18064,31 +18064,27 @@ class RawDataManager {
   }
   // Fetch data from classification
   async getFromClassification(endpoint, options, loader) {
-    const urlParams = new URLSearchParams(options);
-    //------------
     let pathSegment = '';
-    let keyToRemove = '';
-    for (const [key, value] of urlParams.entries()) {
+    const queryParams = [];
+    for (const key in options) {
+      if (!options.hasOwnProperty(key))
+        continue;
+      const value = options[key];
       const lowerKey = key.toLowerCase();
-      if (lowerKey === 'startnode' || lowerKey === 'startnodeid') {
-        pathSegment = value;
-        keyToRemove = key;
-        break;
+      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+        pathSegment = encodeURIComponent(value);
+        continue; // Skip adding this to the query string
       }
+      // Add other keys to query string
+      queryParams.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
     }
-    if (keyToRemove) {
-      urlParams.delete(keyToRemove);
-    }
-    //------------
+    const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
     const newUrl = pathSegment
-      ? `${endpoint}/${pathSegment}?${urlParams.toString()}`
-      : `${endpoint}/?${urlParams.toString()}`;
+      ? `${endpoint}/${pathSegment}/${queryString}`
+      : `${endpoint}/${queryString}`;
     await this.makeRequest('GET', newUrl, null, loader).then((data) => {
       this.loadData(data);
     });
-    // await this.makeRequest('GET', `${endpoint}/?${urlParams.toString()}`, null, loader).then((data) => {
-    //     this.loadData(data);
-    // });
     return;
   }
   // Fetch data from a generic source
@@ -19337,7 +19333,21 @@ const HierarchizedPickerComponent = class {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
         console.log("FLAG 02", this.optionsManager.getOptions());
-        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader);
+        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader).then((data) => {
+          this.rawData = data;
+          if (init) {
+            this.formatDefaultValue();
+            this.showSelectedNodes();
+          }
+        })
+          .catch(error => {
+          try {
+            this.errorToLog = 'getDataFromSource 3 classification rejected:' + JSON.stringify(error, replacer, 2);
+          }
+          catch (_a) {
+            console.error('getDataFromSource 4 classification rejected:', JSON.stringify(error, replacer, 2));
+          }
+        });
       }
       else {
         this.rawDataManager.getFromSource(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader)
@@ -19350,10 +19360,10 @@ const HierarchizedPickerComponent = class {
         })
           .catch(error => {
           try {
-            this.errorToLog = 'getDataFromSource 3 rejected:' + JSON.stringify(error, replacer, 2);
+            this.errorToLog = 'getDataFromSource 3 legacy rejected:' + JSON.stringify(error, replacer, 2);
           }
           catch (_a) {
-            console.error('getDataFromSource 4 rejected:', JSON.stringify(error, replacer, 2));
+            console.error('getDataFromSource 4 legacy rejected:', JSON.stringify(error, replacer, 2));
           }
         });
       }