@fibery/views 1.1.0 → 1.1.4

package/lib/views.js

@@ -1,7 +1,7 @@
+var utils = require('@fibery/expression-utils/utils');
 var immutableUpdate = require('immutability-helper');
 var _ = require('lodash');
 var visitors = require('@fibery/expression-utils/visitors');
-var utils = require('@fibery/expression-utils/utils');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -26,6 +26,35 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+const fixViewUnit = (schema, fromType, unit) => {
+  const {
+    type,
+    expression
+  } = unit;
+
+  if (type === "date") {
+    const [field] = expression;
+
+    if (schema.typeObjectsByName[fromType].fieldObjectsByName[field].type === "fibery/date-time") {
+      return _extends({}, unit, {
+        type: "date-time"
+      });
+    }
+  }
+
+  if (type === "date-range") {
+    const [field] = expression;
+
+    if (schema.typeObjectsByName[fromType].fieldObjectsByName[field].type === "fibery/date-time-range") {
+      return _extends({}, unit, {
+        type: "date-time-range"
+      });
+    }
+  }
+
+  return unit;
+};
+
 const deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression = (schema, queryExpression) => {
   const {
     "q/from": fromExpression,
@@ -132,27 +161,160 @@ const isUnitExpressionValid = unit => {
   return true;
 };
 
-const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitQueryExpressionHolder = (queryHolder, visitor) => {
+  if (queryHolder) {
+    const {
+      query
+    } = queryHolder;
+
+    if (query) {
+      const queryNew = visitor.visitQueryExpression(query);
+      return queryNew ? _extends({}, queryHolder, {
+        query: queryNew
+      }) : null;
+    }
+
+    return queryHolder;
+  }
+
+  return queryHolder;
+};
+
+const visitAxisUnits = (axis, fromType, visitor) => {
+  return fromType ? immutableUpdate__default["default"](axis, {
+    contextExpression: {
+      $apply: contextExpression => contextExpression ? visitor.visitExpression(fromType, contextExpression) : contextExpression
+    },
+    units: {
+      $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map(unit => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit) : unit) : undefined
+    }
+  }) : axis;
+};
+
+const visitAxis$1 = (axis, visitor) => {
+  if (axis && axis.hasOwnProperty("query")) {
+    const fromType = ___default["default"].get(axis, ["query", "q/from"]);
+
+    const axisWithVisitedQuery = visitQueryExpressionHolder(axis, visitor);
+
+    if (axisWithVisitedQuery) {
+      return visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
+    }
+
+    return axisWithVisitedQuery;
+  }
+
+  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 ensureAxisAndItemExpressionInvariant$1 = view => {
+  const actions = [];
+
+  const x = ___default["default"].get(view, ["fibery/meta", "x"]);
+
+  const y = ___default["default"].get(view, ["fibery/meta", "y"]);
+
+  const items = ___default["default"].get(view, ["fibery/meta", "items"]);
+
+  if (x === null) {
+    const resetActions = items.map(item => () => item.xExpression = null);
+    actions.push(...resetActions);
+  }
+
+  if (x !== null && ___default["default"].some(items, ({
+    xExpression
+  }) => xExpression === null)) {
+    const resetActions = items.map(item => () => item.xExpression = null);
+    actions.push(...resetActions);
+    actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
+  }
+
+  if (y === null) {
+    const resetActions = items.map(item => () => item.yExpression = null);
+    actions.push(...resetActions);
+  }
+
+  if (y !== null && ___default["default"].some(items, ({
+    yExpression
+  }) => yExpression === null)) {
+    const resetActions = items.map(item => () => item.yExpression = null);
+    actions.push(...resetActions);
+    actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
+  }
+
+  if (x !== null && ___default["default"].isEmpty(items)) {
+    actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
+  }
+
+  if (y !== null && ___default["default"].isEmpty(items)) {
+    actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
+  }
+
+  if (x !== null && ___default["default"].some(items, ({
+    xExpression
+  }) => !utils.isAxisFieldExpression(xExpression))) {
+    const resetActions = items.map(item => () => item.xExpression = null);
+    actions.push(...resetActions);
+    actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
+  }
+
+  if (y !== null && ___default["default"].some(items, ({
+    yExpression
+  }) => !utils.isAxisFieldExpression(yExpression))) {
+    const resetActions = items.map(item => () => item.yExpression = null);
+    actions.push(...resetActions);
+    actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
+  }
+
+  actions.forEach(action => action());
+  return view;
+};
+
+const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
+    x: {
+      $apply: x => visitAxis$1(x, visitor)
+    },
+    y: {
+      $apply: y => visitAxis$1(y, visitor)
+    },
     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
+          xExpression: {
+            $apply: xExpression => xExpression ? visitor.visitExpression(fromType, xExpression) : xExpression
+          },
+          yExpression: {
+            $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
           },
           contextExpression: {
             $apply: contextExpression => contextExpression ? visitor.visitExpression(fromType, contextExpression) : contextExpression
           },
+          query: {
+            $apply: query => query ? visitor.visitQueryExpression(query) : null
+          },
           units: {
-            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)) : null
+            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map(unit => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit) : unit) : undefined
           },
           colorCoding: {
             $apply: colorCodings => {
-              return colorCodings && colorCodings.map(colorCoding => _extends({}, colorCoding, {
+              return colorCodings ? colorCodings.map(colorCoding => _extends({}, colorCoding, {
                 expression: visitor.visitExpression(fromType, colorCoding.expression)
-              })).filter(colorCoding => colorCoding.expression !== null);
+              })).filter(colorCoding => colorCoding.expression !== null) : undefined;
             }
           }
         }) : item;
