@builttocreate/engine-utils 2.9.1-beta.1 → 2.9.1-beta.3

package/dist/constants/FieldTableColumnTypes.js

@@ -8,11 +8,13 @@ var text = 'text';
 var dropdown = 'dropdown';
 var image = 'image';
 var number = 'number';
+var block = 'block';
 var date = 'date';
 var _default = exports["default"] = {
   text: text,
   dropdown: dropdown,
   image: image,
   number: number,
+  block: block,
   date: date
 };

package/dist/tableHelper.js

@@ -5,7 +5,7 @@ var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validFormulaString = exports.spreadOperandRange = exports.sortRows = exports.sortColumns = exports.resolveOperandValue = exports.hasOperandRange = exports.hasCircularOperandReference = exports.handleTableCellChange = exports.handleMoveTableRowUp = exports.handleMoveTableRowDown = exports.handleMoveColumnRight = exports.handleMoveColumnLeft = exports.handleInsertTableRow = exports.handleDuplicateTableRow = exports.handleCreateTableRow = exports.getTemplateColumnOperandLookup = exports.getTargetColumnWithOperand = exports.getTableRowLookupWithPopulatedDropdownCells = exports.getTableFieldRowOrder = exports.getTableFieldLookupKey = exports.getRows = exports.getRowOrder = exports.getRowMap = exports.getRowIndexLookup = exports.getInputGroupRowLookupWithPopulatedDropdownCells = exports.getIndexesFromTableCellOperand = exports.getFormulaResult = exports.getFilteredRowOrder = exports.getDefaultTextColumn = exports.getDefaultRow = exports.getDefaultNumberColumn = exports.getDefaultImageColumn = exports.getDefaultDropdownColumn = exports.getDefaultDateColumn = exports.getDefaultColumnOption = exports.getColumns = exports.getColumnOrder = exports.getColumnOperand = exports.getCleanedRowOrder = exports.getCleanedColumnOrder = exports.getCellOperand = exports.generateTableLookupForRows = exports.generateTableLookup = exports.generateTableFieldLookups = exports.generateRowTableLookup = exports.generateInputGroupFields = exports["default"] = void 0;
+exports.validFormulaString = exports.spreadOperandRange = exports.sortRows = exports.sortColumns = exports.resolveOperandValue = exports.isUnsupportedColumn = exports.hasOperandRange = exports.hasCircularOperandReference = exports.handleTableCellChange = exports.handleMoveTableRowUp = exports.handleMoveTableRowDown = exports.handleMoveColumnRight = exports.handleMoveColumnLeft = exports.handleInsertTableRow = exports.handleDuplicateTableRow = exports.handleCreateTableRow = exports.getTemplateColumnOperandLookup = exports.getTargetColumnWithOperand = exports.getTableRowLookupWithPopulatedDropdownCells = exports.getTableFieldRowOrder = exports.getTableFieldLookupKey = exports.getRows = exports.getRowOrder = exports.getRowMap = exports.getRowIndexLookup = exports.getInputGroupRowLookupWithPopulatedDropdownCells = exports.getIndexesFromTableCellOperand = exports.getFormulaResult = exports.getFilteredRowOrder = exports.getDefaultTextColumn = exports.getDefaultRow = exports.getDefaultImageColumn = exports.getDefaultDropdownColumn = exports.getDefaultColumnOption = exports.getColumns = exports.getColumnOrder = exports.getColumnOperand = exports.getCleanedRowOrder = exports.getCleanedColumnOrder = exports.getCellOperand = exports.generateTableLookupForRows = exports.generateTableLookup = exports.generateTableFieldLookups = exports.generateRowTableLookup = exports.generateInputGroupFields = exports["default"] = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -88,29 +88,9 @@ var getFilteredRowOrder = exports.getFilteredRowOrder = function getFilteredRowO
       if (row.deleted) return;
       var rowMatched = true;
       filteredColumnIds.forEach(function (columnId) {
-        /**
-         * The following logic compares the filter value with the cell value.
-         *
-         * 1. For table text columns, the cell value is a string.
-         * 2. For table number columns, the cell value is a number.
-         */
-
-        var filter = '';
-        if (filters[columnId] && typeof filters[columnId] === 'string') {
-          filter = filters[columnId].toLowerCase();
-        } else if (filters[columnId] && typeof filters[columnId] === 'number') {
-          filter = filters[columnId];
-        }
-        var value = '';
-        if (row.cells && row.cells[columnId]) {
-          if (typeof row.cells[columnId] === 'string') {
-            value = row.cells[columnId].toLowerCase();
-          } else if (typeof row.cells[columnId] === 'number') {
-            value = row.cells[columnId];
-          }
-        }
-        if (filter && typeof value === 'string' && (!value || value.indexOf(filter) === -1)) rowMatched = false;
-        if (filter && typeof value === 'number' && (!value || value !== filter)) rowMatched = false;
+        var filter = filters[columnId] ? filters[columnId].toLowerCase() : '';
+        var value = row.cells && row.cells[columnId] ? row.cells[columnId].toLowerCase() : '';
+        if (filter && (!value || value.indexOf(filter) === -1)) rowMatched = false;
       });
       if (rowMatched) matchedRows[row._id] = true;
     });
