@fibery/views 11.0.0 → 13.0.0

package/index.js

@@ -0,0 +1 @@
+export * from "./src";

package/lib/views.js

@@ -1,6 +1,6 @@
-var utils = require('@fibery/expression-utils/utils');
 var immutableUpdate = require('immutability-helper');
 var _ = require('lodash');
+var utils = require('@fibery/expression-utils/utils');
 var visitors = require('@fibery/expression-utils/visitors');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -270,20 +270,32 @@ const getUnitTypeForTextField = fieldMeta => {
       return "text";
   }
 };
+const getUnitKind = unit => {
+  if (unit.type === "user-button") {
+    return "user-button";
+  }
+  if (["type-icon", "type-badge", "type-badge-abbr"].includes(unit.type)) {
+    return "db";
+  }
+  return "field";
+};
 const migrateUnit = (schema, fromType, unit, units) => {
   const {
     type,
     expression
   } = unit;
+  const kind = unit.kind || getUnitKind(unit);
   if (type === "date-time") {
     return {
       ...unit,
+      kind,
       type: "date"
     };
   }
   if (type === "date-time-range") {
     return {
       ...unit,
+      kind,
       type: "date-range"
     };
   }
@@ -293,6 +305,7 @@ const migrateUnit = (schema, fromType, unit, units) => {
     if (fieldType === "fibery/email") {
       return {
         ...unit,
+        kind,
         type: "email"
       };
     }
@@ -302,6 +315,7 @@ const migrateUnit = (schema, fromType, unit, units) => {
     if (getFieldType(schema, fromType, field) === "fibery/text") {
       return {
         ...unit,
+        kind,
         type: getUnitTypeForTextField(getFieldMeta(schema, fromType, field))
       };
     }
@@ -311,6 +325,7 @@ const migrateUnit = (schema, fromType, unit, units) => {
     if (getFieldType(schema, fromType, field) === "fibery/file") {
       return {
         ...unit,
+        kind,
         type: "collection-count"
       };
     }
@@ -322,11 +337,15 @@ const migrateUnit = (schema, fromType, unit, units) => {
     if (isAvatarExntensionEnabled && hasAvatarExntensionField) {
       return {
         ...unit,
-        expression: ["avatar/avatars"]
+        expression: ["avatar/avatars"],
+        kind
       };
     }
   }
-  return unit;
+  return {
+    ...unit,
+    kind
+  };
 };
 const fixViewUnit = (schema, fromType, unit, units, {
   unitDefinitions,
@@ -485,7 +504,7 @@ const ensureAxisAndItemExpressionInvariant$1 = view => {
   actions.forEach(action => action());
   return view;
 };
-const visitView$5 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     x: {
       $apply: x => visitAxis$1(x, visitor)
@@ -619,30 +638,30 @@ const fixUserSelectedUnitsViewVisitor = (schema, {
     })
   };
 };
-const replaceIdsWithNamesInBoardView = (schema, view) => visitView$5(view, replaceIdsWithNamesViewVisitor(schema));
-const replaceNamesWithIdsInBoardView = (schema, view) => visitView$5(view, replaceNamesWithIdsViewVisitor(schema));
+const replaceIdsWithNamesInBoardView = (schema, view) => visitView$4(view, replaceIdsWithNamesViewVisitor(schema));
+const replaceNamesWithIdsInBoardView = (schema, view) => visitView$4(view, replaceNamesWithIdsViewVisitor(schema));
 const deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView = (schema, view, ensureAxisInvariant = true) => {
-  const viewNew = visitView$5(view, deleteExpressionWithNotFoundFieldsOrTypesViewVisitor(schema));
+  const viewNew = visitView$4(view, deleteExpressionWithNotFoundFieldsOrTypesViewVisitor(schema));
   return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant$1(viewNew) : viewNew;
 };
 const fixUserSelectedUnitsInBoardView = (schema, view, {
   unitDefinitions,
   getDefaultUnitTypeForField
 }) => {
-  return visitView$5(view, fixUserSelectedUnitsViewVisitor(schema, {
+  return visitView$4(view, fixUserSelectedUnitsViewVisitor(schema, {
     unitDefinitions,
     getDefaultUnitTypeForField
   }));
 };
-const fixContextExpressionWithBrokenPath$7 = (schema, view, defaultContextExpression) => visitView$5(view, {
+const fixContextExpressionWithBrokenPath$6 = (schema, view, defaultContextExpression) => visitView$4(view, {
   visitQueryExpression: query => query,
   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, {
+const collectGarbage$6 = view => {
+  return visitView$4(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitFilter: (_fromType, filter) => filter,
     visitExpression: (fromType, expression) => expression,
@@ -668,7 +687,7 @@ const enableHideWhenEmptyForCovers = view => {
   });
 };
 const enableHideWhenEmptyForCheckedEditableUnits$1 = view => {
-  return visitView$5(view, {
+  return visitView$4(view, {
     visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
@@ -678,7 +697,7 @@ const enableHideWhenEmptyForCheckedEditableUnits$1 = view => {
   });
 };
 
-const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     items: {
       $apply: items => items.map(item => {
@@ -721,20 +740,20 @@ const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view,
   }
 });
 const replaceNamesWithIdsInCalendarView = (schema, view) => {
-  return visitView$4(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 replaceIdsWithNamesInCalendarView = (schema, view) => {
-  return visitView$4(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 deleteExpressionWithNotFoundFieldsOrTypesInCalendarView = (schema, view) => visitView$4(view, {
+const deleteExpressionWithNotFoundFieldsOrTypesInCalendarView = (schema, view) => visitView$3(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
   visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
@@ -743,7 +762,7 @@ const fixUserSelectedUnitsInCalendarView = (schema, view, {
   unitDefinitions,
   getDefaultUnitTypeForField
 }) => {
-  return visitView$4(view, {
+  return visitView$3(view, {
     visitExpression: (_fromType, expression) => expression,
     visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
@@ -753,14 +772,14 @@ const fixUserSelectedUnitsInCalendarView = (schema, view, {
     })
   });
 };
-const fixContextExpressionWithBrokenPath$6 = (schema, view, defaultContextExpression) => visitView$4(view, {
+const fixContextExpressionWithBrokenPath$5 = (schema, view, defaultContextExpression) => visitView$3(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, {
+const collectGarbage$5 = view => {
+  return visitView$3(view, {
     visitExpression: (fromType, expression) => expression,
     visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
@@ -768,7 +787,7 @@ const collectGarbage$6 = view => {
   });
 };
 const enableHideWhenEmptyForCheckedUnits$3 = view => {
-  return visitView$4(view, {
+  return visitView$3(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitFilter: (_fromType, filter) => filter,
     visitGroupByExpression: groupBy => groupBy,
@@ -778,7 +797,7 @@ const enableHideWhenEmptyForCheckedUnits$3 = view => {
   });
 };
 
-const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     items: {
       $apply: items => items.map(item => {
@@ -818,20 +837,20 @@ const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view,
   }
 });
 const replaceNamesWithIdsInFeedView = (schema, view) => {
-  return visitView$3(view, {
+  return visitView$2(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, {
+  return visitView$2(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, {
+const deleteExpressionWithNotFoundFieldsOrTypesInFeedView = (schema, view) => visitView$2(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
   visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
@@ -840,7 +859,7 @@ const fixUserSelectedUnitsInFeedView = (schema, view, {
   unitDefinitions,
   getDefaultUnitTypeForField
 }) => {
-  return visitView$3(view, {
+  return visitView$2(view, {
     visitExpression: (_fromType, expression) => expression,
     visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
@@ -850,14 +869,14 @@ const fixUserSelectedUnitsInFeedView = (schema, view, {
     })
   });
 };
-const fixContextExpressionWithBrokenPath$5 = (schema, view, defaultContextExpression) => visitView$3(view, {
+const fixContextExpressionWithBrokenPath$4 = (schema, view, defaultContextExpression) => visitView$2(view, {
   visitQueryExpression: query => query,
   visitFilter: (_fromType, filter) => filter,
   visitExpression: (_fromType, expression) => expression,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
-const collectGarbage$5 = view => {
-  return visitView$3(view, {
+const collectGarbage$4 = view => {
+  return visitView$2(view, {
     visitExpression: (_fromType, expression) => expression,
     visitFilter: (_fromType, filter) => filter,
     visitQueryExpression: query => query,
@@ -865,7 +884,7 @@ const collectGarbage$5 = view => {
   });
 };
 const enableHideWhenEmptyForCheckedUnits$2 = view => {
-  return visitView$3(view, {
+  return visitView$2(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitFilter: (_fromType, filter) => filter,
@@ -938,7 +957,7 @@ const deleteExpressionWithNotFoundFieldsOrTypesInFormView = (schema, view) => {
   };
 };
 
-const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     items: {
       $apply: items => items.map(item => {
@@ -978,20 +997,20 @@ const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view,
   }
 });
 const replaceNamesWithIdsInMapView = (schema, view) => {
-  return visitView$2(view, {
+  return visitView$1(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, {
+  return visitView$1(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, {
+const deleteExpressionWithNotFoundFieldsOrTypesInMapView = (schema, view) => visitView$1(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
   visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
@@ -1000,7 +1019,7 @@ const fixUserSelectedUnitsInMapView = (schema, view, {
   unitDefinitions,
   getDefaultUnitTypeForField
 }) => {
-  return visitView$2(view, {
+  return visitView$1(view, {
     visitQueryExpression: query => query,
     visitFilter: (_fromType, filter) => filter,
     visitExpression: (_fromType, expression) => expression,
@@ -1010,14 +1029,14 @@ const fixUserSelectedUnitsInMapView = (schema, view, {
     })
   });
 };
-const fixContextExpressionWithBrokenPath$4 = (schema, view, defaultContextExpression) => visitView$2(view, {
+const fixContextExpressionWithBrokenPath$3 = (schema, view, defaultContextExpression) => visitView$1(view, {
   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, {
+const collectGarbage$3 = view => {
+  return visitView$1(view, {
     visitQueryExpression: query => query,
     visitFilter: (_fromType, filter) => filter,
     visitExpression: (_fromType, expression) => expression,
@@ -1025,7 +1044,7 @@ const collectGarbage$4 = view => {
   });
 };
 const enableHideWhenEmptyForCheckedUnits$1 = view => {
-  return visitView$2(view, {
+  return visitView$1(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitFilter: (_fromType, filter) => filter,
@@ -1215,7 +1234,7 @@ const deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder = (schema, smartFol
   visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
-const fixContextExpressionWithBrokenPath$3 = (schema, view, defaultContextExpression) => visitSmartFolder(view, {
+const fixContextExpressionWithBrokenPath$2 = (schema, view, defaultContextExpression) => visitSmartFolder(view, {
   visitQueryExpression: query => query,
   visitGroupByExpression: groupBy => groupBy,
   visitExpression: (_fromType, expression) => expression,
@@ -1253,7 +1272,7 @@ const fixUserSelectedUnitsInSmartFolder = (schema, view, {
     }
   });
 };
-const collectGarbage$3 = view => {
+const collectGarbage$2 = view => {
   return visitSmartFolder(view, {
     visitQueryExpression: query => query,
     visitFilter: (_fromType, filter) => filter,
@@ -1273,84 +1292,6 @@ const enableHideWhenEmptyForCheckedUnits = view => {
   });
 };
 
-const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view, {
-  "fibery/meta": {
-    items: {
-      $apply: items => items.map(item => {
-        const fromType = ___default["default"].get(item, ["query", "q/from"]);
-        return fromType ? immutableUpdate__default["default"](item, {
-          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
-          },
-          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);
-            }
-          }
-        }) : item;
-      }).filter(item => {
-        const {
-          query
-        } = item;
-        return query ? item : null;
-      })
-    }
-  }
-});
-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,
-  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,
-  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
-  });
-};
-
 const visitAxis = (axis, visitor) => {
   if (!axis) {
     return axis;
@@ -1548,15 +1489,13 @@ const deleteExpressionWithNotFoundFieldsOrTypesInView = (schema, view, ensureAxi
     case "board":
       return deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView(schema, view, ensureAxisInvariant);
     case "list":
-      return deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
     case "grid":
+    case "table":
       return deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
     case "timeline":
       return deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(schema, view, ensureAxisInvariant);
     case "calendar":
       return deleteExpressionWithNotFoundFieldsOrTypesInCalendarView(schema, view);
-    case "table":
-      return deleteExpressionWithNotFoundFieldsOrTypesInTableView(schema, view);
     case "feed":
       return deleteExpressionWithNotFoundFieldsOrTypesInFeedView(schema, view);
     case "form":
@@ -1578,17 +1517,9 @@ const fixUserSelectedUnits = (schema, view, {
         getDefaultUnitTypeForField
       });
     case "list":
-      return fixUserSelectedUnitsInSmartFolder(schema, view, {
-        unitDefinitions,
-        getDefaultUnitTypeForField
-      });
     case "grid":
-      return fixUserSelectedUnitsInSmartFolder(schema, view, {
-        unitDefinitions,
-        getDefaultUnitTypeForField
-      });
     case "table":
-      return fixUserSelectedUnitsInTableView(schema, view, {
+      return fixUserSelectedUnitsInSmartFolder(schema, view, {
         unitDefinitions,
         getDefaultUnitTypeForField
       });
@@ -1619,21 +1550,19 @@ const fixUserSelectedUnits = (schema, view, {
 const fixContextExpressionWithBrokenPath = (schema, view, defaultContextExpression) => {
   switch (view["fibery/type"]) {
     case "board":
-      return fixContextExpressionWithBrokenPath$7(schema, view, defaultContextExpression);
+      return fixContextExpressionWithBrokenPath$6(schema, view, defaultContextExpression);
     case "list":
-      return fixContextExpressionWithBrokenPath$3(schema, view, defaultContextExpression);
     case "grid":
-      return fixContextExpressionWithBrokenPath$3(schema, view, defaultContextExpression);
     case "table":
       return fixContextExpressionWithBrokenPath$2(schema, view, defaultContextExpression);
     case "timeline":
       return fixContextExpressionWithBrokenPath$1(schema, view, defaultContextExpression);
     case "calendar":
-      return fixContextExpressionWithBrokenPath$6(schema, view, defaultContextExpression);
-    case "feed":
       return fixContextExpressionWithBrokenPath$5(schema, view, defaultContextExpression);
-    case "map":
+    case "feed":
       return fixContextExpressionWithBrokenPath$4(schema, view, defaultContextExpression);
+    case "map":
+      return fixContextExpressionWithBrokenPath$3(schema, view, defaultContextExpression);
     default:
       return view;
   }
@@ -1657,21 +1586,19 @@ const collectGarbage = (schema, view) => {
   };
   switch (view["fibery/type"]) {
     case "board":
-      return deleteRemoved(collectGarbage$7(view));
+      return deleteRemoved(collectGarbage$6(view));
     case "list":
-      return deleteRemoved(collectGarbage$3(view));
     case "grid":
-      return deleteRemoved(collectGarbage$3(view));
     case "table":
       return deleteRemoved(collectGarbage$2(view));
     case "timeline":
       return deleteRemoved(collectGarbage$1(view));
     case "calendar":
-      return deleteRemoved(collectGarbage$6(view));
-    case "feed":
       return deleteRemoved(collectGarbage$5(view));
-    case "map":
+    case "feed":
       return deleteRemoved(collectGarbage$4(view));
+    case "map":
+      return deleteRemoved(collectGarbage$3(view));
     default:
       return view;
   }
@@ -1681,11 +1608,9 @@ const replaceNamesWithIdsInView = (schema, view) => {
     case "board":
       return replaceNamesWithIdsInBoardView(schema, view);
     case "list":
-      return replaceNamesWithIdsInSmartFolder(schema, view);
     case "grid":
-      return replaceNamesWithIdsInSmartFolder(schema, view);
     case "table":
-      return replaceNamesWithIdsInTableView(schema, view);
+      return replaceNamesWithIdsInSmartFolder(schema, view);
     case "timeline":
       return replaceNamesWithIdsInTimelineView(schema, view);
     case "calendar":
@@ -1705,11 +1630,9 @@ const replaceIdsWithNamesInView = (schema, view) => {
     case "board":
       return replaceIdsWithNamesInBoardView(schema, view);
     case "list":
-      return replaceIdsWithNamesInSmartFolder(schema, view);
     case "grid":
-      return replaceIdsWithNamesInSmartFolder(schema, view);
     case "table":
-      return replaceIdsWithNamesInTableView(schema, view);
+      return replaceIdsWithNamesInSmartFolder(schema, view);
     case "timeline":
       return replaceIdsWithNamesInTimelineView(schema, view);
     case "calendar":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "11.0.0",
+  "version": "13.0.0",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -20,12 +20,12 @@
     "microbundle": "0.15.1",
     "@fibery/babel-preset": "7.4.0",
     "@fibery/eslint-config": "8.6.0",
-    "@fibery/expression-utils": "9.1.0",
-    "@fibery/schema": "10.2.2"
+    "@fibery/schema": "10.2.3",
+    "@fibery/expression-utils": "9.1.2"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.1.0",
-    "@fibery/schema": "^10.2.2",
+    "@fibery/expression-utils": "^9.1.2",
+    "@fibery/schema": "^10.2.3",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"
   },