@fibery/views 13.0.1 → 13.0.3

package/lib/views.js

@@ -1358,9 +1358,9 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
               })).filter(colorCoding => colorCoding.expression !== null);
             }
           },
-          dependenciesExpressions: {
-            $apply: expressions => {
-              return expressions == null ? void 0 : expressions.map(expression => visitor.visitExpression(fromType, expression));
+          dependencyExpression: {
+            $apply: expression => {
+              return expression && visitor.visitExpression(fromType, expression);
             }
           }
         }) : item;
@@ -1416,7 +1416,7 @@ const replaceIdsWithNamesInTimelineView = (schema, view) => {
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression)
   });
 };
-const ensureAxisAndItemExpressionInvariant = view => {
+const ensureAxisAndItemExpressionInvariant = (view, canGroupMetaItem) => {
   const actions = [];
   const y = ___default["default"].get(view, ["fibery/meta", "y"]);
   const yQuery = ___default["default"].get(view, ["fibery/meta", "y", "query"]);
@@ -1429,10 +1429,11 @@ const ensureAxisAndItemExpressionInvariant = view => {
     const resetActions = items.map(item => () => item.yExpression = null);
     actions.push(...resetActions);
   }
-  if (y !== null && ___default["default"].some(items, ({
+  const filteredMetaItems = items.filter(canGroupMetaItem);
+  if (y !== null && ___default["default"].some(filteredMetaItems, ({
     yExpression
   }) => yExpression === null)) {
-    const resetActions = items.map(item => () => item.yExpression = null);
+    const resetActions = filteredMetaItems.map(item => () => item.yExpression = null);
     actions.push(...resetActions);
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
   }
@@ -1442,13 +1443,13 @@ const ensureAxisAndItemExpressionInvariant = view => {
   actions.forEach(action => action());
   return view;
 };
-const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant = true) => {
+const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant, canGroupMetaItem = () => true) => {
   const viewNew = visitView(view, {
     visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
     visitFilter: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInFilter(schema, fromType, expression),
     visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
   });
-  return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant(viewNew) : viewNew;
+  return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant(viewNew, canGroupMetaItem) : viewNew;
 };
 const fixUserSelectedUnitsInTimelineView = (schema, view, {
   unitDefinitions,
@@ -1498,7 +1499,11 @@ const deleteExpressionWithNotFoundFieldsOrTypesInView = (schema, view, ensureAxi
     case "table":
       return deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
     case "timeline":
-      return deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(schema, view, ensureAxisInvariant);
+      return deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(schema, view, ensureAxisInvariant, () => true);
+    case "gantt":
+      return deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(schema, view, ensureAxisInvariant,
+      // Only hierarchy top level meta items can be grouped
+      metaItem => !metaItem.groupBy);
     case "calendar":
       return deleteExpressionWithNotFoundFieldsOrTypesInCalendarView(schema, view);
     case "feed":
@@ -1529,6 +1534,7 @@ const fixUserSelectedUnits = (schema, view, {
         getDefaultUnitTypeForField
       });
     case "timeline":
+    case "gantt":
       return fixUserSelectedUnitsInTimelineView(schema, view, {
         unitDefinitions,
         getDefaultUnitTypeForField
@@ -1561,6 +1567,7 @@ const fixContextExpressionWithBrokenPath = (schema, view, defaultContextExpressi
     case "table":
       return fixContextExpressionWithBrokenPath$2(schema, view, defaultContextExpression);
     case "timeline":
+    case "gantt":
       return fixContextExpressionWithBrokenPath$1(schema, view, defaultContextExpression);
     case "calendar":
       return fixContextExpressionWithBrokenPath$5(schema, view, defaultContextExpression);
@@ -1597,6 +1604,7 @@ const collectGarbage = (schema, view) => {
     case "table":
       return deleteRemoved(collectGarbage$2(view));
     case "timeline":
+    case "gantt":
       return deleteRemoved(collectGarbage$1(view));
     case "calendar":
       return deleteRemoved(collectGarbage$5(view));
@@ -1617,6 +1625,7 @@ const replaceNamesWithIdsInView = (schema, view) => {
     case "table":
       return replaceNamesWithIdsInSmartFolder(schema, view);
     case "timeline":
+    case "gantt":
       return replaceNamesWithIdsInTimelineView(schema, view);
     case "calendar":
       return replaceNamesWithIdsInCalendarView(schema, view);
@@ -1639,6 +1648,7 @@ const replaceIdsWithNamesInView = (schema, view) => {
     case "table":
       return replaceIdsWithNamesInSmartFolder(schema, view);
     case "timeline":
+    case "gantt":
       return replaceIdsWithNamesInTimelineView(schema, view);
     case "calendar":
       return replaceIdsWithNamesInCalendarView(schema, view);
@@ -1662,7 +1672,7 @@ const getViewCardTypes = ({
   }
 }) => type);
 const migrateHideWhenEmptyToUnitsLevel = view => {
-  const viewTypesToTransform = ["board", "list", "timeline", "calendar", "feed", "map"];
+  const viewTypesToTransform = ["board", "list", "timeline", "gantt", "calendar", "feed", "map"];
   const viewType = view["fibery/type"];
   if (!viewTypesToTransform.includes(viewType)) {
     return view;
@@ -1687,6 +1697,7 @@ const migrateHideWhenEmptyToUnitsLevel = view => {
     case "list":
       return enableHideWhenEmptyForCheckedUnits(result);
     case "timeline":
+    case "gantt":
       return enableHideWhenEmptyForCheckedEditableUnits(result);
     case "calendar":
       return enableHideWhenEmptyForCheckedUnits$3(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "13.0.1",
+  "version": "13.0.3",
   "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/schema": "10.2.3",
-    "@fibery/eslint-config": "8.6.0",
-    "@fibery/expression-utils": "9.1.2"
+    "@fibery/expression-utils": "9.1.5",
+    "@fibery/eslint-config": "8.6.1",
+    "@fibery/schema": "10.2.6"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.1.2",
-    "@fibery/schema": "^10.2.3",
+    "@fibery/expression-utils": "^9.1.5",
+    "@fibery/schema": "^10.2.6",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"
   },