@@ -282,42 +262,6 @@ var getDefaultTextColumn = exports.getDefaultTextColumn = function getDefaultTex
   }, defaults);
 };
 
-/**
- * Get default Number column for table field
- *
- * @param {Object} defaults //Overwrite any values with this defaults object
- *
- * @return {Object}
- */
-var getDefaultNumberColumn = exports.getDefaultNumberColumn = function getDefaultNumberColumn() {
-  var defaults = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return _objectSpread({
-    _id: (0, _generateObjectId["default"])(),
-    type: _FieldTableColumnTypes["default"].number,
-    title: 'Number Column',
-    deleted: false,
-    width: 200
-  }, defaults);
-};
-
-/**
- * Get default Number column for table field
- *
- * @param {Object} defaults //Overwrite any values with this defaults object
- *
- * @return {Object}
- */
-var getDefaultDateColumn = exports.getDefaultDateColumn = function getDefaultDateColumn() {
-  var defaults = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return _objectSpread({
-    _id: (0, _generateObjectId["default"])(),
-    type: _FieldTableColumnTypes["default"].date,
-    title: 'Date Column',
-    deleted: false,
-    width: 200
-  }, defaults);
-};
-
 /**
  * Get default dropdown column for table field
  *
@@ -386,6 +330,7 @@ var getColumnOrder = exports.getColumnOrder = function getColumnOrder(columnOrde
 **/
 var getCleanedColumnOrder = exports.getCleanedColumnOrder = function getCleanedColumnOrder(columnOrder, columns) {
   var nextColumnOrder = [];
+  if ((0, _typeof2["default"])(columns) === 'object') return nextColumnOrder;
 
   /**
    * Step 1: Handle generating or retrieving proper column order.
@@ -687,8 +632,10 @@ var generateTableLookup = exports.generateTableLookup = function generateTableLo
   tableRows.forEach(function (row, rowIndex) {
     tableColumns.forEach(function (column) {
       if (!column.operand) return;
+      if (!row) console.warn("Row via column ".concat(column === null || column === void 0 ? void 0 : column._id, " is undefined."));
+      if (!(row !== null && row !== void 0 && row.cells)) console.warn("Row ".concat(row === null || row === void 0 ? void 0 : row._id, " is missing cells."));
       var cellKey = "".concat(column.operand).concat(rowIndex + 1);
-      var cellRawValue = row.cells[column._id] ? row.cells[column._id] : undefined;
+      var cellRawValue = row !== null && row !== void 0 && row.cells && row.cells[column._id] ? row.cells[column._id] : undefined;
       var cellValue;
       if (cellRawValue && typeof cellRawValue === 'string') cellValue = cellRawValue.trim();
       if (cellRawValue && typeof cellRawValue === 'number') cellValue = cellRawValue.toString();
@@ -1132,6 +1079,10 @@ var handleMoveTableRowDown = exports.handleMoveTableRowDown = function handleMov
     targetRowIndex: targetRowIndex
   });
 };
+var isUnsupportedColumn = exports.isUnsupportedColumn = function isUnsupportedColumn(column) {
+  if (!column) return false;
+  return column.type === _FieldTableColumnTypes["default"].block || column.type === _FieldTableColumnTypes["default"].number || column.type === _FieldTableColumnTypes["default"].date;
+};
 var _default = exports["default"] = {
   generateTableLookup: generateTableLookup,
   generateTableLookupForRows: generateTableLookupForRows,

package/package.json

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