@fibery/views 10.7.1 → 12.0.0

package/lib/views.js

@@ -270,20 +270,32 @@ const getUnitTypeForTextField = fieldMeta => {
       return "text";
   }
 };
+const getUnitKind = unit => {
+  if (unit.type === "user-button") {
+    return "user-button";
+  }
+  if (["type-icon", "type-badge", "type-badge-abbr"].includes(unit.type)) {
+    return "db";
+  }
+  return "field";
+};
 const migrateUnit = (schema, fromType, unit, units) => {
   const {
     type,
     expression
   } = unit;
+  const kind = unit.kind || getUnitKind(unit);
   if (type === "date-time") {
     return {
       ...unit,
+      kind,
       type: "date"
     };
   }
   if (type === "date-time-range") {
     return {
       ...unit,
+      kind,
       type: "date-range"
     };
   }
@@ -293,6 +305,7 @@ const migrateUnit = (schema, fromType, unit, units) => {
     if (fieldType === "fibery/email") {
       return {
         ...unit,
+        kind,
         type: "email"
       };
     }
@@ -302,6 +315,7 @@ const migrateUnit = (schema, fromType, unit, units) => {
     if (getFieldType(schema, fromType, field) === "fibery/text") {
       return {
         ...unit,
+        kind,
         type: getUnitTypeForTextField(getFieldMeta(schema, fromType, field))
       };
     }
@@ -311,6 +325,7 @@ const migrateUnit = (schema, fromType, unit, units) => {
     if (getFieldType(schema, fromType, field) === "fibery/file") {
       return {
         ...unit,
+        kind,
         type: "collection-count"
       };
     }
@@ -322,11 +337,15 @@ const migrateUnit = (schema, fromType, unit, units) => {
     if (isAvatarExntensionEnabled && hasAvatarExntensionField) {
       return {
         ...unit,
-        expression: ["avatar/avatars"]
+        expression: ["avatar/avatars"],
+        kind
       };
     }
   }
-  return unit;
+  return {
+    ...unit,
+    kind
+  };
 };
 const fixViewUnit = (schema, fromType, unit, units, {
   unitDefinitions,
@@ -494,45 +513,50 @@ const visitView$5 = (view, visitor) => immutableUpdate__default["default"](view,
       $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, {
-          coverExpression: {
-            $apply: coverExpression => coverExpression ? visitor.visitExpression(fromType, coverExpression) : coverExpression
-          },
-          xExpression: {
-            $apply: xExpression => xExpression ? visitor.visitExpression(fromType, xExpression) : xExpression
-          },
-          yExpression: {
-            $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
-          },
-          contextExpression: {
-            $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
-          },
-          query: {
-            $apply: query => query ? visitor.visitQueryExpression(query) : null
-          },
-          filter: {
-            $apply: filter => filter ? visitor.visitFilter(fromType, filter) : 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) : undefined;
+      $apply: items => {
+        if (!items) {
+          return [];
+        }
+        return items.map(item => {
+          const fromType = ___default["default"].get(item, ["query", "q/from"]);
+          return fromType ? immutableUpdate__default["default"](item, {
+            coverExpression: {
+              $apply: coverExpression => coverExpression ? visitor.visitExpression(fromType, coverExpression) : coverExpression
+            },
+            xExpression: {
+              $apply: xExpression => xExpression ? visitor.visitExpression(fromType, xExpression) : xExpression
+            },
+            yExpression: {
+              $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
+            },
+            contextExpression: {
+              $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
+            },
+            query: {
+              $apply: query => query ? visitor.visitQueryExpression(query) : null
+            },
+            filter: {
+              $apply: filter => filter ? visitor.visitFilter(fromType, filter) : 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) : undefined;
+              }
             }
-          }
-        }) : item;
-      }).filter(item => {
-        const {
-          query
-        } = item;
-        return query ? item : null;
-      })
+          }) : item;
+        }).filter(item => {
+          const {
+            query
+          } = item;
+          return query ? item : null;
+        });
+      }
     }
   }
 });

package/package.json

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