@builttocreate/engine-utils 2.5.0-beta.1 → 2.5.0-beta.1.1

package/dist/joyDocHelper.js

@@ -19,6 +19,10 @@ var _FieldPresentationModes = _interopRequireDefault(require("./constants/FieldP
 
 var _DocumentTypes = _interopRequireDefault(require("./constants/DocumentTypes"));
 
+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); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -153,6 +157,24 @@ var getCleanedJoyDoc = function getCleanedJoyDoc(doc) {
   } else {
     nextDoc.files = [getDefaultJoyDocFile()];
   }
+  /**
+   * Logic below is used to clean the table field rowOrder by removing the
+   * deletedRowIds / duplicateRowIds from the rowOrder.
+   **/
+
+
+  if (nextDoc.fields && nextDoc.fields.length > 0) {
+    nextDoc.fields = nextDoc.fields.map(function (field) {
+      var nextField = _objectSpread({}, field);
+
+      if (field.type === _FieldTypes["default"].table) {
+        var cleanedRoworder = (0, _tableHelper.getCleanedRowOrder)(field.rowOrder, field.value);
+        nextField.rowOrder = cleanedRoworder;
+      }
+
+      return nextField;
+    });
+  }
 
   return nextDoc;
 };

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.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,53 @@ var getTableFieldRowOrder = function getTableFieldRowOrder(fieldId, fieldSetting
     return row._id;
   });
 };
+/**
+ * This method removes the rowIds of the deleted rows (or) any duplicate rowIds
+ * from the rowOrder there by returning a cleaned rowOrder
+ * @param {*} rowOrder
+ * @param {*} rows
+ *
+ * @returns {Array}
+**/
+
+
+exports.getTableFieldRowOrder = getTableFieldRowOrder;
+
+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 (rowId && filteredNextRowOrder.indexOf(rowId) === -1) filteredNextRowOrder.push(rowId);
+  });
+  return filteredNextRowOrder;
+};
 /**
  * Handle Move Column Left
  *
@@ -206,7 +253,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 +1208,11 @@ var _default = {
   getCellOperand: getCellOperand,
   getIndexesFromTableCellOperand: getIndexesFromTableCellOperand,
   getRowOrder: getRowOrder,
+  getTableFieldRowOrder: getTableFieldRowOrder,
+  getFilteredRowOrder: getFilteredRowOrder,
+  getCleanedRowOrder: getCleanedRowOrder,
   getRows: getRows,
   sortRows: sortRows,
-  getFilteredRowOrder: getFilteredRowOrder,
   getDefaultRow: getDefaultRow,
   getRowMap: getRowMap,
   getDefaultColumnOption: getDefaultColumnOption,
@@ -1179,7 +1228,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.1",
+  "version": "2.5.0-beta.1.1",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [