@builttocreate/engine-utils 2.3.2 → 2.4.0-beta.0.1

package/dist/constants/FieldTypes.js

@@ -7,7 +7,8 @@ exports["default"] = void 0;
 // Display Fields
 var uniqueId = 'uniqueId';
 var image = 'image';
-var richText = 'richText'; // Data Fields
+var richText = 'richText';
+var block = 'block'; // Data Fields
 
 var text = 'text';
 var textarea = 'textarea';
@@ -25,6 +26,7 @@ var chart = 'chart';
 var types = {
   uniqueId: uniqueId,
   image: image,
+  block: block,
   richText: richText,
   text: text,
   textarea: textarea,
@@ -44,6 +46,7 @@ types.all = Object.keys(types);
 types.titles = {
   uniqueId: 'Auto Number',
   image: 'Image',
+  block: 'Display Text',
   richText: 'Rich Text',
   text: 'Short Text',
   textarea: 'Long Text',

package/dist/fieldHelper.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handleMultiSelectOptionToggle = exports.getTemplateWithLookups = exports.getMultiSelectFieldValue = exports.getImportFieldValues = exports.getDefaultOption = exports.getDefaultFieldValuesFromTemplate = exports.getChartFieldValue = exports["default"] = void 0;
+exports.isTargetOptionDeleted = exports.isFieldEmpty = exports.handleMultiSelectOptionToggle = exports.getTemplateWithLookups = exports.getMultiSelectFieldValue = exports.getImportFieldValues = exports.getDefaultOption = exports.getDefaultFieldValuesFromTemplate = exports.getChartFieldValue = exports["default"] = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
@@ -13,14 +13,18 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _FieldTypes = _interopRequireDefault(require("./constants/FieldTypes"));
-
 var _chartHelper = require("./chartHelper");
 
 var _tableHelper = require("./tableHelper");
 
 var _generateObjectId = _interopRequireDefault(require("./generateObjectId"));
 
+var _FieldTypes = _interopRequireDefault(require("./constants/FieldTypes"));
+
+var _FieldDisplayTypes = _interopRequireDefault(require("./constants/FieldDisplayTypes"));
+
+var _FieldTableColumnTypes = _interopRequireDefault(require("./constants/FieldTableColumnTypes"));
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -281,8 +285,76 @@ var getTemplateWithLookups = function getTemplateWithLookups(template) {
   });
   return nextTemplate;
 };
+/**
+ * This method checks if the field passed via input is empty by checking 
+ * the field.value.
+ * @param {*} fieldProps 
+ * @returns 
+ */
+
 
 exports.getTemplateWithLookups = getTemplateWithLookups;
