@fibery/views 14.0.0 → 14.0.1

package/lib/views.js

@@ -1217,14 +1217,14 @@ const replaceNamesWithIdsInGroupByExpression = (schema, groupByExpression, fromT
 const replaceNamesWithIdsInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
   visitFilter: (fromType, expression) => replaceNamesWithIdsInFilter(schema, fromType, expression),
-  visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType, Object.keys(groupBy).map(() => 0)),
+  visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType),
   visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
   visitUnitGroupKey: unitGroupKey => replaceNamesWithIdsInUnitGroupKey(unitGroupKey, schema)
 });
 const replaceIdsWithNamesInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
   visitFilter: (fromType, expression) => replaceIdsWithNamesInFilter(schema, fromType, expression),
-  visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType, Object.keys(groupBy).map(() => 0)),
+  visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType),
   visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
   visitUnitGroupKey: unitGroupKey => replaceIdsWithNamesInUnitGroupKey(unitGroupKey, getFieldObjectsById(smartFolder, schema))
 });
@@ -1334,56 +1334,69 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
       $apply: y => visitAxis(y, visitor)
     },
     items: {
-      $apply: items => items.map(item => {
-        const fromType = ___default["default"].get(item, ["query", "q/from"]);
-        return fromType ? immutableUpdate__default["default"](item, {
-          yExpression: {
-            $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
-          },
-          startExpression: {
-            $apply: startExpression => startExpression ? visitor.visitExpression(fromType, startExpression) : startExpression
-          },
-          endExpression: {
-            $apply: endExpression => endExpression ? visitor.visitExpression(fromType, endExpression) : endExpression
-          },
-          secondaryStartExpression: {
-            $apply: secondaryStartExpression => secondaryStartExpression ? visitor.visitExpression(fromType, secondaryStartExpression) : secondaryStartExpression
-          },
-          secondaryEndExpression: {
-            $apply: secondaryEndExpression => secondaryEndExpression ? visitor.visitExpression(fromType, secondaryEndExpression) : secondaryEndExpression
-          },
-          contextExpression: {
-            $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
-          },
-          filter: {
-            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : null
-          },
-          query: {
-            $apply: query => query ? visitor.visitQueryExpression(query) : null
-          },
-          units: {
-            $apply: units => units ? units.filter(unit => Boolean(unit)).map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map((unit, idx, units) => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit, units) : unit).filter(unit => unit !== REMOVE) : undefined
-          },
-          colorCoding: {
-            $apply: colorCodings => {
-              return colorCodings && colorCodings.map(colorCoding => ({
-                ...colorCoding,
-                expression: visitor.visitExpression(fromType, colorCoding.expression)
-              })).filter(colorCoding => colorCoding.expression !== null);
-            }
-          },
-          dependencyExpression: {
-            $apply: expression => {
-              return expression && visitor.visitExpression(fromType, expression);
+      $apply: items => {
+        const removedItemsIndexes = items.map((item, index) => visitor.visitQueryExpression(item.query) ? null : index).filter(value => value !== null);
+        return items.map(item => {
+          const fromType = ___default["default"].get(item, ["query", "q/from"]);
+          return fromType ? immutableUpdate__default["default"](item, {
+            yExpression: {
+              $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
+            },
+            startExpression: {
+              $apply: startExpression => startExpression ? visitor.visitExpression(fromType, startExpression) : startExpression
+            },
+            endExpression: {
+              $apply: endExpression => endExpression ? visitor.visitExpression(fromType, endExpression) : endExpression
+            },
+            secondaryStartExpression: {
+              $apply: secondaryStartExpression => secondaryStartExpression ? visitor.visitExpression(fromType, secondaryStartExpression) : secondaryStartExpression
+            },
+            secondaryEndExpression: {
+              $apply: secondaryEndExpression => secondaryEndExpression ? visitor.visitExpression(fromType, secondaryEndExpression) : secondaryEndExpression
+            },
+            contextExpression: {
+              $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
+            },
+            filter: {
+              $apply: filter => filter ? visitor.visitFilter(fromType, filter) : null
+            },
+            query: {
+              $apply: query => query ? visitor.visitQueryExpression(query) : null
+            },
+            units: {
+              $apply: units => units ? units.filter(unit => Boolean(unit)).map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map((unit, idx, units) => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit, units) : unit).filter(unit => unit !== REMOVE) : undefined
+            },
+            colorCoding: {
+              $apply: colorCodings => {
+                return colorCodings && colorCodings.map(colorCoding => ({
+                  ...colorCoding,
+                  expression: visitor.visitExpression(fromType, colorCoding.expression)
+                })).filter(colorCoding => colorCoding.expression !== null);
+              }
+            },
+            dependencyExpression: {
+              $apply: expression => {
+                return expression && visitor.visitExpression(fromType, expression);
+              }
+            },
+            groupBy: {
+              $apply: groupBy => {
+                if (!groupBy) {
+                  return groupBy;
+                }
+                const groupByIndexes = Object.keys(groupBy).map(key => parseInt(key));
+                const removedItemsBeforeTargetLengths = groupByIndexes.map(groupByIndex => removedItemsIndexes.filter(n => n < groupByIndex).length);
+                return visitor.visitGroupByExpression(groupBy, fromType, removedItemsBeforeTargetLengths);
+              }
             }
-          }
-        }) : item;
-      }).filter(item => {
-        const {
-          query
-        } = item;
-        return query ? item : null;
-      })
+          }) : item;
+        }).filter(item => {
+          const {
+            query
+          } = item;
+          return query ? item : null;
+        });
+      }
     },
     milestones: {
       $apply: milestones => {
@@ -1429,7 +1442,8 @@ const replaceNamesWithIdsInTimelineView = (schema, view) => {
         result[type] = axis;
       }
       return result;
-    }, {})
+    }, {}),
+    visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType)
   };
   return visitView(view, visitor);
 };
