@builttocreate/engine-utils 1.8.1 → 1.8.3

package/dist/activityHelper.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.getFormattedActivity = void 0;
+exports["default"] = exports.addDocumentDataToActivities = exports.getFormattedActivity = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -13,6 +13,10 @@ var _ActivityTypes = _interopRequireDefault(require("./constants/ActivityTypes")
 
 var _FileTypes = _interopRequireDefault(require("./constants/FileTypes"));
 
+var _FieldTypes = _interopRequireDefault(require("./constants/FieldTypes"));
+
+var _tableHelper = require("./tableHelper");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -65,9 +69,118 @@ var getFormattedActivity = function getFormattedActivity(comments, deficiencies,
   });
   return activity;
 };
+/**
+ *
+ * Template should be a template that is using the new getTemplateWithLookups
+ */
+
 
 exports.getFormattedActivity = getFormattedActivity;
+
+var addDocumentDataToActivities = function addDocumentDataToActivities(activities, doc, template) {
+  var templateFieldLookup = {};
+
+  if (template.fields && template.fields.length > 0) {
+    template.fields.forEach(function (field) {
+      return templateFieldLookup[field._id] = field;
+    });
+  }
+
+  var fieldValues = doc && doc.fields ? doc.fields : null;
+  if (!activities || activities.length < 1 || !templateFieldLookup || !fieldValues) return activities;
+  var fieldRowsLookup = {};
+  var fieldRowIndexLookup = {};
+  var nextActivities = [];
+  activities.forEach(function (activity) {
+    var nextActivity = _objectSpread({}, activity);
+
+    if (activity.document && activity.document._id && activity.document.field) {
+      var docFieldValue = fieldValues[activity.document.field];
+      var templateField = templateFieldLookup[activity.document.field];
+      nextActivity.document.title = templateField.title;
+      nextActivity.document.type = templateField.type;
+      nextActivity.document.columns = templateField.tableColumns;
+
+      if (docFieldValue && templateField.type === _FieldTypes["default"].table) {
+        /**
+         * Table 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 to help increase performance,
+         * just incase we have other deficiencies that reference the same table field.
+         */
+
+        /**
+         * 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 = (0, _tableHelper.getRows)(docFieldValue);
+
+        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.
+         *
+         * 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.
+         */
+
+
+        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)
+         * 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
+         * 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];
+      } else if (docFieldValue && templateField.type === _FieldTypes["default"].multiSelect) {
+        var parsedDocFieldValue = docFieldValue && typeof docFieldValue === 'string' ? docFieldValue.split(',') : docFieldValue;
+        var _nextDocFieldValue = '';
+
+        if (parsedDocFieldValue.length > 0) {
+          parsedDocFieldValue.forEach(function (item) {
+            var option = templateField.optionsLookup[item];
+            _nextDocFieldValue = _nextDocFieldValue.concat(' ', option.value);
+          });
+        }
+
+        nextActivity.document.value = _nextDocFieldValue;
+      } //This should handle adding the display value for selection and regular input fields
+      else {
+          var option = templateField.optionsLookup[docFieldValue];
+          nextActivity.document.value = option && option.value ? option.value : docFieldValue;
+        }
+    }
+
+    nextActivities.push(nextActivity);
+  });
+  return nextActivities;
+};
+
+exports.addDocumentDataToActivities = addDocumentDataToActivities;
 var _default = {
-  getFormattedActivity: getFormattedActivity
+  getFormattedActivity: getFormattedActivity,
+  addDocumentDataToActivities: addDocumentDataToActivities
 };
 exports["default"] = _default;

package/dist/fieldHelper.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.getImportFieldValues = exports.getDefaultFieldValuesFromTemplate = exports.getMultiSelectFieldValue = exports.getChartFieldValue = void 0;
+exports["default"] = exports.getTemplateWithLookups = exports.getImportFieldValues = exports.getDefaultFieldValuesFromTemplate = exports.getMultiSelectFieldValue = exports.getChartFieldValue = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -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;
@@ -177,12 +177,62 @@ var getImportFieldValues = function getImportFieldValues(template, importSource,
   });
   return fields;
 };
+/**
+ *  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
+ */
+
 
 exports.getImportFieldValues = getImportFieldValues;
