@fibery/views 1.1.9 → 1.1.10

package/lib/views.js

@@ -627,11 +627,14 @@ const replaceNamesWithIdsInFormView = (schema, view) => {
   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);
+    if (!(typeObject != null && typeObject.fieldObjectsByName.hasOwnProperty(field.id))) {
+      return field;
+    }
+
+    return _extends({}, field, {
+      id: typeObject.fieldObjectsByName[field.id].id
+    });
+  });
   return _extends({}, view, {
     "fibery/meta": _extends({}, view["fibery/meta"], {
       typeId: typeObject ? typeObject.id : typeId,
@@ -646,11 +649,14 @@ const replaceIdsWithNamesInFormView = (schema, view) => {
   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);
+    if (!(typeObject != null && typeObject.fieldObjectsById.hasOwnProperty(field.id))) {
+      return field;
+    }
+
+    return _extends({}, field, {
+      id: typeObject.fieldObjectsById[field.id].name
+    });
+  });
   return _extends({}, view, {
     "fibery/meta": _extends({}, view["fibery/meta"], {
       typeId: typeObject ? typeObject.name : typeId,
@@ -658,6 +664,21 @@ const replaceIdsWithNamesInFormView = (schema, view) => {
     })
   });
 };
+const deleteExpressionWithNotFoundFieldsOrTypesInFormView = (schema, view) => {
+  var _view$fiberyMeta5, _view$fiberyMeta6;
+
+  // we expect view in names terms here.
+  const typeName = (_view$fiberyMeta5 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta5.typeId;
+  const typeObject = schema.typeObjectsByName.hasOwnProperty(typeName) ? schema.typeObjectsByName[typeName] : null;
+  const fields = (_view$fiberyMeta6 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta6.fields;
+  const existingFields = fields && fields.filter(field => typeObject == null ? void 0 : typeObject.fieldObjectsByName.hasOwnProperty(field.id));
+  return _extends({}, view, {
+    "fibery/meta": _extends({}, view["fibery/meta"], {
+      typeId: typeObject ? typeObject.name : typeName,
+      fields: existingFields || fields
+    })
+  });
+};
 
 const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["default"](smartFolder, {
   "fibery/meta": {
@@ -1056,6 +1077,9 @@ const deleteExpressionWithNotFoundFieldsOrTypesInView = (schema, view, ensureAxi
     case "feed":
       return deleteExpressionWithNotFoundFieldsOrTypesInFeedView(schema, view);
 
+    case "form":
+      return deleteExpressionWithNotFoundFieldsOrTypesInFormView(schema, view);
+
     default:
       return view;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",