@fibery/views 10.6.0 → 10.7.0

package/lib/views.js

@@ -11,6 +11,37 @@ var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 // Return this symbol from a visitor callback to remove the node from the
 // output. Not supported in all places, add support as needed.
 const REMOVE = Symbol("remove");
+function visitDeleteExpressionInFilterGroup(filter, visitExpression) {
+  if (filter.kind !== "group") {
+    return null;
+  }
+  const value = filter.value.map(nestedFilter => {
+    if (nestedFilter.kind === "group") {
+      return visitFilterGroup(nestedFilter, visitExpression);
+    }
+    const expression = visitExpression(nestedFilter.value.expression);
+    if (!expression) {
+      return null;
+    }
+    return {
+      ...nestedFilter,
+      value: {
+        ...nestedFilter.value,
+        expression: expression
+      }
+    };
+  }).filter(Boolean);
+  if (value.length === 0) {
+    return null;
+  }
+  return {
+    ...filter,
+    value: value
+  };
+}
+const deleteExpressionWithNotFoundFieldsOrTypesInFilter = (schema, fromType, filter) => {
+  return visitDeleteExpressionInFilterGroup(filter, expression => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression));
+};
 const deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression = (schema, queryExpression) => {
   const {
     "q/from": fromExpression,
@@ -86,6 +117,40 @@ const replaceIdsWithNamesInQueryExpression = (schema, queryExpression) => {
   }
   return queryExpression;
 };
+function visitFilterGroup(filter, visitExpression, type) {
+  if (filter.kind !== "group") {
+    return null;
+  }
+  return {
+    ...filter,
+    value: filter.value.map(nestedFilter => {
+      if (nestedFilter.kind === "group") {
+        return visitFilterGroup(nestedFilter, visitExpression);
+      }
+      return {
+        ...nestedFilter,
+        value: {
+          ...nestedFilter.value,
+          expression: visitExpression(nestedFilter.value.expression)
+        }
+      };
+    })
+  };
+}
+const replaceIdsWithNamesInFilter = (schema, fromType, filter) => {
+  if (schema.typeObjectsById.hasOwnProperty(fromType)) {
+    const typeObject = schema.typeObjectsById[fromType];
+    return filter ? visitFilterGroup(filter, expression => visitors.replaceIdsWithNamesVisitor(typeObject).visitExpression(expression)) : null;
+  }
+  return filter;
+};
+const replaceNamesWithIdsInFilter = (schema, fromType, filter) => {
+  if (schema.typeObjectsByName.hasOwnProperty(fromType)) {
+    const typeObject = schema.typeObjectsByName[fromType];
+    return filter ? visitFilterGroup(filter, expression => visitors.replaceNamesWithIdsVisitor(typeObject).visitExpression(expression)) : null;
+  }
+  return filter;
+};
 const replaceNamesWithIdsInQueryExpression = (schema, queryExpression) => {
   const {
     "q/from": fromExpression,
@@ -126,6 +191,63 @@ const isUnitExpressionValid = unit => {
   }
   return true;
 };
+const getFieldObjectsById = (smartFolder, schema) => {
+  const types = smartFolder["fibery/meta"].items.map(item => item.query["q/from"]);
+  return types.reduce((acc, type) => {
+    if (!(type in schema.typeObjectsById)) {
+      return acc;
+    }
+    const fieldObjects = schema.typeObjectsById[type].fieldObjectsById;
+    return {
+      ...acc,
+      ...fieldObjects
+    };
+  }, {});
+};
+const replaceIdsWithNamesInUnitGroupKey = (unitGroupKey, fieldObjectsById) => {
+  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 keyPart;
+    }
+    return `${unitType}_${fieldObject.holderType}:${fieldObject.name}`;
+  }).filter(Boolean).join("|");
+};
+const replaceNamesWithIdsInUnitGroupKey = (unitGroupKey, schema) => {
+  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(":");
+    if (!field) {
+      return keyPart;
+    }
+    if (!(type in schema.typeObjectsByName)) {
+      return keyPart;
+    }
+    const typeObject = schema.typeObjectsByName[type];
+    if (!(field in typeObject.fieldObjectsByName)) {
+      return keyPart;
+    }
+    const fieldObject = typeObject.fieldObjectsByName[field];
+    return `${unitType}_${fieldObject.id}`;
+  }).filter(Boolean).join("|");
+};
 
 const getField = (schema, fromType, field) => Object.hasOwn(schema.typeObjectsByName, fromType) && Object.hasOwn(schema.typeObjectsByName[fromType].fieldObjectsByName, field) ? schema.typeObjectsByName[fromType].fieldObjectsByName[field] : undefined;
 const getFieldType = (schema, fromType, field) => {
@@ -251,18 +373,32 @@ const enableHideWhenEmptyForCheckedEditableUnit = unit => {
 const visitQueryExpressionHolder = (queryHolder, visitor) => {
   if (queryHolder) {
     const {
-      query
+      query,
+      filter
     } = queryHolder;
+    const newQueryHolder = {
+      ...queryHolder
+    };
     if (query) {
       const queryNew = visitor.visitQueryExpression(query);
-      return queryNew ? {
-        ...queryHolder,
-        ...{
-          query: queryNew
+      if (queryNew) {
+        newQueryHolder.query = queryNew;
+      } else {
+        return null;
+      }
+      const {
+        "q/from": fromType
+      } = query;
+      if (filter && fromType) {
+        const filterNew = visitor.visitFilter(fromType, filter);
+        if (filterNew) {
+          newQueryHolder.filter = filterNew;
+        } else {
+          newQueryHolder.filter = null;
         }
-      } : null;
+      }
     }
-    return queryHolder;
+    return newQueryHolder;
   }
   return queryHolder;
 };
@@ -376,6 +512,9 @@ const visitView$5 = (view, visitor) => immutableUpdate__default["default"](view,
           query: {
             $apply: query => query ? visitor.visitQueryExpression(query) : null
           },
+          filter: {
+            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : 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
           },
@@ -400,6 +539,7 @@ const visitView$5 = (view, visitor) => immutableUpdate__default["default"](view,
 const replaceNamesWithIdsViewVisitor = schema => {
   const visitor = {
     visitQueryExpression: queryExpression => replaceNamesWithIdsInQueryExpression(schema, queryExpression),
+    visitFilter: (fromType, filter) => replaceNamesWithIdsInFilter(schema, fromType, filter),
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
     visitEnums: enums => ___default["default"].entries(enums).reduce((result, [type, queryHolder]) => {
       if (schema.typeObjectsByName.hasOwnProperty(type)) {
@@ -418,6 +558,10 @@ const replaceNamesWithIdsViewVisitor = schema => {
 const replaceIdsWithNamesViewVisitor = schema => {
   const visitor = {
     visitQueryExpression: queryExpression => replaceIdsWithNamesInQueryExpression(schema, queryExpression),
+    visitFilter: (fromType, filter) => {
+      const replaceIdsWithNamesInFilter1 = replaceIdsWithNamesInFilter(schema, fromType, filter);
+      return replaceIdsWithNamesInFilter1;
+    },
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
     visitEnums: enums => ___default["default"].entries(enums).reduce((result, [typeId, queryHolder]) => {
       if (schema.typeObjectsById.hasOwnProperty(typeId)) {
@@ -436,6 +580,7 @@ const replaceIdsWithNamesViewVisitor = schema => {
 const deleteExpressionWithNotFoundFieldsOrTypesViewVisitor = schema => {
   const visitor = {
     visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+    visitFilter: (fromType, filter) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, filter),
     visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression),
     visitEnums: enums => {
       const enumsNew = ___default["default"].entries(enums).reduce((result, [type, queryHolder]) => {
@@ -460,7 +605,8 @@ const fixUserSelectedUnitsViewVisitor = (schema, {
 }) => {
   return {
     visitQueryExpression: queryExpression => queryExpression,
-    visitExpression: (fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
+    visitExpression: (_fromType, expression) => expression,
     visitEnums: enums => enums,
     visitViewUnit: (fromType, unit, units) => fixViewUnit(schema, fromType, unit, units, {
       unitDefinitions,
@@ -485,13 +631,15 @@ const fixUserSelectedUnitsInBoardView = (schema, view, {
 };
 const fixContextExpressionWithBrokenPath$7 = (schema, view, defaultContextExpression) => visitView$5(view, {
   visitQueryExpression: query => query,
-  visitExpression: (fromType, expression) => expression,
+  visitFilter: (_fromType, filter) => filter,
+  visitExpression: (_fromType, expression) => expression,
   visitEnums: enums => enums,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
 const collectGarbage$7 = view => {
   return visitView$5(view, {
     visitQueryExpression: queryExpression => queryExpression,
+    visitFilter: (_fromType, filter) => filter,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
@@ -516,6 +664,7 @@ const enableHideWhenEmptyForCovers = view => {
 };
 const enableHideWhenEmptyForCheckedEditableUnits$1 = view => {
   return visitView$5(view, {
+    visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitExpression: (fromType, expression) => expression,
@@ -542,6 +691,9 @@ const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view,
           query: {
             $apply: query => query ? visitor.visitQueryExpression(query) : null
           },
+          filter: {
+            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : 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
           },
@@ -566,17 +718,20 @@ const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view,
 const replaceNamesWithIdsInCalendarView = (schema, view) => {
   return visitView$4(view, {
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
+    visitFilter: (fromType, expression) => replaceNamesWithIdsInFilter(schema, fromType, expression),
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
   });
 };
 const replaceIdsWithNamesInCalendarView = (schema, view) => {
   return visitView$4(view, {
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
+    visitFilter: (fromType, expression) => replaceIdsWithNamesInFilter(schema, fromType, expression),
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
   });
 };
 const deleteExpressionWithNotFoundFieldsOrTypesInCalendarView = (schema, view) => visitView$4(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+  visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
 const fixUserSelectedUnitsInCalendarView = (schema, view, {
@@ -584,7 +739,8 @@ const fixUserSelectedUnitsInCalendarView = (schema, view, {
   getDefaultUnitTypeForField
 }) => {
   return visitView$4(view, {
-    visitExpression: (fromType, expression) => expression,
+    visitExpression: (_fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit, units) => fixViewUnit(schema, fromType, unit, units, {
       unitDefinitions,
@@ -594,12 +750,14 @@ const fixUserSelectedUnitsInCalendarView = (schema, view, {
 };
 const fixContextExpressionWithBrokenPath$6 = (schema, view, defaultContextExpression) => visitView$4(view, {
   visitQueryExpression: query => query,
+  visitFilter: (_fromType, filter) => filter,
   visitExpression: (fromType, expression) => expression,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
 const collectGarbage$6 = view => {
   return visitView$4(view, {
     visitExpression: (fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
@@ -607,6 +765,7 @@ const collectGarbage$6 = view => {
 const enableHideWhenEmptyForCheckedUnits$3 = view => {
   return visitView$4(view, {
     visitQueryExpression: queryExpression => queryExpression,
+    visitFilter: (_fromType, filter) => filter,
     visitGroupByExpression: groupBy => groupBy,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
@@ -629,6 +788,9 @@ const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view,
           query: {
             $apply: query => query ? visitor.visitQueryExpression(query) : null
           },
+          filter: {
+            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : 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
           },
@@ -653,17 +815,20 @@ const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view,
 const replaceNamesWithIdsInFeedView = (schema, view) => {
   return visitView$3(view, {
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
+    visitFilter: (fromType, expression) => replaceNamesWithIdsInFilter(schema, fromType, expression),
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
   });
 };
 const replaceIdsWithNamesInFeedView = (schema, view) => {
   return visitView$3(view, {
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
+    visitFilter: (fromType, expression) => replaceIdsWithNamesInFilter(schema, fromType, expression),
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
   });
 };
 const deleteExpressionWithNotFoundFieldsOrTypesInFeedView = (schema, view) => visitView$3(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+  visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
 const fixUserSelectedUnitsInFeedView = (schema, view, {
@@ -671,7 +836,8 @@ const fixUserSelectedUnitsInFeedView = (schema, view, {
   getDefaultUnitTypeForField
 }) => {
   return visitView$3(view, {
-    visitExpression: (fromType, expression) => expression,
+    visitExpression: (_fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit, units) => fixViewUnit(schema, fromType, unit, units, {
       unitDefinitions,
@@ -681,12 +847,14 @@ const fixUserSelectedUnitsInFeedView = (schema, view, {
 };
 const fixContextExpressionWithBrokenPath$5 = (schema, view, defaultContextExpression) => visitView$3(view, {
   visitQueryExpression: query => query,
-  visitExpression: (fromType, expression) => expression,
+  visitFilter: (_fromType, filter) => filter,
+  visitExpression: (_fromType, expression) => expression,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
 const collectGarbage$5 = view => {
   return visitView$3(view, {
-    visitExpression: (fromType, expression) => expression,
+    visitExpression: (_fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
@@ -695,9 +863,10 @@ const enableHideWhenEmptyForCheckedUnits$2 = view => {
   return visitView$3(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
-    visitExpression: (fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
+    visitExpression: (_fromType, expression) => expression,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
+    visitViewUnit: (_fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -779,6 +948,9 @@ const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view,
           query: {
             $apply: query => query ? visitor.visitQueryExpression(query) : null
           },
+          filter: {
+            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : 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
           },
@@ -803,17 +975,20 @@ const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view,
 const replaceNamesWithIdsInMapView = (schema, view) => {
   return visitView$2(view, {
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
+    visitFilter: (fromType, expression) => replaceNamesWithIdsInFilter(schema, fromType, expression),
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression)
   });
 };
 const replaceIdsWithNamesInMapView = (schema, view) => {
   return visitView$2(view, {
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
+    visitFilter: (fromType, expression) => replaceIdsWithNamesInFilter(schema, fromType, expression),
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression)
   });
 };
 const deleteExpressionWithNotFoundFieldsOrTypesInMapView = (schema, view) => visitView$2(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+  visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
 const fixUserSelectedUnitsInMapView = (schema, view, {
@@ -822,7 +997,8 @@ const fixUserSelectedUnitsInMapView = (schema, view, {
 }) => {
   return visitView$2(view, {
     visitQueryExpression: query => query,
-    visitExpression: (fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
+    visitExpression: (_fromType, expression) => expression,
     visitViewUnit: (fromType, unit, units) => fixViewUnit(schema, fromType, unit, units, {
       unitDefinitions,
       getDefaultUnitTypeForField
@@ -830,24 +1006,27 @@ const fixUserSelectedUnitsInMapView = (schema, view, {
   });
 };
 const fixContextExpressionWithBrokenPath$4 = (schema, view, defaultContextExpression) => visitView$2(view, {
-  visitExpression: (fromType, expression) => expression,
+  visitExpression: (_fromType, expression) => expression,
   visitQueryExpression: query => query,
+  visitFilter: (_fromType, filter) => filter,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
 const collectGarbage$4 = view => {
   return visitView$2(view, {
     visitQueryExpression: query => query,
-    visitExpression: (fromType, expression) => expression,
-    visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
+    visitFilter: (_fromType, filter) => filter,
+    visitExpression: (_fromType, expression) => expression,
+    visitViewUnit: (_fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
 const enableHideWhenEmptyForCheckedUnits$1 = view => {
   return visitView$2(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
-    visitExpression: (fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
+    visitExpression: (_fromType, expression) => expression,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
+    visitViewUnit: (_fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -894,6 +1073,9 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
         }).map(item => {
           const fromType = ___default["default"].get(item, ["query", "q/from"]);
           return fromType ? immutableUpdate__default["default"](item, {
+            filter: {
+              $apply: filter => filter ? visitor.visitFilter(fromType, filter) : null
+            },
             query: {
               $apply: query => {
                 const visitedQuery = visitor.visitQueryExpression(query);
@@ -1010,78 +1192,29 @@ 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)),
   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(":");
-      if (!field) {
-        return keyPart;
-      }
-      if (!(type in schema.typeObjectsByName)) {
-        return keyPart;
-      }
-      const typeObject = schema.typeObjectsByName[type];
-      if (!(field in typeObject.fieldObjectsByName)) {
-        return keyPart;
-      }
-      const fieldObject = typeObject.fieldObjectsByName[field];
-      return `${unitType}_${fieldObject.id}`;
-    }).filter(Boolean).join("|");
-  }
+  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)),
   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 keyPart;
-      }
-      return `${unitType}_${fieldObject.holderType}:${fieldObject.name}`;
-    }).filter(Boolean).join("|");
-  }
+  visitUnitGroupKey: unitGroupKey => replaceIdsWithNamesInUnitGroupKey(unitGroupKey, getFieldObjectsById(smartFolder, schema))
 });
 const deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, query),
   visitGroupByExpression: (groupBy, fromType, removedItems) => deleteExpressionWithNotFoundFieldsOrTypesInGroupByExpression(schema, groupBy, fromType, removedItems),
+  visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
 const fixContextExpressionWithBrokenPath$3 = (schema, view, defaultContextExpression) => visitSmartFolder(view, {
   visitQueryExpression: query => query,
   visitGroupByExpression: groupBy => groupBy,
-  visitExpression: (fromType, expression) => expression,
+  visitExpression: (_fromType, expression) => expression,
+  visitFilter: (_fromType, filter) => filter,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
 const fixUserSelectedUnitsInSmartFolder = (schema, view, {
@@ -1091,7 +1224,8 @@ const fixUserSelectedUnitsInSmartFolder = (schema, view, {
   return visitSmartFolder(view, {
     visitQueryExpression: query => query,
     visitGroupByExpression: groupBy => groupBy,
-    visitExpression: (fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
+    visitExpression: (_fromType, expression) => expression,
     visitViewUnit: (fromType, unit, units) => {
       const {
         type,
@@ -1117,18 +1251,20 @@ const fixUserSelectedUnitsInSmartFolder = (schema, view, {
 const collectGarbage$3 = view => {
   return visitSmartFolder(view, {
     visitQueryExpression: query => query,
+    visitFilter: (_fromType, filter) => filter,
     visitGroupByExpression: groupBy => groupBy,
-    visitExpression: (fromType, expression) => expression,
-    visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
+    visitExpression: (_fromType, expression) => expression,
+    visitViewUnit: (_fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
 const enableHideWhenEmptyForCheckedUnits = view => {
   return visitSmartFolder(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
-    visitExpression: (fromType, expression) => expression,
+    visitExpression: (_fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
+    visitViewUnit: (_fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -1141,6 +1277,9 @@ const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view,
           query: {
             $apply: query => query ? visitor.visitQueryExpression(query) : null
           },
+          filter: {
+            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : null
+          },
           contextExpression: {
             $apply: contextExpression => contextExpression ? visitor.visitExpression(fromType, contextExpression) : contextExpression
           },
@@ -1167,35 +1306,41 @@ const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view,
 });
 const replaceNamesWithIdsInTableView = (schema, view) => visitView$1(view, {
   visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
+  visitFilter: (fromType, expression) => replaceNamesWithIdsInFilter(schema, fromType, expression),
   visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
 });
 const replaceIdsWithNamesInTableView = (schema, view) => visitView$1(view, {
   visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
+  visitFilter: (fromType, expression) => replaceIdsWithNamesInFilter(schema, fromType, expression),
   visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
 });
 const deleteExpressionWithNotFoundFieldsOrTypesInTableView = (schema, view) => visitView$1(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+  visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
 const fixUserSelectedUnitsInTableView = (schema, view, {
   unitDefinitions,
   getDefaultUnitTypeForField
 }) => visitView$1(view, {
-  visitExpression: (fromType, expression) => expression,
+  visitExpression: (_fromType, expression) => expression,
   visitQueryExpression: query => query,
+  visitFilter: (_fromType, filter) => filter,
   visitViewUnit: (fromType, unit, units) => fixViewUnit(schema, fromType, unit, units, {
     unitDefinitions,
     getDefaultUnitTypeForField
   })
 });
 const fixContextExpressionWithBrokenPath$2 = (schema, view, defaultContextExpression) => visitView$1(view, {
-  visitExpression: (fromType, expression) => expression,
+  visitExpression: (_fromType, expression) => expression,
+  visitFilter: (_fromType, filter) => filter,
   visitQueryExpression: query => query,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
 const collectGarbage$2 = view => {
   return visitView$1(view, {
     visitExpression: (fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
@@ -1209,6 +1354,7 @@ const visitAxis = (axis, visitor) => {
   const firstOrNull = x => ___default["default"].first(x) || null;
   const axisResult = {
     ...axis,
+    filter: axis.filter ? visitor.visitFilter(fromType, axis.filter) : null,
     query: axis.query && visitor.visitQueryExpression(axis.query),
     contextExpression: visitContextExpression(fromType, axis.contextExpression, visitor),
     units: axis.units && axis.units.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),
@@ -1249,6 +1395,9 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
           contextExpression: {
             $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
           },
+          filter: {
+            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : null
+          },
           query: {
             $apply: query => query ? visitor.visitQueryExpression(query) : null
           },
@@ -1282,6 +1431,9 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
             dateExpression: {
               $apply: startExpression => startExpression ? visitor.visitExpression(fromType, startExpression) : startExpression
             },
+            filter: {
+              $apply: filter => filter ? visitor.visitFilter(fromType, filter) : null
+            },
             query: {
               $apply: query => query ? visitor.visitQueryExpression(query) : null
             },
@@ -1302,12 +1454,14 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
 const replaceNamesWithIdsInTimelineView = (schema, view) => {
   return visitView(view, {
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
+    visitFilter: (fromType, expression) => replaceNamesWithIdsInFilter(schema, fromType, expression),
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression)
   });
 };
 const replaceIdsWithNamesInTimelineView = (schema, view) => {
   return visitView(view, {
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
+    visitFilter: (fromType, expression) => replaceIdsWithNamesInFilter(schema, fromType, expression),
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression)
   });
 };
@@ -1340,6 +1494,7 @@ const ensureAxisAndItemExpressionInvariant = view => {
 const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant = true) => {
   const viewNew = visitView(view, {
     visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+    visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
     visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
   });
   return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant(viewNew) : viewNew;
@@ -1350,7 +1505,8 @@ const fixUserSelectedUnitsInTimelineView = (schema, view, {
 }) => {
   return visitView(view, {
     visitQueryExpression: query => query,
-    visitExpression: (fromType, expression) => expression,
+    visitExpression: (_fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
     visitViewUnit: (fromType, unit, units) => fixViewUnit(schema, fromType, unit, units, {
       unitDefinitions,
       getDefaultUnitTypeForField
@@ -1358,24 +1514,27 @@ const fixUserSelectedUnitsInTimelineView = (schema, view, {
   });
 };
 const fixContextExpressionWithBrokenPath$1 = (schema, view, defaultContextExpression) => visitView(view, {
-  visitExpression: (fromType, expression) => expression,
+  visitExpression: (_fromType, expression) => expression,
+  visitFilter: (_fromType, filter) => filter,
   visitQueryExpression: query => query,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
 const collectGarbage$1 = view => {
   return visitView(view, {
     visitQueryExpression: query => query,
-    visitExpression: (fromType, expression) => expression,
-    visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
+    visitFilter: (_fromType, filter) => filter,
+    visitExpression: (_fromType, expression) => expression,
+    visitViewUnit: (_fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
 const enableHideWhenEmptyForCheckedEditableUnits = view => {
   return visitView(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
-    visitExpression: (fromType, expression) => expression,
+    visitExpression: (_fromType, expression) => expression,
+    visitFilter: (_fromType, filter) => filter,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
+    visitViewUnit: (_fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "10.6.0",
+  "version": "10.7.0",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -18,10 +18,10 @@
     "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.5"
+    "@fibery/babel-preset": "7.4.0",
+    "@fibery/expression-utils": "9.0.5",
+    "@fibery/schema": "10.2.1"
   },
   "peerDependencies": {
     "@fibery/expression-utils": "^9.0.5",