@@ -1446,7 +1460,8 @@ const replaceIdsWithNamesInTimelineView = (schema, view) => {
         result[typeId] = axis;
       }
       return result;
-    }, {})
+    }, {}),
+    visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType)
   };
   return visitView(view, visitor);
 };
@@ -1477,7 +1492,7 @@ const ensureAxisAndItemExpressionInvariant = (view, canGroupMetaItem) => {
   actions.forEach(action => action());
   return view;
 };
-const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant, canGroupMetaItem = () => true) => {
+const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant, canGroupMetaItem = metaItem => true) => {
   const visitor = {
     visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
     visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
@@ -1494,7 +1509,8 @@ const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, e
         return result;
       }, {});
       return ___default["default"].isEmpty(enumsNew) ? null : enumsNew;
-    }
+    },
+    visitGroupByExpression: (groupBy, fromType, removedItems) => deleteExpressionWithNotFoundFieldsOrTypesInGroupByExpression(schema, groupBy, fromType, removedItems)
   };
   const viewNew = visitView(view, visitor);
   return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant(viewNew, canGroupMetaItem) : viewNew;
@@ -1511,7 +1527,8 @@ const fixUserSelectedUnitsInTimelineView = (schema, view, {
       unitDefinitions,
       getDefaultUnitTypeForField
     }),
-    visitEnums: enums => enums
+    visitEnums: enums => enums,
+    visitGroupByExpression: groupBy => groupBy
   });
 };
 const fixContextExpressionWithBrokenPath$1 = (schema, view, defaultContextExpression) => visitView(view, {
@@ -1519,7 +1536,8 @@ const fixContextExpressionWithBrokenPath$1 = (schema, view, defaultContextExpres
   visitFilter: (_fromType, filter) => filter,
   visitQueryExpression: query => query,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression),
-  visitEnums: enums => enums
+  visitEnums: enums => enums,
+  visitGroupByExpression: groupBy => groupBy
 });
 const collectGarbage$1 = view => {
   return visitView(view, {
@@ -1527,17 +1545,18 @@ const collectGarbage$1 = view => {
     visitFilter: (_fromType, filter) => filter,
     visitExpression: (_fromType, expression) => expression,
     visitViewUnit: (_fromType, unit) => unit.checked ? unit : REMOVE,
-    visitEnums: enums => enums
+    visitEnums: enums => enums,
+    visitGroupByExpression: groupBy => groupBy
   });
 };
 const enableHideWhenEmptyForCheckedEditableUnits = view => {
   return visitView(view, {
     visitQueryExpression: queryExpression => queryExpression,
-    visitGroupByExpression: groupBy => groupBy,
     visitExpression: (_fromType, expression) => expression,
     visitFilter: (_fromType, filter) => filter,
     visitViewUnit: (_fromType, unit) => enableHideWhenEmptyForCheckedEditableUnit(unit),
-    visitEnums: enums => enums
+    visitEnums: enums => enums,
+    visitGroupByExpression: groupBy => groupBy
   });
 };
 

package/package.json

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

package/src/index.js

@@ -1,228 +0,0 @@
-import immutableUpdate from "immutability-helper";
-import _ from "lodash";
-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 timeline from "./private/timeline";
-import {REMOVE} from "./private/utils";
-
-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":
-    case "grid":
-    case "table":
-      return smartfolder.deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
-    case "timeline":
-      return timeline.deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(
-        schema,
-        view,
-        ensureAxisInvariant,
-        () => true
-      );
-    case "gantt":
-      return timeline.deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(
-        schema,
-        view,
-        ensureAxisInvariant,
-        // Only hierarchy top level meta items can be grouped
-        (metaItem) => !metaItem.groupBy
-      );
-    case "calendar":
-      return calendar.deleteExpressionWithNotFoundFieldsOrTypesInCalendarView(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":
-    case "grid":
-    case "table":
-      return smartfolder.fixUserSelectedUnitsInSmartFolder(schema, view, {unitDefinitions, getDefaultUnitTypeForField});
-    case "timeline":
-    case "gantt":
-      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":
-    case "grid":
-    case "table":
-      return smartfolder.fixContextExpressionWithBrokenPath(schema, view, defaultContextExpression);
-    case "timeline":
-    case "gantt":
-      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":
-    case "grid":
-    case "table":
-      return deleteRemoved(smartfolder.collectGarbage(view));
-    case "timeline":
-    case "gantt":
-      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":
-    case "grid":
-    case "table":
-      return smartfolder.replaceNamesWithIdsInSmartFolder(schema, view);
-    case "timeline":
-    case "gantt":
-      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":
-    case "grid":
-    case "table":
-      return smartfolder.replaceIdsWithNamesInSmartFolder(schema, view);
-    case "timeline":
-    case "gantt":
-      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", "gantt", "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.enableHideWhenEmptyForCheckedEditableUnits(result);
-      return result;
-    case "list":
-      return smartfolder.enableHideWhenEmptyForCheckedUnits(result);
-    case "timeline":
-    case "gantt":
-      return timeline.enableHideWhenEmptyForCheckedEditableUnits(result);
-    case "calendar":
-      return calendar.enableHideWhenEmptyForCheckedUnits(result);
-    case "feed":
-      return feed.enableHideWhenEmptyForCheckedUnits(result);
-    case "map":
-      return map.enableHideWhenEmptyForCheckedUnits(result);
-    default:
-      return result;
-  }
-};