@fibery/views 1.1.4 → 1.1.5

package/README.md

@@ -0,0 +1,31 @@
+## How to update and publish @fibery/views
+
+Execute this:
+
+      cd fibery-views
+      yarn build
+      npm version patch
+      npm publish --dry-run
+
+Check the output, it should say there are at least 2 total files:
+
+      npm notice 📦  @fibery/views@1.1.4
+      npm notice === Tarball Contents ===
+      npm notice 37.1kB lib/views.js
+      npm notice 1.1kB  package.json
+      npm notice === Tarball Details ===
+      npm notice name:          @fibery/views
+      npm notice version:       1.1.4
+      npm notice package size:  4.7 kB
+      npm notice unpacked size: 38.3 kB
+      npm notice shasum:        0c8f17195d49cda1a321edc9a07d443c97ed6ba5
+      npm notice integrity:     sha512-XpaByuvN4YSZi[...]OFceXnL4J2VHw==
+      npm notice total files:   2
+      npm notice
+      + @fibery/views@1.1.4
+
+If everything looks good, do
+
+      npm publish
+
+Don't forget to commit the updated package.json.

package/lib/views.js

@@ -26,6 +26,38 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+const getFieldType = (schema, fromType, field) => {
+  if (!schema.typeObjectsByName.hasOwnProperty(fromType) || !schema.typeObjectsByName[fromType].fieldObjectsByName.hasOwnProperty(field)) {
+    return null;
+  }
+
+  return schema.typeObjectsByName[fromType].fieldObjectsByName[field].type;
+};
+
+const getFieldMeta = (schema, fromType, field) => {
+  if (!schema.typeObjectsByName.hasOwnProperty(fromType) || !schema.typeObjectsByName[fromType].fieldObjectsByName.hasOwnProperty(field)) {
+    return null;
+  }
+
+  return schema.typeObjectsByName[fromType].fieldObjectsByName[field].rawMeta;
+};
+
+const getUnitTypeForTextField = fieldMeta => {
+  switch (fieldMeta["ui/type"]) {
+    case "email":
+      return "email";
+
+    case "url":
+      return "url";
+
+    case "phone":
+      return "phone";
+
+    default:
+      return "text";
+  }
+};
+
 const fixViewUnit = (schema, fromType, unit) => {
   const {
     type,
@@ -35,7 +67,7 @@ const fixViewUnit = (schema, fromType, unit) => {
   if (type === "date") {
     const [field] = expression;
 
-    if (schema.typeObjectsByName[fromType].fieldObjectsByName[field].type === "fibery/date-time") {
+    if (getFieldType(schema, fromType, field) === "fibery/date-time") {
       return _extends({}, unit, {
         type: "date-time"
       });
@@ -45,13 +77,34 @@ const fixViewUnit = (schema, fromType, unit) => {
   if (type === "date-range") {
     const [field] = expression;
 
-    if (schema.typeObjectsByName[fromType].fieldObjectsByName[field].type === "fibery/date-time-range") {
+    if (getFieldType(schema, fromType, field) === "fibery/date-time-range") {
       return _extends({}, unit, {
         type: "date-time-range"
       });
     }
   }
 
+  if (type === "text") {
+    const [field] = expression;
+    const fieldType = getFieldType(schema, fromType, field);
+
+    if (fieldType === "fibery/email") {
+      return _extends({}, unit, {
+        type: "email"
+      });
+    }
+  }
+
+  if (["text", "email", "phone", "url"].includes(type)) {
+    const [field] = expression;
+
+    if (getFieldType(schema, fromType, field) === "fibery/text") {
+      return _extends({}, unit, {
+        type: getUnitTypeForTextField(getFieldMeta(schema, fromType, field))
+      });
+    }
+  }
+
   return unit;
 };
 
@@ -547,7 +600,7 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
     items: {
       $apply: items => {
         const isOldSmartFolder = !items.every(item => item.hasOwnProperty("groupBy"));
-        let removedItems = [];
+        const removedItemsIndexes = items.map((item, index) => visitor.visitQueryExpression(item.query) ? null : index).filter(value => value !== null);
         return items.map((item, index) => {
           if (isOldSmartFolder) {
             return item;
@@ -558,28 +611,23 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
           return fromType ? immutableUpdate__default["default"](item, {
             groupBy: {
               $apply: groupBy => {
-                const removedItemsBeforeCurrent = removedItems.filter(n => n < index);
+                const removedItemsBeforeCurrent = removedItemsIndexes.filter(n => n < index);
                 return groupBy ? visitor.visitGroupByExpression(groupBy, fromType, removedItemsBeforeCurrent.length) : null;
               }
             }
           }) : item;
-        }).map((item, index) => {
+        }).map(item => {
           const fromType = ___default["default"].get(item, ["query", "q/from"]);
 
           return fromType ? immutableUpdate__default["default"](item, {
             query: {
               $apply: query => {
                 const visitedQuery = visitor.visitQueryExpression(query);
-
-                if (!visitedQuery) {
-                  removedItems.push(index);
-                }
-
                 return query ? visitedQuery : null;
               }
             },
             units: {
-              $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)) : undefined
+              $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map(unit => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit) : unit) : undefined
             },
             contextExpression: {
               $apply: contextExpression => contextExpression ? visitor.visitExpression(fromType, contextExpression) : contextExpression
@@ -679,6 +727,14 @@ const deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder = (schema, smartFol
   visitGroupByExpression: (groupBy, fromType, removedItems) => deleteExpressionWithNotFoundFieldsOrTypesInGroupByExpression(schema, groupBy, fromType, removedItems),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
+const fixUserSelectedUnitsInSmartFolder = (schema, view) => {
+  return visitSmartFolder(view, {
+    visitQueryExpression: query => query,
+    visitGroupByExpression: groupBy => groupBy,
+    visitExpression: (fromType, expression) => expression,
+    visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
+  });
+};
 
 const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
@@ -923,6 +979,9 @@ const fixUserSelectedUnits = (schema, view) => {
     case "board":
       return fixUserSelectedUnitsInBoardView(schema, view);
 
+    case "list":
+      return fixUserSelectedUnitsInSmartFolder(schema, view);
+
     case "table":
       return fixUserSelectedUnitsInTableView(schema, view);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -13,11 +13,12 @@
   "dependencies": {},
   "devDependencies": {
     "@babel/core": "7.15.0",
-    "babel-jest": "27.0.6",
-    "babel-loader": "8.2.2",
-    "babel-preset-fibery": "7.2.0",
-    "eslint-config-fibery": "7.0.0",
-    "jest": "27.0.6",
+    "babel-jest": "27.5.1",
+    "babel-loader": "8.2.5",
+    "@fibery/babel-preset": "7.2.0",
+    "@fibery/eslint-config": "7.1.0",
+    "jest": "27.5.1",
+    "jest-junit": "13.0.0",
     "microbundle": "0.14.1"
   },
   "peerDependencies": {
@@ -29,15 +30,27 @@
   "scripts": {
     "build": "rm -rf lib && microbundle index.js -o lib -f cjs  --no-compress --target node --sourcemap false",
     "test": "node scripts/test.js",
+    "test:ci": "yarn test --coverage --reporters=default --reporters=jest-junit",
     "lint": "eslint ."
   },
   "jest": {
     "testEnvironment": "node",
+    "coveragePathIgnorePatterns": [
+      "/node_modules/"
+    ],
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx,ts,tsx}",
+      "!src/**/*.d.ts"
+    ],
+    "coverageReporters": [
+      "text",
+      "cobertura"
+    ],
     "testPathIgnorePatterns": [
       "<rootDir>[/\\\\](build|docs|node_modules|scripts)[/\\\\]"
     ],
     "transform": {
-      "^.+\\.jsx?$": "../fibery-ui/config/jest/babel.js"
+      "^.+\\.(js|jsx|ts|tsx)$": "../fibery-ui/config/jest/babel.js"
     },
     "testURL": "http://localhost"
   }