@fibery/views 10.2.0 → 10.4.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;
@@ -863,7 +857,7 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
       $apply: (items = []) => {
         const isOldSmartFolder = !items.every(item => item.hasOwnProperty("groupBy"));
         const removedItemsIndexes = items.map((item, index) => visitor.visitQueryExpression(item.query) ? null : index).filter(value => value !== null);
-        return items.map((item, index) => {
+        return items.map(item => {
           if (isOldSmartFolder) {
             return item;
           }
@@ -871,12 +865,16 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
           return fromType ? immutableUpdate__default["default"](item, {
             groupBy: {
               $apply: groupBy => {
-                const removedItemsBeforeCurrent = removedItemsIndexes.filter(n => n < index);
-                return groupBy ? visitor.visitGroupByExpression(groupBy, fromType, removedItemsBeforeCurrent.length) : null;
+                if (!groupBy) {
+                  return null;
+                }
+                const groupByIndex = parseInt(Object.keys(groupBy)[0]);
+                const removedItemsBeforeTarget = removedItemsIndexes.filter(n => n < groupByIndex);
+                return visitor.visitGroupByExpression(groupBy, fromType, removedItemsBeforeTarget.length);
               }
             }
           }) : item;
-        }).map((item, index) => {
+        }).map(item => {
           if (isOldSmartFolder) {
             return item;
           }
@@ -884,8 +882,12 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
           return fromType ? immutableUpdate__default["default"](item, {
             groupingExpression: {
               $apply: groupingExpression => {
-                const removedItemsBeforeCurrent = removedItemsIndexes.filter(n => n < index);
-                return groupingExpression ? visitor.visitGroupByExpression(groupingExpression, fromType, removedItemsBeforeCurrent.length) : null;
+                if (!groupingExpression) {
+                  return null;
+                }
+                const groupingExpressionIndex = parseInt(Object.keys(groupingExpression)[0]);
+                const removedItemsBeforeTarget = removedItemsIndexes.filter(n => n < groupingExpressionIndex);
+                return visitor.visitGroupByExpression(groupingExpression, fromType, removedItemsBeforeTarget.length);
               }
             }
           }) : item;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "10.2.0",
+  "version": "10.4.0",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -20,11 +20,11 @@
     "microbundle": "0.15.1",
     "@fibery/babel-preset": "7.4.0",
     "@fibery/eslint-config": "8.6.0",
-    "@fibery/expression-utils": "9.0.4",
+    "@fibery/expression-utils": "9.0.5",
     "@fibery/schema": "10.2.1"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.0.4",
+    "@fibery/expression-utils": "^9.0.5",
     "@fibery/schema": "^10.2.1",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"