+
+var isFieldEmpty = function isFieldEmpty(fieldType, fieldValue, fieldOptions, fieldDisplayType, fieldColumnType) {
+  var isEmpty = false;
+  if (fieldType === _FieldTypes["default"].block) return;
+
+  if (fieldType === _FieldTypes["default"].text && (!fieldValue || fieldValue && fieldValue.replace(/\s+/g, '').length == 0)) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].textarea && (!fieldValue || fieldValue && fieldValue.replace(/\s+/g, '').length == 0)) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].number && !fieldValue) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].date && !fieldValue) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].signature && !fieldValue) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].dropdown && (!fieldValue || fieldValue && fieldOptions.length > 0 && isTargetOptionDeleted(fieldValue, fieldOptions))) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].multiSelect && (!fieldValue || fieldValue && fieldOptions.length > 0 && isTargetOptionDeleted(fieldValue, fieldOptions))) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].image && (!fieldValue || fieldValue && fieldValue.length === 0)) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].chart && (!fieldValue || fieldValue && fieldValue.length === 0)) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].table && fieldDisplayType === _FieldDisplayTypes["default"].original && (!fieldValue || fieldValue && fieldValue.filter(function (item) {
+    return !item.deleted;
+  }).length === 0)) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].table && fieldDisplayType === _FieldDisplayTypes["default"].text && fieldColumnType === _FieldTableColumnTypes["default"].dropdown && (!fieldValue || fieldValue && fieldOptions.length > 0 && isTargetOptionDeleted(fieldValue, fieldOptions))) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].table && fieldDisplayType !== _FieldDisplayTypes["default"].text && fieldColumnType === _FieldTableColumnTypes["default"].dropdown && (!fieldValue || fieldValue && fieldOptions.length > 0 && isTargetOptionDeleted(fieldValue, fieldOptions))) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].table && fieldDisplayType === _FieldDisplayTypes["default"].text && fieldColumnType === _FieldTableColumnTypes["default"].text && (!fieldValue || fieldValue && fieldValue.replace(/\s+/g, '').length == 0)) {
+    isEmpty = true;
+  } else if (fieldType === _FieldTypes["default"].table && fieldDisplayType === _FieldDisplayTypes["default"].text && fieldColumnType === _FieldTableColumnTypes["default"].image && (!fieldValue || fieldValue && fieldValue.length === 0)) {
+    isEmpty = true;
+  }
+
+  return isEmpty;
+};
+/**
+ * This function checks whether an option associated with multiselect or dropdown
+ * field is deleted. 
+ * @param {*} value // value 
+ * @param {*} options 
+ */
+
+
+exports.isFieldEmpty = isFieldEmpty;
+
+var isTargetOptionDeleted = function isTargetOptionDeleted(value, options) {
+  //Dropdown field has value as a string whereas multiselect has value as an array
+  var nextValue = value && typeof value === 'string' ? value : value[0]; //If user unchecks an option in mutliselect value will be undefiend
+
+  if (!nextValue) return true;
+  var targetOption = options.find(function (option) {
+    return option._id === nextValue;
+  });
+  return targetOption ? targetOption.deleted : true;
+};
+
+exports.isTargetOptionDeleted = isTargetOptionDeleted;
 var _default = {
   getDefaultOption: getDefaultOption,
   getChartFieldValue: getChartFieldValue,
@@ -290,6 +362,8 @@ var _default = {
   handleMultiSelectOptionToggle: handleMultiSelectOptionToggle,
   getDefaultFieldValuesFromTemplate: getDefaultFieldValuesFromTemplate,
   getImportFieldValues: getImportFieldValues,
-  getTemplateWithLookups: getTemplateWithLookups
+  getTemplateWithLookups: getTemplateWithLookups,
+  isFieldEmpty: isFieldEmpty,
+  isTargetOptionDeleted: isTargetOptionDeleted
 };
 exports["default"] = _default;

package/dist/joyDocHelper.js

@@ -393,38 +393,104 @@ var duplicateDocumentPage = function duplicateDocumentPage(doc, fileId, pageId)
   (_nextDoc$fields = nextDoc.fields) === null || _nextDoc$fields === void 0 ? void 0 : _nextDoc$fields.forEach(function (field) {
     if (field.file === fileId) fieldLookup[field._id] = field;
   });
-  var newFieldsLookupByOldId = {};
+  /**
+   * Step 1: Duplicate fields associated with target page
+   */
+
+  var fieldIdsToDuplicate = []; //Step 1.1 Get all field Ids from primary page
+
+  var targetPageIndex = nextDoc.files[fileIndex].pages.findIndex(function (page) {
+    return page._id === pageId;
+  });
+  if (targetPageIndex !== -1) nextDoc.files[fileIndex].pages[targetPageIndex].fieldPositions.forEach(function (fieldPosition) {
+    return fieldIdsToDuplicate.push(fieldPosition.field);
+  }); //Step 1.2 Get all field Ids from view page
+
+  if (nextDoc.files[fileIndex].views && nextDoc.files[fileIndex].views.length > 0) {
+    nextDoc.files[fileIndex].views.forEach(function (view) {
+      var viewPageIndex = view.pages.findIndex(function (page) {
+        return page._id === pageId;
+      });
 
-  var duplicateFieldForFieldPosition = function duplicateFieldForFieldPosition(field) {
+      if (viewPageIndex !== -1) {
+        view.pages[viewPageIndex].fieldPositions.forEach(function (fieldPosition) {
+          if (fieldIdsToDuplicate.indexOf(fieldPosition.field) === -1) fieldIdsToDuplicate.push(fieldPosition.field);
+        });
+      }
+    });
+  }
+
+  var newFieldsLookupByOldId = {};
+  var duplicatedFields = [];
+  fieldIdsToDuplicate.forEach(function (fieldId) {
     /**
      * Why do we check if a new field has already been created?
      *
      * That is because multiple field positions can be associated with the same
      * field. If a field has already been created by a previous field position
-     * that is linked to the same field as the current target then just return
-     * the existing newly created field.
+     * that is linked to the same field as the current target then do not create
+     * again.
      */
-    if (newFieldsLookupByOldId[field._id]) return newFieldsLookupByOldId[field._id];
+    if (newFieldsLookupByOldId[fieldId]) return;
+    var field = fieldLookup[fieldId];
 
     var duplicateField = _objectSpread(_objectSpread({}, field), {}, {
       _id: (0, _generateObjectId["default"])()
     });
 
-    nextDoc.fields.push(duplicateField);
-    changelogInfo.fields.push(duplicateField);
+    duplicatedFields.push(duplicateField);
     /**
      * Add to lookup so it can be used with other associated field positions
      */
 
     newFieldsLookupByOldId[field._id] = duplicateField;
-    return duplicateField;
-  };
+  });
   /**
-   * Step 1: Update Primary View Page Order
+   * Step 2: Update newly duplicated fields logic properties
    *
-   * IMPORTANT NOTE: Page order update must go before page object creation.
+   * This step can only be done after all fields have been properly duplicated.
+   *
+   * We only need to update logic conditions that referenced the target page
+   * that we are duplicating. We do this by checking the logic.condition[x].page
+   * property of the condition.
    */
 
+  duplicatedFields = duplicatedFields.map(function (duplicatedField) {
+    if (!duplicatedField.logic || !duplicatedField.logic.conditions || duplicatedField.logic.conditions.length < 1) return duplicatedField;
+
+    var nextField = _objectSpread(_objectSpread({}, duplicatedField), {}, {
+      logic: _objectSpread({}, duplicatedField.logic)
+    });
+
+    nextField.logic.conditions = nextField.logic.conditions.map(function (condition) {
+      /**
+       * 1. Only update conditions associated with the current page being duplicated.
+       * 2. Only update conditions associated with a field that was duplicated.
+       */
+      if (condition.page === pageId && newFieldsLookupByOldId[condition.field]) {
+        return _objectSpread(_objectSpread({}, condition), {}, {
+          page: newPageId,
+          field: newFieldsLookupByOldId[condition.field]._id
+        });
+      } else {
+        return condition;
+      }
+    });
+    return nextField;
+  });
+  /**
+   * Step 3: Add newly duplicated fields changelogs and update doucment
+   */
+
+  duplicatedFields.forEach(function (duplicateField) {
+    changelogInfo.fields.push(duplicateField);
+    nextDoc.fields.push(duplicateField);
+  });
+  /**
+   * Step 4: Update Primary View Page Order
+   *
+   * IMPORTANT NOTE: Page order update must go before page object creation.
+   */
 
   var pageOrder = getPageOrder(nextDoc.files[fileIndex].pageOrder, nextDoc.files[fileIndex].pages);
   var primaryPageOrderIndex = pageOrder.findIndex(function (id) {
@@ -434,7 +500,7 @@ var duplicateDocumentPage = function duplicateDocumentPage(doc, fileId, pageId)
   nextDoc.files[fileIndex].pageOrder = pageOrder;
   nextDoc.files[fileIndex].pageOrder.splice(primaryPageOrderTargetIndex, 0, newPageId);
   /**
-   * Step 2: Generate Primary View Page
+   * Step 5: Generate Primary View Page
    */
 
   var primaryPageIndex = nextDoc.files[fileIndex].pages.findIndex(function (page) {
@@ -445,20 +511,20 @@ var duplicateDocumentPage = function duplicateDocumentPage(doc, fileId, pageId)
     fieldPositions: []
   }, pageDefaults);
   nextDoc.files[fileIndex].pages[primaryPageIndex].fieldPositions.forEach(function (fieldPosition) {
-    var newField = duplicateFieldForFieldPosition(fieldLookup[fieldPosition.field]);
+    var newField = newFieldsLookupByOldId[fieldPosition.field];
     newPrimaryPage.fieldPositions.push(_objectSpread(_objectSpread({}, fieldPosition), {}, {
       field: newField._id
     }));
   });
   nextDoc.files[fileIndex].pages.splice(primaryPageIndex + 1, 0, newPrimaryPage);
   /**
-   * Step 3: Update Primary Page Changelog
+   * Step 6: Update Primary Page Changelog
    */
 
   changelogInfo.primaryPages.targetIndex = primaryPageOrderTargetIndex;
   changelogInfo.primaryPages.page = newPrimaryPage;
   /**
-   * Step 4: Update Views
+   * Step 7: Update Views
    */
 
   if (nextDoc.files[fileIndex].views && nextDoc.files[fileIndex].views.length > 0) {
@@ -470,7 +536,7 @@ var duplicateDocumentPage = function duplicateDocumentPage(doc, fileId, pageId)
       });
       if (viewPageIndex === -1) return view;
       /**
-       * Step 4.1 Update View Page Order.
+       * Step 7.1 Update View Page Order.
        *
        * IMPORTANT NOTE: Page order update must go before page object creation.
        */
@@ -483,7 +549,7 @@ var duplicateDocumentPage = function duplicateDocumentPage(doc, fileId, pageId)
       nextView.pageOrder = nextViewPageOrder;
       nextView.pageOrder.splice(nextViewTargetPageOrderIndex, 0, newPageId);
       /**
-       * Step 4.2 Update View Pages
+       * Step 7.2 Update View Pages
        */
 
       var newViewPage = _objectSpread(_objectSpread({}, nextView.pages[viewPageIndex]), {}, {
@@ -492,14 +558,14 @@ var duplicateDocumentPage = function duplicateDocumentPage(doc, fileId, pageId)
       }, pageDefaults);
 
       nextView.pages[viewPageIndex].fieldPositions.forEach(function (fieldPosition) {
-        var newField = duplicateFieldForFieldPosition(fieldLookup[fieldPosition.field]);
+        var newField = newFieldsLookupByOldId[fieldPosition.field];
         newViewPage.fieldPositions.push(_objectSpread(_objectSpread({}, fieldPosition), {}, {
           field: newField._id
         }));
       });
       nextView.pages.splice(viewPageIndex + 1, 0, newViewPage);
       /**
-       * Step 4.3 Add View Page Changelog Info
+       * Step 7.3 Add View Page Changelog Info
        */
 
       changelogInfo.viewPages.push({

package/package.json

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