@builttocreate/engine-utils 1.8.1-rc.1.2.7 → 1.8.1-rc.1.2.8

package/dist/activityHelper.js

@@ -84,7 +84,8 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
     template.fields.forEach(function (field) {
       return templateFieldLookup[field._id] = field;
     });
-  } // const fieldLookup = template && template.fieldLookup ? template.fieldLookup : null;
+  } //I don't think this line is needed. Consult Scooby
+  // const fieldLookup = template && template.fieldLookup ? template.fieldLookup : null;
 
 
   var fieldValues = doc && doc.fields ? doc.fields : null;
@@ -98,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;
@@ -110,13 +110,18 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
          * We only need to generate the row lookup once per field to help increase performance,
          * just incase we have other deficiencies that reference the same table field.
          */
-        //removing deleted rows
+
+        /**
+         * Removing deleted rows from doc field value
+         * 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;
         });
 
         if (!fieldRowsLookup[templateField._id]) {
-          fieldRowsLookup[templateField._id] = (0, _tableHelper.getRowLookupWithPopulatedDropdownCells)(templateField.tableColumns, docFieldValue);
+          fieldRowsLookup[templateField._id] = (0, _tableHelper.getTableRowLookupWithPopulatedDropdownCells)(templateField.tableColumns, nextDocFieldValue);
         }
         /**
          * Table Step 2: create an easy way to lookup a row index so we can use it in our row 
@@ -147,13 +152,13 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
          * We only need to generate the row lookup once per field (since input groups are just rows) 
          * to help increase performance, just incase we have other deficiencies that reference the same table field.
          */
-        if (!fieldRowsLookup[templateField._id]) fieldRowsLookup[templateField._id] = (0, _tableHelper.getRowLookupWithPopulatedDropdownCells)(templateField.tableColumns, docFieldValue);
+        if (!fieldRowsLookup[templateField._id]) fieldRowsLookup[templateField._id] = (0, _tableHelper.getInputGroupRowLookupWithPopulatedDropdownCells)(templateField.tableColumns, docFieldValue);
         /**
          * Input Group Step 2: Add invidual row.cell value. We only add the invidual cell value and not the 
          * 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 = '';

package/dist/fieldHelper.js

@@ -202,7 +202,7 @@ var getTemplateWithLookups = function getTemplateWithLookups(template) {
 
     if (nextField.tableColumns) {
       nextField.tableColumnsLookup = {};
-      nextField.tableColumns.forEach(function (column) {
+      nextField.tableColumns.forEach(function (column, index) {
         var nextColumn = _objectSpread(_objectSpread({}, column), {}, {
           optionsLookup: {}
         });
@@ -227,10 +227,10 @@ var getTemplateWithLookups = function getTemplateWithLookups(template) {
                nextRow.cells[column._id] = column.optionsLookup[optionId] ? column.optionsLookup[optionId].value : optionId;
              }
          */
+        // column.optionsLookup = nextColumn.optionsLookup;
 
 
-        column.optionsLookup = nextColumn.optionsLookup;
-        nextField.tableColumnsLookup[nextColumn._id] = nextColumn;
+        nextField.tableColumns[index] = nextColumn; // nextField.tableColumnsLookup[nextColumn._id] = nextColumn;
       });
     }
 

package/dist/tableHelper.js

@@ -7,7 +7,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.handleMoveTableRowDown = exports.handleMoveTableRowUp = exports.handleDuplicateTableRow = exports.handleCreateTableRow = exports.handleInsertTableRow = exports.handleTableCellChange = exports.getRowIndexLookup = exports.getRowLookupWithPopulatedDropdownCells = exports.generateInputGroupFields = exports.spreadOperandRange = exports.validFormulaString = exports.hasOperandRange = exports.hasCircularOperandReference = exports.resolveOperandValue = exports.getFormulaResult = exports.generateTableLookup = exports.generateTableLookupForRows = exports.generateTableFieldLookups = exports.generateRowTableLookup = exports.getCellOperand = exports.getTemplateColumnOperandLookup = exports.getIndexesFromTableCellOperand = exports.getColumnOperand = exports.getColumns = exports.getTableFieldRowOrder = exports.getRowMap = exports.getFilteredRowOrder = exports.sortRows = exports.getRows = exports.getDefaultRow = exports.getTableFieldLookupKey = void 0;
+exports["default"] = exports.handleMoveTableRowDown = exports.handleMoveTableRowUp = exports.handleDuplicateTableRow = exports.handleCreateTableRow = exports.handleInsertTableRow = exports.handleTableCellChange = exports.getRowIndexLookup = exports.getInputGroupRowLookupWithPopulatedDropdownCells = exports.getTableRowLookupWithPopulatedDropdownCells = exports.generateInputGroupFields = exports.spreadOperandRange = exports.validFormulaString = exports.hasOperandRange = exports.hasCircularOperandReference = exports.resolveOperandValue = exports.getFormulaResult = exports.generateTableLookup = exports.generateTableLookupForRows = exports.generateTableFieldLookups = exports.generateRowTableLookup = exports.getCellOperand = exports.getTemplateColumnOperandLookup = exports.getIndexesFromTableCellOperand = exports.getColumnOperand = exports.getColumns = exports.getTableFieldRowOrder = exports.getRowMap = exports.getFilteredRowOrder = exports.sortRows = exports.getRows = exports.getDefaultRow = exports.getTableFieldLookupKey = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -713,25 +713,29 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
   return tableReferences;
 };
 /**
- * Populate row cells with dropdown display values:
- * @param {*} columns 
+ * Populate table rows with values
+ *  - Dropdown cells will have chosen values
+ *  - Formula cells will have the formula result
+ * 
+ * Note: Columns should already have the options lookup populated before
+ * being sent into this function
+ * 
+ * @param {*} columns -
  * @param {*} rows 
  * @returns 
  */
