@builttocreate/engine-utils 1.10.0-rc1 → 1.11.0

package/dist/activityHelper.js

@@ -87,6 +87,7 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
   }
 
   var fieldValues = doc && doc.fields ? doc.fields : null;
+  var fieldSettings = doc && doc.fieldSettings ? doc.fieldSettings : {};
   if (!activities || activities.length < 1 || !templateFieldLookup || !fieldValues) return activities;
   var fieldRowsLookup = {};
   var fieldRowIndexLookup = {};
@@ -94,7 +95,7 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
   activities.forEach(function (activity) {
     var nextActivity = _objectSpread({}, activity);
 
-    if (activity.document && activity.document._id && activity.document.field) {
+    if (activity.document && activity.document.field) {
       var docFieldValue = fieldValues[activity.document.field];
       var templateField = templateFieldLookup[activity.document.field];
       nextActivity.document.title = templateField.title;
@@ -129,7 +130,7 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
 
 
         if (!fieldRowIndexLookup[templateField._id]) {
-          fieldRowIndexLookup[templateField._id] = (0, _tableHelper.getRowIndexLookup)(templateField._id, template.fieldSettings, docFieldValue);
+          fieldRowIndexLookup[templateField._id] = (0, _tableHelper.getRowIndexLookup)(templateField._id, fieldSettings, docFieldValue);
         }
         /**
          * Table Step 3: Add row and rowIndex to the activity.document object for easy reference.
@@ -138,8 +139,10 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
          */
 
 
-        nextActivity.document.value = fieldRowsLookup[activity.document.field][activity.document.row];
-        nextActivity.document.rowIndex = fieldRowIndexLookup[activity.document.field][activity.document.row];
+        if (fieldRowsLookup[activity.document.field] && fieldRowIndexLookup[activity.document.field]) {
+          nextActivity.document.value = fieldRowsLookup[activity.document.field][activity.document.row];
+          nextActivity.document.rowIndex = fieldRowIndexLookup[activity.document.field][activity.document.row];
+        }
       } else if (docFieldValue && templateField.type === _FieldTypes["default"].inputGroup) {
         /**
          * Input Group Step 1: create an easy way to lookup a row with the dropdown cells populated.
@@ -153,7 +156,9 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
          * whole row because input group display components are treated like regular field and not like table rows.
          */
 
-        nextActivity.document.value = fieldRowsLookup[activity.document.field][activity.document.row].cells[activity.document.column];
+        if (fieldRowsLookup[activity.document.field] && fieldRowsLookup[activity.document.field][activity.document.row] && fieldRowsLookup[activity.document.field][activity.document.row].cells[activity.document.column]) {
+          nextActivity.document.value = fieldRowsLookup[activity.document.field][activity.document.row].cells[activity.document.column];
+        }
       } else if (docFieldValue && templateField.type === _FieldTypes["default"].multiSelect) {
         var parsedDocFieldValue = docFieldValue && typeof docFieldValue === 'string' ? docFieldValue.split(',') : docFieldValue;
         var _nextDocFieldValue = '';
@@ -161,7 +166,8 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
         if (parsedDocFieldValue.length > 0) {
           parsedDocFieldValue.forEach(function (item) {
             var option = templateField.optionsLookup[item];
-            _nextDocFieldValue = _nextDocFieldValue.concat(' ', option.value);
+            if (!option) return;
+            _nextDocFieldValue = _nextDocFieldValue.concat(option.value, ', ');
           });
         }
 

package/dist/fieldHelper.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.getTemplateWithLookups = exports.getImportFieldValues = exports.getDefaultFieldValuesFromTemplate = exports.getMultiSelectFieldValue = exports.getChartFieldValue = void 0;
+exports["default"] = exports.getTemplateWithLookups = exports.getImportFieldValues = exports.getDefaultFieldValuesFromTemplate = exports.handleMultiSelectOptionToggle = exports.getMultiSelectFieldValue = exports.getChartFieldValue = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -55,13 +55,44 @@ exports.getChartFieldValue = getChartFieldValue;
 
 var getMultiSelectFieldValue = function getMultiSelectFieldValue(value) {
   if (value && typeof value === 'string') {
-    return value.split(',');
+    return value.replace(/\s/g, '').split(',');
   } else if (value && (0, _typeof2["default"])(value) === 'object') {
     return (0, _toConsumableArray2["default"])(value);
   } else {
     return [];
   }
 };
+/**
+ * Update the selected options.
+ *
+ * @param (Bool) multi
+ * @param (Array) selectedOptions //[optionId, optionId, ...]
+ * @param (String) optionId //Option that is being toggled
+ */
+
+
+exports.getMultiSelectFieldValue = getMultiSelectFieldValue;
+
+var handleMultiSelectOptionToggle = function handleMultiSelectOptionToggle(multi) {
+  var selectedOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var optionId = arguments.length > 2 ? arguments[2] : undefined;
+  var nextSelection = (0, _toConsumableArray2["default"])(selectedOptions);
+  var optionIndex = nextSelection.indexOf(optionId);
+
+  if (optionIndex !== -1) {
+    nextSelection.splice(optionIndex, 1);
+  } else if (multi) {
+    nextSelection.push(optionId);
+  } else {
+    nextSelection = [optionId];
+  }
+
+  if (multi) {
+    return nextSelection;
+  } else {
+    return nextSelection[0] || '';
+  }
+};
 /**
  * Get default field values from template
  *
@@ -70,7 +101,7 @@ var getMultiSelectFieldValue = function getMultiSelectFieldValue(value) {
  */
 
 
-exports.getMultiSelectFieldValue = getMultiSelectFieldValue;
+exports.handleMultiSelectOptionToggle = handleMultiSelectOptionToggle;
 
 var getDefaultFieldValuesFromTemplate = function getDefaultFieldValuesFromTemplate(template, defaultUserId) {
   var fields = {};
@@ -231,6 +262,7 @@ exports.getTemplateWithLookups = getTemplateWithLookups;
 var _default = {
   getChartFieldValue: getChartFieldValue,
   getMultiSelectFieldValue: getMultiSelectFieldValue,
+  handleMultiSelectOptionToggle: handleMultiSelectOptionToggle,
   getDefaultFieldValuesFromTemplate: getDefaultFieldValuesFromTemplate,
   getImportFieldValues: getImportFieldValues,
   getTemplateWithLookups: getTemplateWithLookups

package/dist/tableHelper.js

@@ -15,6 +15,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _shortid = _interopRequireDefault(require("shortid"));
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _hotFormulaParser = require("@builttocreate/hot-formula-parser");
 
 var _Table = _interopRequireWildcard(require("./constants/Table"));
@@ -39,7 +41,7 @@ exports.getTableFieldLookupKey = getTableFieldLookupKey;
 
 var getDefaultRow = function getDefaultRow() {
   return {
-    _id: _shortid["default"].generate(),
+    _id: "".concat(_shortid["default"].generate()).concat((0, _moment["default"])().valueOf()),
     deleted: false,
     cells: {}
   };
@@ -98,6 +100,17 @@ var getFilteredRowOrder = function getFilteredRowOrder(rowOrder, rows, filters)
       return row._id;
     });
   }
+  /**
+   * Remove any duplicate rowIds. We have had instances where
+   * users encounter duplicate rowIds in the rowOrder.
+   * See: https://github.com/zionlabs/Issues/issues/1589
+   */
+
+
+  var cleanedValidRowOrder = [];
+  validRowOrder.forEach(function (rowId) {
+    if (cleanedValidRowOrder.indexOf(rowId) === -1) cleanedValidRowOrder.push(rowId);
+  });
 
   if (filteredColumnIds.length > 0) {
     var matchedRows = {};
@@ -111,11 +124,11 @@ var getFilteredRowOrder = function getFilteredRowOrder(rowOrder, rows, filters)
       });
       if (rowMatched) matchedRows[row._id] = true;
     });
-    return validRowOrder.filter(function (rowId) {
+    return cleanedValidRowOrder.filter(function (rowId) {
       return matchedRows[rowId];
     });
   } else {
-    return validRowOrder;
+    return cleanedValidRowOrder;
   }
 };
 /**
@@ -657,7 +670,7 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
     activity.forEach(function (act) {
       var rowId = act.document.row;
       var columnId = act.document.column;
-      var cellKey = "".concat(field._id, "-").concat(rowId, "-").concat(columnId);
+      var cellKey = "".concat(field._id).concat(rowId).concat(columnId);
       if (!cellActivityLookup[cellKey]) cellActivityLookup[cellKey] = 0;
       cellActivityLookup[cellKey] += 1;
     });
@@ -671,7 +684,7 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
      */
 
     tableReferences.push({
-      uniqueId: "".concat(field._id, "-").concat(row._id),
+      uniqueId: "".concat(field._id).concat(row._id),
       _id: field._id,
       title: field.title,
       type: _Table.inputGroupFieldTypes.inputGroupRowHeader,
@@ -690,7 +703,7 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
       var lastColumnIndex = columnIndex === tableColumns.length - 1;
       var value = row && row.cells ? row.cells[column._id] : '';
       var displayValue = column.type === _FieldTableColumnTypes["default"].dropdown ? columnOptionValueLookup[column._id][value] : value;
-      var cellKey = "".concat(field._id, "-").concat(row._id, "-").concat(column._id);
+      var cellKey = "".concat(field._id).concat(row._id).concat(column._id);
       tableReferences.push({
         uniqueId: cellKey,
         _id: field._id,
@@ -768,7 +781,7 @@ exports.getTableRowLookupWithPopulatedDropdownCells = getTableRowLookupWithPopul
 
 var getInputGroupRowLookupWithPopulatedDropdownCells = function getInputGroupRowLookupWithPopulatedDropdownCells(columns, rows) {
   var rowsLookup = {};
-  var validRows = typeof row === 'string' ? JSON.parse(rows) : rows;
+  var validRows = typeof rows === 'string' ? JSON.parse(rows) : rows;
   validRows.forEach(function (row) {
     var nextRow = _objectSpread(_objectSpread({}, row), {}, {
       cells: _objectSpread({}, row.cells)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "1.10.0-rc1",
+  "version": "1.11.0",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [
@@ -46,6 +46,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
     "@builttocreate/hot-formula-parser": "4.0.1",
+    "moment": "^2.29.1",
     "shortid": "^2.2.16"
   },
   "jest": {