@builttocreate/engine-utils 2.8.0-beta.6 → 2.8.0-beta.9

package/dist/joyDocHelper.js

@@ -161,42 +161,97 @@ var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc)
  * Remove orphaned fields from doc
  */
 
-var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = function removeOrphanedFieldsFromJoydoc(doc) {
-  var nextDoc = _objectSpread({}, doc);
+// export const removeOrphanedFieldsFromJoydoc = (doc) => {
 
-  /**
-  * Logic below removes orphaned fields (ie fields without fieldPositions)
-  */
+//   const nextDoc = { ...doc };
 
-  nextDoc.fields = nextDoc.fields.filter(function (field) {
-    var isOrphanedField = true;
-    nextDoc.files.forEach(function (file) {
-      var _file$views$find;
-      var primaryViewPages = file.pages;
+//   /**
+//   * Logic below removes orphaned fields (ie fields without fieldPositions)
+//   */
 
-      // Check if field is associated with any field positions in primary view pages
-      var isFieldAssociatedWithPrimaryView = primaryViewPages.some(function (page) {
-        return page.fieldPositions.some(function (fieldPosition) {
-          return fieldPosition.field === field._id;
-        });
+//   nextDoc.fields = nextDoc.fields.filter((field) => {
+
+//     let isOrphanedField = true;
+
+//     nextDoc.files.forEach((file) => {
+
+//       const primaryViewPages = file.pages;
+
+//       // Check if field is associated with any field positions in primary view pages
+//       const isFieldAssociatedWithPrimaryView = primaryViewPages.some((page) => {
+//         return page.fieldPositions.some((fieldPosition) => fieldPosition.field === field._id);
+//       });
+
+//       // Check if field is associated with other views
+//       let isFieldAssociatedWithAnotherView;
+
+//       if (file.views && file.views.length > 0) {
+
+//         isFieldAssociatedWithAnotherView = file.views.some((view) => {
+//           return view.pages.some((page) => {
+//             return page.fieldPositions.some((fieldPosition) => fieldPosition.field === field._id);
+//           });
+//         });
+
+//       }
+
+//       if (isFieldAssociatedWithPrimaryView || isFieldAssociatedWithAnotherView) {
+//         isOrphanedField = false;
+//       }
+
+//     });
+
+//     if (!isOrphanedField) return field;
+
+//     return null;
+
+//   });
+
+//   return nextDoc;
+
+// };
+
+var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = function removeOrphanedFieldsFromJoydoc(doc) {
+  var _nextDoc$files;
+  var nextDoc = _objectSpread({}, doc);
+  var associatedFieldIdLookup = {};
+  nextDoc === null || nextDoc === void 0 ? void 0 : (_nextDoc$files = nextDoc.files) === null || _nextDoc$files === void 0 ? void 0 : _nextDoc$files.forEach(function (file) {
+    var _file$views;
+    /**
+     * Primary view
+     */
+    file.pages.forEach(function (page) {
+      page.fieldPositions.forEach(function (fieldPosition) {
+        return associatedFieldIdLookup[fieldPosition.field] = true;
       });
-      var mobileViewPages = file.views.length > 0 ? ((_file$views$find = file.views.find(function (view) {
-        return view.type === _FileViews["default"].mobile;
-      })) === null || _file$views$find === void 0 ? void 0 : _file$views$find.pages) || [] : null;
-
-      // Check if field is associated with any field positions in mobile view pages
-      var isFieldAssociatedWithMobileView = mobileViewPages && mobileViewPages.length > 0 ? mobileViewPages.some(function (page) {
-        return page.fieldPositions.some(function (fieldPosition) {
-          return fieldPosition.field === field._id;
+    });
+
+    /**
+     * Alternative view
+     */
+    (_file$views = file.views) === null || _file$views === void 0 ? void 0 : _file$views.forEach(function (view) {
+      var _view$pages;
+      view === null || view === void 0 ? void 0 : (_view$pages = view.pages) === null || _view$pages === void 0 ? void 0 : _view$pages.forEach(function (page) {
+        page === null || page === void 0 ? void 0 : page.fieldPositions.forEach(function (fieldPosition) {
+          return associatedFieldIdLookup[fieldPosition.field] = true;
         });
-      }) : false;
-      if (isFieldAssociatedWithPrimaryView || isFieldAssociatedWithMobileView) {
-        isOrphanedField = false;
-      }
+      });
     });
-    if (!isOrphanedField) return field;
   });
-  return nextDoc;
+
+  /**
+  * Logic below removes orphaned fields (ie fields without fieldPositions)
+  */
+  var validFields = [];
+  var deletedFields = [];
+  nextDoc.fields.forEach(function (field) {
+    if (associatedFieldIdLookup[field._id]) validFields.push(field);else deletedFields.push(field);
+  });
+  nextDoc.fields = validFields;
+  return {
+    doc: nextDoc,
+    deletedFields: deletedFields
+  };
 };
 
 /**
@@ -588,8 +643,8 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
  * @returns {Object}
  */
 var getMobileViewFromFile = exports.getMobileViewFromFile = function getMobileViewFromFile(file) {
-  var _file$views;
-  var mobileViewIndex = file !== null && file !== void 0 && file.views && (file === null || file === void 0 ? void 0 : (_file$views = file.views) === null || _file$views === void 0 ? void 0 : _file$views.length) > 0 ? file.views.findIndex(function (view) {
+  var _file$views2;
+  var mobileViewIndex = file !== null && file !== void 0 && file.views && (file === null || file === void 0 ? void 0 : (_file$views2 = file.views) === null || _file$views2 === void 0 ? void 0 : _file$views2.length) > 0 ? file.views.findIndex(function (view) {
     return view.type === _FileViews["default"].mobile;
   }) : -1;
   if (mobileViewIndex !== -1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "2.8.0-beta.6",
+  "version": "2.8.0-beta.9",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [