@fibery/views 13.0.3 → 14.0.1

package/lib/views.js

@@ -1217,14 +1217,14 @@ const replaceNamesWithIdsInGroupByExpression = (schema, groupByExpression, fromT
 const replaceNamesWithIdsInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
   visitFilter: (fromType, expression) => replaceNamesWithIdsInFilter(schema, fromType, expression),
-  visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType, Object.keys(groupBy).map(() => 0)),
+  visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType),
   visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
   visitUnitGroupKey: unitGroupKey => replaceNamesWithIdsInUnitGroupKey(unitGroupKey, schema)
 });
 const replaceIdsWithNamesInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
   visitFilter: (fromType, expression) => replaceIdsWithNamesInFilter(schema, fromType, expression),
-  visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType, Object.keys(groupBy).map(() => 0)),
+  visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType),
   visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
   visitUnitGroupKey: unitGroupKey => replaceIdsWithNamesInUnitGroupKey(unitGroupKey, getFieldObjectsById(smartFolder, schema))
 });
@@ -1292,10 +1292,7 @@ const enableHideWhenEmptyForCheckedUnits = view => {
   });
 };
 
-const visitAxis = (axis, visitor) => {
-  if (!axis) {
-    return axis;
-  }
+const visitAxisSingle = (axis, visitor) => {
   const fromType = ___default["default"].get(axis, ["query", "q/from"]);
   const firstOrNull = x => ___default["default"].first(x) || null;
   const axisResult = {
@@ -1314,62 +1311,92 @@ const visitAxis = (axis, visitor) => {
   }
   return axisResult;
 };
+const visitAxis = (axis, visitor) => {
+  if (axis && axis.hasOwnProperty("query")) {
+    return visitAxisSingle(axis, visitor);
+  }
+  if (axis && axis.hasOwnProperty("enums")) {
+    const axisNew = immutableUpdate__default["default"](axis, {
+      enums: {
+        $apply: enums => visitor.visitEnums(enums)
+      }
+    });
+    const {
+      enums
+    } = axisNew;
+    return enums ? axisNew : null;
+  }
+  return axis;
+};
 const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     y: {
       $apply: y => visitAxis(y, visitor)
     },
     items: {
-      $apply: items => items.map(item => {
-        const fromType = ___default["default"].get(item, ["query", "q/from"]);
-        return fromType ? immutableUpdate__default["default"](item, {
-          yExpression: {
-            $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
-          },
-          startExpression: {
-            $apply: startExpression => startExpression ? visitor.visitExpression(fromType, startExpression) : startExpression
-          },
-          endExpression: {
-            $apply: endExpression => endExpression ? visitor.visitExpression(fromType, endExpression) : endExpression
-          },
-          secondaryStartExpression: {
-            $apply: secondaryStartExpression => secondaryStartExpression ? visitor.visitExpression(fromType, secondaryStartExpression) : secondaryStartExpression
-          },
-          secondaryEndExpression: {
-            $apply: secondaryEndExpression => secondaryEndExpression ? visitor.visitExpression(fromType, secondaryEndExpression) : secondaryEndExpression
-          },
-          contextExpression: {
-            $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
-          },
-          filter: {
-            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : null
-          },
-          query: {
-            $apply: query => query ? visitor.visitQueryExpression(query) : null
-          },
-          units: {
-            $apply: units => units ? units.filter(unit => Boolean(unit)).map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map((unit, idx, units) => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit, units) : unit).filter(unit => unit !== REMOVE) : undefined
-          },
-          colorCoding: {
-            $apply: colorCodings => {
-              return colorCodings && colorCodings.map(colorCoding => ({
-                ...colorCoding,
-                expression: visitor.visitExpression(fromType, colorCoding.expression)
-              })).filter(colorCoding => colorCoding.expression !== null);
-            }
-          },
-          dependencyExpression: {
-            $apply: expression => {
-              return expression && visitor.visitExpression(fromType, expression);
+      $apply: items => {
+        const removedItemsIndexes = items.map((item, index) => visitor.visitQueryExpression(item.query) ? null : index).filter(value => value !== null);
+        return items.map(item => {
+          const fromType = ___default["default"].get(item, ["query", "q/from"]);
+          return fromType ? immutableUpdate__default["default"](item, {
+            yExpression: {
+              $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
+            },
+            startExpression: {
+              $apply: startExpression => startExpression ? visitor.visitExpression(fromType, startExpression) : startExpression
+            },
+            endExpression: {
+              $apply: endExpression => endExpression ? visitor.visitExpression(fromType, endExpression) : endExpression
+            },
+            secondaryStartExpression: {
+              $apply: secondaryStartExpression => secondaryStartExpression ? visitor.visitExpression(fromType, secondaryStartExpression) : secondaryStartExpression
+            },
+            secondaryEndExpression: {
+              $apply: secondaryEndExpression => secondaryEndExpression ? visitor.visitExpression(fromType, secondaryEndExpression) : secondaryEndExpression
+            },
+            contextExpression: {
+              $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
+            },
+            filter: {
+              $apply: filter => filter ? visitor.visitFilter(fromType, filter) : null
+            },
+            query: {
+              $apply: query => query ? visitor.visitQueryExpression(query) : null
+            },
+            units: {
+              $apply: units => units ? units.filter(unit => Boolean(unit)).map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map((unit, idx, units) => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit, units) : unit).filter(unit => unit !== REMOVE) : undefined
+            },
+            colorCoding: {
+              $apply: colorCodings => {
+                return colorCodings && colorCodings.map(colorCoding => ({
+                  ...colorCoding,
+                  expression: visitor.visitExpression(fromType, colorCoding.expression)
+                })).filter(colorCoding => colorCoding.expression !== null);
+              }
+            },
+            dependencyExpression: {
+              $apply: expression => {
+                return expression && visitor.visitExpression(fromType, expression);
+              }
+            },
+            groupBy: {
+              $apply: groupBy => {
+                if (!groupBy) {
+                  return groupBy;
+                }
+                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;
-      }).filter(item => {
-        const {
-          query
-        } = item;
-        return query ? item : null;
-      })
+          }) : item;
+        }).filter(item => {
+          const {
+            query
+          } = item;
+          return query ? item : null;
+        });
+      }
     },
     milestones: {
       $apply: milestones => {
@@ -1403,18 +1430,40 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
   }
 });
 const replaceNamesWithIdsInTimelineView = (schema, view) => {
-  return visitView(view, {
+  const visitor = {
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
     visitFilter: (fromType, expression) => replaceNamesWithIdsInFilter(schema, fromType, expression),
-    visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression)
-  });
+    visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
+    visitEnums: enums => ___default["default"].entries(enums).reduce((result, [type, axis]) => {
+      if (schema.typeObjectsByName.hasOwnProperty(type)) {
+        const typeObject = schema.typeObjectsByName[type];
+        result[typeObject.id] = visitAxisSingle(axis, visitor);
+      } else {
+        result[type] = axis;
+      }
+      return result;
+    }, {}),
+    visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType)
+  };
+  return visitView(view, visitor);
 };
 const replaceIdsWithNamesInTimelineView = (schema, view) => {
-  return visitView(view, {
+  const visitor = {
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
     visitFilter: (fromType, expression) => replaceIdsWithNamesInFilter(schema, fromType, expression),
-    visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression)
-  });
+    visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
+    visitEnums: enums => ___default["default"].entries(enums).reduce((result, [typeId, axis]) => {
+      if (schema.typeObjectsById.hasOwnProperty(typeId)) {
+        const typeObject = schema.typeObjectsById[typeId];
+        result[typeObject.name] = visitAxisSingle(axis, visitor);
+      } else {
+        result[typeId] = axis;
+      }
+      return result;
+    }, {}),
+    visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType)
+  };
+  return visitView(view, visitor);
 };
 const ensureAxisAndItemExpressionInvariant = (view, canGroupMetaItem) => {
   const actions = [];
@@ -1443,12 +1492,27 @@ const ensureAxisAndItemExpressionInvariant = (view, canGroupMetaItem) => {
   actions.forEach(action => action());
   return view;
 };
-const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant, canGroupMetaItem = () => true) => {
-  const viewNew = visitView(view, {
+const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant, canGroupMetaItem = metaItem => true) => {
+  const visitor = {
     visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
     visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
-    visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
-  });
+    visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression),
+    visitEnums: enums => {
+      const enumsNew = ___default["default"].entries(enums).reduce((result, [type, axis]) => {
+        if (schema.typeObjectsByName.hasOwnProperty(type)) {
+          const typeObject = schema.typeObjectsByName[type];
+          const axisResult = visitAxisSingle(axis, visitor);
+          if (axisResult) {
+            result[typeObject.name] = axisResult;
+          }
+        }
+        return result;
+      }, {});
+      return ___default["default"].isEmpty(enumsNew) ? null : enumsNew;
+    },
+    visitGroupByExpression: (groupBy, fromType, removedItems) => deleteExpressionWithNotFoundFieldsOrTypesInGroupByExpression(schema, groupBy, fromType, removedItems)
+  };
+  const viewNew = visitView(view, visitor);
   return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant(viewNew, canGroupMetaItem) : viewNew;
 };
 const fixUserSelectedUnitsInTimelineView = (schema, view, {
@@ -1462,31 +1526,37 @@ const fixUserSelectedUnitsInTimelineView = (schema, view, {
     visitViewUnit: (fromType, unit, units) => fixViewUnit(schema, fromType, unit, units, {
       unitDefinitions,
       getDefaultUnitTypeForField
-    })
+    }),
+    visitEnums: enums => enums,
+    visitGroupByExpression: groupBy => groupBy
   });
 };
 const fixContextExpressionWithBrokenPath$1 = (schema, view, defaultContextExpression) => visitView(view, {
   visitExpression: (_fromType, expression) => expression,
   visitFilter: (_fromType, filter) => filter,
   visitQueryExpression: query => query,
-  visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
+  visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression),
+  visitEnums: enums => enums,
+  visitGroupByExpression: groupBy => groupBy
 });
 const collectGarbage$1 = view => {
   return visitView(view, {
     visitQueryExpression: query => query,
     visitFilter: (_fromType, filter) => filter,
     visitExpression: (_fromType, expression) => expression,
-    visitViewUnit: (_fromType, unit) => unit.checked ? unit : REMOVE
+    visitViewUnit: (_fromType, unit) => unit.checked ? unit : REMOVE,
+    visitEnums: enums => enums,
+    visitGroupByExpression: groupBy => groupBy
   });
 };
 const enableHideWhenEmptyForCheckedEditableUnits = view => {
   return visitView(view, {
     visitQueryExpression: queryExpression => queryExpression,
-    visitGroupByExpression: groupBy => groupBy,
     visitExpression: (_fromType, expression) => expression,
     visitFilter: (_fromType, filter) => filter,
+    visitViewUnit: (_fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit),
     visitEnums: enums => enums,
-    visitViewUnit: (_fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
+    visitGroupByExpression: groupBy => groupBy
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "13.0.3",
+  "version": "14.0.1",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -19,13 +19,13 @@
     "lodash": "4.17.21",
     "microbundle": "0.15.1",
     "@fibery/babel-preset": "7.4.0",
-    "@fibery/expression-utils": "9.1.5",
     "@fibery/eslint-config": "8.6.1",
-    "@fibery/schema": "10.2.6"
+    "@fibery/schema": "10.2.8",
+    "@fibery/expression-utils": "9.2.1"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.1.5",
-    "@fibery/schema": "^10.2.6",
+    "@fibery/expression-utils": "^9.2.1",
+    "@fibery/schema": "^10.2.8",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"
   },