@fibery/views 10.1.0 → 10.3.0

package/lib/views.js

@@ -153,23 +153,17 @@ const migrateUnit = (schema, fromType, unit, units) => {
     type,
     expression
   } = unit;
-  if (type === "date") {
-    const [field] = expression;
-    if (getFieldType(schema, fromType, field) === "fibery/date-time") {
-      return {
-        ...unit,
-        type: "date-time"
-      };
-    }
+  if (type === "date-time") {
+    return {
+      ...unit,
+      type: "date"
+    };
   }
-  if (type === "date-range") {
-    const [field] = expression;
-    if (getFieldType(schema, fromType, field) === "fibery/date-time-range") {
-      return {
-        ...unit,
-        type: "date-time-range"
-      };
-    }
+  if (type === "date-time-range") {
+    return {
+      ...unit,
+      type: "date-range"
+    };
   }
   if (type === "text") {
     const [field] = expression;
@@ -244,6 +238,15 @@ const fixViewUnit = (schema, fromType, unit, units, {
   }
   return migrated;
 };
+const enableHideWhenEmptyForCheckedEditableUnit = unit => {
+  if (unit.checked) {
+    return {
+      ...unit,
+      hideWhenEmpty: true
+    };
+  }
+  return unit;
+};
 
 const visitQueryExpressionHolder = (queryHolder, visitor) => {
   if (queryHolder) {
@@ -511,21 +514,13 @@ const enableHideWhenEmptyForCovers = view => {
     }
   });
 };
-const enableHideWhenEmptyForCheckedUnits$5 = view => {
+const enableHideWhenEmptyForCheckedEditableUnits$1 = view => {
   return visitView$5(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => {
-      if (unit.checked) {
-        return {
-          ...unit,
-          hideWhenEmpty: true
-        };
-      }
-      return unit;
-    }
+    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -609,21 +604,13 @@ const collectGarbage$6 = view => {
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
-const enableHideWhenEmptyForCheckedUnits$4 = view => {
+const enableHideWhenEmptyForCheckedUnits$3 = view => {
   return visitView$4(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => {
-      if (unit.checked) {
-        return {
-          ...unit,
-          hideWhenEmpty: true
-        };
-      }
-      return unit;
-    }
+    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -704,21 +691,13 @@ const collectGarbage$5 = view => {
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
-const enableHideWhenEmptyForCheckedUnits$3 = view => {
+const enableHideWhenEmptyForCheckedUnits$2 = view => {
   return visitView$3(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => {
-      if (unit.checked) {
-        return {
-          ...unit,
-          hideWhenEmpty: true
-        };
-      }
-      return unit;
-    }
+    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -862,21 +841,13 @@ const collectGarbage$4 = view => {
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
-const enableHideWhenEmptyForCheckedUnits$2 = view => {
+const enableHideWhenEmptyForCheckedUnits$1 = view => {
   return visitView$2(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => {
-      if (unit.checked) {
-        return {
-          ...unit,
-          hideWhenEmpty: true
-        };
-      }
-      return unit;
-    }
+    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -1062,21 +1033,13 @@ const collectGarbage$3 = view => {
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
-const enableHideWhenEmptyForCheckedUnits$1 = view => {
+const enableHideWhenEmptyForCheckedUnits = view => {
   return visitSmartFolder(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => {
-      if (unit.checked) {
-        return {
-          ...unit,
-          hideWhenEmpty: true
-        };
-      }
-      return unit;
-    }
+    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -1159,7 +1122,7 @@ const visitAxis = (axis, visitor) => {
     ...axis,
     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)).filter(unit => unit !== REMOVE),
+    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),
     groupByExpression: axis.groupByExpression && firstOrNull(visitor.visitExpression(fromType, [axis.groupByExpression]))
   };
   if (!axisResult.query) {
@@ -1317,21 +1280,13 @@ const collectGarbage$1 = view => {
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
-const enableHideWhenEmptyForCheckedUnits = view => {
+const enableHideWhenEmptyForCheckedEditableUnits = view => {
   return visitView(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitGroupByExpression: groupBy => groupBy,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
-    visitViewUnit: (fromType, unit) => {
-      if (unit.checked) {
-        return {
-          ...unit,
-          hideWhenEmpty: true
-        };
-      }
-      return unit;
-    }
+    visitViewUnit: (fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit)
   });
 };
 
@@ -1546,18 +1501,18 @@ const migrateHideWhenEmptyToUnitsLevel = view => {
   switch (result["fibery/type"]) {
     case "board":
       result = enableHideWhenEmptyForCovers(result);
-      result = enableHideWhenEmptyForCheckedUnits$5(result);
+      result = enableHideWhenEmptyForCheckedEditableUnits$1(result);
       return result;
     case "list":
-      return enableHideWhenEmptyForCheckedUnits$1(result);
-    case "timeline":
       return enableHideWhenEmptyForCheckedUnits(result);
+    case "timeline":
+      return enableHideWhenEmptyForCheckedEditableUnits(result);
     case "calendar":
-      return enableHideWhenEmptyForCheckedUnits$4(result);
-    case "feed":
       return enableHideWhenEmptyForCheckedUnits$3(result);
-    case "map":
+    case "feed":
       return enableHideWhenEmptyForCheckedUnits$2(result);
+    case "map":
+      return enableHideWhenEmptyForCheckedUnits$1(result);
     default:
       return result;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "10.1.0",
+  "version": "10.3.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/schema": "10.2.1",
     "@fibery/eslint-config": "8.6.0",
-    "@fibery/expression-utils": "9.0.4"
+    "@fibery/schema": "10.2.1",
+    "@fibery/expression-utils": "9.0.4",
+    "@fibery/babel-preset": "7.4.0"
   },
   "peerDependencies": {
     "@fibery/expression-utils": "^9.0.4",

package/index.js

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

package/src/index.js

@@ -1,222 +0,0 @@
-import * as board from "./private/board";
-import * as calendar from "./private/calendar";
-import * as feed from "./private/feed";
-import * as form from "./private/form";
-import * as map from "./private/map";
-import * as smartfolder from "./private/smart-folder";
-import * as table from "./private/table";
-import * as timeline from "./private/timeline";
-import {REMOVE} from "./private/utils";
-import _ from "lodash";
-import immutableUpdate from "immutability-helper";
-
-export {
-  deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder,
-  replaceIdsWithNamesInSmartFolder,
-  replaceNamesWithIdsInSmartFolder,
-} from "./private/smart-folder";
-
-export const deleteExpressionWithNotFoundFieldsOrTypesInView = (schema, view, ensureAxisInvariant = true) => {
-  switch (view["fibery/type"]) {
-    case "board":
-      return board.deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView(schema, view, ensureAxisInvariant);
-    case "list":
-      return smartfolder.deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
-    case "grid":
-      return smartfolder.deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
-    case "timeline":
-      return timeline.deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(schema, view, ensureAxisInvariant);
-    case "calendar":
-      return calendar.deleteExpressionWithNotFoundFieldsOrTypesInCalendarView(schema, view);
-    case "table":
-      return table.deleteExpressionWithNotFoundFieldsOrTypesInTableView(schema, view);
-    case "feed":
-      return feed.deleteExpressionWithNotFoundFieldsOrTypesInFeedView(schema, view);
-    case "form":
-      return form.deleteExpressionWithNotFoundFieldsOrTypesInFormView(schema, view);
-    case "map":
-      return map.deleteExpressionWithNotFoundFieldsOrTypesInMapView(schema, view);
-    default:
-      return view;
-  }
-};
-
-export const fixUserSelectedUnits = (schema, view, {unitDefinitions, getDefaultUnitTypeForField}) => {
-  switch (view["fibery/type"]) {
-    case "board":
-      return board.fixUserSelectedUnitsInBoardView(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    case "list":
-      return smartfolder.fixUserSelectedUnitsInSmartFolder(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    case "grid":
-      return smartfolder.fixUserSelectedUnitsInSmartFolder(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    case "table":
-      return table.fixUserSelectedUnitsInTableView(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    case "timeline":
-      return timeline.fixUserSelectedUnitsInTimelineView(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    case "calendar":
-      return calendar.fixUserSelectedUnitsInCalendarView(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    case "feed":
-      return feed.fixUserSelectedUnitsInFeedView(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    case "map":
-      return map.fixUserSelectedUnitsInMapView(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    default:
-      return view;
-  }
-};
-
-export const fixContextExpressionWithBrokenPath = (schema, view, defaultContextExpression) => {
-  switch (view["fibery/type"]) {
-    case "board":
-      return board.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    case "list":
-      return smartfolder.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    case "grid":
-      return smartfolder.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    case "table":
-      return table.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    case "timeline":
-      return timeline.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    case "calendar":
-      return calendar.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    case "feed":
-      return feed.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    case "map":
-      return map.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    default:
-      return view;
-  }
-};
-
-/**
- * Removes garbage from view's meta to reduce the size.
- */
-export const collectGarbage = (schema, view) => {
-  const deleteRemoved = (x) => {
-    if (Array.isArray(x)) {
-      return x.map(deleteRemoved).filter((y) => y !== REMOVE);
-    }
-    if (typeof x === "object" && x !== null) {
-      let tmp = Object.entries(x);
-      tmp = tmp.map((e) => [e[0], deleteRemoved(e[1])]);
-      tmp = tmp.filter((e) => e[1] !== REMOVE);
-      return Object.fromEntries(tmp);
-    }
-    return x;
-  };
-
-  switch (view["fibery/type"]) {
-    case "board":
-      return deleteRemoved(board.collectGarbage(view));
-    case "list":
-      return deleteRemoved(smartfolder.collectGarbage(view));
-    case "grid":
-      return deleteRemoved(smartfolder.collectGarbage(view));
-    case "table":
-      return deleteRemoved(table.collectGarbage(view));
-    case "timeline":
-      return deleteRemoved(timeline.collectGarbage(view));
-    case "calendar":
-      return deleteRemoved(calendar.collectGarbage(view));
-    case "feed":
-      return deleteRemoved(feed.collectGarbage(view));
-    case "map":
-      return deleteRemoved(map.collectGarbage(view));
-    default:
-      return view;
-  }
-};
-
-export const replaceNamesWithIdsInView = (schema, view) => {
-  switch (view["fibery/type"]) {
-    case "board":
-      return board.replaceNamesWithIdsInBoardView(schema, view);
-    case "list":
-      return smartfolder.replaceNamesWithIdsInSmartFolder(schema, view);
-    case "grid":
-      return smartfolder.replaceNamesWithIdsInSmartFolder(schema, view);
-    case "table":
-      return table.replaceNamesWithIdsInTableView(schema, view);
-    case "timeline":
-      return timeline.replaceNamesWithIdsInTimelineView(schema, view);
-    case "calendar":
-      return calendar.replaceNamesWithIdsInCalendarView(schema, view);
-    case "feed":
-      return feed.replaceNamesWithIdsInFeedView(schema, view);
-    case "form":
-      return form.replaceNamesWithIdsInFormView(schema, view);
-    case "map":
-      return map.replaceNamesWithIdsInMapView(schema, view);
-    default:
-      return view;
-  }
-};
-
-export const replaceIdsWithNamesInView = (schema, view) => {
-  switch (view["fibery/type"]) {
-    case "board":
-      return board.replaceIdsWithNamesInBoardView(schema, view);
-    case "list":
-      return smartfolder.replaceIdsWithNamesInSmartFolder(schema, view);
-    case "grid":
-      return smartfolder.replaceIdsWithNamesInSmartFolder(schema, view);
-    case "table":
-      return table.replaceIdsWithNamesInTableView(schema, view);
-    case "timeline":
-      return timeline.replaceIdsWithNamesInTimelineView(schema, view);
-    case "calendar":
-      return calendar.replaceIdsWithNamesInCalendarView(schema, view);
-    case "feed":
-      return feed.replaceIdsWithNamesInFeedView(schema, view);
-    case "form":
-      return form.replaceIdsWithNamesInFormView(schema, view);
-    case "map":
-      return map.replaceIdsWithNamesInMapView(schema, view);
-    default:
-      return view;
-  }
-};
-
-export const getViewCardTypes = ({"fibery/meta": {items}}) => items.map(({query: {"q/from": type}}) => type);
-
-export const migrateHideWhenEmptyToUnitsLevel = (view) => {
-  const viewTypesToTransform = ["board", "list", "timeline", "calendar", "feed", "map"];
-  const viewType = view["fibery/type"];
-
-  if (!viewTypesToTransform.includes(viewType)) {
-    return view;
-  }
-
-  const showEmptyUnitValues = _.get(view, ["fibery/meta", "showEmptyUnitValues"]);
-  if (showEmptyUnitValues === undefined) {
-    return view;
-  }
-
-  let result = immutableUpdate(view, {
-    "fibery/meta": {
-      $apply: (x) => _.omit(x, "showEmptyUnitValues"),
-    },
-  });
-
-  if (showEmptyUnitValues === true) {
-    return result;
-  }
-
-  switch (result["fibery/type"]) {
-    case "board":
-      result = board.enableHideWhenEmptyForCovers(result);
-      result = board.enableHideWhenEmptyForCheckedUnits(result);
-      return result;
-    case "list":
-      return smartfolder.enableHideWhenEmptyForCheckedUnits(result);
-    case "timeline":
-      return timeline.enableHideWhenEmptyForCheckedUnits(result);
-    case "calendar":
-      return calendar.enableHideWhenEmptyForCheckedUnits(result);
-    case "feed":
-      return feed.enableHideWhenEmptyForCheckedUnits(result);
-    case "map":
-      return map.enableHideWhenEmptyForCheckedUnits(result);
-    default:
-      return result;
-  }
-};