@fibery/views 10.3.0 → 10.5.0

package/lib/views.js

@@ -857,7 +857,7 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
       $apply: (items = []) => {
         const isOldSmartFolder = !items.every(item => item.hasOwnProperty("groupBy"));
         const removedItemsIndexes = items.map((item, index) => visitor.visitQueryExpression(item.query) ? null : index).filter(value => value !== null);
-        return items.map((item, index) => {
+        return items.map(item => {
           if (isOldSmartFolder) {
             return item;
           }
@@ -865,12 +865,16 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
           return fromType ? immutableUpdate__default["default"](item, {
             groupBy: {
               $apply: groupBy => {
-                const removedItemsBeforeCurrent = removedItemsIndexes.filter(n => n < index);
-                return groupBy ? visitor.visitGroupByExpression(groupBy, fromType, removedItemsBeforeCurrent.length) : null;
+                if (!groupBy) {
+                  return null;
+                }
+                const groupByIndexes = Object.keys(groupBy).map(key => parseInt(key));
+                const removedItemsBeforeTargetLengths = groupByIndexes.map(groupByIndex => removedItemsIndexes.filter(n => n < groupByIndex).length);
+                return visitor.visitGroupByExpression(groupBy, fromType, removedItemsBeforeTargetLengths);
               }
             }
           }) : item;
-        }).map((item, index) => {
+        }).map(item => {
           if (isOldSmartFolder) {
             return item;
           }
@@ -878,8 +882,12 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
           return fromType ? immutableUpdate__default["default"](item, {
             groupingExpression: {
               $apply: groupingExpression => {
-                const removedItemsBeforeCurrent = removedItemsIndexes.filter(n => n < index);
-                return groupingExpression ? visitor.visitGroupByExpression(groupingExpression, fromType, removedItemsBeforeCurrent.length) : null;
+                if (!groupingExpression) {
+                  return null;
+                }
+                const groupingExpressionIndexes = Object.keys(groupingExpression).map(key => parseInt(key));
+                const removedItemsBeforeTargetLengths = groupingExpressionIndexes.map(groupByIndex => removedItemsIndexes.filter(n => n < groupByIndex).length);
+                return visitor.visitGroupByExpression(groupingExpression, fromType, removedItemsBeforeTargetLengths);
               }
             }
           }) : item;
@@ -916,6 +924,32 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
           return query ? item : null;
         });
       }
+    },
+    columnOrderWithIds: {
+      $apply: columnOrderWithIds => {
+        if (!visitor.visitUnitGroupKey || !columnOrderWithIds) {
+          return columnOrderWithIds;
+        }
+        return columnOrderWithIds.map(key => visitor.visitUnitGroupKey(key));
+      }
+    },
+    pinnedColumnsWithIds: {
+      $apply: pinnedColumnsWithIds => {
+        if (!visitor.visitUnitGroupKey || !pinnedColumnsWithIds) {
+          return pinnedColumnsWithIds;
+        }
+        return pinnedColumnsWithIds.map(key => visitor.visitUnitGroupKey(key));
+      }
+    },
+    columnAggFunc: {
+      $apply: columnAggFunc => {
+        if (!visitor.visitUnitGroupKey || !columnAggFunc) {
+          return columnAggFunc;
+        }
+        return Object.fromEntries(Object.entries(columnAggFunc).map(([key, value]) => {
+          return [visitor.visitUnitGroupKey(key), value];
+        }));
+      }
     }
   }
 });
@@ -925,10 +959,10 @@ const deleteExpressionWithNotFoundFieldsOrTypesInGroupByExpression = (schema, gr
   }
   const entries = Object.entries(groupByExpression).map(([index, {
     expression
-  }]) => {
+  }], groupByIndex) => {
     const visitedExpression = deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression);
     if (visitedExpression) {
-      return [`${parseInt(index) - removedItems}`, {
+      return [`${parseInt(index) - removedItems[groupByIndex]}`, {
         expression: visitedExpression
       }];
     }
@@ -976,13 +1010,61 @@ const replaceNamesWithIdsInGroupByExpression = (schema, groupByExpression, fromT
 };
 const replaceNamesWithIdsInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
-  visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType),
-  visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression)
+  visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType, Object.keys(groupBy).map(() => 0)),
+  visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
+  visitUnitGroupKey: unitGroupKey => {
+    const keyParts = unitGroupKey.split("|");
+    return keyParts.map(keyPart => {
+      const [unitType, ...rest] = keyPart.split("_");
+      if (unitType === "user-button") {
+        return keyPart;
+      }
+      const name = rest.join("_");
+      if (!name) {
+        return keyPart;
+      }
+      const [type, field] = name.split(":");
+      const fieldObject = schema.typeObjectsByName[type].fieldObjectsByName[field];
+      if (!fieldObject) {
+        return null;
+      }
+      return `${unitType}_${fieldObject.id}`;
+    }).filter(Boolean).join("|");
+  }
 });
 const replaceIdsWithNamesInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
-  visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType),
-  visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression)
+  visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType, Object.keys(groupBy).map(() => 0)),
+  visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
+  visitUnitGroupKey: unitGroupKey => {
+    const types = smartFolder["fibery/meta"].items.map(item => item.query["q/from"]);
+    const fieldObjectsById = types.reduce((acc, type) => {
+      if (!(type in schema.typeObjectsById)) {
+        return acc;
+      }
+      const fieldObjects = schema.typeObjectsById[type].fieldObjectsById;
+      return {
+        ...acc,
+        ...fieldObjects
+      };
+    }, {});
+    const keyParts = unitGroupKey.split("|");
+    return keyParts.map(keyPart => {
+      const [unitType, ...rest] = keyPart.split("_");
+      if (unitType === "user-button") {
+        return keyPart;
+      }
+      const fieldId = rest.join("_");
+      if (!fieldId) {
+        return keyPart;
+      }
+      const fieldObject = fieldObjectsById[fieldId];
+      if (!fieldObject) {
+        return null;
+      }
+      return `${unitType}_${fieldObject.holderType}:${fieldObject.name}`;
+    }).filter(Boolean).join("|");
+  }
 });
 const deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, query),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "10.3.0",
+  "version": "10.5.0",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -18,13 +18,13 @@
     "jest-junit": "13.0.0",
     "lodash": "4.17.21",
     "microbundle": "0.15.1",
+    "@fibery/babel-preset": "7.4.0",
     "@fibery/eslint-config": "8.6.0",
-    "@fibery/schema": "10.2.1",
-    "@fibery/expression-utils": "9.0.4",
-    "@fibery/babel-preset": "7.4.0"
+    "@fibery/expression-utils": "9.0.5",
+    "@fibery/schema": "10.2.1"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.0.4",
+    "@fibery/expression-utils": "^9.0.5",
     "@fibery/schema": "^10.2.1",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"