@@ -166,20 +328,96 @@ const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view,
   }
 });
 
-const replaceNamesWithIdsInTableView = (schema, view) => visitView$3(view, {
-  visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
-  visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
-});
-const replaceIdsWithNamesInTableView = (schema, view) => visitView$3(view, {
-  visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
-  visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
-});
-const deleteExpressionWithNotFoundFieldsOrTypesInTableView = (schema, view) => visitView$3(view, {
-  visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
-  visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
-});
+const replaceNamesWithIdsViewVisitor = schema => {
+  const visitor = {
+    visitQueryExpression: queryExpression => replaceNamesWithIdsInQueryExpression(schema, queryExpression),
+    visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
+    visitEnums: enums => ___default["default"].entries(enums).reduce((result, [type, queryHolder]) => {
+      if (schema.typeObjectsByName.hasOwnProperty(type)) {
+        const typeObject = schema.typeObjectsByName[type];
 
-const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view, {
+        const fromType = ___default["default"].get(queryHolder, ["query", "q/from"]);
+
+        const axisWithVisitedQuery = visitQueryExpressionHolder(queryHolder, visitor);
+        result[typeObject.id] = visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
+      } else {
+        result[type] = queryHolder;
+      }
+
+      return result;
+    }, {})
+  };
+  return visitor;
+};
+
+const replaceIdsWithNamesViewVisitor = schema => {
+  const visitor = {
+    visitQueryExpression: queryExpression => replaceIdsWithNamesInQueryExpression(schema, queryExpression),
+    visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
+    visitEnums: enums => ___default["default"].entries(enums).reduce((result, [typeId, queryHolder]) => {
+      if (schema.typeObjectsById.hasOwnProperty(typeId)) {
+        const typeObject = schema.typeObjectsById[typeId];
+
+        const fromType = ___default["default"].get(queryHolder, ["query", "q/from"]);
+
+        const axisWithVisitedQuery = visitQueryExpressionHolder(queryHolder, visitor);
+        result[typeObject.name] = visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
+      } else {
+        result[typeId] = queryHolder;
+      }
+
+      return result;
+    }, {})
+  };
+  return visitor;
+};
+
+const deleteExpressionWithNotFoundFieldsOrTypesViewVisitor = schema => {
+  const visitor = {
+    visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+    visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression),
+    visitEnums: enums => {
+      const enumsNew = ___default["default"].entries(enums).reduce((result, [type, queryHolder]) => {
+        if (schema.typeObjectsByName.hasOwnProperty(type)) {
+          const typeObject = schema.typeObjectsByName[type];
+          const queryHolderResult = visitQueryExpressionHolder(queryHolder, visitor);
+
+          if (queryHolderResult) {
+            result[typeObject.name] = queryHolderResult;
+          }
+
+          return result;
+        }
+
+        return result;
+      }, {});
+
+      return ___default["default"].isEmpty(enumsNew) ? null : enumsNew;
+    }
+  };
+  return visitor;
+};
+
+const fixUserSelectedUnitsViewVisitor = schema => {
+  return {
+    visitQueryExpression: queryExpression => queryExpression,
+    visitExpression: (fromType, expression) => expression,
+    visitEnums: enums => enums,
+    visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
+  };
+};
+
+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$4(view, deleteExpressionWithNotFoundFieldsOrTypesViewVisitor(schema));
+  return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant$1(viewNew) : viewNew;
+};
+const fixUserSelectedUnitsInBoardView = (schema, view) => {
+  return visitView$4(view, fixUserSelectedUnitsViewVisitor(schema));
+};
+
+const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     items: {
       $apply: items => items.map(item => {
@@ -199,7 +437,7 @@ const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view,
             $apply: query => query ? visitor.visitQueryExpression(query) : null
           },
           units: {
-            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)) : null
+            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map(unit => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit) : unit) : undefined
           },
           colorCoding: {
             $apply: colorCodings => {
@@ -220,32 +458,100 @@ const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view,
 });
 
 const replaceNamesWithIdsInCalendarView = (schema, view) => {
-  return visitView$2(view, {
+  return visitView$3(view, {
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
   });
 };
 const replaceIdsWithNamesInCalendarView = (schema, view) => {
-  return visitView$2(view, {
+  return visitView$3(view, {
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
   });
 };
-const deleteExpressionWithNotFoundFieldsOrTypesInCalendarView = (schema, view) => visitView$2(view, {
+const deleteExpressionWithNotFoundFieldsOrTypesInCalendarView = (schema, view) => visitView$3(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
+const fixUserSelectedUnitsInCalendarView = (schema, view) => {
+  return visitView$3(view, {
+    visitExpression: (fromType, expression) => expression,
+    visitQueryExpression: query => query,
+    visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
+  });
+};
 
-const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["default"](smartFolder, {
+const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     items: {
-      $apply: items => {
-        const isOldSmartFolder = !items.every(item => item.hasOwnProperty("groupBy"));
-        let removedItems = [];
-        return items.map((item, index) => {
-          if (isOldSmartFolder) {
-            return item;
-          }
+      $apply: items => items.map(item => {
+        const fromType = ___default["default"].get(item, ["query", "q/from"]);
+
+        return fromType ? immutableUpdate__default["default"](item, {
+          postExpression: {
+            $apply: postExpression => postExpression ? visitor.visitExpression(fromType, postExpression) : postExpression
+          },
+          contextExpression: {
+            $apply: contextExpression => contextExpression ? visitor.visitExpression(fromType, contextExpression) : contextExpression
+          },
+          query: {
+            $apply: query => query ? visitor.visitQueryExpression(query) : null
+          },
+          units: {
+            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map(unit => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit) : unit) : undefined
+          },
+          colorCoding: {
+            $apply: colorCodings => {
+              return colorCodings && colorCodings.map(colorCoding => _extends({}, colorCoding, {
+                expression: visitor.visitExpression(fromType, colorCoding.expression)
+              })).filter(colorCoding => colorCoding.expression !== null);
+            }
+          }
+        }) : item;
+      }).filter(item => {
+        const {
+          query
+        } = item;
+        return query ? item : null;
+      })
+    }
+  }
+});
+
+const replaceNamesWithIdsInFeedView = (schema, view) => {
+  return visitView$2(view, {
+    visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
+    visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
+  });
+};
+const replaceIdsWithNamesInFeedView = (schema, view) => {
+  return visitView$2(view, {
+    visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
+    visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
+  });
+};
+const deleteExpressionWithNotFoundFieldsOrTypesInFeedView = (schema, view) => visitView$2(view, {
+  visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+  visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
+});
+const fixUserSelectedUnitsInFeedView = (schema, view) => {
+  return visitView$2(view, {
+    visitExpression: (fromType, expression) => expression,
+    visitQueryExpression: query => query,
+    visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
+  });
+};
+
+const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["default"](smartFolder, {
+  "fibery/meta": {
+    items: {
+      $apply: items => {
+        const isOldSmartFolder = !items.every(item => item.hasOwnProperty("groupBy"));
+        let removedItems = [];
+        return items.map((item, index) => {
+          if (isOldSmartFolder) {
+            return item;
+          }
 
           const fromType = ___default["default"].get(item, ["query", "q/from"]);
 
@@ -374,7 +680,59 @@ const deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder = (schema, smartFol
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
 
-const visitAxis$1 = (axis, visitor) => {
+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
+          },
+          contextExpression: {
+            $apply: contextExpression => contextExpression ? visitor.visitExpression(fromType, contextExpression) : contextExpression
+          },
+          units: {
+            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map(unit => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit) : unit) : undefined
+          },
+          colorCoding: {
+            $apply: colorCodings => {
+              return colorCodings && colorCodings.map(colorCoding => _extends({}, 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),
+  visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
+});
+const replaceIdsWithNamesInTableView = (schema, view) => visitView$1(view, {
+  visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
+  visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
+});
+const deleteExpressionWithNotFoundFieldsOrTypesInTableView = (schema, view) => visitView$1(view, {
+  visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+  visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
+});
+const fixUserSelectedUnitsInTableView = (schema, view) => visitView$1(view, {
+  visitExpression: (fromType, expression) => expression,
+  visitQueryExpression: query => query,
+  visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
+});
+
+const visitAxis = (axis, visitor) => {
   if (!axis) {
     return axis;
   }
@@ -401,10 +759,10 @@ const visitAxis$1 = (axis, visitor) => {
   return axisResult;
 };
 
-const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     y: {
-      $apply: y => visitAxis$1(y, visitor)
+      $apply: y => visitAxis(y, visitor)
     },
     items: {
       $apply: items => items.map(item => {
@@ -427,7 +785,7 @@ const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view,
             $apply: query => query ? visitor.visitQueryExpression(query) : null
           },
           units: {
-            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)) : null
+            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map(unit => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit) : unit) : undefined
           },
           colorCoding: {
             $apply: colorCodings => {
@@ -473,19 +831,19 @@ const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view,
 });
 
 const replaceNamesWithIdsInTimelineView = (schema, view) => {
-  return visitView$1(view, {
+  return visitView(view, {
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression)
   });
 };
 const replaceIdsWithNamesInTimelineView = (schema, view) => {
-  return visitView$1(view, {
+  return visitView(view, {
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression)
   });
 };
 
-const ensureAxisAndItemExpressionInvariant$1 = view => {
+const ensureAxisAndItemExpressionInvariant = view => {
   const actions = [];
 
   const y = ___default["default"].get(view, ["fibery/meta", "y"]);
@@ -521,274 +879,61 @@ const ensureAxisAndItemExpressionInvariant$1 = view => {
   return view;
 };
 
-const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view) => {
-  const viewNew = visitView$1(view, {
+const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant = true) => {
+  const viewNew = visitView(view, {
     visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
     visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
   });
-  return ensureAxisAndItemExpressionInvariant$1(viewNew);
+  return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant(viewNew) : viewNew;
 };
-
-const visitQueryExpressionHolder = (queryHolder, visitor) => {
-  if (queryHolder) {
-    const {
-      query
-    } = queryHolder;
-
-    if (query) {
-      const queryNew = visitor.visitQueryExpression(query);
-      return queryNew ? _extends({}, queryHolder, {
-        query: queryNew
-      }) : null;
-    }
-
-    return queryHolder;
-  }
-
-  return queryHolder;
-};
-
-const visitAxisUnits = (axis, fromType, visitor) => {
-  return fromType ? immutableUpdate__default["default"](axis, {
-    contextExpression: {
-      $apply: contextExpression => contextExpression ? visitor.visitExpression(fromType, contextExpression) : contextExpression
-    },
-    units: {
-      $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)) : undefined
-    }
-  }) : axis;
-};
-
-const visitAxis = (axis, visitor) => {
-  if (axis && axis.hasOwnProperty("query")) {
-    const fromType = ___default["default"].get(axis, ["query", "q/from"]);
-
-    const axisWithVisitedQuery = visitQueryExpressionHolder(axis, visitor);
-
-    if (axisWithVisitedQuery) {
-      return visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
-    }
-
-    return axisWithVisitedQuery;
-  }
-
-  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 fixUserSelectedUnitsInTimelineView = (schema, view) => {
+  return visitView(view, {
+    visitQueryExpression: query => query,
+    visitExpression: (fromType, expression) => expression,
+    visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
+  });
 };
 
-const ensureAxisAndItemExpressionInvariant = view => {
-  const actions = [];
-
-  const x = ___default["default"].get(view, ["fibery/meta", "x"]);
-
-  const y = ___default["default"].get(view, ["fibery/meta", "y"]);
-
-  const items = ___default["default"].get(view, ["fibery/meta", "items"]);
-
-  if (x === null) {
-    const resetActions = items.map(item => () => item.xExpression = null);
-    actions.push(...resetActions);
-  }
-
-  if (x !== null && ___default["default"].some(items, ({
-    xExpression
-  }) => xExpression === null)) {
-    const resetActions = items.map(item => () => item.xExpression = null);
-    actions.push(...resetActions);
-    actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
-  }
-
-  if (y === null) {
-    const resetActions = items.map(item => () => item.yExpression = null);
-    actions.push(...resetActions);
-  }
-
-  if (y !== null && ___default["default"].some(items, ({
-    yExpression
-  }) => yExpression === null)) {
-    const resetActions = items.map(item => () => item.yExpression = null);
-    actions.push(...resetActions);
-    actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
-  }
-
-  if (x !== null && ___default["default"].isEmpty(items)) {
-    actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
-  }
+const deleteExpressionWithNotFoundFieldsOrTypesInView = (schema, view, ensureAxisInvariant = true) => {
+  switch (view["fibery/type"]) {
+    case "board":
+      return deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView(schema, view, ensureAxisInvariant);
 
-  if (y !== null && ___default["default"].isEmpty(items)) {
-    actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
-  }
+    case "list":
+      return deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
 
-  if (x !== null && ___default["default"].some(items, ({
-    xExpression
-  }) => !utils.isAxisFieldExpression(xExpression))) {
-    const resetActions = items.map(item => () => item.xExpression = null);
-    actions.push(...resetActions);
-    actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
-  }
+    case "timeline":
+      return deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(schema, view, ensureAxisInvariant);
 
-  if (y !== null && ___default["default"].some(items, ({
-    yExpression
-  }) => !utils.isAxisFieldExpression(yExpression))) {
-    const resetActions = items.map(item => () => item.yExpression = null);
-    actions.push(...resetActions);
-    actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
-  }
+    case "calendar":
+      return deleteExpressionWithNotFoundFieldsOrTypesInCalendarView(schema, view);
 
-  actions.forEach(action => action());
-  return view;
-};
+    case "table":
+      return deleteExpressionWithNotFoundFieldsOrTypesInTableView(schema, view);
 
-const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
-  "fibery/meta": {
-    x: {
-      $apply: x => visitAxis(x, visitor)
-    },
-    y: {
-      $apply: y => visitAxis(y, visitor)
-    },
-    items: {
-      $apply: items => items.map(item => {
-        const fromType = ___default["default"].get(item, ["query", "q/from"]);
+    case "feed":
+      return deleteExpressionWithNotFoundFieldsOrTypesInFeedView(schema, view);
 
-        return fromType ? immutableUpdate__default["default"](item, {
-          xExpression: {
-            $apply: xExpression => xExpression ? visitor.visitExpression(fromType, xExpression) : xExpression
-          },
-          yExpression: {
-            $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
-          },
-          contextExpression: {
-            $apply: contextExpression => contextExpression ? visitor.visitExpression(fromType, contextExpression) : contextExpression
-          },
-          query: {
-            $apply: query => query ? visitor.visitQueryExpression(query) : null
-          },
-          units: {
-            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)) : null
-          },
-          colorCoding: {
-            $apply: colorCodings => {
-              return colorCodings ? colorCodings.map(colorCoding => _extends({}, colorCoding, {
-                expression: visitor.visitExpression(fromType, colorCoding.expression)
-              })).filter(colorCoding => colorCoding.expression !== null) : undefined;
-            }
-          }
-        }) : item;
-      }).filter(item => {
-        const {
-          query
-        } = item;
-        return query ? item : null;
-      })
-    }
+    default:
+      return view;
   }
-});
-
-const replaceNamesWithIdsViewVisitor = schema => {
-  const visitor = {
-    visitQueryExpression: queryExpression => replaceNamesWithIdsInQueryExpression(schema, queryExpression),
-    visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
-    visitEnums: enums => ___default["default"].entries(enums).reduce((result, [type, queryHolder]) => {
-      if (schema.typeObjectsByName.hasOwnProperty(type)) {
-        const typeObject = schema.typeObjectsByName[type];
-
-        const fromType = ___default["default"].get(queryHolder, ["query", "q/from"]);
-
-        const axisWithVisitedQuery = visitQueryExpressionHolder(queryHolder, visitor);
-        result[typeObject.id] = visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
-      } else {
-        result[type] = queryHolder;
-      }
-
-      return result;
-    }, {})
-  };
-  return visitor;
 };
-
-const replaceIdsWithNamesViewVisitor = schema => {
-  const visitor = {
-    visitQueryExpression: queryExpression => replaceIdsWithNamesInQueryExpression(schema, queryExpression),
-    visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
-    visitEnums: enums => ___default["default"].entries(enums).reduce((result, [typeId, queryHolder]) => {
-      if (schema.typeObjectsById.hasOwnProperty(typeId)) {
-        const typeObject = schema.typeObjectsById[typeId];
-
-        const fromType = ___default["default"].get(queryHolder, ["query", "q/from"]);
-
-        const axisWithVisitedQuery = visitQueryExpressionHolder(queryHolder, visitor);
-        result[typeObject.name] = visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
-      } else {
-        result[typeId] = queryHolder;
-      }
-
-      return result;
-    }, {})
-  };
-  return visitor;
-};
-
-const deleteExpressionWithNotFoundFieldsOrTypesViewVisitor = schema => {
-  const visitor = {
-    visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
-    visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression),
-    visitEnums: enums => {
-      const enumsNew = ___default["default"].entries(enums).reduce((result, [type, queryHolder]) => {
-        if (schema.typeObjectsByName.hasOwnProperty(type)) {
-          const typeObject = schema.typeObjectsByName[type];
-          const queryHolderResult = visitQueryExpressionHolder(queryHolder, visitor);
-
-          if (queryHolderResult) {
-            result[typeObject.name] = queryHolderResult;
-          }
-
-          return result;
-        }
-
-        return result;
-      }, {});
-
-      return ___default["default"].isEmpty(enumsNew) ? null : enumsNew;
-    }
-  };
-  return visitor;
-};
-
-const replaceIdsWithNamesInBoardView = (schema, view) => visitView(view, replaceIdsWithNamesViewVisitor(schema));
-const replaceNamesWithIdsInBoardView = (schema, view) => visitView(view, replaceNamesWithIdsViewVisitor(schema));
-const deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView = (schema, view) => {
-  const viewNew = visitView(view, deleteExpressionWithNotFoundFieldsOrTypesViewVisitor(schema));
-  return ensureAxisAndItemExpressionInvariant(viewNew);
-};
-
-const deleteExpressionWithNotFoundFieldsOrTypesInView = (schema, view) => {
+const fixUserSelectedUnits = (schema, view) => {
   switch (view["fibery/type"]) {
     case "board":
-      return deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView(schema, view);
+      return fixUserSelectedUnitsInBoardView(schema, view);
 
-    case "list":
-      return deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
+    case "table":
+      return fixUserSelectedUnitsInTableView(schema, view);
 
     case "timeline":
-      return deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(schema, view);
+      return fixUserSelectedUnitsInTimelineView(schema, view);
 
     case "calendar":
-      return deleteExpressionWithNotFoundFieldsOrTypesInCalendarView(schema, view);
+      return fixUserSelectedUnitsInCalendarView(schema, view);
 
-    case "table":
-      return deleteExpressionWithNotFoundFieldsOrTypesInTableView(schema, view);
+    case "feed":
+      return fixUserSelectedUnitsInFeedView(schema, view);
 
     default:
       return view;
@@ -811,6 +956,9 @@ const replaceNamesWithIdsInView = (schema, view) => {
     case "calendar":
       return replaceNamesWithIdsInCalendarView(schema, view);
 
+    case "feed":
+      return replaceNamesWithIdsInFeedView(schema, view);
+
     default:
       return view;
   }
@@ -832,6 +980,9 @@ const replaceIdsWithNamesInView = (schema, view) => {
     case "calendar":
       return replaceIdsWithNamesInCalendarView(schema, view);
 
+    case "feed":
+      return replaceIdsWithNamesInFeedView(schema, view);
+
     default:
       return view;
   }
@@ -848,6 +999,7 @@ const getViewCardTypes = ({
 
 exports.deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder = deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder;
 exports.deleteExpressionWithNotFoundFieldsOrTypesInView = deleteExpressionWithNotFoundFieldsOrTypesInView;
+exports.fixUserSelectedUnits = fixUserSelectedUnits;
 exports.getViewCardTypes = getViewCardTypes;
 exports.replaceIdsWithNamesInSmartFolder = replaceIdsWithNamesInSmartFolder;
 exports.replaceIdsWithNamesInView = replaceIdsWithNamesInView;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -21,7 +21,7 @@
     "microbundle": "0.14.1"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^1.1.0",
+    "@fibery/expression-utils": "^1.1.4",
     "fibery-schema": "^7.0.6",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"