@teselagen/ui 0.8.6-beta.20 → 0.8.6-beta.21

package/index.cjs.js

@@ -19814,12 +19814,13 @@ function applyOrderBy(records, _order_by) {
         if (sortFn) {
           const sortFnArray = Array.isArray(sortFn) ? sortFn : [sortFn];
           sortFnArray.forEach((fn4) => {
+            const getter = typeof fn4 === "function" ? fn4 : (r2) => get$3(r2, fn4);
             orderFuncs.push((r2) => {
-              const val = fn4(r2);
+              const val = getter(r2);
               return val !== null && val !== void 0 ? 1 : 0;
             });
             ascOrDescArray.push("desc");
-            orderFuncs.push(fn4);
+            orderFuncs.push(getter);
             ascOrDescArray.push(direction);
           });
         } else if (getValueToFilterOn) {

package/index.es.js

@@ -19796,12 +19796,13 @@ function applyOrderBy(records, _order_by) {
         if (sortFn) {
           const sortFnArray = Array.isArray(sortFn) ? sortFn : [sortFn];
           sortFnArray.forEach((fn4) => {
+            const getter = typeof fn4 === "function" ? fn4 : (r2) => get$3(r2, fn4);
             orderFuncs.push((r2) => {
-              const val = fn4(r2);
+              const val = getter(r2);
               return val !== null && val !== void 0 ? 1 : 0;
             });
             ascOrDescArray.push("desc");
-            orderFuncs.push(fn4);
+            orderFuncs.push(getter);
             ascOrDescArray.push(direction);
           });
         } else if (getValueToFilterOn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.8.6-beta.20",
+  "version": "0.8.6-beta.21",
   "main": "./src/index.js",
   "type": "module",
   "exports": {

package/src/DataTable/utils/filterLocalEntitiesToHasura.js

@@ -249,21 +249,25 @@ function applyOrderBy(records, _order_by) {
         direction = direction || "desc";
 
         if (sortFn) {
-          // Handle specifically custom sort functions
-          // First make sure we have an array of sort functions
+          // Allow sortFn to be a function, a string, or an array of functions/strings
           const sortFnArray = Array.isArray(sortFn) ? sortFn : [sortFn];
 
-          // For each sort function
           sortFnArray.forEach(fn => {
-            // First handle null check for this function's values
+            // If fn is a string, treat it as a path to get from the record
+            const getter =
+              typeof fn === "function"
+          ? fn
+          : r => get(r, fn);
+
+            // First handle null check for this function's/string's values
             orderFuncs.push(r => {
-              const val = fn(r);
+              const val = getter(r);
               return val !== null && val !== undefined ? 1 : 0;
             });
             ascOrDescArray.push("desc"); // Always push nulls to the bottom
 
-            // Then the actual sort function
-            orderFuncs.push(fn);
+            // Then the actual sort function or path getter
+            orderFuncs.push(getter);
             ascOrDescArray.push(direction);
           });
         } else if (getValueToFilterOn) {

package/src/DataTable/utils/filterLocalEntitiesToHasura.test.js

@@ -1216,4 +1216,70 @@ describe("filterLocalEntitiesToHasura", () => {
     ]);
     expect(result.entityCount).toBe(5);
   });
+  it("should order using array of string paths in sortFn", () => {
+    // Records with rowPosition and columnPosition properties
+    const gridRecords = [
+      { id: 1, name: "Item A", rowPosition: 2, columnPosition: 3 },
+      { id: 2, name: "Item B", rowPosition: 1, columnPosition: 2 },
+      { id: 3, name: "Item C", rowPosition: 1, columnPosition: 1 },
+      { id: 4, name: "Item D", rowPosition: 2, columnPosition: 1 },
+      { id: 5, name: "Item E", rowPosition: 0, columnPosition: 0 }
+    ];
+
+    const result = filterLocalEntitiesToHasura(gridRecords, {
+      order_by: [
+        { path: "rowPosition", direction: "asc" },
+        { path: "columnPosition", direction: "asc" }
+      ]
+    });
+
+    // Should sort first by rowPosition ascending, then by columnPosition ascending
+    expect(result.entities).toEqual([
+      gridRecords[4], // rowPos: 0, colPos: 0
+      gridRecords[2], // rowPos: 1, colPos: 1
+      gridRecords[1], // rowPos: 1, colPos: 2
+      gridRecords[3], // rowPos: 2, colPos: 1
+      gridRecords[0]  // rowPos: 2, colPos: 3
+    ]);
+    expect(result.entitiesAcrossPages).toEqual([
+      gridRecords[4], 
+      gridRecords[2], 
+      gridRecords[1], 
+      gridRecords[3], 
+      gridRecords[0]
+    ]);
+    expect(result.entityCount).toBe(5);
+  });
+  it("should handle nulls and missing properties with array of string paths in sortFn", () => {
+    // Records with some missing or null rowPosition and columnPosition properties
+    const gridRecords = [
+      { id: 1, name: "Item A", rowPosition: 2, columnPosition: 3 },
+      { id: 2, name: "Item B", rowPosition: null, columnPosition: 2 },
+      { id: 3, name: "Item C", rowPosition: 1, columnPosition: null },
+      { id: 4, name: "Item D" }, // Missing both properties
+      { id: 5, name: "Item E", rowPosition: 0, columnPosition: 0 }
+    ];
+
+    const result = filterLocalEntitiesToHasura(gridRecords, {
+      order_by: { sortFn: ["rowPosition", "columnPosition"], direction: "asc" }
+    });
+
+    // Should sort first by rowPosition ascending, then by columnPosition ascending
+    // Null or undefined values should be placed at the end
+    expect(result.entities).toEqual([
+      gridRecords[4], // rowPos: 0, colPos: 0
+      gridRecords[2], // rowPos: 1, colPos: null
+      gridRecords[0], // rowPos: 2, colPos: 3
+      gridRecords[1], // rowPos: null, colPos: 2
+      gridRecords[3]  // rowPos: undefined, colPos: undefined
+    ]);
+    expect(result.entitiesAcrossPages).toEqual([
+      gridRecords[4],
+      gridRecords[2],
+      gridRecords[0],
+      gridRecords[1],
+      gridRecords[3]
+    ]);
+    expect(result.entityCount).toBe(5);
+  });
 });