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

package/index.cjs.js

@@ -20170,7 +20170,7 @@ function getQueryParams({
     });
     initializeHasuraWhereAndFilter(additionalFilter, where, currentParams);
     if (isLocalCall) {
-      const newEnts = filterLocalEntitiesToHasura(
+      const r2 = filterLocalEntitiesToHasura(
         prepEntitiesForLocalFilter({ entities, ccFields }),
         {
           where,
@@ -20189,14 +20189,14 @@ function getQueryParams({
           isInfinite
         }
       );
-      toRet = __spreadValues(__spreadValues({}, toRet), newEnts);
+      toRet = __spreadValues(__spreadValues({}, toRet), r2);
       return toRet;
     } else {
       if (!order_by.length) {
         order_by.push({ updatedAt: "desc" });
       }
       order_by.push(
-        isCodeModel ? { code: "desc" } : { [window.__sortId || "id"]: "desc" }
+        isCodeModel ? { code: "asc" } : { [window.__sortId || "id"]: "asc" }
       );
       return __spreadProps(__spreadValues({}, toRet), {
         variables: {
@@ -20232,15 +20232,20 @@ function getQueryParams({
 __name(getQueryParams, "getQueryParams");
 function prepEntitiesForLocalFilter({ entities, ccFields }) {
   const r2 = entities.map((entity) => {
-    const newEnt = __spreadValues({}, entity);
+    const toSpread = {};
+    let hasChanged = false;
     forEach(ccFields, ({ getValueToFilterOn, path: path2 }) => {
       if (getValueToFilterOn) {
-        newEnt["___original___" + path2] = newEnt[path2];
-        const value = getValueToFilterOn(newEnt);
-        newEnt[path2] = value;
+        hasChanged = true;
+        toSpread["___original___" + path2] = entity[path2];
+        const value = getValueToFilterOn(entity);
+        toSpread[path2] = value;
       }
     });
-    return newEnt;
+    if (hasChanged) {
+      return __spreadValues(__spreadValues({}, entity), toSpread);
+    }
+    return entity;
   });
   return r2;
 }

package/index.es.js

@@ -20152,7 +20152,7 @@ function getQueryParams({
     });
     initializeHasuraWhereAndFilter(additionalFilter, where, currentParams);
     if (isLocalCall) {
-      const newEnts = filterLocalEntitiesToHasura(
+      const r2 = filterLocalEntitiesToHasura(
         prepEntitiesForLocalFilter({ entities, ccFields }),
         {
           where,
@@ -20171,14 +20171,14 @@ function getQueryParams({
           isInfinite
         }
       );
-      toRet = __spreadValues(__spreadValues({}, toRet), newEnts);
+      toRet = __spreadValues(__spreadValues({}, toRet), r2);
       return toRet;
     } else {
       if (!order_by.length) {
         order_by.push({ updatedAt: "desc" });
       }
       order_by.push(
-        isCodeModel ? { code: "desc" } : { [window.__sortId || "id"]: "desc" }
+        isCodeModel ? { code: "asc" } : { [window.__sortId || "id"]: "asc" }
       );
       return __spreadProps(__spreadValues({}, toRet), {
         variables: {
@@ -20214,15 +20214,20 @@ function getQueryParams({
 __name(getQueryParams, "getQueryParams");
 function prepEntitiesForLocalFilter({ entities, ccFields }) {
   const r2 = entities.map((entity) => {
-    const newEnt = __spreadValues({}, entity);
+    const toSpread = {};
+    let hasChanged = false;
     forEach(ccFields, ({ getValueToFilterOn, path: path2 }) => {
       if (getValueToFilterOn) {
-        newEnt["___original___" + path2] = newEnt[path2];
-        const value = getValueToFilterOn(newEnt);
-        newEnt[path2] = value;
+        hasChanged = true;
+        toSpread["___original___" + path2] = entity[path2];
+        const value = getValueToFilterOn(entity);
+        toSpread[path2] = value;
       }
     });
-    return newEnt;
+    if (hasChanged) {
+      return __spreadValues(__spreadValues({}, entity), toSpread);
+    }
+    return entity;
   });
   return r2;
 }

package/package.json

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

package/src/DataTable/utils/filterLocalEntitiesToHasura.js

@@ -254,10 +254,7 @@ function applyOrderBy(records, _order_by) {
 
           sortFnArray.forEach(fn => {
             // 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);
+            const getter = typeof fn === "function" ? fn : r => get(r, fn);
 
             // First handle null check for this function's/string's values
             orderFuncs.push(r => {

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

@@ -1239,13 +1239,13 @@ describe("filterLocalEntitiesToHasura", () => {
       gridRecords[2], // rowPos: 1, colPos: 1
       gridRecords[1], // rowPos: 1, colPos: 2
       gridRecords[3], // rowPos: 2, colPos: 1
-      gridRecords[0]  // rowPos: 2, colPos: 3
+      gridRecords[0] // rowPos: 2, colPos: 3
     ]);
     expect(result.entitiesAcrossPages).toEqual([
-      gridRecords[4], 
-      gridRecords[2], 
-      gridRecords[1], 
-      gridRecords[3], 
+      gridRecords[4],
+      gridRecords[2],
+      gridRecords[1],
+      gridRecords[3],
       gridRecords[0]
     ]);
     expect(result.entityCount).toBe(5);
@@ -1271,7 +1271,7 @@ describe("filterLocalEntitiesToHasura", () => {
       gridRecords[2], // rowPos: 1, colPos: null
       gridRecords[0], // rowPos: 2, colPos: 3
       gridRecords[1], // rowPos: null, colPos: 2
-      gridRecords[3]  // rowPos: undefined, colPos: undefined
+      gridRecords[3] // rowPos: undefined, colPos: undefined
     ]);
     expect(result.entitiesAcrossPages).toEqual([
       gridRecords[4],

package/src/DataTable/utils/queryParams.js

@@ -346,7 +346,7 @@ export function getQueryParams({
     if (isLocalCall) {
       //if the table is local (aka not directly connected to a db) then we need to
       //handle filtering/paging/sorting all on the front end
-      const newEnts = filterLocalEntitiesToHasura(
+      const r = filterLocalEntitiesToHasura(
         prepEntitiesForLocalFilter({ entities, ccFields }),
         {
           where,
@@ -369,7 +369,7 @@ export function getQueryParams({
 
       toRet = {
         ...toRet,
-        ...newEnts
+        ...r
       };
       return toRet;
     } else {
@@ -381,7 +381,7 @@ export function getQueryParams({
       // in case entries that have the same value in the column being sorted on
       // fall back to id as a secondary sort to make sure ordering happens correctly
       order_by.push(
-        isCodeModel ? { code: "desc" } : { [window.__sortId || "id"]: "desc" }
+        isCodeModel ? { code: "asc" } : { [window.__sortId || "id"]: "asc" }
       );
 
       return {
@@ -420,16 +420,22 @@ export function getQueryParams({
 function prepEntitiesForLocalFilter({ entities, ccFields }) {
   // Prepare entities for local filtering by mapping over them and applying necessary transformations
   const r = entities.map(entity => {
-    const newEnt = { ...entity };
+    const toSpread = {};
+    let hasChanged = false;
     // Apply any necessary transformations using ccFields
     forEach(ccFields, ({ getValueToFilterOn, path }) => {
       if (getValueToFilterOn) {
-        newEnt["___original___" + path] = newEnt[path];
-        const value = getValueToFilterOn(newEnt);
-        newEnt[path] = value;
+        hasChanged = true;
+        toSpread["___original___" + path] = entity[path];
+        const value = getValueToFilterOn(entity);
+        toSpread[path] = value;
       }
     });
-    return newEnt;
+    if (hasChanged) {
+      // If there are any transformations, spread them into the entity
+      return { ...entity, ...toSpread };
+    }
+    return entity;
   });
   return r;
 }