@builttocreate/engine-utils 1.8.1-rc.1.3.1 → 1.8.1-rc.1.3.3

package/dist/activityHelper.js

@@ -84,9 +84,7 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
     template.fields.forEach(function (field) {
       return templateFieldLookup[field._id] = field;
     });
-  } //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;
   if (!activities || activities.length < 1 || !templateFieldLookup || !fieldValues) return activities;
@@ -116,16 +114,14 @@ 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
          */
-        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);
         }
         /**
-         * Table Step 2: create an easy way to lookup a row index so we can use it in our row 
-         * display component. 
+         * Table Step 2: create an easy way to lookup a row index so we can use it in our row
+         * display component.
          *
          * We only need to generate the row index lookup once per field to help increase performance,
          * just incase we have other deficiencies that reference the same table field.
@@ -135,26 +131,25 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
         if (!fieldRowIndexLookup[templateField._id]) {
           fieldRowIndexLookup[templateField._id] = (0, _tableHelper.getRowIndexLookup)(templateField._id, template.fieldSettings, docFieldValue);
         }
-
-        ;
         /**
          * Table Step 3: Add row and rowIndex to the activity.document object for easy reference.
          *
          * nextActivity.document.value will now contain the single row object with all cell values populated ready to be displayed
          */
 
+
         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.
          *
-         * We only need to generate the row lookup once per field (since input groups are just rows) 
+         * 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.getInputGroupRowLookupWithPopulatedDropdownCells)(templateField.tableColumns, docFieldValue);
         /**
-         * Input Group Step 2: Add invidual row.cell value. We only add the invidual cell value and not the 
+         * 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.
          */
 

package/dist/fieldHelper.js

@@ -108,7 +108,7 @@ var getDefaultFieldValuesFromTemplate = function getDefaultFieldValuesFromTempla
     }
 
     if (field.type === _FieldTypes["default"].date) {
-      fields[field._id] = field.value || new Date().getTime();
+      fields[field._id] = field.blockAutoPopulate ? '' : field.value || new Date().getTime();
     }
   });
   return fields;
@@ -178,32 +178,12 @@ var getImportFieldValues = function getImportFieldValues(template, importSource,
   return fields;
 };
 /**
- *  Generate options and table column lookups for template fields
- * @param {} template 
- * @returns 
+ *  Generate optionsLookup  and fieldLookup for template fields
+ * Note: Options lookup will be used by dropdown, mutliSelect, table and inputGroup fields
+ * to display value in dropdowns
+ * @param {} template
+ * @returns template
  */
-// 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;
@@ -244,7 +224,6 @@ var getTemplateWithLookups = function getTemplateWithLookups(template) {
     nextTemplate.fields.push(nextField);
     nextTemplate.fieldLookup[nextField._id] = nextField;
   });
-  console.log('nextTemplate', nextTemplate);
   return nextTemplate;
 };
 

package/dist/tableHelper.js

@@ -716,13 +716,13 @@ var generateInputGroupFields = function generateInputGroupFields(field, 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 
+ * @param {*} rows
+ * @returns
  */
 
 
@@ -733,20 +733,14 @@ var getTableRowLookupWithPopulatedDropdownCells = function getTableRowLookupWith
   var tableLookup = generateTableLookup(rows, columns);
   var validRows = getRows(rows);
   var validColumns = getColumns(columns);
-  console.log('---------------------------------------------------------');
-  console.log('rows, columns', rows, columns);
-  console.log('valid rows , columns', validRows, validColumns);
   validRows.forEach(function (row, rowIndex) {
     var nextRow = _objectSpread(_objectSpread({}, row), {}, {
       cells: _objectSpread({}, row.cells)
     });
 
-    validColumns.forEach(function (column, i) {
+    validColumns.forEach(function (column) {
       var cellOperand = getCellOperand(column.operand, rowIndex + 1);
-      console.log('column, rowIndex, cellOpearand', column, rowIndex, cellOperand);
       var value = tableLookup[cellOperand];
-      console.log('tableLookup, tableLookup[cellOpearnad]', tableLookup, tableLookup[cellOperand]);
-      console.log('***************************************************************************************');
 
       if (value && column.type === _FieldTableColumnTypes["default"].dropdown) {
         nextRow.cells[column._id] = column.optionsLookup[value] ? column.optionsLookup[value].value : value;
@@ -755,34 +749,18 @@ var getTableRowLookupWithPopulatedDropdownCells = function getTableRowLookupWith
       }
     });
     rowsLookup[nextRow._id] = nextRow;
-  }); // 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;
 };
 /**
  * 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 
+ *
+ * @param {*} columns
+ * @param {*} rows
+ * @returns
  */
 
 
@@ -796,7 +774,7 @@ var getInputGroupRowLookupWithPopulatedDropdownCells = function getInputGroupRow
       cells: _objectSpread({}, row.cells)
     });
 
-    columns.forEach(function (column, i) {
+    columns.forEach(function (column) {
       var optionId = nextRow.cells[column._id];
 
       if (optionId && column.type === _FieldTableColumnTypes["default"].dropdown) {
@@ -809,10 +787,10 @@ var getInputGroupRowLookupWithPopulatedDropdownCells = function getInputGroupRow
 };
 /**
  * Generate row index lookup:
- * @param {*} fieldId 
- * @param {*} fieldSettings 
- * @param {*} rows 
- * @returns 
+ * @param {*} fieldId
+ * @param {*} fieldSettings
+ * @param {*} rows
+ * @returns
  */
 
 

package/package.json

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