-//Columns should have the options lookup already populated
 
 
 exports.generateInputGroupFields = generateInputGroupFields;
 
-var getRowLookupWithPopulatedDropdownCells = function getRowLookupWithPopulatedDropdownCells(columns, rows) {
+var getTableRowLookupWithPopulatedDropdownCells = function getTableRowLookupWithPopulatedDropdownCells(columns, rows) {
   var rowsLookup = {};
   var tableLookup = generateTableLookup(rows, columns);
-  var validRows = typeof row === 'string' ? JSON.parse(rows) : rows;
+  var validRows = typeof row === 'string' ? JSON.parse(rows) : rows; //Removing deleted columns so column operand doesn't look messy
+
   var validColumns = columns.filter(function (column) {
     return !column.deleted;
   });
-  console.log('validRows', validRows);
-  console.log('validColumns', validColumns);
   validRows.forEach(function (row, rowIndex) {
     var nextRow = _objectSpread(_objectSpread({}, row), {}, {
       cells: _objectSpread({}, row.cells)
@@ -743,10 +747,6 @@ var getRowLookupWithPopulatedDropdownCells = function getRowLookupWithPopulatedD
       if (optionId && optionId.charAt(0) === '=' && column.type === _FieldTableColumnTypes["default"].text) {
         var columnOperand = getColumnOperand(i);
         var cellOperand = getCellOperand(columnOperand, rowIndex + 1);
-        console.log('columnOperand', columnOperand, i);
-        console.log('cellOperand', cellOperand);
-        console.log('endResult', tableLookup, tableLookup[cellOperand]);
-        console.log('*****************************************************');
         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;
@@ -754,6 +754,41 @@ var getRowLookupWithPopulatedDropdownCells = function getRowLookupWithPopulatedD
     });
     rowsLookup[nextRow._id] = nextRow;
   });
+  console.log('table field rowsLookup', rowsLookup);
+  return rowsLookup;
+};
+/**
+ * Populate inputGroup dropdown questions with chosen value
+ * 
+ * Note: Columns should already have the options lookup populated before
+ * being sent into this function
+ * 
+ * @param {*} columns 
+ * @param {*} rows 
+ * @returns 
+ */
+
+
+exports.getTableRowLookupWithPopulatedDropdownCells = getTableRowLookupWithPopulatedDropdownCells;
+
+var getInputGroupRowLookupWithPopulatedDropdownCells = function getInputGroupRowLookupWithPopulatedDropdownCells(columns, rows) {
+  var rowsLookup = {};
+  var validRows = typeof row === 'string' ? JSON.parse(rows) : rows;
+  validRows.forEach(function (row) {
+    var nextRow = _objectSpread(_objectSpread({}, row), {}, {
+      cells: _objectSpread({}, row.cells)
+    });
+
+    columns.forEach(function (column, i) {
+      var optionId = nextRow.cells[column._id];
+
+      if (optionId && column.type === _FieldTableColumnTypes["default"].dropdown) {
+        nextRow.cells[column._id] = column.optionsLookup[optionId] ? column.optionsLookup[optionId].value : optionId;
+      }
+    });
+    rowsLookup[nextRow._id] = nextRow;
+  });
+  console.log('input group rows lookup', rowsLookup);
   return rowsLookup;
 };
 /**
@@ -765,7 +800,7 @@ var getRowLookupWithPopulatedDropdownCells = function getRowLookupWithPopulatedD
  */
 
 
-exports.getRowLookupWithPopulatedDropdownCells = getRowLookupWithPopulatedDropdownCells;
+exports.getInputGroupRowLookupWithPopulatedDropdownCells = getInputGroupRowLookupWithPopulatedDropdownCells;
 
 var getRowIndexLookup = function getRowIndexLookup(fieldId, fieldSettings, rows) {
   var rowOrder = getTableFieldRowOrder(fieldId, fieldSettings, rows);
@@ -921,7 +956,8 @@ var _default = {
   spreadOperandRange: spreadOperandRange,
   getTableFieldLookupKey: getTableFieldLookupKey,
   getTableFieldRowOrder: getTableFieldRowOrder,
-  getRowLookupWithPopulatedDropdownCells: getRowLookupWithPopulatedDropdownCells,
+  getTableRowLookupWithPopulatedDropdownCells: getTableRowLookupWithPopulatedDropdownCells,
+  getInputGroupRowLookupWithPopulatedDropdownCells: getInputGroupRowLookupWithPopulatedDropdownCells,
   getRowIndexLookup: getRowIndexLookup,
   handleTableCellChange: handleTableCellChange,
   handleInsertTableRow: handleInsertTableRow,

package/package.json

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