reneco-hierarchized-picker 0.4.2-beta.14 → 0.4.2-beta.16

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

@@ -339,9 +339,11 @@ Tree.prototype.bindEvent = function (ele) {
       // If source is webservice (it shouldn't be something else)
       if (this.options.parentApi.theOptions.source == 'webservice') {
         if (this.options.parentApi.theOptions.origin == 'classification') {
+          const contextualApiParams = this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId }));
+          const contextualApiURL = this.options.parentApi.getContextualApiURL();
           // WS Call
           this.options.rawDataManager
-            .getFromClassification(this.options.parentApi.getContextualApiURL(), this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId })), document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
+            .getFromClassification(contextualApiURL, contextualApiParams, document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
             .then(data => {
             this.options.completeCurrentTreeWithTree(this, data, this.options.parentApi.theOptions);
           });
@@ -643,7 +645,7 @@ Tree.prototype.createUlEle = function () {
 Tree.prototype.createLiEle = function (node, closed) {
   const li = document.createElement('li');
   li.classList.add('treejs-node');
-  if (node.deprecated) {
+  if (node.deprecated || node.Is_Deprecated) {
     li.classList.add('treejs-node__deprecated');
   }
   if (node.isDesaturated) {
@@ -18192,7 +18194,7 @@ class RawDataManager {
         continue;
       const value = options[key];
       const lowerKey = key.toLowerCase();
-      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+      if ((lowerKey === 'startnode') && !pathSegment) {
         pathSegment = encodeURIComponent(value);
         continue; // Skip adding this to the query string
       }
@@ -18279,8 +18281,16 @@ class RawDataManager {
    * Merge new data into the existing data.
    * @param newData New data to merge.
    */
-  mergeData(newData) {
-    this.rawData = this.genericMerge(this.rawData || {}, newData, 'key', 'children');
+  mergeData(newData, idKey) {
+    if (!this.rawData)
+      this.rawData = newData;
+    else {
+      this.rawData = this.genericMerge(this.rawData, newData, idKey, 'children');
+    }
+  }
+  reorderItems(referenceArray, toReorderArray, idKey) {
+    const idMap = new Map(toReorderArray.map(item => [item[idKey], item]));
+    return referenceArray.map(refItem => idMap.get(refItem[idKey])).filter(Boolean);
   }
   /**
    * Generic merge method.
@@ -18296,9 +18306,11 @@ class RawDataManager {
     }
     if (!toAdd || !((_a = toAdd[childrenKey]) === null || _a === void 0 ? void 0 : _a.length))
       return source;
+    if (source[childrenKey] && source[childrenKey].length > 0 && toAdd[childrenKey] && toAdd[childrenKey].length > 0)
+      toAdd[childrenKey] = this.reorderItems(source[childrenKey], toAdd[childrenKey], idKey);
     source[childrenKey] = ((_b = source[childrenKey]) === null || _b === void 0 ? void 0 : _b.length)
       ? source[childrenKey].map((child, index) => {
-        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[index], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;
@@ -18368,6 +18380,12 @@ class OptionsManager {
       delete this.options.defaultValue;
     }
   }
+  // This method is pretty ugly and shouldn't have to be called, but temporarily works until a better solution is set
+  dropReach() {
+    if (this.options.options && this.options.options.Reach) {
+      delete this.options.options.Reach;
+    }
+  }
 }
 
 /**
@@ -18422,7 +18440,7 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
   if (myObject && myObject.length) {
     myObject.forEach(value => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d;
       let keyPropFromNode = null;
       let valueTranslatedPropFromNode = null;
       let fullpathPropFromNode = null;
@@ -18430,15 +18448,12 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
       if (options.origin == "classification") {
         keyPropFromNode = getPropertyFromNode(value, 'ID');
         valueTranslatedPropFromNode = (_a = getPropertyFromNode(value, 'Translations')[options.language]) === null || _a === void 0 ? void 0 : _a.translated_name;
-        // TODO Not sure this is correct in the latest versions, may require review during second half of 2025
-        if (searched) {
-          fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_FullPath;
-          fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'fullpathTranslated')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
-        }
-        else {
-          fullpathPropFromNode = (_d = getPropertyFromNode(value, 'Properties')) === null || _d === void 0 ? void 0 : _d.System_Fullpath;
-          fullpathTranslatedPropFromNode = (_e = getPropertyFromNode(value, 'Translations')[options.language]) === null || _e === void 0 ? void 0 : _e.translated_fullpath;
-        }
+        fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_Fullpath;
+        fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'Translations')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
+        if (!fullpathPropFromNode)
+          fullpathPropFromNode = (_d = getPropertyFromNode(value, 'Properties')) === null || _d === void 0 ? void 0 : _d.System_FullPath;
+        if (!fullpathTranslatedPropFromNode)
+          fullpathTranslatedPropFromNode = getPropertyFromNode(value, 'fullpathTranslated');
       }
       else {
         keyPropFromNode = getPropertyFromNode(value, 'key');
@@ -18447,7 +18462,9 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
         fullpathTranslatedPropFromNode = getPropertyFromNode(value, 'fullpathTranslated');
       }
       const childrenPropFromNode = getPropertyFromNode(value, 'children', false);
-      const deprecated = getPropertyFromNode(value, 'deprecated', false);
+      let deprecated = getPropertyFromNode(value, 'deprecated', null);
+      if (deprecated === null)
+        deprecated = getPropertyFromNode(value, 'Is_Deprecated', false);
       const objToPush = {
         id: keyPropFromNode,
         nodeId: keyPropFromNode,
@@ -19110,9 +19127,15 @@ const HierarchizedPickerComponent = class {
   }
   getApiSearchURL() {
     if (this.optionsManager.getOptions().origin == 'classification') {
-      let substringUpToLastSlash = this.optionsManager.getOptions().url.substring(0, this.optionsManager.getOptions().url.lastIndexOf('/'));
-      let context = substringUpToLastSlash.substring(substringUpToLastSlash.lastIndexOf('/'), substringUpToLastSlash.length);
-      return substringUpToLastSlash.substring(0, substringUpToLastSlash.lastIndexOf('/')) + '/search' + context;
+      const baseURL = this.optionsManager.getOptions().url;
+      if (baseURL.indexOf("getTree") > -1) {
+        return baseURL.replace("/getTree/", "/search/");
+      }
+      else {
+        let substringUpToLastSlash = this.optionsManager.getOptions().url.substring(0, this.optionsManager.getOptions().url.lastIndexOf('/'));
+        let context = substringUpToLastSlash.substring(substringUpToLastSlash.lastIndexOf('/'), substringUpToLastSlash.length);
+        return substringUpToLastSlash.substring(0, substringUpToLastSlash.lastIndexOf('/')) + '/search' + context;
+      }
     }
     else {
       return this.optionsManager.getOptions().url.substring(0, this.optionsManager.getOptions().url.lastIndexOf('/')) + '/GetTreeFromSearch';
@@ -19127,15 +19150,16 @@ const HierarchizedPickerComponent = class {
       const pathSegments = parsedUrl.pathname.split('/');
       const dynamicType = pathSegments[pathSegments.length - 2];
       const newPathname = `/api/v1/classification/reach/${dynamicType}/${options.Reach}`;
+      this.optionsManager.dropReach();
       return `${parsedUrl.origin}${newPathname}`;
     }
     return url;
   }
-  getContextualApiParams(options = null) {
+  getContextualApiParams(options = null, search = null) {
     if (!options)
       options = this.optionsManager.getOptions().options;
+    let optionsToReturn = Object.assign({}, options);
     if (options.Reach) {
-      let optionsToReturn = Object.assign({}, options);
       delete optionsToReturn.Reach;
       if ("startNode" in optionsToReturn) {
         optionsToReturn.startingnode = optionsToReturn.startNode;
@@ -19145,10 +19169,15 @@ const HierarchizedPickerComponent = class {
         optionsToReturn.startingnode = optionsToReturn.StartNodeID;
         delete optionsToReturn.StartNodeID;
       }
-      return optionsToReturn;
     }
-    else
-      return options;
+    else if (search) {
+      optionsToReturn.searchedValue = search;
+      if ("startNode" in optionsToReturn) {
+        optionsToReturn.StartNodeID = optionsToReturn.startNode;
+        delete optionsToReturn.startNode;
+      }
+    }
+    return optionsToReturn;
   }
   translateDataForTree(dataToLoad, searchID = null, searched = null) {
     if (searched && searched != "") {
@@ -19161,7 +19190,7 @@ const HierarchizedPickerComponent = class {
   loadSearchDataInCurrentTree(searchID, searched) {
     let displayResults = (newtree) => {
       if (this.searchToDisplay > -1) { // TODO > Not working anymore after refact, prevents issues in displaying results when running multiple researchs at the same time && searchID == this.searchToDisplay) {
-        this.rawDataManager.mergeData(newtree);
+        this.rawDataManager.mergeData(newtree, this.theOptions.origin == 'classification' ? "ID" : "key");
         newtree.children.forEach((value, index) => {
           completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
         });
@@ -19183,9 +19212,7 @@ const HierarchizedPickerComponent = class {
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
-        this.rawDataManager.getFromClassification(this.getApiSearchURL(), {
-          searchedValue: searched
-        }, document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
+        this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(null, searched)), document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
           .then((data) => {
           displayResults(data);
           if (!searched) {
@@ -19334,19 +19361,24 @@ const HierarchizedPickerComponent = class {
     // ----- BEGIN -----
     let node = treeToUpdate.nodesById[id];
     let onChange = treeToUpdate.options.onChange;
-    if (!node.disabled) {
-      treeToUpdate.setValue(id);
-      treeToUpdate.updateLiElements();
+    if (!node) {
+      this.logError("The current selected value is not part of the loaded tree!");
     }
-    userClick && onChange && onChange.call(treeToUpdate);
-    // ------ END ------
-    if (this.setValueOnClick) {
-      this.editValue(node, userClick);
-      if (this.shownTree && userClick) {
-        // TODO > is this required ?
-        // await focusMainInput(this);
-        if (!this.optionsManager.getOptions().multiple) {
-          this.showTree('hide');
+    else {
+      if (!node.disabled) {
+        treeToUpdate.setValue(id);
+        treeToUpdate.updateLiElements();
+      }
+      userClick && onChange && onChange.call(treeToUpdate);
+      // ------ END ------
+      if (this.setValueOnClick) {
+        this.editValue(node, userClick);
+        if (this.shownTree && userClick) {
+          // TODO > is this required ?
+          // await focusMainInput(this);
+          if (!this.optionsManager.getOptions().multiple) {
+            this.showTree('hide');
+          }
         }
       }
     }
@@ -19425,6 +19457,11 @@ const HierarchizedPickerComponent = class {
     if (this.hasFocus.indexOf('hide') > -1 && !isStillInsidePicker) {
       this.hasFocus = [];
     }
+    else {
+      if (!this.shownTree && this.theOptions.loading == 'click' && !this.ready) {
+        this.loadDataForTree(true, document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"));
+      }
+    }
     const previousShownTree = this.shownTree;
     this.shownTree = this.hasFocus.length > 0;
     if (this.shownTree && !previousShownTree) {
@@ -19473,12 +19510,13 @@ const HierarchizedPickerComponent = class {
     if (!value)
       value = this.value;
     this.displayedValue = value.map(item => {
-      var _a, _b;
-      return (_b = (_a = item.fullpathTranslated) !== null && _a !== void 0 ? _a : item.shortpathTranslated) !== null && _b !== void 0 ? _b : `Node ${item.nodeid}`;
+      var _a;
+      return (_a = (this.optionsManager.getOptions().isFullpath ? item.fullpathTranslated : item.shortpathTranslated)) !== null && _a !== void 0 ? _a : `Node ${item.nodeid}`;
     }).join(';');
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
+    this.loader.classList.add('loading');
     let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
     if (this.optionsManager.getOptions().mode == 'input' && searchinput) {
       searchinput.classList.remove('fieldError');
@@ -19515,6 +19553,7 @@ const HierarchizedPickerComponent = class {
       // this.checkFields(this.value, false);
       this.setSearchResults([]);
     }
+    this.loader.classList.remove('loading');
   }
   // Refresh the tree with search results
   triggerSearch(searched) {
@@ -19533,7 +19572,9 @@ const HierarchizedPickerComponent = class {
   loadDataForTree(init, loader) {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
-        this.rawDataManager.getFromClassification(this.getContextualApiURL(), this.getContextualApiParams(), loader).then((data) => {
+        const contextualApiParams = this.getContextualApiParams();
+        const contextualApiURL = this.getContextualApiURL();
+        this.rawDataManager.getFromClassification(contextualApiURL, contextualApiParams, loader).then((data) => {
           this.rawData = data;
           if (init) {
             this.formatDefaultValue();

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

@@ -442,9 +442,15 @@ export class HierarchizedPickerComponent {
   }
   getApiSearchURL() {
     if (this.optionsManager.getOptions().origin == 'classification') {
-      let substringUpToLastSlash = this.optionsManager.getOptions().url.substring(0, this.optionsManager.getOptions().url.lastIndexOf('/'));
-      let context = substringUpToLastSlash.substring(substringUpToLastSlash.lastIndexOf('/'), substringUpToLastSlash.length);
-      return substringUpToLastSlash.substring(0, substringUpToLastSlash.lastIndexOf('/')) + '/search' + context;
+      const baseURL = this.optionsManager.getOptions().url;
+      if (baseURL.indexOf("getTree") > -1) {
+        return baseURL.replace("/getTree/", "/search/");
+      }
+      else {
+        let substringUpToLastSlash = this.optionsManager.getOptions().url.substring(0, this.optionsManager.getOptions().url.lastIndexOf('/'));
+        let context = substringUpToLastSlash.substring(substringUpToLastSlash.lastIndexOf('/'), substringUpToLastSlash.length);
+        return substringUpToLastSlash.substring(0, substringUpToLastSlash.lastIndexOf('/')) + '/search' + context;
+      }
     }
     else {
       return this.optionsManager.getOptions().url.substring(0, this.optionsManager.getOptions().url.lastIndexOf('/')) + '/GetTreeFromSearch';
@@ -459,15 +465,16 @@ export class HierarchizedPickerComponent {
       const pathSegments = parsedUrl.pathname.split('/');
       const dynamicType = pathSegments[pathSegments.length - 2];
       const newPathname = `/api/v1/classification/reach/${dynamicType}/${options.Reach}`;
+      this.optionsManager.dropReach();
       return `${parsedUrl.origin}${newPathname}`;
     }
     return url;
   }
-  getContextualApiParams(options = null) {
+  getContextualApiParams(options = null, search = null) {
     if (!options)
       options = this.optionsManager.getOptions().options;
+    let optionsToReturn = Object.assign({}, options);
     if (options.Reach) {
-      let optionsToReturn = Object.assign({}, options);
       delete optionsToReturn.Reach;
       if ("startNode" in optionsToReturn) {
         optionsToReturn.startingnode = optionsToReturn.startNode;
@@ -477,10 +484,15 @@ export class HierarchizedPickerComponent {
         optionsToReturn.startingnode = optionsToReturn.StartNodeID;
         delete optionsToReturn.StartNodeID;
       }
-      return optionsToReturn;
     }
-    else
-      return options;
+    else if (search) {
+      optionsToReturn.searchedValue = search;
+      if ("startNode" in optionsToReturn) {
+        optionsToReturn.StartNodeID = optionsToReturn.startNode;
+        delete optionsToReturn.startNode;
+      }
+    }
+    return optionsToReturn;
   }
   translateDataForTree(dataToLoad, searchID = null, searched = null) {
     if (searched && searched != "") {
@@ -493,7 +505,7 @@ export class HierarchizedPickerComponent {
   loadSearchDataInCurrentTree(searchID, searched) {
     let displayResults = (newtree) => {
       if (this.searchToDisplay > -1) { // TODO > Not working anymore after refact, prevents issues in displaying results when running multiple researchs at the same time && searchID == this.searchToDisplay) {
-        this.rawDataManager.mergeData(newtree);
+        this.rawDataManager.mergeData(newtree, this.theOptions.origin == 'classification' ? "ID" : "key");
         newtree.children.forEach((value, index) => {
           completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
         });
@@ -515,9 +527,7 @@ export class HierarchizedPickerComponent {
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
-        this.rawDataManager.getFromClassification(this.getApiSearchURL(), {
-          searchedValue: searched
-        }, document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
+        this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(null, searched)), document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
           .then((data) => {
           displayResults(data);
           if (!searched) {
@@ -666,19 +676,24 @@ export class HierarchizedPickerComponent {
     // ----- BEGIN -----
     let node = treeToUpdate.nodesById[id];
     let onChange = treeToUpdate.options.onChange;
-    if (!node.disabled) {
-      treeToUpdate.setValue(id);
-      treeToUpdate.updateLiElements();
-    }
-    userClick && onChange && onChange.call(treeToUpdate);
-    // ------ END ------
-    if (this.setValueOnClick) {
-      this.editValue(node, userClick);
-      if (this.shownTree && userClick) {
-        // TODO > is this required ?
-        // await focusMainInput(this);
-        if (!this.optionsManager.getOptions().multiple) {
-          this.showTree('hide');
+    if (!node) {
+      this.logError("The current selected value is not part of the loaded tree!");
+    }
+    else {
+      if (!node.disabled) {
+        treeToUpdate.setValue(id);
+        treeToUpdate.updateLiElements();
+      }
+      userClick && onChange && onChange.call(treeToUpdate);
+      // ------ END ------
+      if (this.setValueOnClick) {
+        this.editValue(node, userClick);
+        if (this.shownTree && userClick) {
+          // TODO > is this required ?
+          // await focusMainInput(this);
+          if (!this.optionsManager.getOptions().multiple) {
+            this.showTree('hide');
+          }
         }
       }
     }
@@ -757,6 +772,11 @@ export class HierarchizedPickerComponent {
     if (this.hasFocus.indexOf('hide') > -1 && !isStillInsidePicker) {
       this.hasFocus = [];
     }
+    else {
+      if (!this.shownTree && this.theOptions.loading == 'click' && !this.ready) {
+        this.loadDataForTree(true, document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"));
+      }
+    }
     const previousShownTree = this.shownTree;
     this.shownTree = this.hasFocus.length > 0;
     if (this.shownTree && !previousShownTree) {
@@ -805,12 +825,13 @@ export class HierarchizedPickerComponent {
     if (!value)
       value = this.value;
     this.displayedValue = value.map(item => {
-      var _a, _b;
-      return (_b = (_a = item.fullpathTranslated) !== null && _a !== void 0 ? _a : item.shortpathTranslated) !== null && _b !== void 0 ? _b : `Node ${item.nodeid}`;
+      var _a;
+      return (_a = (this.optionsManager.getOptions().isFullpath ? item.fullpathTranslated : item.shortpathTranslated)) !== null && _a !== void 0 ? _a : `Node ${item.nodeid}`;
     }).join(';');
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
+    this.loader.classList.add('loading');
     let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
     if (this.optionsManager.getOptions().mode == 'input' && searchinput) {
       searchinput.classList.remove('fieldError');
@@ -847,6 +868,7 @@ export class HierarchizedPickerComponent {
       // this.checkFields(this.value, false);
       this.setSearchResults([]);
     }
+    this.loader.classList.remove('loading');
   }
   // Refresh the tree with search results
   triggerSearch(searched) {
@@ -865,7 +887,9 @@ export class HierarchizedPickerComponent {
   loadDataForTree(init, loader) {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
-        this.rawDataManager.getFromClassification(this.getContextualApiURL(), this.getContextualApiParams(), loader).then((data) => {
+        const contextualApiParams = this.getContextualApiParams();
+        const contextualApiURL = this.getContextualApiURL();
+        this.rawDataManager.getFromClassification(contextualApiURL, contextualApiParams, loader).then((data) => {
           this.rawData = data;
           if (init) {
             this.formatDefaultValue();

package/dist/collection/components/treejs/index.js

@@ -207,9 +207,11 @@ Tree.prototype.bindEvent = function (ele) {
       // If source is webservice (it shouldn't be something else)
       if (this.options.parentApi.theOptions.source == 'webservice') {
         if (this.options.parentApi.theOptions.origin == 'classification') {
+          const contextualApiParams = this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId }));
+          const contextualApiURL = this.options.parentApi.getContextualApiURL();
           // WS Call
           this.options.rawDataManager
-            .getFromClassification(this.options.parentApi.getContextualApiURL(), this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId })), document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
+            .getFromClassification(contextualApiURL, contextualApiParams, document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
             .then(data => {
             this.options.completeCurrentTreeWithTree(this, data, this.options.parentApi.theOptions);
           });
@@ -512,7 +514,7 @@ Tree.prototype.createLiEle = function (node, closed) {
   const li = document.createElement('li');
   ;
   li.classList.add('treejs-node');
-  if (node.deprecated) {
+  if (node.deprecated || node.Is_Deprecated) {
     li.classList.add('treejs-node__deprecated');
   }
   if (node.isDesaturated) {

package/dist/collection/core/options-manager.js

@@ -45,4 +45,10 @@ export class OptionsManager {
       delete this.options.defaultValue;
     }
   }
+  // This method is pretty ugly and shouldn't have to be called, but temporarily works until a better solution is set
+  dropReach() {
+    if (this.options.options && this.options.options.Reach) {
+      delete this.options.options.Reach;
+    }
+  }
 }

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

@@ -62,7 +62,7 @@ export class RawDataManager {
         continue;
       const value = options[key];
       const lowerKey = key.toLowerCase();
-      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+      if ((lowerKey === 'startnode') && !pathSegment) {
         pathSegment = encodeURIComponent(value);
         continue; // Skip adding this to the query string
       }
@@ -149,8 +149,16 @@ export class RawDataManager {
    * Merge new data into the existing data.
    * @param newData New data to merge.
    */
-  mergeData(newData) {
-    this.rawData = this.genericMerge(this.rawData || {}, newData, 'key', 'children');
+  mergeData(newData, idKey) {
+    if (!this.rawData)
+      this.rawData = newData;
+    else {
+      this.rawData = this.genericMerge(this.rawData, newData, idKey, 'children');
+    }
+  }
+  reorderItems(referenceArray, toReorderArray, idKey) {
+    const idMap = new Map(toReorderArray.map(item => [item[idKey], item]));
+    return referenceArray.map(refItem => idMap.get(refItem[idKey])).filter(Boolean);
   }
   /**
    * Generic merge method.
@@ -166,9 +174,11 @@ export class RawDataManager {
     }
     if (!toAdd || !((_a = toAdd[childrenKey]) === null || _a === void 0 ? void 0 : _a.length))
       return source;
+    if (source[childrenKey] && source[childrenKey].length > 0 && toAdd[childrenKey] && toAdd[childrenKey].length > 0)
+      toAdd[childrenKey] = this.reorderItems(source[childrenKey], toAdd[childrenKey], idKey);
     source[childrenKey] = ((_b = source[childrenKey]) === null || _b === void 0 ? void 0 : _b.length)
       ? source[childrenKey].map((child, index) => {
-        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[index], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;

package/dist/collection/features/tree/tree-utils.js

@@ -51,7 +51,7 @@ export function fillTreeWithObject(tree, myObject, searched, options, depth = 0)
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
   if (myObject && myObject.length) {
     myObject.forEach(value => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d;
       let keyPropFromNode = null;
       let valueTranslatedPropFromNode = null;
       let fullpathPropFromNode = null;
@@ -59,15 +59,12 @@ export function fillTreeWithObject(tree, myObject, searched, options, depth = 0)
       if (options.origin == "classification") {
         keyPropFromNode = getPropertyFromNode(value, 'ID');
         valueTranslatedPropFromNode = (_a = getPropertyFromNode(value, 'Translations')[options.language]) === null || _a === void 0 ? void 0 : _a.translated_name;
-        // TODO Not sure this is correct in the latest versions, may require review during second half of 2025
-        if (searched) {
-          fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_FullPath;
-          fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'fullpathTranslated')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
-        }
-        else {
-          fullpathPropFromNode = (_d = getPropertyFromNode(value, 'Properties')) === null || _d === void 0 ? void 0 : _d.System_Fullpath;
-          fullpathTranslatedPropFromNode = (_e = getPropertyFromNode(value, 'Translations')[options.language]) === null || _e === void 0 ? void 0 : _e.translated_fullpath;
-        }
+        fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_Fullpath;
+        fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'Translations')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
+        if (!fullpathPropFromNode)
+          fullpathPropFromNode = (_d = getPropertyFromNode(value, 'Properties')) === null || _d === void 0 ? void 0 : _d.System_FullPath;
+        if (!fullpathTranslatedPropFromNode)
+          fullpathTranslatedPropFromNode = getPropertyFromNode(value, 'fullpathTranslated');
       }
       else {
         keyPropFromNode = getPropertyFromNode(value, 'key');
@@ -76,7 +73,9 @@ export function fillTreeWithObject(tree, myObject, searched, options, depth = 0)
         fullpathTranslatedPropFromNode = getPropertyFromNode(value, 'fullpathTranslated');
       }
       const childrenPropFromNode = getPropertyFromNode(value, 'children', false);
-      const deprecated = getPropertyFromNode(value, 'deprecated', false);
+      let deprecated = getPropertyFromNode(value, 'deprecated', null);
+      if (deprecated === null)
+        deprecated = getPropertyFromNode(value, 'Is_Deprecated', false);
       const objToPush = {
         id: keyPropFromNode,
         nodeId: keyPropFromNode,