@builttocreate/engine-utils 1.15.2 → 1.16.0-rc2

package/dist/activityHelper.js

@@ -17,9 +17,9 @@ 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); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var getFormattedActivity = function getFormattedActivity(comments, deficiencies, files) {
   var activity = [];
@@ -174,9 +174,9 @@ var addDocumentDataToActivities = function addDocumentDataToActivities(activitie
         nextActivity.document.value = _nextDocFieldValue;
       } //This should handle adding the display value for selection and regular input fields
       else {
-          var option = templateField.optionsLookup[docFieldValue];
-          nextActivity.document.value = option && option.value ? option.value : docFieldValue;
-        }
+        var option = templateField.optionsLookup[docFieldValue];
+        nextActivity.document.value = option && option.value ? option.value : docFieldValue;
+      }
     }
 
     nextActivities.push(nextActivity);

package/dist/constants/FieldStyleModes.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.overlay = exports.normal = void 0;
+
+/**
+ * Page field style modes
+ *
+ * Used to to determine how a field 
+ * should be presented on the form.
+ */
+var normal = 'normal';
+exports.normal = normal;
+var overlay = 'overlay';
+exports.overlay = overlay;
+var _default = {
+  normal: normal,
+  overlay: overlay
+};
+exports["default"] = _default;

package/dist/constants/PageLayoutModes.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+/**
+ * Page layout modes
+ */
+var grid = 'grid';
+var overlay = 'overlay';
+var _default = {
+  grid: grid,
+  overlay: overlay
+};
+exports["default"] = _default;

package/dist/fieldHelper.js

@@ -21,9 +21,9 @@ var _tableHelper = require("./tableHelper");
 
 var _generateObjectId = _interopRequireDefault(require("./generateObjectId"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 /**
  * Get chart field line data
@@ -207,14 +207,14 @@ var getImportFieldValues = function getImportFieldValues(template, importSource,
            * already set in the importTarget document.
            */
           else if (column.blockImport && currentDocRows[i] && currentDocRows[i].cells[column._id]) {
-              newRow.cells[column._id] = currentDocRows[i].cells[column._id];
-            }
-            /**
-             * Option 3: If column has block import enabled then add default column value
-             */
-            else if (column.blockImport && column.value) {
-                newRow.cells[column._id] = column.value;
-              }
+            newRow.cells[column._id] = currentDocRows[i].cells[column._id];
+          }
+          /**
+           * Option 3: If column has block import enabled then add default column value
+           */
+          else if (column.blockImport && column.value) {
+            newRow.cells[column._id] = column.value;
+          }
         });
         nextTableFieldValues.push(newRow);
       });

package/dist/formHelper.js

@@ -0,0 +1,93 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.formatv2Form = exports.getDefaultPage = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _generateObjectId = _interopRequireDefault(require("./generateObjectId"));
+
+var _PageLayoutModes = _interopRequireDefault(require("./constants/PageLayoutModes"));
+
+var _FieldStyleModes = _interopRequireDefault(require("./constants/FieldStyleModes"));
+
+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; }
+
+/**
+ * Create default page
+ *
+ * @param {Object} defaults
+ * @return {Object}
+ */
+var getDefaultPage = function getDefaultPage() {
+  var defaults = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return _objectSpread({
+    _id: (0, _generateObjectId["default"])(),
+    name: 'New Page',
+    fields: [],
+    layoutMode: _PageLayoutModes["default"].grid,
+    fieldStyleMode: _FieldStyleModes["default"].normal
+  }, defaults);
+};
+/**
+ * Format a version 2 form (template)
+ *
+  * @param {Object} form
+  * @return {Object}
+ */
+
+
+exports.getDefaultPage = getDefaultPage;
+
+var formatv2Form = function formatv2Form(form) {
+  var pages = form.pages,
+      fields = form.fields;
+  var fieldsLookup = {};
+  fields.forEach(function (field) {
+    fieldsLookup[field._id] = field;
+  });
+  /**
+   * Fully populated list of fields
+   */
+
+  var nextFields = [];
+  var nextPages = (0, _toConsumableArray2["default"])(pages).map(function (page) {
+    var nextPage = _objectSpread(_objectSpread({}, page), {}, {
+      fields: []
+    });
+
+    page.fields.forEach(function (pageFieldPosition) {
+      var field = fieldsLookup[pageFieldPosition.field];
+
+      var formattedData = _objectSpread({
+        type: field.type
+      }, pageFieldPosition);
+
+      if (field.title) formattedData.title = field.title;
+      if (field.value) formattedData.value = field.value;
+      if (field.tableColumns) formattedData.tableColumns = field.tableColumns;
+      if (field.options) formattedData.tableColumns = field.options;
+      nextPage.fields.push(formattedData);
+      nextFields.push(formattedData);
+    });
+  });
+  return _objectSpread(_objectSpread({}, form), {}, {
+    pages: nextPages,
+    fields: nextFields
+  });
+};
+
+exports.formatv2Form = formatv2Form;
+var _default = {
+  getDefaultPage: getDefaultPage,
+  formatv2Form: formatv2Form
+};
+exports["default"] = _default;

package/dist/index.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _typeof = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -37,7 +37,9 @@ Object.defineProperty(exports, "generateObjectId", {
     return _generateObjectId["default"];
   }
 });
