@ukhomeoffice/cop-react-form-renderer 6.7.0-alpha → 6.12.0

package/dist/components/FormRenderer/onPageAction.js

@@ -10,27 +10,28 @@ var _setCollectionPageData = _interopRequireDefault(require("../../utils/Collect
 var _handlers = _interopRequireDefault(require("./handlers"));
 var _helpers = _interopRequireDefault(require("./helpers"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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) { _defineProperty(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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 // Handle actions from pages.
 // (patch captures payload-ready field name and value, 
 // patchLabel captures non-ID values 
 // for display purposes after submission.)
-const onPageAction = (action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors, submitting, setSubmitting, existingErrors) => {
+var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors, submitting, setSubmitting, existingErrors) {
   // Save a copy of data in case submit errors and we need to revert
-  const preSubmitData = {
-    ...data
-  };
-  const form = formState;
-  const update = hooks.onAction(form.page.formData, patch, data, action.customAction);
+  var preSubmitData = _objectSpread({}, data);
+  var form = formState;
+  var update = hooks.onAction(form.page.formData, patch, data, action.customAction);
   form.page.formData = update.formData;
-  let _patch = update.patch;
+  var _patch = update.patch;
 
   // Re-apply the patch to the page's formData.
   // This should normally have no effect but will prevent issues 
   // with validation if formData happens to have been wiped.
-  form.page.formData = {
-    ...form.page.formData,
-    ..._patch
-  };
+  form.page.formData = _objectSpread(_objectSpread({}, form.page.formData), _patch);
 
   // Exposes form data to consuming application.
   if (action.type === _models.PageAction.TYPES.CANCEL) {
@@ -46,8 +47,8 @@ const onPageAction = (action, patch, patchLabel, hooks, data, formState, validat
     _patch = _helpers.default.cleanHiddenNestedData(_patch, form.page);
     setSubmitting(true);
     if (action.addToFormData) {
-      const operations = Array.isArray(action.addToFormData) ? action.addToFormData : [action.addToFormData];
-      operations.forEach(op => {
+      var operations = Array.isArray(action.addToFormData) ? action.addToFormData : [action.addToFormData];
+      operations.forEach(function (op) {
         if (op.isCollection) {
           (0, _setCollectionPageData.default)(op.field, op.value, formState.page.formData);
         } else {
@@ -60,52 +61,56 @@ const onPageAction = (action, patch, patchLabel, hooks, data, formState, validat
       _handlers.default.navigate(action, pageId, onPageChange);
       setSubmitting(false);
     } else {
-      let pageUpdate = next => onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, next));
+      var pageUpdate = function pageUpdate(next) {
+        return onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, next));
+      };
       /* eslint-disable no-case-declarations */
       switch (action.type) {
         case _models.PageAction.TYPES.SUBMIT:
           setPagePoint('submit');
           break;
         case _models.PageAction.TYPES.SAVE_AND_NAVIGATE:
-          const state = {
-            ...currentTask
+          var state = _objectSpread({}, currentTask);
+          pageUpdate = function pageUpdate() {
+            return _handlers.default.navigate(action, pageId, onPageChange, state);
           };
-          pageUpdate = () => _handlers.default.navigate(action, pageId, onPageChange, state);
           break;
         case _models.PageAction.TYPES.COLLECTION_ADD:
           _utils.default.CollectionPage.addEntry(action.collection, form.page.formData);
-          pageUpdate = () => _handlers.default.navigate(action, pageId, onPageChange);
+          pageUpdate = function pageUpdate() {
+            return _handlers.default.navigate(action, pageId, onPageChange);
+          };
           break;
         case _models.PageAction.TYPES.COLLECTION_DUPLICATE:
           if (_utils.default.CollectionPage.duplicateActiveEntry(action.collection, formState.page.formData)) {
-            pageUpdate = () => _handlers.default.navigate(action, pageId, onPageChange);
+            pageUpdate = function pageUpdate() {
+              return _handlers.default.navigate(action, pageId, onPageChange);
+            };
           }
           ;
           break;
         case _models.PageAction.TYPES.COLLECTION_REMOVE:
-          const activeId = action.targetId || form.page.formData["".concat(action.collection.split('.').pop(), "ActiveId")];
-          const removedEntry = _utils.default.CollectionPage.removeEntry(action.collection, formState.page.formData, activeId);
+          var activeId = action.targetId || form.page.formData["".concat(action.collection.split('.').pop(), "ActiveId")];
+          var removedEntry = _utils.default.CollectionPage.removeEntry(action.collection, formState.page.formData, activeId);
           if (action.recordRemoval) {
-            form.page.formData["".concat(action.collection.split('.').pop(), "LastRemoved")] = {
-              ...removedEntry
-            };
+            form.page.formData["".concat(action.collection.split('.').pop(), "LastRemoved")] = _objectSpread({}, removedEntry);
           }
           break;
         default:
           break;
       }
       ;
-      /* eslint-enable no-case-declarations */
+
+      // If a value has been deleted from formData,
+      // also delete it from data before doing object spread,
+      // or else it will reappear in submissionData.
+      _utils.default.Data.deleteValues(data, formState.page.formData);
 
       // Save draft or submit.
-      const submissionData = _utils.default.Format.form({
-        pages,
-        components
-      }, {
-        ...data,
-        ...patch,
-        ...formState.page.formData
-      }, _models.EventTypes.SUBMIT);
+      var submissionData = _utils.default.Format.form({
+        pages: pages,
+        components: components
+      }, _objectSpread(_objectSpread(_objectSpread({}, data), patch), formState.page.formData), _models.EventTypes.SUBMIT);
       submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.sections);
       if (_patch) {
         setData(submissionData);
@@ -114,8 +119,8 @@ const onPageAction = (action, patch, patchLabel, hooks, data, formState, validat
 
       // In case of hub-and-spoke if patchLabel has changed then 
       // save name and value to variables for call to onSubmit hook
-      let changedFieldName;
-      let changedFieldValue;
+      var changedFieldName;
+      var changedFieldValue;
       if (type === _models.FormTypes.HUB && Object.keys(patchLabel).length > 0) {
         /* eslint-disable prefer-destructuring */
         changedFieldName = Object.keys(patchLabel)[0];
@@ -125,25 +130,20 @@ const onPageAction = (action, patch, patchLabel, hooks, data, formState, validat
       ;
 
       // Now submit the data to the backend...
-      hooks.onSubmit(action.type, submissionData, response => {
+      hooks.onSubmit(action.type, submissionData, function (response) {
         // The backend response may well contain data we need so apply it...
         // ... but this needs to happen in a useEffect, not right away.
-        const sData = {
-          ...submissionData,
-          ...response
-        };
+        var sData = _objectSpread(_objectSpread({}, submissionData), response);
         setSubmitted({
           data: sData
         });
         pageUpdate(sData);
         setSubmitting(false);
       }, function (errors) {
-        let wipeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+        var wipeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
         _handlers.default.submissionError(errors, addErrors);
         if (wipeData) {
-          setData({
-            ...preSubmitData
-          });
+          setData(_objectSpread({}, preSubmitData));
         }
         setSubmitting(false);
       }, changedFieldName, changedFieldValue, pageId);