@builttocreate/engine-utils 1.1.1 → 1.2.1

package/dist/constants/Table.js

@@ -3,7 +3,62 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.inputGroupFieldTypes = exports.viewTypes = exports.operandLetters = void 0;
+exports["default"] = exports.inputGroupFieldTypes = exports.viewTypes = exports.operandLetters = exports.operandLetterIndexes = void 0;
+var operandLetterIndexes = {
+  A: 0,
+  B: 1,
+  C: 2,
+  D: 3,
+  E: 4,
+  F: 5,
+  G: 6,
+  H: 7,
+  I: 8,
+  J: 9,
+  K: 10,
+  L: 11,
+  M: 12,
+  N: 13,
+  O: 14,
+  P: 15,
+  Q: 16,
+  R: 17,
+  S: 18,
+  T: 19,
+  U: 20,
+  V: 21,
+  W: 22,
+  X: 23,
+  Y: 24,
+  Z: 25,
+  AA: 26,
+  AB: 27,
+  AC: 28,
+  AD: 29,
+  AE: 30,
+  AF: 31,
+  AG: 32,
+  AH: 33,
+  AI: 34,
+  AJ: 35,
+  AK: 36,
+  AL: 37,
+  AM: 38,
+  AN: 39,
+  AO: 40,
+  AP: 41,
+  AQ: 42,
+  AR: 43,
+  AS: 44,
+  AT: 45,
+  AU: 46,
+  AV: 47,
+  AW: 48,
+  AX: 49,
+  AY: 50,
+  AZ: 51
+};
+exports.operandLetterIndexes = operandLetterIndexes;
 var operandLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'AA', 'AB', 'AC', 'AD', 'AE', 'AF', 'AG', 'AH', 'AI', 'AJ', 'AK', 'AL', 'AM', 'AN', 'AO', 'AP', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AV', 'AW', 'AX', 'AY', 'AZ'];
 exports.operandLetters = operandLetters;
 var viewTypes = {

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.getColumnOperand = exports.getColumns = exports.getTableFieldRowOrder = exports.getRowMap = 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.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.sortRows = exports.getRows = exports.getDefaultRow = exports.getTableFieldLookupKey = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -158,6 +158,36 @@ exports.getColumns = getColumns;
 var getColumnOperand = function getColumnOperand(index) {
   return String.fromCharCode(65 + index);
 };
+/**
+ * Return rowIndex and columnIndex for cellOperand
+ *
+ * Operand examples: A1, B12, etc.
+ *
+ * @param {String} cellOperand
+ * @returns {Object}
+ */
+
+
+exports.getColumnOperand = getColumnOperand;
+
+var getIndexesFromTableCellOperand = function getIndexesFromTableCellOperand(cellOperand) {
+  var letter = cellOperand.match(/[A-Z]*/gi).find(function (value) {
+    return value;
+  });
+  var rowIndex = cellOperand.match(/[0-9]*/gi).find(function (value) {
+    return value;
+  });
+  return {
+    columnIndex: _Table.operandLetterIndexes[letter],
+
+    /**
+     * Cell operands start at an index of 1. So to get the true
+     * index for the rowIndex we need to substract 1 so we can
+     * use a 0 based index.
+     */
+    rowIndex: rowIndex - 1
+  };
+};
 /**
  * Get operand lookup for all table/inputGroup fields in a template.
  *
@@ -168,7 +198,7 @@ var getColumnOperand = function getColumnOperand(index) {
  */
 
 
-exports.getColumnOperand = getColumnOperand;
+exports.getIndexesFromTableCellOperand = getIndexesFromTableCellOperand;
 
 var getTemplateColumnOperandLookup = function getTemplateColumnOperandLookup(template) {
   var operandLookup = {};
@@ -303,7 +333,9 @@ var generateTableLookupForRows = function generateTableLookupForRows(rows, colum
   var tableLookup = generateTableLookup(rows, columns);
   var rowLookup = {};
   Object.keys(tableLookup).forEach(function (key) {
-    var rowIndex = key.match(/[0-9]*/gi)[1];
+    var rowIndex = key.match(/[0-9]*/gi).find(function (value) {
+      return value;
+    });
     if (!rowLookup[rowIndex]) rowLookup[rowIndex] = {};
     rowLookup[rowIndex][key] = tableLookup[key];
   });
@@ -563,6 +595,7 @@ exports.spreadOperandRange = spreadOperandRange;
 var generateInputGroupFields = function generateInputGroupFields(field, columns) {
   var rows = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [getDefaultRow()];
   var fieldSettings = arguments.length > 3 ? arguments[3] : undefined;
+  var activity = arguments.length > 4 ? arguments[4] : undefined;
   var tableReferences = [];
   var tableColumns = getColumns(columns);
   var columnOptionValueLookup = {};
@@ -577,6 +610,18 @@ var generateInputGroupFields = function generateInputGroupFields(field, columns)
   var tableRows = getRows(rows);
   var rowOrder = getTableFieldRowOrder(field._id, fieldSettings, tableRows);
   var sortedTableRows = sortRows(tableRows, rowOrder);
+  var cellActivityLookup = {};
+
+  if (activity && activity.length > 0) {
+    activity.forEach(function (act) {
+      var rowId = act.document.row;
+      var columnId = act.document.column;
+      var cellKey = "".concat(field._id, "-").concat(rowId, "-").concat(columnId);
+      if (!cellActivityLookup[cellKey]) cellActivityLookup[cellKey] = 0;
+      cellActivityLookup[cellKey] += 1;
+    });
+  }
+
   sortedTableRows.forEach(function (row, rowIndex) {
     var firstRowIndex = rowIndex === 0;
     var lastRowIndex = rowIndex === sortedTableRows.length - 1;
@@ -604,13 +649,15 @@ 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);
       tableReferences.push({
-        uniqueId: "".concat(field._id, "-").concat(row._id, "-").concat(column._id),
+        uniqueId: cellKey,
         _id: field._id,
         title: column.title,
         type: column.type === _FieldTableColumnTypes["default"].dropdown ? _Table.inputGroupFieldTypes.inputGroupDropdownCell : _Table.inputGroupFieldTypes.inputGroupTextCell,
         rowIndex: rowIndex,
         rowId: row._id,
+        activity: cellActivityLookup[cellKey] || 0,
         columnId: column._id,
         columnIndex: columnIndex,
         value: value,
@@ -746,52 +793,6 @@ var handleMoveTableRowDown = function handleMoveTableRowDown(rows, rowIndex, cal
     targetRowIndex: targetRowIndex
   });
 };
-/**
- * Get cell position lookup for table field data
- *
- * @param {Array} columns
- * @param {Array} rows
- * @param {Object} columnWidthLookup = { rowMenu: 20, rowNumber: 20, dropdown: 100, text: 100 }
- * @return {Object}
- *
- */
-
-/*const getTableFieldCellPositionLookup = (columns, rows, columnWidthLookup) => {
-
-  const columns = getColumns([...columns]);
-  const rows = getRows(rows);
-
-  const rowMenuColumnWidth = columnWidthLookup[FieldTableCustomColumnIds.rowMenu] || 0;
-  const rowNumberColumnWidth = columnWidthLookup[FieldTableCustomColumnIds.rowNumber] || 0;
-  const startingColumnWidth = rowMenuColumnWidth + rowNumberColumnWidth;
-
-  const cellLookup = {};
-
-  if (rows && rows.length > 0) {
-    rows.forEach((row, rowIndex) => {
-      columns.forEach((column, columnIndex) => {
-
-        const columnWidth = column.type === FieldTableColumnTypes.text ?
-          columnWidthLookup[FieldTableColumnTypes.text] : columnWidthLookup[FieldTableColumnTypes.dropdown];
-
-        cellLookup[`${rowIndex}-${columnIndex}`] = {
-          rowId: row._id,
-          rowIndex,
-          columnX: startingColumnWidth + (columnIndex * columnWidth),
-          columnId: column._id,
-          columnType: column.type
-        };
-
-      });
-
-    });
-
-  }
-
-  return cellLookup;
-
-}*/
-
 
 exports.handleMoveTableRowDown = handleMoveTableRowDown;
 var _default = {
@@ -800,6 +801,7 @@ var _default = {
   generateInputGroupFields: generateInputGroupFields,
   getColumnOperand: getColumnOperand,
   getCellOperand: getCellOperand,
+  getIndexesFromTableCellOperand: getIndexesFromTableCellOperand,
   getRows: getRows,
   getDefaultRow: getDefaultRow,
   getRowMap: getRowMap,

package/package.json

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