-exports.paginationHelper = exports.roleHelper = exports.fileHelper = exports.activityHelper = exports.fieldHelper = exports.chartHelper = exports.tableHelper = exports["default"] = void 0;
+exports.paginationHelper = exports.formHelper = exports.roleHelper = exports.fileHelper = exports.activityHelper = exports.fieldHelper = exports.chartHelper = exports.tableHelper = exports["default"] = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var tableHelper = _interopRequireWildcard(require("./tableHelper"));
 
@@ -63,6 +65,10 @@ var roleHelper = _interopRequireWildcard(require("./roleHelper"));
 
 exports.roleHelper = roleHelper;
 
+var formHelper = _interopRequireWildcard(require("./formHelper"));
+
+exports.formHelper = formHelper;
+
 var _reduxApiMiddleware = _interopRequireWildcard(require("./reduxApiMiddleware"));
 
 var paginationHelper = _interopRequireWildcard(require("./paginationHelper"));
@@ -75,18 +81,20 @@ var _Roles = _interopRequireDefault(require("./constants/Roles"));
 
 var _generateObjectId = _interopRequireDefault(require("./generateObjectId"));
 
-var _default = {
+var _fileHelper$tableHelp;
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var _default = (_fileHelper$tableHelp = {
   fileHelper: fileHelper,
   tableHelper: tableHelper,
   chartHelper: chartHelper,
   fieldHelper: fieldHelper,
-  activityHelper: activityHelper,
+  formHelper: formHelper,
   reduxApiMiddleware: _reduxApiMiddleware["default"],
-  CALL_API: _reduxApiMiddleware.CALL_API,
-  paginationHelper: paginationHelper,
-  changedKeys: _changedKeys["default"],
-  roleHelper: roleHelper,
-  Roles: _Roles["default"],
-  generateObjectId: _generateObjectId["default"]
-};
+  activityHelper: activityHelper
+}, (0, _defineProperty2["default"])(_fileHelper$tableHelp, "reduxApiMiddleware", _reduxApiMiddleware["default"]), (0, _defineProperty2["default"])(_fileHelper$tableHelp, "CALL_API", _reduxApiMiddleware.CALL_API), (0, _defineProperty2["default"])(_fileHelper$tableHelp, "paginationHelper", paginationHelper), (0, _defineProperty2["default"])(_fileHelper$tableHelp, "changedKeys", _changedKeys["default"]), (0, _defineProperty2["default"])(_fileHelper$tableHelp, "roleHelper", roleHelper), (0, _defineProperty2["default"])(_fileHelper$tableHelp, "Roles", _Roles["default"]), (0, _defineProperty2["default"])(_fileHelper$tableHelp, "generateObjectId", _generateObjectId["default"]), _fileHelper$tableHelp);
+
 exports["default"] = _default;

package/dist/reduxApiMiddleware.js

@@ -11,9 +11,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var CALL_API = 'CALL API';
 exports.CALL_API = CALL_API;

package/dist/tableHelper.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -25,9 +25,13 @@ var _FieldTableColumnTypes = _interopRequireDefault(require("./constants/FieldTa
 
 var _FieldTableCustomColumnIds = _interopRequireDefault(require("./constants/FieldTableCustomColumnIds"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var parser = new _hotFormulaParser.Parser();
 
@@ -762,23 +766,23 @@ var spreadOperandRange = function spreadOperandRange(targetValue) {
   } // Handle column range
   // For instance, A1:D1
   else {
-      var _startIndex = parseInt(_Table["default"].operandLetters.indexOf(operandALetter.toUpperCase()), 10);
+    var _startIndex = parseInt(_Table["default"].operandLetters.indexOf(operandALetter.toUpperCase()), 10);
 
-      var _endIndex = parseInt(_Table["default"].operandLetters.indexOf(operandBLetter.toUpperCase()), 10);
+    var _endIndex = parseInt(_Table["default"].operandLetters.indexOf(operandBLetter.toUpperCase()), 10);
 
-      var _operandRangeValues = operandA;
+    var _operandRangeValues = operandA;
 
-      var _i = _startIndex + 1;
+    var _i = _startIndex + 1;
 
-      while (_i <= _endIndex) {
-        var nextOperandLetter = _Table["default"].operandLetters[_i];
-        _operandRangeValues += ",".concat(nextOperandLetter).concat(operandAIndex);
-        _i++;
-      }
-
-      targetValue = targetValue.replace(/[A-Z](\d{1,10}):[A-Z](\d{1,10})/gi, _operandRangeValues);
+    while (_i <= _endIndex) {
+      var nextOperandLetter = _Table["default"].operandLetters[_i];
+      _operandRangeValues += ",".concat(nextOperandLetter).concat(operandAIndex);
+      _i++;
     }
 
+    targetValue = targetValue.replace(/[A-Z](\d{1,10}):[A-Z](\d{1,10})/gi, _operandRangeValues);
+  }
+
   return targetValue;
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "1.15.2",
+  "version": "1.16.0-rc2",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [
@@ -45,11 +45,8 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "moment": "^2.29.1",
-    "shortid": "^2.2.16"
-  },
-  "peerDependencies": {
-    "@builttocreate/hot-formula-parser": "^4.0.1"
+    "@builttocreate/hot-formula-parser": "^5.0.0-rc1",
+    "moment": "^2.29.1"
   },
   "jest": {
     "verbose": true,