@visns-studio/visns-components 5.1.25 → 5.1.26

package/package.json

@@ -77,7 +77,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.1.25",
+    "version": "5.1.26",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/crm/generic/GenericEditableTable.jsx

@@ -226,18 +226,27 @@ const GenericEditableTable = ({
 
         dataArray.forEach((entry, index) => {
             const categoryInfo = entry[rows.categoryKey.id];
-            const categoryType = categoryInfo
+            const categoryLabel = categoryInfo
                 ? categoryInfo[rows.categoryKey.label]
                 : null;
             const categoryId = categoryInfo ? categoryInfo.id : null;
             const groupKey = categoryId || 'no_category';
+            // Use the category's sort_order if provided; otherwise, default to a high number (e.g. 9999)
+
+            console.info(categoryInfo);
+
+            const catSortOrder =
+                categoryInfo && typeof categoryInfo.sort_order !== 'undefined'
+                    ? categoryInfo.sort_order
+                    : 9999;
 
             if (!grouped[groupKey]) {
                 grouped[groupKey] = {
                     id: groupKey,
                     category:
-                        categoryType ||
+                        categoryLabel ||
                         (groupKey === 'no_category' ? 'No Category' : ''),
+                    catSortOrder, // assign the sort order (or fallback)
                     entries: [],
                 };
             }
@@ -247,15 +256,23 @@ const GenericEditableTable = ({
             });
         });
 
+        // Sort entries within each group by their universal sort_order
         Object.values(grouped).forEach((group) => {
             group.entries.sort((a, b) => a.sort_order - b.sort_order);
         });
 
-        // Ensure 'no_category' group is at the top
+        // Now sort the groups by the cost category's sort_order (catSortOrder)
         const groupedArray = Object.values(grouped);
-        return groupedArray.sort((a, b) =>
-            a.id === 'no_category' ? -1 : b.id === 'no_category' ? 1 : 0
-        );
+        groupedArray.sort((a, b) => {
+            // Optionally, place 'no_category' first (or adjust as needed)
+            if (a.id === 'no_category') return -1;
+            if (b.id === 'no_category') return 1;
+            return a.catSortOrder - b.catSortOrder;
+        });
+
+        console.info(groupedArray);
+
+        return groupedArray;
     };
 
     const groupedCategories = useMemo(() => {