@builttocreate/engine-utils 2.11.0-beta.1 → 2.11.0-beta.3

package/dist/joyDocHelper.js

@@ -270,7 +270,7 @@ var getCleanedJoyDocPages = exports.getCleanedJoyDocPages = function getCleanedJ
       * Step 1: Replace pages[x]._id if it is not valid (always use objectId for pages)
       */
       var nextPage = _objectSpread({}, page);
-      if (nextPage._id && !(0, _validateObjectId["default"])(nextPage._id)) nextPage._id = (0, _generateObjectId["default"])();
+      if (nextPage._id && !(0, _validateObjectId["default"])(nextPage._id) && !(0, _validateReadableId["default"])(nextPage._id)) nextPage._id = (0, _generateObjectId["default"])();
       if (nextPage.fieldPositions && nextPage.fieldPositions.length > 0) {
         nextPage.fieldPositions = nextPage.fieldPositions.map(function (fieldPosition) {
           /**
@@ -280,7 +280,7 @@ var getCleanedJoyDocPages = exports.getCleanedJoyDocPages = function getCleanedJ
           var nextFieldPosition = _objectSpread({}, fieldPosition);
 
           // Clean fieldPosition _id
-          nextFieldPosition._id = nextFieldPosition._id && (0, _validateObjectId["default"])(nextFieldPosition._id) ? nextFieldPosition._id : (0, _generateObjectId["default"])();
+          nextFieldPosition._id = nextFieldPosition._id && ((0, _validateObjectId["default"])(nextFieldPosition._id) || (0, _validateReadableId["default"])(nextFieldPosition._id)) ? nextFieldPosition._id : (0, _generateObjectId["default"])();
 
           // Clean fieldPosition.field reference
           nextFieldPosition.field = getFieldId(nextFieldPosition.field, fieldPosition.type, doc);
@@ -452,7 +452,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 +484,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 +495,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.1",
+  "version": "2.11.0-beta.3",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [