@builttocreate/engine-utils 2.4.0-beta.0.2 → 2.4.0-beta.0.4

package/dist/fieldHelper.js

@@ -286,10 +286,10 @@ var getTemplateWithLookups = function getTemplateWithLookups(template) {
   return nextTemplate;
 };
 /**
- * This method checks if the field passed via input is empty by checking 
+ * This method checks if the field passed via input is empty by checking
  * the field.value.
- * @param {*} fieldProps 
- * @returns 
+ * @param {*} fieldProps
+ * @returns
  */
 
 
@@ -299,9 +299,9 @@ var isFieldEmpty = function isFieldEmpty(fieldType, fieldValue, fieldOptions, fi
   var isEmpty = false;
   if (fieldType === _FieldTypes["default"].block) return;
 
-  if (fieldType === _FieldTypes["default"].text && (!fieldValue || fieldValue && fieldValue.replace(/\s+/g, '').length == 0)) {
+  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)) {
+  } 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;
@@ -309,9 +309,9 @@ var isFieldEmpty = function isFieldEmpty(fieldType, fieldValue, fieldOptions, fi
     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))) {
+  } else if (fieldType === _FieldTypes["default"].dropdown && (fieldDisplayType === _FieldDisplayTypes["default"].original || fieldDisplayType !== fieldDisplayType.original) && (!fieldValue || fieldValue && fieldOptions.length > 0 && isTargetOptionDeleted(fieldValue, fieldOptions))) {
     isEmpty = true;
-  } else if (fieldType === _FieldTypes["default"].multiSelect && (!fieldValue || fieldValue && fieldOptions.length > 0 && isTargetOptionDeleted(fieldValue, fieldOptions))) {
+  } else if (fieldType === _FieldTypes["default"].multiSelect && (fieldDisplayType === _FieldDisplayTypes["default"].original || fieldDisplayType !== fieldDisplayType.original) && (!fieldValue || fieldValue && fieldOptions.length > 0 && isTargetOptionDeleted(fieldValue, fieldOptions))) {
     isEmpty = true;
   } else if (fieldType === _FieldTypes["default"].image && (!fieldValue || fieldValue && fieldValue.length === 0)) {
     isEmpty = true;
@@ -321,11 +321,9 @@ var isFieldEmpty = function isFieldEmpty(fieldType, fieldValue, fieldOptions, fi
     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))) {
+  } else if (fieldType === _FieldTypes["default"].table && (fieldDisplayType === _FieldDisplayTypes["default"].text || 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)) {
+  } 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;
@@ -335,25 +333,31 @@ var isFieldEmpty = function isFieldEmpty(fieldType, fieldValue, fieldOptions, fi
 };
 /**
  * This function checks whether an option associated with multiselect or dropdown
- * field is deleted. 
- * @param {*} value // value 
- * @param {*} options 
+ * field is deleted.
+ * @param {*} value // value
+ * @param {*} options
  */
 
 
 exports.isFieldEmpty = isFieldEmpty;
 
 var isTargetOptionDeleted = function isTargetOptionDeleted(value, options) {
+  /***
+   * We are converting the value that is passed in to array since
+   * this method is used by dropdown field and multiSelect field
+   * Dropdown passes the value as a string  whereas mutliselect passes
+   * the value as an array
+   */
   var nextValue = Array.isArray(value) ? value : [value];
   if (!nextValue || nextValue.length === 0) return true;
   var optionsLookup = {};
   options.forEach(function (option) {
     optionsLookup[option._id] = option;
   });
-  var undeletedOptions = value.filter(function (item) {
+  var undeletedOptions = nextValue.filter(function (item) {
     return optionsLookup[item] && !optionsLookup[item].deleted;
   });
-  var result = undeletedOptions.length > 0 ? false : true;
+  var result = !(undeletedOptions.length > 0);
   return result;
 };
 

package/package.json

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