+
+var getTemplateWithLookups = function getTemplateWithLookups(template) {
+  var nextTemplate = _objectSpread({}, template);
+
+  nextTemplate.fields = [];
+  nextTemplate.fieldLookup = {};
+  template.fields.forEach(function (field) {
+    var nextField = _objectSpread({}, field);
+
+    nextField.optionsLookup = {};
+
+    if (nextField.options) {
+      nextField.options.forEach(function (option) {
+        return nextField.optionsLookup[option._id] = option;
+      });
+    }
+
+    if (nextField.tableColumns) {
+      nextField.tableColumnsLookup = {};
+      nextField.tableColumns.forEach(function (column, index) {
+        var nextColumn = _objectSpread(_objectSpread({}, column), {}, {
+          optionsLookup: {}
+        });
+
+        if (nextColumn.options) {
+          nextColumn.options.forEach(function (option) {
+            return nextColumn.optionsLookup[option._id] = option;
+          });
+        }
+
+        nextField.tableColumns[index] = nextColumn;
+      });
+    }
+
+    nextTemplate.fields.push(nextField);
+    nextTemplate.fieldLookup[nextField._id] = nextField;
+  });
+  return nextTemplate;
+};
+
+exports.getTemplateWithLookups = getTemplateWithLookups;
 var _default = {
   getChartFieldValue: getChartFieldValue,
   getMultiSelectFieldValue: getMultiSelectFieldValue,
   getDefaultFieldValuesFromTemplate: getDefaultFieldValuesFromTemplate,
-  getImportFieldValues: getImportFieldValues
+  getImportFieldValues: getImportFieldValues,
+  getTemplateWithLookups: getTemplateWithLookups
 };
 exports["default"] = _default;

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.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"));
 
@@ -517,7 +517,7 @@ var resolveOperandValue = function resolveOperandValue(sourceOperand, targetOper
   //  It creates and infinite circular loop of trying to resovle a value
   //  because they both depend on eachother.
 
-  if (sourceOperand && hasCircularOperandReference(targetValue, sourceOperand)) return '* INVALID - Circular Reference'; // 4. If targetCell has a formula value
+  if (sourceOperand && hasCircularOperandReference(targetValue, sourceOperand) || targetOperand && hasCircularOperandReference(targetValue, targetOperand)) return '* INVALID - Circular Reference'; // 4. If targetCell has a formula value
 
   if (targetValue !== undefined && targetValue.charAt(0) === '=') {
     var result = getFormulaResult(sourceOperand, targetValue, tableLookup);
@@ -712,6 +712,98 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
   });
   return tableReferences;
 };
+/**
+ * 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
+ */
+
+
+exports.generateInputGroupFields = generateInputGroupFields;
+
+var getTableRowLookupWithPopulatedDropdownCells = function getTableRowLookupWithPopulatedDropdownCells(columns, rows) {
+  var rowsLookup = {};
+  var tableLookup = generateTableLookup(rows, columns);
+  var validRows = getRows(rows);
+  var validColumns = getColumns(columns);
+  validRows.forEach(function (row, rowIndex) {
+    var nextRow = _objectSpread(_objectSpread({}, row), {}, {
+      cells: _objectSpread({}, row.cells)
+    });
+
+    validColumns.forEach(function (column) {
+      var cellOperand = getCellOperand(column.operand, rowIndex + 1);
+      var value = tableLookup[cellOperand];
+
+      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;
+  });
+  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) {
+      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;
+  });
+  return rowsLookup;
+};
+/**
+ * Generate row index lookup:
+ * @param {*} fieldId
+ * @param {*} fieldSettings
+ * @param {*} rows
+ * @returns
+ */
+
+
+exports.getInputGroupRowLookupWithPopulatedDropdownCells = getInputGroupRowLookupWithPopulatedDropdownCells;
+
+var getRowIndexLookup = function getRowIndexLookup(fieldId, fieldSettings, rows) {
+  var rowOrder = getTableFieldRowOrder(fieldId, fieldSettings, rows);
+  var rowIndexLookup = {};
+  rowOrder.forEach(function (rowId, index) {
+    rowIndexLookup[rowId] = index;
+  });
+  return rowIndexLookup;
+};
 /**
  * Handle Table Cell Change
  *
@@ -723,7 +815,7 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
  */
 
 
-exports.generateInputGroupFields = generateInputGroupFields;
+exports.getRowIndexLookup = getRowIndexLookup;
 
 var handleTableCellChange = function handleTableCellChange(rows, rowId, columnId, val, callback) {
   var targetRowIndex = rows.findIndex(function (row) {
@@ -858,6 +950,9 @@ var _default = {
   spreadOperandRange: spreadOperandRange,
   getTableFieldLookupKey: getTableFieldLookupKey,
   getTableFieldRowOrder: getTableFieldRowOrder,
+  getTableRowLookupWithPopulatedDropdownCells: getTableRowLookupWithPopulatedDropdownCells,
+  getInputGroupRowLookupWithPopulatedDropdownCells: getInputGroupRowLookupWithPopulatedDropdownCells,
+  getRowIndexLookup: getRowIndexLookup,
   handleTableCellChange: handleTableCellChange,
   handleInsertTableRow: handleInsertTableRow,
   handleCreateTableRow: handleCreateTableRow,

package/package.json

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