@builttocreate/engine-utils 1.8.1-rc.1.2.9 → 1.8.1-rc.1.3.0

package/dist/activityHelper.js

@@ -99,7 +99,6 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
     if (activity.document && activity.document._id && activity.document.field) {
       var docFieldValue = fieldValues[activity.document.field];
       var templateField = templateFieldLookup[activity.document.field];
-      var templateFieldColumn = templateField.tableColumnsLookup[activity.document.column];
       nextActivity.document.title = templateField.title;
       nextActivity.document.type = templateField.type;
       nextActivity.document.columns = templateField.tableColumns;
@@ -117,9 +116,9 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
          * Added as a fix for table bug that did not display proper output for formula cells
          *  as rowIndex was messy
          */
-        var nextDocFieldValue = docFieldValue.filter(function (item) {
-          return !item.deleted;
-        });
+        console.log('tableDoc field value', docFieldValue);
+        var nextDocFieldValue = (0, _tableHelper.getRows)(docFieldValue);
+        console.log('nextDocFiedlValues', nextDocFieldValue);
 
         if (!fieldRowsLookup[templateField._id]) {
           fieldRowsLookup[templateField._id] = (0, _tableHelper.getTableRowLookupWithPopulatedDropdownCells)(templateField.tableColumns, nextDocFieldValue);
@@ -159,7 +158,7 @@ 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[templateFieldColumn._id];
+        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 = '';
@@ -169,10 +168,9 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
             var option = templateField.optionsLookup[item];
             _nextDocFieldValue = _nextDocFieldValue.concat(' ', option.value);
           });
-          nextActivity.document.value = _nextDocFieldValue;
-        } else {
-          nextActivity.document.value = 'No Option Selected';
         }
+
+        nextActivity.document.value = _nextDocFieldValue;
       } //This should handle adding the display value for selection and regular input fields
       else {
           var option = templateField.optionsLookup[docFieldValue];

package/dist/fieldHelper.js

@@ -182,6 +182,28 @@ var getImportFieldValues = function getImportFieldValues(template, importSource,
  * @param {} template 
  * @returns 
  */
+// export const getTemplateWithLookups = (template) => {
+//   const nextTemplate = { ...template };
+//   nextTemplate.fields = template.fields.map((field) => {
+//     const nextField = { ...field };
+//     nextField.optionsLookup = {};
+//     if (nextField.options) {
+//       nextField.options.forEach((option) => nextField.optionsLookup[option._id] = option);
+//     }
+//     if (nextField.tableColumns) {
+//       nextField.tableColumnsLookup = {};
+//       nextField.tableColumns.forEach((column, index) => {
+//         const nextColumn = { ...column, optionsLookup: {} }
+//         if (nextColumn.options) {
+//           nextColumn.options.forEach((option) => nextColumn.optionsLookup[option._id] = option);
+//         }
+//         nextField.tableColumns[index] = nextColumn
+//       });
+//     }
+//     return nextField;
+//   });
+//   return nextTemplate;
+// }
 
 
 exports.getImportFieldValues = getImportFieldValues;
@@ -189,7 +211,9 @@ exports.getImportFieldValues = getImportFieldValues;
 var getTemplateWithLookups = function getTemplateWithLookups(template) {
   var nextTemplate = _objectSpread({}, template);
 
-  nextTemplate.fields = template.fields.map(function (field) {
+  nextTemplate.fields = [];
+  nextTemplate.fieldLookup = {};
+  template.fields.forEach(function (field) {
     var nextField = _objectSpread({}, field);
 
     nextField.optionsLookup = {};
@@ -212,30 +236,15 @@ var getTemplateWithLookups = function getTemplateWithLookups(template) {
             return nextColumn.optionsLookup[option._id] = option;
           });
         }
-        /** -------------Remove this comment before merge-------------------------------
-         * What do we do here
-         *  We are adding optionsLookup to the template.tableColumns to fetch the dropdown cell values inside
-         *  getRowlookupWithPopulatedDropdownCells
-         * 
-         * Why can't we use the tableColumnsLookup object that gets added to the template?
-         * We can use it but i will have map through table columns and add the optionsLookup
-         * to them within activity helper. Without options lookup we will not be able to fetch
-         * dropdown cell values 
-         * 
-         * * TableHelper logic to fetch values of drodpown cells
-            if (optionId && column.type === FieldTableColumnTypes.dropdown) {
-               nextRow.cells[column._id] = column.optionsLookup[optionId] ? column.optionsLookup[optionId].value : optionId;
-             }
-         */
-        // column.optionsLookup = nextColumn.optionsLookup;
-
-
-        nextField.tableColumns[index] = nextColumn; // nextField.tableColumnsLookup[nextColumn._id] = nextColumn;
+
+        nextField.tableColumns[index] = nextColumn;
       });
     }
 
-    return nextField;
+    nextTemplate.fields.push(nextField);
+    nextTemplate.fieldLookup[nextField._id] = nextField;
   });
