fix tree

comps/list/utils/sort-tree.ts

@@ -43,87 +43,157 @@ export const treePrefix = (props: any) => {
   return prefix;
 };
 
-export const sortTree = (list: any, parent_key: string, pk: string) => {
+export const sortTree = (list: any[], parent_key: string, pk: string) => {
-  let meta = {} as Record<
+  const nodes: { [id: string]: any } = {};
-    string,
+  const result: any[] = [];
-    { item: any; idx: string; depth: number; id_parent: any }
-  >;
 
-  if (list.length > 0 && !isEditor) {
+  // First pass: Create nodes
-    const new_list = [];
+  list.forEach((node) => {
-    const unlisted = {} as Record<string, any>;
+    const id = node[pk];
-    for (const item of list) {
+    nodes[id] = { ...node, __depth: 0, __children: [] };
-      if (item[parent_key] === null) {
+  });
-        if (!meta[item[pk]]) {
+
-          meta[item[pk]] = {
+  // Second pass: Build the tree structure
-            item,
+  list.forEach((node) => {
-            idx: new_list.length + "",
+    const id = node[pk];
-            depth: 0,
+    const parentId = node[parent_key];
-            id_parent: null,
+    if (parentId === null || parentId === undefined) {
-          };
+      result.push(nodes[id]);
-          item.__depth = 0;
-          new_list.push(item);
-        }
     } else {
-        unlisted[item[pk]] = item;
+      if (nodes[parentId]) {
-      }
+        nodes[parentId].__children.push(nodes[id]);
-    }
-
-    let cyclic = {} as Record<string, number>;
-    while (Object.values(unlisted).length > 0) {
-      for (const item of Object.values(unlisted)) {
-        const parent = meta[item[parent_key]];
-        if (!cyclic[item[pk]]) {
-          cyclic[item[pk]] = 1;
       } else {
-          cyclic[item[pk]]++;
+        // Handle the case where a parent is missing
+        result.push(nodes[id]);
       }
-        if (cyclic[item[pk]] > 5) {
+    }
-          item.__depth = 0;
+  });
-          meta[item[pk]] = {
+
-            item,
+  // Function to flatten the tree
-            depth: 0,
+  function flattenTree(node: any, depth: number = 0): any[] {
-            idx: new_list.length + "",
+    node.__depth = depth;
-            id_parent: null,
+    const children = node.__children || [];
+    delete node.__children;
+    return [
+      node,
+      ...children
+        .sort((a: any, b: any) => {
+          if (
+            a.__children.length === 0 &&
+            b.__children.length === 0 &&
+            a.name &&
+            b.name
+          ) {
+            return a.name.localeCompare(b.name);
+          }
+
+          return (b.__children?.length || 0) - (a.__children?.length || 0);
+        })
+        .flatMap((child: any) => flattenTree(child, depth + 1)),
+    ];
+  }
+
+  // Flatten and assign indices
+  const flatResult = result.flatMap((node) => flattenTree(node));
+  flatResult.forEach((node, index) => {
+    node.idx = index;
+  });
+
+  return flatResult;
 };
-          new_list.push(item);
-          delete unlisted[item[pk]];
-          continue;
-        }
 
-        if (item[parent_key] === item[pk]) {
+// export const sortTree = (list: any[], parent_key: string, pk: string) => {
-          item.__depth = 0;
+//   let meta = {} as Record<
+//     string,
+//     { item: any; idx: string; depth: number; id_parent: any }
+//   >;
 
-          meta[item[pk]] = {
+//   let mode = "" as "" | "str" | "num";
-            item,
+//   let _list = list.sort((a, b) => {
-            depth: 0,
+//     if (!mode) {
-            idx: new_list.length + "",
+//       mode = typeof a[pk] === "string" ? "str" : "num";
-            id_parent: null,
+//     }
-          };
-          new_list.push(item);
-          delete unlisted[item[pk]];
-          continue;
-        }
 
-        if (parent) {
+//     if (mode === "str") return b[pk].toLocaleString(a[pk]);
-          item.__depth = parent.depth + 1;
 
-          meta[item[pk]] = {
+//     return a[pk] - b[pk];
-            item,
+//   });
-            depth: parent.depth + 1,
-            idx: parent.idx + ".",
-            id_parent: item[parent_key],
-          };
-          delete unlisted[item[pk]];
-        }
-      }
-    }
-    const sorted = Object.values(meta)
-      .sort((a, b) => a.idx.localeCompare(b.idx))
-      .map((e) => e.item);
 
-    return sorted;
+//   if (_list.length > 0 && !isEditor) {
-  }
+//     const new_list = [];
+//     const unlisted = {} as Record<string, any>;
+//     for (const item of _list) {
+//       if (item[parent_key] === null) {
+//         if (!meta[item[pk]]) {
+//           meta[item[pk]] = {
+//             item,
+//             idx: new_list.length + "",
+//             depth: 0,
+//             id_parent: null,
+//           };
+//           item.__depth = 0;
+//           new_list.push(item);
+//         }
+//       } else {
+//         unlisted[item[pk]] = item;
+//       }
+//     }
 
-  return list;
+//     let cyclic = {} as Record<string, number>;
-};
+//     while (Object.values(unlisted).length > 0) {
+//       for (const item of Object.values(unlisted)) {
+//         const parent = meta[item[parent_key]];
+//         if (!cyclic[item[pk]]) {
+//           cyclic[item[pk]] = 1;
+//         } else {
+//           cyclic[item[pk]]++;
+//         }
+//         if (cyclic[item[pk]] > 5) {
+//           item.__depth = 0;
+//           meta[item[pk]] = {
+//             item,
+//             depth: 0,
+//             idx: new_list.length + "",
+//             id_parent: null,
+//           };
+//           new_list.push(item);
+//           delete unlisted[item[pk]];
+//           continue;
+//         }
+
+//         if (item[parent_key] === item[pk]) {
+//           item.__depth = 0;
+
+//           meta[item[pk]] = {
+//             item,
+//             depth: 0,
+//             idx: new_list.length + "",
+//             id_parent: null,
+//           };
+//           new_list.push(item);
+//           delete unlisted[item[pk]];
+//           continue;
+//         }
+
+//         if (parent) {
+//           item.__depth = parent.depth + 1;
+
+//           meta[item[pk]] = {
+//             item,
+//             depth: parent.depth + 1,
+//             idx: parent.idx + ".",
+//             id_parent: item[parent_key],
+//           };
+//           delete unlisted[item[pk]];
+//         }
+//       }
+//     }
+//     const sorted = Object.values(meta)
+//       .sort((a, b) => a.idx.localeCompare(b.idx))
+//       .map((e) => e.item);
+
+//     return sorted;
+//   }
+
+//   return _list;
+// };