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

package/dist/joyDocHelper.js

@@ -18,6 +18,7 @@ var _FieldDisplayTypes = _interopRequireDefault(require("./constants/FieldDispla
 var _FileViews = _interopRequireDefault(require("./constants/FileViews"));
 var _FormStyleOptions = _interopRequireDefault(require("./constants/FormStyleOptions"));
 var _tableHelper = require("./tableHelper");
+var _FieldTableColumnTypes = _interopRequireDefault(require("./constants/FieldTableColumnTypes"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -108,6 +109,22 @@ var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc)
    * Step 1.1: Replace doc._id if it is not valid
    */
   if (nextDoc._id && !(0, _validateObjectId["default"])(nextDoc._id)) nextDoc._id = (0, _generateObjectId["default"])();
+
+  /**
+   * Remove this when merging keystone branch into master
+   * Logic below remove the unsupported tableColumns from the table field
+   */
+  if (nextDoc.fields && nextDoc.fields.length > 0) {
+    nextDoc.fields = nextDoc.fields.map(function (field) {
+      var nextField = _objectSpread({}, field);
+      if (field.type === _FieldTypes["default"].table && field.tableColumns) {
+        nextField.tableColumns = nextField.tableColumns.filter(function (column) {
+          return column && column._id && (column.type !== _FieldTableColumnTypes["default"].block || column.type !== _FieldTableColumnTypes["default"].number || column.type !== _FieldTableColumnTypes["default"].date);
+        });
+      }
+      return nextField;
+    });
+  }
   if (nextDoc.files && nextDoc.files.length > 0) {
     nextDoc.files = nextDoc.files.map(function (file) {
       var _nextFile$views;
@@ -234,6 +251,16 @@ var getCleanedJoyDocPages = exports.getCleanedJoyDocPages = function getCleanedJ
           var nextFieldPosition = _objectSpread({}, fieldPosition);
           if (nextFieldPosition._id && !(0, _validateObjectId["default"])(nextFieldPosition._id)) nextFieldPosition._id = (0, _generateObjectId["default"])();
           if (nextFieldPosition.field && !(0, _validateObjectId["default"])(nextFieldPosition.field)) nextFieldPosition.field = (0, _generateObjectId["default"])();
+
+          /**
+           * <------------NOTICE-------------------------------->
+           * This was introduced as a part of the fix for prevent crash in issue NO-735. 
+           * Remove this when merging keystone branch into master.
+           * We introduced fieldPosition.tableColumns as a part of keystone to store the date formats of table date columns
+           * We are removing it here to prevent crashes on JS/RN SDK and the api as they don't expect fieldPosition to have
+           * tableColumns
+           */
+          if (nextFieldPosition.tableColumns) delete nextFieldPosition.tableColumns;
           return nextFieldPosition;
         });
       } else {

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.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;
+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.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"));
@@ -330,7 +330,6 @@ 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.
@@ -1079,10 +1078,6 @@ 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.3",
+  "version": "2.9.1-beta.6",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [