reneco-hierarchized-picker 0.4.1 → 0.4.2-beta.10

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

@@ -44,6 +44,96 @@ var vanillaContextMenu = createCommonjsModule(function (module, exports) {
 
 const VanillaContextMenu = /*@__PURE__*/getDefaultExportFromCjs(vanillaContextMenu);
 
+let curDraggingItem = null;
+let lastDraggedOverNodeId = null;
+let lastDraggedOverTimeForAscendent = new Date().getTime();
+let lastDraggedOverTimeForLevel = new Date().getTime();
+const acceptableDelayBetweenSimilarActions = 300;
+/**
+ * Handles the drag start event.
+ */
+function onItemDragStart(el, e) {
+  curDraggingItem = el;
+  el.classList.add('dragging');
+  e.stopPropagation();
+}
+/**
+ * Handles the drag end event.
+ */
+function onItemDragEnd(el, e) {
+  el.classList.remove('dragging');
+  e.stopPropagation();
+  clearDragOverStyles(el.parentElement);
+}
+/**
+ * Handles the drag over event.
+ */
+function onItemDragOver(el, e) {
+  const now = new Date().getTime();
+  if (now - lastDraggedOverTimeForAscendent < 50 && el.dataset.nodeId !== lastDraggedOverNodeId) {
+    return;
+  }
+  lastDraggedOverTimeForAscendent = now;
+  if (el.dataset.nodeId === lastDraggedOverNodeId) {
+    if (now - lastDraggedOverTimeForLevel < acceptableDelayBetweenSimilarActions) {
+      return;
+    }
+    lastDraggedOverTimeForLevel = now;
+  }
+  else {
+    lastDraggedOverNodeId = el.dataset.nodeId;
+  }
+  clearDragOverStyles(el);
+  if (el === curDraggingItem) {
+    el.classList.remove('dragover');
+    return;
+  }
+  const pos = getDragOverPosition(el, e);
+  el.classList.add(`dragover-${pos}`);
+  el.classList.add('dragover');
+  e.stopPropagation();
+  e.preventDefault();
+}
+/**
+ * Handles the drag leave event.
+ */
+function onItemDragLeave(el, e) {
+  clearDragOverStyles(el);
+  el.classList.remove('dragover');
+  e.stopPropagation();
+}
+/**
+ * Handles the drop event.
+ */
+function onItemDrop(el, e, dropCallback) {
+  clearDragOverStyles(el);
+  el.classList.remove('dragover');
+  e.stopPropagation();
+  if (curDraggingItem) {
+    const pos = getDragOverPosition(el, e);
+    dropCallback(curDraggingItem, el, pos);
+  }
+}
+/**
+ * Determines the drop position based on the mouse event.
+ */
+function getDragOverPosition(el, e) {
+  const h = el.offsetHeight;
+  const before = h / 4;
+  const after = h - before;
+  const y = e.offsetY;
+  return y <= before ? 'before' : y >= after ? 'after' : 'over';
+}
+/**
+ * Clears the drag-over styles from the element.
+ */
+function clearDragOverStyles(el) {
+  if (!el)
+    return;
+  const prevClasses = Array.from(el.classList).filter(name => name.startsWith('dragover-'));
+  prevClasses.forEach(name => el.classList.remove(name));
+}
+
 function deepClone(obj) {
   return JSON.parse(JSON.stringify(obj));
 }
@@ -191,15 +281,16 @@ Tree.prototype.buildTree = function (nodes, depth) {
 };
 Tree.prototype.bindEvent = function (ele) {
   var _a;
-  const that = this;
   if (!this.options.parentApi.isDisabled) {
     const contextMenu = this.options.parentApi.theOptions.contextMenu;
     if ((_a = contextMenu === null || contextMenu === void 0 ? void 0 : contextMenu.items) === null || _a === void 0 ? void 0 : _a.length) {
       new VanillaContextMenu(Object.assign(Object.assign({}, contextMenu), { scope: ele, menuItems: contextMenu.items.map(item => {
           return typeof item === 'string'
             ? item
-            : Object.assign(Object.assign({}, item), { callback: e => {
-                let targetOutput = Object.assign(Object.assign({}, that.nodesById[e.target.nodeId]), { hasChildren: that.nodesById[e.target.nodeId].children.length && that.nodesById[e.target.nodeId].children.length > 0 });
+            : Object.assign(Object.assign({}, item), { callback: async (e) => {
+                const pickerValue = await this.options.parentApi.getValue();
+                const treeJsNodeInfo = Object.assign({}, this.options.parentApi.loadedTreeJs.nodesById[pickerValue.nodeid]);
+                let targetOutput = Object.assign(Object.assign({}, treeJsNodeInfo), { hasChildren: treeJsNodeInfo.children.length > 0 });
                 delete targetOutput.children;
                 this.options.parentApi.onItemContextMenuItemClick(Object.assign(Object.assign({}, e), { target: targetOutput, contextMenuItem: item }));
               } });
@@ -240,7 +331,7 @@ Tree.prototype.bindEvent = function (ele) {
         if (this.options.parentApi.theOptions.origin == 'classification') {
           // WS Call
           this.options.rawDataManager
-            .getFromClassification(this.options.parentApi.theOptions.url, Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId }))
+            .getFromClassification(this.options.parentApi.getContextualApiURL(), this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId })))
             .then(data => {
             this.options.completeCurrentTreeWithTree(this, data, this.options.parentApi.theOptions);
           });
@@ -575,19 +666,21 @@ Tree.prototype.createLiEle = function (node, closed) {
   if (this.options.parentApi.theOptions.dragAndDropEnabled) {
     li.setAttribute('draggable', 'true');
     li.addEventListener('dragstart', e => {
-      this.options.parentApi.onItemDragStart(li, e);
+      onItemDragStart(li, e);
     });
     li.addEventListener('dragend', e => {
-      this.options.parentApi.onItemDragEnd(li, e);
+      onItemDragEnd(li, e);
     });
     li.addEventListener('dragover', e => {
-      this.options.parentApi.onItemDragOver(li, e);
+      onItemDragOver(li, e);
     });
     li.addEventListener('dragleave', e => {
-      this.options.parentApi.onItemDragLeave(li, e);
+      onItemDragLeave(li, e);
     });
     li.addEventListener('drop', e => {
-      this.options.parentApi.onItemDrop(li, e);
+      onItemDrop(li, e, (dragEl, dropEl, position) => {
+        this.options.parentApi.itemDropped.emit({ dragEl, dropEl, position });
+      });
     });
   }
   return li;
@@ -18291,6 +18384,27 @@ function getPropertyFromNode(node, property, logerror = true) {
 function findNodeById(tree, nodeId) {
   return tree.nodesById[nodeId] || null;
 }
+// TODO Deprecated ?
+// export function getNodesFromSearch(data: any, searched: string): any[] {
+//     let toret: any[] = [];
+//     if (data && data.children) {
+//         data.children.forEach(value => {
+//             if (value && value.valueTranslated) {
+//                 if (value.valueTranslated.toLowerCase().includes(searched.toLowerCase())) {
+//                     toret.push({
+//                         id: value.key,
+//                         fullpath: value.fullpath,
+//                         fullpathTranslated: value.fullpathTranslated,
+//                         text: value.valueTranslated,
+//                         deprecated: value.deprecated,
+//                     });
+//                 }
+//                 toret = toret.concat(getNodesFromSearch(value, searched));
+//             }
+//         });
+//     }
+//     return toret;
+// }
 /**
  * Fills the tree with nodes based on the provided object.
  */
@@ -18298,7 +18412,7 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
   if (myObject && myObject.length) {
     myObject.forEach(value => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e;
       let keyPropFromNode = null;
       let valueTranslatedPropFromNode = null;
       let fullpathPropFromNode = null;
@@ -18306,8 +18420,15 @@ 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;
-        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;
+        // 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;
+        }
       }
       else {
         keyPropFromNode = getPropertyFromNode(value, 'key');
@@ -18319,6 +18440,7 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
       const deprecated = getPropertyFromNode(value, 'deprecated', false);
       const objToPush = {
         id: keyPropFromNode,
+        nodeId: keyPropFromNode,
         depth,
         text: valueTranslatedPropFromNode,
         fullpath: fullpathPropFromNode,
@@ -18801,6 +18923,7 @@ const HierarchizedPickerComponent = class {
     }
     let autoAssignReach = true;
     let defaultFromFullpaths = undefined;
+    // TODO Revoir cette partie ? utilite ? (case == null ?)
     if (!this.isDisabled)
       this.isDisabled = false;
     if (this.optionsManager.getOptions().readonly !== undefined)
@@ -18818,7 +18941,7 @@ const HierarchizedPickerComponent = class {
     if (!this.optionsManager.getOptions().displayRootNode)
       this.optionsManager.getOptions().displayRootNode = false;
     if (!this.optionsManager.getOptions().dragAndDropEnabled)
-      this.optionsManager.getOptions().dragAndDropEnabled = true;
+      this.optionsManager.getOptions().dragAndDropEnabled = false;
     if (!this.optionsManager.getOptions().defaultValueIsFullpath)
       this.optionsManager.getOptions().defaultValueIsFullpath = false;
     if (!this.optionsManager.getOptions() && this.optionsManager.getOptions().errorsInInput !== false)
@@ -18981,6 +19104,37 @@ const HierarchizedPickerComponent = class {
       return this.optionsManager.getOptions().url.substring(0, this.optionsManager.getOptions().url.lastIndexOf('/')) + '/GetTreeFromSearch';
     }
   }
+  getContextualApiURL() {
+    if (this.optionsManager.getOptions().options.Reach) {
+      const url = new URL(this.optionsManager.getOptions().url);
+      const pathSegments = url.pathname.split('/');
+      const dynamicType = pathSegments[pathSegments.length - 2];
+      const newPathname = `/api/v1/classification/reach/${dynamicType}/${this.optionsManager.getOptions().options.Reach}`;
+      return `${url.origin}${newPathname}`;
+    }
+    else
+      return this.optionsManager.getOptions().url;
+  }
+  getContextualApiParams(options = null) {
+    if (!options)
+      options = this.optionsManager.getOptions().options;
+    if (options.Reach) {
+      let optionsToReturn = Object.assign({}, options);
+      delete optionsToReturn.Reach;
+      if ("startNode" in optionsToReturn) {
+        optionsToReturn.startingnode = optionsToReturn.startNode;
+        delete optionsToReturn.startNode;
+      }
+      else if ("StartNodeID" in optionsToReturn) {
+        optionsToReturn.startingnode = optionsToReturn.StartNodeID;
+        delete optionsToReturn.StartNodeID;
+      }
+      console.log("JE RETOURNE", optionsToReturn);
+      return optionsToReturn;
+    }
+    else
+      return options;
+  }
   translateDataForTree(dataToLoad, searchID = null, searched = null) {
     if (searched && searched != "") {
       this.loadSearchDataInCurrentTree(searchID, searched);
@@ -19015,12 +19169,7 @@ const HierarchizedPickerComponent = class {
       if (this.theOptions.origin == 'classification') {
         // WS Call
         this.rawDataManager.getFromClassification(this.getApiSearchURL(), {
-          search: {
-            StartNodeID: this.theOptions.options.startNode,
-            lng: this.theOptions.options.lng,
-            deprecated: this.theOptions.options.IsDeprecated,
-            searchedValue: searched,
-          }
+          searchedValue: searched
         })
           .then((data) => {
           displayResults(data);
@@ -19157,11 +19306,12 @@ const HierarchizedPickerComponent = class {
   onItemContextMenuItemClick(e) {
     this.itemContextMenuItemClick.emit(e);
   }
-  async setNodeAsSelected(id, treeToUpdate, userClick) {
+  setNodeAsSelected(id, treeToUpdate, userClick) {
     // TODO Temporarily ignores disabled mode for selecting nodes if mode is tree
     if (((this.isDisabled && this.optionsManager.getOptions().mode != "tree") && this.shownTree && this.setValueOnClick) ||
-      (this.loadedTreeJs.liElementsById[id].classList.value && this.loadedTreeJs.liElementsById[id].classList.value.indexOf('readonly_node') != -1))
+      (this.loadedTreeJs.liElementsById[id] && this.loadedTreeJs.liElementsById[id].classList.value && this.loadedTreeJs.liElementsById[id].classList.value.indexOf('readonly_node') != -1)) {
       return;
+    }
     if (treeToUpdate.getValues().indexOf(id.toString()) != -1)
       return;
     this.ignoreOptionsChanges = true;
@@ -19368,7 +19518,7 @@ const HierarchizedPickerComponent = class {
   loadDataForTree(init, loader) {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
-        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader).then((data) => {
+        this.rawDataManager.getFromClassification(this.getContextualApiURL(), this.getContextualApiParams(), loader).then((data) => {
           this.rawData = data;
           if (init) {
             this.formatDefaultValue();

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

@@ -465,6 +465,7 @@ reneco-hierarchized-picker input[title] {
   white-space: nowrap;
 }
 
+/* TODO For now, the readonly status is ignored for the mode tree, probably need a rework sometime */
 /* .hierarchized-picker-raw-tree-area.readonly li.treejs-node{
   cursor: initial;
   pointer-events: none;

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

@@ -262,6 +262,7 @@ export class HierarchizedPickerComponent {
     }
     let autoAssignReach = true;
     let defaultFromFullpaths = undefined;
+    // TODO Revoir cette partie ? utilite ? (case == null ?)
     if (!this.isDisabled)
       this.isDisabled = false;
     if (this.optionsManager.getOptions().readonly !== undefined)
@@ -279,7 +280,7 @@ export class HierarchizedPickerComponent {
     if (!this.optionsManager.getOptions().displayRootNode)
       this.optionsManager.getOptions().displayRootNode = false;
     if (!this.optionsManager.getOptions().dragAndDropEnabled)
-      this.optionsManager.getOptions().dragAndDropEnabled = true;
+      this.optionsManager.getOptions().dragAndDropEnabled = false;
     if (!this.optionsManager.getOptions().defaultValueIsFullpath)
       this.optionsManager.getOptions().defaultValueIsFullpath = false;
     if (!this.optionsManager.getOptions() && this.optionsManager.getOptions().errorsInInput !== false)
@@ -445,6 +446,37 @@ export class HierarchizedPickerComponent {
       return this.optionsManager.getOptions().url.substring(0, this.optionsManager.getOptions().url.lastIndexOf('/')) + '/GetTreeFromSearch';
     }
   }
+  getContextualApiURL() {
+    if (this.optionsManager.getOptions().options.Reach) {
+      const url = new URL(this.optionsManager.getOptions().url);
+      const pathSegments = url.pathname.split('/');
+      const dynamicType = pathSegments[pathSegments.length - 2];
+      const newPathname = `/api/v1/classification/reach/${dynamicType}/${this.optionsManager.getOptions().options.Reach}`;
+      return `${url.origin}${newPathname}`;
+    }
+    else
+      return this.optionsManager.getOptions().url;
+  }
+  getContextualApiParams(options = null) {
+    if (!options)
+      options = this.optionsManager.getOptions().options;
+    if (options.Reach) {
+      let optionsToReturn = Object.assign({}, options);
+      delete optionsToReturn.Reach;
+      if ("startNode" in optionsToReturn) {
+        optionsToReturn.startingnode = optionsToReturn.startNode;
+        delete optionsToReturn.startNode;
+      }
+      else if ("StartNodeID" in optionsToReturn) {
+        optionsToReturn.startingnode = optionsToReturn.StartNodeID;
+        delete optionsToReturn.StartNodeID;
+      }
+      console.log("JE RETOURNE", optionsToReturn);
+      return optionsToReturn;
+    }
+    else
+      return options;
+  }
   translateDataForTree(dataToLoad, searchID = null, searched = null) {
     if (searched && searched != "") {
       this.loadSearchDataInCurrentTree(searchID, searched);
@@ -479,12 +511,7 @@ export class HierarchizedPickerComponent {
       if (this.theOptions.origin == 'classification') {
         // WS Call
         this.rawDataManager.getFromClassification(this.getApiSearchURL(), {
-          search: {
-            StartNodeID: this.theOptions.options.startNode,
-            lng: this.theOptions.options.lng,
-            deprecated: this.theOptions.options.IsDeprecated,
-            searchedValue: searched,
-          }
+          searchedValue: searched
         })
           .then((data) => {
           displayResults(data);
@@ -621,11 +648,12 @@ export class HierarchizedPickerComponent {
   onItemContextMenuItemClick(e) {
     this.itemContextMenuItemClick.emit(e);
   }
-  async setNodeAsSelected(id, treeToUpdate, userClick) {
+  setNodeAsSelected(id, treeToUpdate, userClick) {
     // TODO Temporarily ignores disabled mode for selecting nodes if mode is tree
     if (((this.isDisabled && this.optionsManager.getOptions().mode != "tree") && this.shownTree && this.setValueOnClick) ||
-      (this.loadedTreeJs.liElementsById[id].classList.value && this.loadedTreeJs.liElementsById[id].classList.value.indexOf('readonly_node') != -1))
+      (this.loadedTreeJs.liElementsById[id] && this.loadedTreeJs.liElementsById[id].classList.value && this.loadedTreeJs.liElementsById[id].classList.value.indexOf('readonly_node') != -1)) {
       return;
+    }
     if (treeToUpdate.getValues().indexOf(id.toString()) != -1)
       return;
     this.ignoreOptionsChanges = true;
@@ -832,7 +860,7 @@ export class HierarchizedPickerComponent {
   loadDataForTree(init, loader) {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
-        this.rawDataManager.getFromClassification(this.optionsManager.getOptions().url, this.optionsManager.getOptions().options, loader).then((data) => {
+        this.rawDataManager.getFromClassification(this.getContextualApiURL(), this.getContextualApiParams(), loader).then((data) => {
           this.rawData = data;
           if (init) {
             this.formatDefaultValue();

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

@@ -1,4 +1,5 @@
 import VanillaContextMenu from 'vanilla-context-menu';
+import { onItemDragStart, onItemDragEnd, onItemDragOver, onItemDragLeave, onItemDrop } from '../../features/tree/drag-drop';
 function deepClone(obj) {
   return JSON.parse(JSON.stringify(obj));
 }
@@ -146,7 +147,7 @@ Tree.prototype.buildTree = function (nodes, depth) {
 };
 Tree.prototype.bindEvent = function (ele) {
   var _a;
-  const that = this;
+  // const that = this;
   // let parentOptions:any = {};
   // try{
   //   parentOptions = JSON.parse(this.options.parentApi.theOptions);
@@ -164,8 +165,10 @@ Tree.prototype.bindEvent = function (ele) {
       new VanillaContextMenu(Object.assign(Object.assign({}, contextMenu), { scope: ele, menuItems: contextMenu.items.map(item => {
           return typeof item === 'string'
             ? item
-            : Object.assign(Object.assign({}, item), { callback: e => {
-                let targetOutput = Object.assign(Object.assign({}, that.nodesById[e.target.nodeId]), { hasChildren: that.nodesById[e.target.nodeId].children.length && that.nodesById[e.target.nodeId].children.length > 0 });
+            : Object.assign(Object.assign({}, item), { callback: async (e) => {
+                const pickerValue = await this.options.parentApi.getValue();
+                const treeJsNodeInfo = Object.assign({}, this.options.parentApi.loadedTreeJs.nodesById[pickerValue.nodeid]);
+                let targetOutput = Object.assign(Object.assign({}, treeJsNodeInfo), { hasChildren: treeJsNodeInfo.children.length > 0 });
                 delete targetOutput.children;
                 this.options.parentApi.onItemContextMenuItemClick(Object.assign(Object.assign({}, e), { target: targetOutput, contextMenuItem: item }));
               } });
@@ -206,7 +209,7 @@ Tree.prototype.bindEvent = function (ele) {
         if (this.options.parentApi.theOptions.origin == 'classification') {
           // WS Call
           this.options.rawDataManager
-            .getFromClassification(this.options.parentApi.theOptions.url, Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId }))
+            .getFromClassification(this.options.parentApi.getContextualApiURL(), this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId })))
             .then(data => {
             this.options.completeCurrentTreeWithTree(this, data, this.options.parentApi.theOptions);
           });
@@ -542,19 +545,21 @@ Tree.prototype.createLiEle = function (node, closed) {
   if (this.options.parentApi.theOptions.dragAndDropEnabled) {
     li.setAttribute('draggable', 'true');
     li.addEventListener('dragstart', e => {
-      this.options.parentApi.onItemDragStart(li, e);
+      onItemDragStart(li, e);
     });
     li.addEventListener('dragend', e => {
-      this.options.parentApi.onItemDragEnd(li, e);
+      onItemDragEnd(li, e);
     });
     li.addEventListener('dragover', e => {
-      this.options.parentApi.onItemDragOver(li, e);
+      onItemDragOver(li, e);
     });
     li.addEventListener('dragleave', e => {
-      this.options.parentApi.onItemDragLeave(li, e);
+      onItemDragLeave(li, e);
     });
     li.addEventListener('drop', e => {
-      this.options.parentApi.onItemDrop(li, e);
+      onItemDrop(li, e, (dragEl, dropEl, position) => {
+        this.options.parentApi.itemDropped.emit({ dragEl, dropEl, position });
+      });
     });
   }
   return li;

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

@@ -23,26 +23,27 @@ export function getPropertyFromNode(node, property, logerror = true) {
 export function findNodeById(tree, nodeId) {
   return tree.nodesById[nodeId] || null;
 }
-export function getNodesFromSearch(data, searched) {
-  let toret = [];
-  if (data && data.children) {
-    data.children.forEach(value => {
-      if (value && value.valueTranslated) {
-        if (value.valueTranslated.toLowerCase().includes(searched.toLowerCase())) {
-          toret.push({
-            id: value.key,
-            fullpath: value.fullpath,
-            fullpathTranslated: value.fullpathTranslated,
-            text: value.valueTranslated,
-            deprecated: value.deprecated,
-          });
-        }
-        toret = toret.concat(getNodesFromSearch(value, searched));
-      }
-    });
-  }
-  return toret;
-}
+// TODO Deprecated ?
+// export function getNodesFromSearch(data: any, searched: string): any[] {
+//     let toret: any[] = [];
+//     if (data && data.children) {
+//         data.children.forEach(value => {
+//             if (value && value.valueTranslated) {
+//                 if (value.valueTranslated.toLowerCase().includes(searched.toLowerCase())) {
+//                     toret.push({
+//                         id: value.key,
+//                         fullpath: value.fullpath,
+//                         fullpathTranslated: value.fullpathTranslated,
+//                         text: value.valueTranslated,
+//                         deprecated: value.deprecated,
+//                     });
+//                 }
+//                 toret = toret.concat(getNodesFromSearch(value, searched));
+//             }
+//         });
+//     }
+//     return toret;
+// }
 /**
  * Fills the tree with nodes based on the provided object.
  */
@@ -50,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;
+      var _a, _b, _c, _d, _e;
       let keyPropFromNode = null;
       let valueTranslatedPropFromNode = null;
       let fullpathPropFromNode = null;
@@ -58,8 +59,15 @@ 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;
-        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;
+        // 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;
+        }
       }
       else {
         keyPropFromNode = getPropertyFromNode(value, 'key');
@@ -71,6 +79,7 @@ export function fillTreeWithObject(tree, myObject, searched, options, depth = 0)
       const deprecated = getPropertyFromNode(value, 'deprecated', false);
       const objToPush = {
         id: keyPropFromNode,
+        nodeId: keyPropFromNode,
         depth,
         text: valueTranslatedPropFromNode,
         fullpath: fullpathPropFromNode,