@builttocreate/engine-utils 2.11.0-beta.2 → 2.11.0-beta.4

package/dist/joyDocHelper.js

@@ -212,12 +212,27 @@ var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = fu
   var nextDoc = _objectSpread({}, doc);
   var associatedFieldIdLookup = {};
   nextDoc === null || nextDoc === void 0 || (_nextDoc$files = nextDoc.files) === null || _nextDoc$files === void 0 || _nextDoc$files.forEach(function (file) {
-    var _file$views;
+    var _file$header, _file$footer, _file$pages, _file$views;
+    /**
+     * Header 
+     */
+    if (file.header) (_file$header = file.header) === null || _file$header === void 0 || (_file$header = _file$header.fieldPositions) === null || _file$header === void 0 || _file$header.forEach(function (fieldPosition) {
+      return associatedFieldIdLookup[fieldPosition.field] = true;
+    });
+
+    /**
+     * Footer
+     */
+    if (file.footer) (_file$footer = file.footer) === null || _file$footer === void 0 || (_file$footer = _file$footer.fieldPositions) === null || _file$footer === void 0 || _file$footer.forEach(function (fieldPosition) {
+      return associatedFieldIdLookup[fieldPosition.field] = true;
+    });
+
     /**
      * Primary view
      */
-    file.pages.forEach(function (page) {
-      page === null || page === void 0 || page.fieldPositions.forEach(function (fieldPosition) {
+    (_file$pages = file.pages) === null || _file$pages === void 0 || _file$pages.forEach(function (page) {
+      var _page$fieldPositions;
+      page === null || page === void 0 || (_page$fieldPositions = page.fieldPositions) === null || _page$fieldPositions === void 0 || _page$fieldPositions.forEach(function (fieldPosition) {
         return associatedFieldIdLookup[fieldPosition.field] = true;
       });
     });
@@ -228,7 +243,8 @@ var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = fu
     (_file$views = file.views) === null || _file$views === void 0 || _file$views.forEach(function (view) {
       var _view$pages;
       view === null || view === void 0 || (_view$pages = view.pages) === null || _view$pages === void 0 || _view$pages.forEach(function (page) {
-        page === null || page === void 0 || page.fieldPositions.forEach(function (fieldPosition) {
+        var _page$fieldPositions2;
+        page === null || page === void 0 || (_page$fieldPositions2 = page.fieldPositions) === null || _page$fieldPositions2 === void 0 || _page$fieldPositions2.forEach(function (fieldPosition) {
           return associatedFieldIdLookup[fieldPosition.field] = true;
         });
       });
@@ -452,7 +468,7 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
   var newPageId = (0, _generateObjectId["default"])();
   var fieldLookup = {};
   (_nextDoc$fields = nextDoc.fields) === null || _nextDoc$fields === void 0 || _nextDoc$fields.forEach(function (field) {
-    if (field.file === fileId) fieldLookup[field._id] = field;
+    fieldLookup[field._id] = field;
   });
 
   /**
@@ -484,6 +500,7 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
   var newFieldsLookupByOldId = {};
   var duplicatedFields = [];
   fieldIdsToDuplicate.forEach(function (fieldId) {
+    var _nextDoc$files$fileIn, _nextDoc$files$fileIn2;
     /**
      * Why do we check if a new field has already been created?
      *
@@ -494,9 +511,21 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
      */
     if (newFieldsLookupByOldId[fieldId]) return;
     var field = fieldLookup[fieldId];
+
+    // Skip if field not found in lookup
+    if (!field) return;
+
+    // Generate readable ID using current fields plus already duplicated fields
+    var allFields = [].concat((0, _toConsumableArray2["default"])(nextDoc.fields), (0, _toConsumableArray2["default"])(duplicatedFields));
     var duplicateField = _objectSpread(_objectSpread({}, field), {}, {
-      _id: (0, _generateObjectId["default"])()
+      _id: (0, _generateReadableId.generateReadableId)({
+        fields: allFields,
+        pages: (_nextDoc$files$fileIn = nextDoc.files[fileIndex]) === null || _nextDoc$files$fileIn === void 0 ? void 0 : _nextDoc$files$fileIn.pages,
+        views: (_nextDoc$files$fileIn2 = nextDoc.files[fileIndex]) === null || _nextDoc$files$fileIn2 === void 0 ? void 0 : _nextDoc$files$fileIn2.views
+      }, field.type)
     });
+    // Remove formulas property when duplicating
+    delete duplicateField.formulas;
     duplicatedFields.push(duplicateField);
 
     /**

package/package.json

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