@teselagen/ui 0.8.6-beta.6 → 0.8.6-beta.8

package/index.cjs.js

@@ -19492,7 +19492,7 @@ function tableQueryParamsToHasuraClauses({
         case "contains":
           return { [filterOn]: { _ilike: `%${filterValue}%` } };
         case "notContains":
-          return { [filterOn]: { _not_ilike: `%${filterValue}%` } };
+          return { [filterOn]: { _nilike: `%${filterValue}%` } };
         case "isExactly":
           return { [filterOn]: { _eq: filterValue } };
         case "isEmpty":
@@ -22209,15 +22209,21 @@ __name(applyWhereClause, "applyWhereClause");
 function applyOrderBy(records, _order_by) {
   const order_by = isArray$2(_order_by) ? _order_by : isEmpty$1(_order_by) ? [] : [_order_by];
   if (order_by.length > 0) {
-    const fields = [];
     const directions = [];
+    const iteratees = [];
     order_by.forEach((item) => {
       const field = Object.keys(item)[0];
       const direction = item[field];
-      fields.push(field);
       directions.push(direction);
+      iteratees.push((record) => {
+        const value = record[field];
+        if (isString$1(value) && /\d/.test(value)) {
+          return value.replace(/(\d+)/g, (num) => num.padStart(10, "0"));
+        }
+        return value;
+      });
     });
-    records = orderBy$1(records, fields, directions);
+    records = orderBy$1(records, iteratees, directions);
   }
   return records;
 }

package/index.es.js

@@ -19474,7 +19474,7 @@ function tableQueryParamsToHasuraClauses({
         case "contains":
           return { [filterOn]: { _ilike: `%${filterValue}%` } };
         case "notContains":
-          return { [filterOn]: { _not_ilike: `%${filterValue}%` } };
+          return { [filterOn]: { _nilike: `%${filterValue}%` } };
         case "isExactly":
           return { [filterOn]: { _eq: filterValue } };
         case "isEmpty":
@@ -22191,15 +22191,21 @@ __name(applyWhereClause, "applyWhereClause");
 function applyOrderBy(records, _order_by) {
   const order_by = isArray$2(_order_by) ? _order_by : isEmpty$1(_order_by) ? [] : [_order_by];
   if (order_by.length > 0) {
-    const fields = [];
     const directions = [];
+    const iteratees = [];
     order_by.forEach((item) => {
       const field = Object.keys(item)[0];
       const direction = item[field];
-      fields.push(field);
       directions.push(direction);
+      iteratees.push((record) => {
+        const value = record[field];
+        if (isString$1(value) && /\d/.test(value)) {
+          return value.replace(/(\d+)/g, (num) => num.padStart(10, "0"));
+        }
+        return value;
+      });
     });
-    records = orderBy$1(records, fields, directions);
+    records = orderBy$1(records, iteratees, directions);
   }
   return records;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.8.6-beta.6",
+  "version": "0.8.6-beta.8",
   "main": "./src/index.js",
   "type": "module",
   "exports": {
@@ -55,7 +55,8 @@
     "chance": "^1.1.11",
     "@dnd-kit/utilities": "3.2.2",
     "@teselagen/file-utils": "0.3.20",
-    "@blueprintjs/icons": "3.33.0"
+    "@blueprintjs/icons": "3.33.0",
+    "jszip": "3.10.1"
   },
   "license": "MIT"
 }

package/src/DataTable/utils/filterLocalEntitiesToHasura.js

@@ -239,14 +239,30 @@ function applyOrderBy(records, _order_by) {
   if (order_by.length > 0) {
     const fields = [];
     const directions = [];
+    const iteratees = [];
+    
     order_by.forEach(item => {
       // Hasura-style: { field: "asc" }
       const field = Object.keys(item)[0];
       const direction = item[field];
       fields.push(field);
       directions.push(direction);
+      
+      // Create a custom iteratee function for natural sorting
+      iteratees.push(record => {
+        const value = record[field];
+        // Use natural sorting only for strings that contain numbers
+        if (isString(value) && /\d/.test(value)) {
+          // Return the value in a format that can be naturally sorted
+          // This effectively creates a sort key that respects natural ordering
+          return value.replace(/(\d+)/g, num => num.padStart(10, '0'));
+        }
+        return value;
+      });
     });
-    records = orderBy(records, fields, directions);
+    
+    // Use the custom iteratees for natural sorting
+    records = orderBy(records, iteratees, directions);
   }
   return records;
 }

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

@@ -536,13 +536,31 @@ describe("filterLocalEntitiesToHasura", () => {
     expect(result.entitiesAcrossPages).toEqual([records[0], records[2]]);
     expect(result.entityCount).toBe(2);
   });
+  it("should order order well names properly, aka names a1, a11, a2, a3 should be sorted a1, a2, a3, a11", () => {
+    const recordsWithNames = [
+      { id: 1, name: "a1" },
+      { id: 2, name: "a11" },
+      { id: 3, name: "a2" },
+      { id: 4, name: "a3" }
+    ];
+    const result = filterLocalEntitiesToHasura(recordsWithNames, {
+      order_by: { name: "asc" }
+    });
+    expect(result.entities).toEqual([
+      recordsWithNames[0], // a1
+      recordsWithNames[2], // a2
+      recordsWithNames[3], // a3
+      recordsWithNames[1] // a11
+    ]);
+    expect(result.entityCount).toBe(4);
+  });
   it("should order by multiple fields (age asc, name desc)", () => {
     // Make two of the ages the same for testing secondary sort
     const modifiedRecords = [
-      records[1],                 // Jane Smith, age 25
+      records[1], // Jane Smith, age 25
       { ...records[0], age: 25 }, // John Doe, age 25
-      records[2],                 // Alice Johnson, age 35
-      records[3]                  // Bob Williams, age 20
+      records[2], // Alice Johnson, age 35
+      records[3] // Bob Williams, age 20
     ];
     const result = filterLocalEntitiesToHasura(modifiedRecords, {
       order_by: [{ age: "asc" }, { name: "desc" }]
@@ -551,7 +569,7 @@ describe("filterLocalEntitiesToHasura", () => {
       modifiedRecords[3], // age 20, name "Bob Williams"
       modifiedRecords[1], // age 25, name "John Doe" (name desc)
       modifiedRecords[0], // age 25, name "Jane Smith"
-      modifiedRecords[2]  // age 35, name "Alice Johnson"
+      modifiedRecords[2] // age 35, name "Alice Johnson"
     ]);
     expect(result.entityCount).toBe(4);
   });

package/src/DataTable/utils/queryParams.js

@@ -373,7 +373,7 @@ export function getQueryParams({
           limit: 0,
           offset: 0
         }
-      }
+      };
     } else {
       console.error("Error building query params from filter:");
       throw e;

package/src/DataTable/utils/tableQueryParamsToHasuraClauses.js

@@ -108,7 +108,7 @@ export function tableQueryParamsToHasuraClauses({
           case "contains":
             return { [filterOn]: { _ilike: `%${filterValue}%` } };
           case "notContains":
-            return { [filterOn]: { _not_ilike: `%${filterValue}%` } };
+            return { [filterOn]: { _nilike: `%${filterValue}%` } };
           case "isExactly":
             return { [filterOn]: { _eq: filterValue } };
           case "isEmpty":