@builttocreate/engine-utils 2.11.0-beta.1629.0 → 2.11.0-beta.1629.2

package/dist/joyDocHelper.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sortPages = exports.sortFieldPositionsByXAndYCoordinates = exports.removeOrphanedFieldsFromJoydoc = exports.mergeAssoicatedFieldPositionsForMobilePage = exports.getPageOrder = exports.getMobileViewFromFile = exports.getDocumentFromTemplate = exports.getDefaultTemplate = exports.getDefaultJoyDocPage = exports.getDefaultJoyDocFile = exports.getDefaultJoyDoc = exports.getDefaultDocument = exports.getCleanedJoyDocPages = exports.getCleanedJoyDoc = exports.generateMobileViewFromFile = exports.generateMobilePageFieldPositions = exports.generateMobilePage = exports.formatTableFieldPositions = exports.duplicateDocumentPage = exports.duplicate = exports["default"] = exports.cleanPageOrder = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _generateObjectId = _interopRequireDefault(require("./generateObjectId"));
 var _validateObjectId = _interopRequireDefault(require("./validateObjectId"));
@@ -20,6 +21,7 @@ var _FileViews = _interopRequireDefault(require("./constants/FileViews"));
 var _FormStyleOptions = _interopRequireDefault(require("./constants/FormStyleOptions"));
 var _tableHelper = require("./tableHelper");
 var _validateReadableId = _interopRequireDefault(require("./validateReadableId"));
+var _excluded = ["useReadableIds"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -454,6 +456,10 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
   var _nextDoc$fields;
   var pageDefaults = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   console.log('duplicateDocumentPage', doc, fileId, pageId, pageDefaults);
+
+  // Extract useReadableIds from pageDefaults to prevent it from being stored in page objects
+  var useReadableIds = pageDefaults.useReadableIds,
+    cleanPageDefaults = (0, _objectWithoutProperties2["default"])(pageDefaults, _excluded);
   var changelogInfo = {
     primaryPages: {
       targetIndex: 0,
@@ -518,12 +524,13 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
 
     // Generate readable ID using current fields plus already duplicated fields
     var allFields = [].concat((0, _toConsumableArray2["default"])(nextDoc.fields), (0, _toConsumableArray2["default"])(duplicatedFields));
+    var readableId = useReadableIds ? (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) : (0, _generateObjectId["default"])();
     var duplicateField = _objectSpread(_objectSpread({}, field), {}, {
-      _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)
+      _id: readableId
     });
     // Remove formulas property when duplicating
     delete duplicateField.formulas;
@@ -596,7 +603,7 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
   var newPrimaryPage = primaryPageIndex === -1 ? null : _objectSpread(_objectSpread({}, nextDoc.files[fileIndex].pages[primaryPageIndex]), {}, {
     _id: newPageId,
     fieldPositions: []
-  }, pageDefaults);
+  }, cleanPageDefaults);
   nextDoc.files[fileIndex].pages[primaryPageIndex].fieldPositions.forEach(function (fieldPosition) {
     var newField = newFieldsLookupByOldId[fieldPosition.field];
     newPrimaryPage.fieldPositions.push(_objectSpread(_objectSpread({}, fieldPosition), {}, {
@@ -641,7 +648,7 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
       var newViewPage = _objectSpread(_objectSpread({}, nextView.pages[viewPageIndex]), {}, {
         _id: newPageId,
         fieldPositions: []
-      }, pageDefaults);
+      }, cleanPageDefaults);
       nextView.pages[viewPageIndex].fieldPositions.forEach(function (fieldPosition) {
         var newField = newFieldsLookupByOldId[fieldPosition.field];
         newViewPage.fieldPositions.push(_objectSpread(_objectSpread({}, fieldPosition), {}, {

package/package.json

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