@builttocreate/engine-utils 2.5.0-beta.3 → 2.5.0-beta.4

package/dist/tableHelper.js

@@ -7,7 +7,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.getDefaultImageColumn = exports.getDefaultDropdownColumn = exports.getDefaultColumnOption = exports.getColumns = exports.getColumnOrder = exports.getColumnOperand = 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.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.getCleanedTableFieldRowOrder = exports.getCleanedRowOrder = exports.getCellOperand = exports.generateTableLookupForRows = exports.generateTableLookup = exports.generateTableFieldLookups = exports.generateRowTableLookup = exports.generateInputGroupFields = exports["default"] = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
@@ -198,6 +198,91 @@ var getTableFieldRowOrder = function getTableFieldRowOrder(fieldId, fieldSetting
     return row._id;
   });
 };
+/**
+ * This method returns a cleanedRowOrder by removing anY invalid rowIds of deleted rows
+ * or duplicate rowIds from the rowOrder that is passed in via input
+ * @param {*} rowOrder
+ * @param {*} rows
+ *
+ * @returns {Array}
+ */
+
+
+exports.getTableFieldRowOrder = getTableFieldRowOrder;
+
+var getCleanedTableFieldRowOrder = function getCleanedTableFieldRowOrder(rowOrder, rows) {
+  var nextRowOrder = [];
+  /**
+   * Step 1: Handle generating or retrieving proper row order.
+   */
+
+  if (rowOrder && rowOrder.length > 0) {
+    nextRowOrder = rowOrder;
+  } else if (rows && rows.length > 0) {
+    rows.forEach(function (row) {
+      if (!row.deleted) nextRowOrder.push(row._id);
+    });
+  }
+  /**
+   * Step 2: Remove row Ids from rowOrder for rows that no longer exist or have been deleted
+   */
+
+
+  var rowLookup = {};
+  rows.forEach(function (row) {
+    return rowLookup[row._id] = row && !row.deleted;
+  });
+  nextRowOrder = nextRowOrder.filter(function (rowId) {
+    return rowLookup[rowId];
+  });
+  /**
+   * Step 3: Remove any duplicate row Id references in the row order.
+   */
+
+  var filteredNextRowOrder = [];
+  nextRowOrder.forEach(function (rowId) {
+    if (filteredNextRowOrder.indexOf(rowId) === -1) filteredNextRowOrder.push(rowId);
+  });
+  return filteredNextRowOrder;
+};
+
+exports.getCleanedTableFieldRowOrder = getCleanedTableFieldRowOrder;
+
+var getCleanedRowOrder = function getCleanedRowOrder(rowOrder, rows) {
+  var nextRowOrder = [];
+  /**
+   * Step 1: Handle generating or retrieving proper row order.
+   */
+
+  if (rowOrder && rowOrder.length > 0) {
+    nextRowOrder = rowOrder;
+  } else if (rows && rows.length > 0) {
+    rows.forEach(function (row) {
+      if (!row.deleted) nextRowOrder.push(row._id);
+    });
+  }
+  /**
+   * Step 2: Remove row Ids from rowOrder for rows that no longer exist or have been deleted
+   */
+
+
+  var rowLookup = {};
+  rows.forEach(function (row) {
+    return rowLookup[row._id] = row && !row.deleted;
+  });
+  nextRowOrder = nextRowOrder.filter(function (rowId) {
+    return rowLookup[rowId];
+  });
+  /**
+   * Step 3: Remove any duplicate row Id references in the row order.
+   */
+
+  var filteredNextRowOrder = [];
+  nextRowOrder.forEach(function (rowId) {
+    if (filteredNextRowOrder.indexOf(rowId) === -1) filteredNextRowOrder.push(rowId);
+  });
+  return filteredNextRowOrder;
+};
 /**
  * Handle Move Column Left
  *
@@ -206,7 +291,7 @@ var getTableFieldRowOrder = function getTableFieldRowOrder(fieldId, fieldSetting
  */
 
 
-exports.getTableFieldRowOrder = getTableFieldRowOrder;
+exports.getCleanedRowOrder = getCleanedRowOrder;
 
 var handleMoveColumnLeft = function handleMoveColumnLeft(columnIndex, callback) {
   //If first index then ignore
@@ -1161,9 +1246,12 @@ var _default = {
   getCellOperand: getCellOperand,
   getIndexesFromTableCellOperand: getIndexesFromTableCellOperand,
   getRowOrder: getRowOrder,
+  getCleanedTableFieldRowOrder: getCleanedTableFieldRowOrder,
+  getTableFieldRowOrder: getTableFieldRowOrder,
+  getFilteredRowOrder: getFilteredRowOrder,
+  getCleanedRowOrder: getCleanedRowOrder,
   getRows: getRows,
   sortRows: sortRows,
-  getFilteredRowOrder: getFilteredRowOrder,
   getDefaultRow: getDefaultRow,
   getRowMap: getRowMap,
   getDefaultColumnOption: getDefaultColumnOption,
@@ -1179,7 +1267,6 @@ var _default = {
   hasOperandRange: hasOperandRange,
   spreadOperandRange: spreadOperandRange,
   getTableFieldLookupKey: getTableFieldLookupKey,
-  getTableFieldRowOrder: getTableFieldRowOrder,
   getTableRowLookupWithPopulatedDropdownCells: getTableRowLookupWithPopulatedDropdownCells,
   getInputGroupRowLookupWithPopulatedDropdownCells: getInputGroupRowLookupWithPopulatedDropdownCells,
   getRowIndexLookup: getRowIndexLookup,

package/package.json

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