+  console.log('nextTemplate', nextTemplate);
   return nextTemplate;
 };
 

package/dist/tableHelper.js

@@ -731,7 +731,7 @@ exports.generateInputGroupFields = generateInputGroupFields;
 var getTableRowLookupWithPopulatedDropdownCells = function getTableRowLookupWithPopulatedDropdownCells(columns, rows) {
   var rowsLookup = {};
   var tableLookup = generateTableLookup(rows, columns);
-  var validRows = typeof row === 'string' ? JSON.parse(rows) : rows; //Removing deleted columns so column operand doesn't look messy
+  var validRows = getRows(rows); //Removing deleted columns so column operand doesn't look messy
 
   var validColumns = columns.filter(function (column) {
     return !column.deleted;
@@ -742,19 +742,34 @@ var getTableRowLookupWithPopulatedDropdownCells = function getTableRowLookupWith
     });
 
     validColumns.forEach(function (column, i) {
-      var optionId = nextRow.cells[column._id];
+      var columnOperand = getColumnOperand(i);
+      var cellOperand = getCellOperand(columnOperand, rowIndex + 1);
+      var value = tableLookup[cellOperand];
 
-      if (optionId && optionId.charAt(0) === '=' && column.type === _FieldTableColumnTypes["default"].text) {
-        var columnOperand = getColumnOperand(i);
-        var cellOperand = getCellOperand(columnOperand, rowIndex + 1);
-        nextRow.cells[column._id] = tableLookup[cellOperand];
-      } else if (optionId && column.type === _FieldTableColumnTypes["default"].dropdown) {
-        nextRow.cells[column._id] = column.optionsLookup[optionId] ? column.optionsLookup[optionId].value : optionId;
+      if (value && column.type === _FieldTableColumnTypes["default"].dropdown) {
+        nextRow.cells[column._id] = column.optionsLookup[value] ? column.optionsLookup[value].value : value;
+      } else {
+        nextRow.cells[column._id] = value;
       }
     });
     rowsLookup[nextRow._id] = nextRow;
-  });
-  console.log('table field rowsLookup', rowsLookup);
+  }); // validRows.forEach((row, rowIndex) => {
+  //   const nextRow = {...row, cells: {...row.cells}};
+  //   const validColumns = columns.filter((column) => !column.deleted);
+  // validColumns.forEach((column, i) => {
+  //   const optionId = nextRow.cells[column._id];
+  //   if(optionId && optionId.charAt(0) === '=' && column.type === FieldTableColumnTypes.text){
+  //     const columnOperand = getColumnOperand(i);
+  //     const cellOperand = getCellOperand(columnOperand,rowIndex+1 );
+  //     nextRow.cells[column._id] = tableLookup[cellOperand];
+  //   }
+  //   else if (optionId && column.type === FieldTableColumnTypes.dropdown) {
+  //     nextRow.cells[column._id] = column.optionsLookup[optionId] ? column.optionsLookup[optionId].value : optionId;
+  //   }
+  // });
+  // rowsLookup[nextRow._id] = nextRow;
+  // });
+
   return rowsLookup;
 };
 /**
@@ -788,7 +803,6 @@ var getInputGroupRowLookupWithPopulatedDropdownCells = function getInputGroupRow
     });
     rowsLookup[nextRow._id] = nextRow;
   });
-  console.log('input group rows lookup', rowsLookup);
   return rowsLookup;
 };
 /**

package/package.json

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