@builttocreate/engine-utils 1.17.2-rc3 → 1.17.2-rc5

package/dist/formHelper.js

@@ -15,6 +15,8 @@ var _fieldHelper = require("./fieldHelper");
 
 var _generateObjectId = _interopRequireDefault(require("./generateObjectId"));
 
+var _FieldTypes = _interopRequireDefault(require("./constants/FieldTypes"));
+
 var _PageLayoutModes = _interopRequireDefault(require("./constants/PageLayoutModes"));
 
 var _FieldStyleModes = _interopRequireDefault(require("./constants/FieldStyleModes"));
@@ -36,6 +38,8 @@ var getDefaultPage = function getDefaultPage() {
   return _objectSpread({
     _id: (0, _generateObjectId["default"])(),
     name: 'New Page',
+    width: 816,
+    height: 1056,
     fields: [],
     layoutMode: _PageLayoutModes["default"].grid,
     fieldStyleMode: _FieldStyleModes["default"].normal
@@ -125,7 +129,7 @@ var getv2FormUpdatePayload = function getv2FormUpdatePayload(formPayload) {
    * and not on the fieldPosition object.
    */
 
-  var fieldKeys = ['identifier', 'title', 'value', 'tableColumns', 'tableColumnOrder', 'options', 'yTitle', 'yMax', 'yMin', 'xTitle', 'xMax', 'xMin'];
+  var fieldKeys = ['identifier', 'type', 'title', 'value', 'tableColumns', 'tableColumnOrder', 'options', 'yTitle', 'yMax', 'yMin', 'xTitle', 'xMax', 'xMin'];
   /**
    * Step 1: Properly save fields and field postion date
    */
@@ -163,7 +167,16 @@ var getv2FormUpdatePayload = function getv2FormUpdatePayload(formPayload) {
        * we need to add it the new field to form.fields.
        */
 
-      var fieldIndex = nextFieldsIndexLookup[fieldData._id];
+      var fieldIndex = nextFieldsIndexLookup[fieldData._id]; //Make sure proper tableColumnOrder is added
+
+      if (fieldData.type === _FieldTypes["default"].table || fieldData.type === _FieldTypes["default"].inputGroup) {
+        if (fieldPosition.tableColumns && (!fieldPosition.tableColumnOrder || fieldPosition.tableColumnOrder < 1)) {
+          fieldData.tableColumnOrder = [];
+          fieldPosition.tableColumns.forEach(function (col) {
+            if (!col.deleted) fieldData.tableColumnOrder.push(col._id);
+          });
+        }
+      }
 
       if (typeof fieldIndex !== 'number') {
         //Step 1.2.1 Field does not exist so add it

package/dist/tableHelper.js

@@ -617,20 +617,16 @@ var generateTableLookup = function generateTableLookup(rows, columns) {
   tableRows.forEach(function (row, rowIndex) {
     tableColumns.forEach(function (column) {
       if (!column.operand) return;
-      console.log('row.cells:', row.cells);
       var cellKey = "".concat(column.operand).concat(rowIndex + 1);
-      console.log(' row.cells[column._id]:', row.cells[column._id]);
       var cellRawValue = row.cells[column._id] ? row.cells[column._id] : undefined;
-      console.log('cellRawValue:', cellRawValue);
       var cellValue = cellRawValue && typeof cellRawValue === 'string' ? cellRawValue.trim() : undefined;
-      console.log('cellValue:', cellValue);
       var formulaCell = cellValue !== undefined && cellValue.charAt(0) === '=';
       var containsOperands = cellValue !== undefined && cellValue.match(/[A-Z]([0-9]{1,10})/gi);
 
       if (cellValue && column.type === _FieldTableColumnTypes["default"].dropdown) {
         tableLookup[cellKey] = columnOptionsLookup[column._id][cellValue];
       } else if (cellValue && column.type === _FieldTableColumnTypes["default"].image) {
-        tableLookup[cellKey] = columnOptionsLookup[column._id][cellRawValue];
+        tableLookup[cellKey] = cellRawValue;
       } else if (cellValue && formulaCell && containsOperands) {
         formulaCells.push(cellKey);
         tableLookup[cellKey] = cellValue;

package/package.json

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