@fibery/views 1.1.7 → 1.1.9

package/lib/views.js

@@ -472,7 +472,7 @@ const deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView = (schema, v
 const fixUserSelectedUnitsInBoardView = (schema, view) => {
   return visitView$4(view, fixUserSelectedUnitsViewVisitor(schema));
 };
-const collectGarbage$5 = view => {
+const collectGarbage$6 = view => {
   return visitView$4(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitExpression: (fromType, expression) => expression,
@@ -544,7 +544,7 @@ const fixUserSelectedUnitsInCalendarView = (schema, view) => {
     visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
   });
 };
-const collectGarbage$4 = view => {
+const collectGarbage$5 = view => {
   return visitView$3(view, {
     visitExpression: (fromType, expression) => expression,
     visitQueryExpression: query => query,
@@ -612,7 +612,7 @@ const fixUserSelectedUnitsInFeedView = (schema, view) => {
     visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
   });
 };
-const collectGarbage$3 = view => {
+const collectGarbage$4 = view => {
   return visitView$2(view, {
     visitExpression: (fromType, expression) => expression,
     visitQueryExpression: query => query,
@@ -620,6 +620,45 @@ const collectGarbage$3 = view => {
   });
 };
 
+const replaceNamesWithIdsInFormView = (schema, view) => {
+  var _view$fiberyMeta, _view$fiberyMeta2;
+
+  const typeId = (_view$fiberyMeta = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta.typeId;
+  const typeObject = schema.typeObjectsByName.hasOwnProperty(typeId) ? schema.typeObjectsByName[typeId] : null;
+  const fields = (_view$fiberyMeta2 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta2.fields;
+  const fieldsInIdsTerms = fields && fields.map(field => {
+    const fieldObject = typeObject != null && typeObject.fieldObjectsByName.hasOwnProperty(field.id) ? typeObject.fieldObjectsByName[field.id] : null;
+    return fieldObject ? _extends({}, field, {
+      id: fieldObject.id
+    }) : null;
+  }).filter(Boolean);
+  return _extends({}, view, {
+    "fibery/meta": _extends({}, view["fibery/meta"], {
+      typeId: typeObject ? typeObject.id : typeId,
+      fields: fieldsInIdsTerms || fields
+    })
+  });
+};
+const replaceIdsWithNamesInFormView = (schema, view) => {
+  var _view$fiberyMeta3, _view$fiberyMeta4;
+
+  const typeId = (_view$fiberyMeta3 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta3.typeId;
+  const typeObject = schema.typeObjectsById.hasOwnProperty(typeId) ? schema.typeObjectsById[typeId] : null;
+  const fields = (_view$fiberyMeta4 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta4.fields;
+  const fieldsInNameTerms = fields && fields.map(field => {
+    const fieldObject = typeObject != null && typeObject.fieldObjectsById.hasOwnProperty(field.id) ? typeObject.fieldObjectsById[field.id] : null;
+    return fieldObject ? _extends({}, field, {
+      id: fieldObject.name
+    }) : null;
+  }).filter(Boolean);
+  return _extends({}, view, {
+    "fibery/meta": _extends({}, view["fibery/meta"], {
+      typeId: typeObject ? typeObject.name : typeId,
+      fields: fieldsInNameTerms || fields
+    })
+  });
+};
+
 const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["default"](smartFolder, {
   "fibery/meta": {
     items: {
@@ -760,6 +799,14 @@ const fixUserSelectedUnitsInSmartFolder = (schema, view) => {
     visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
   });
 };
+const collectGarbage$3 = view => {
+  return visitSmartFolder(view, {
+    visitQueryExpression: query => query,
+    visitGroupByExpression: groupBy => groupBy,
+    visitExpression: (fromType, expression) => expression,
+    visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
+  });
+};
 
 const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
@@ -1059,10 +1106,10 @@ const collectGarbage = (schema, view) => {
 
   switch (view["fibery/type"]) {
     case "board":
-      return deleteRemoved(collectGarbage$5(view));
+      return deleteRemoved(collectGarbage$6(view));
 
     case "list":
-      return deleteRemoved(undefined(view));
+      return deleteRemoved(collectGarbage$3(view));
 
     case "table":
       return deleteRemoved(collectGarbage$2(view));
@@ -1071,10 +1118,10 @@ const collectGarbage = (schema, view) => {
       return deleteRemoved(collectGarbage$1(view));
 
     case "calendar":
-      return deleteRemoved(collectGarbage$4(view));
+      return deleteRemoved(collectGarbage$5(view));
 
     case "feed":
-      return deleteRemoved(collectGarbage$3(view));
+      return deleteRemoved(collectGarbage$4(view));
 
     default:
       return view;
@@ -1100,6 +1147,9 @@ const replaceNamesWithIdsInView = (schema, view) => {
     case "feed":
       return replaceNamesWithIdsInFeedView(schema, view);
 
+    case "form":
+      return replaceNamesWithIdsInFormView(schema, view);
+
     default:
       return view;
   }
@@ -1124,6 +1174,9 @@ const replaceIdsWithNamesInView = (schema, view) => {
     case "feed":
       return replaceIdsWithNamesInFeedView(schema, view);
 
+    case "form":
+      return replaceIdsWithNamesInFormView(schema, view);
+
     default:
       return view;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -16,14 +16,14 @@
     "babel-jest": "27.5.1",
     "babel-loader": "8.2.5",
     "@fibery/babel-preset": "7.2.0",
-    "@fibery/eslint-config": "7.1.0",
+    "@fibery/eslint-config": "8.1.0",
     "jest": "27.5.1",
     "jest-junit": "13.0.0",
     "microbundle": "0.15.0"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^1.1.4",
-    "@fibery/schema": "^8.0.6",
+    "@fibery/expression-utils": "^1.1.7",
+    "@fibery/schema": "^8.1.0",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"
   },