@ukhomeoffice/cop-react-form-renderer 3.2.2 → 3.2.3

package/dist/components/FormRenderer/FormRenderer.js

@@ -246,27 +246,6 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   var onPageAction = function onPageAction(action, patch) {
     // Check to see whether the action is able to proceed, which in
     // in the case of a submission will validate the fields in the page.
-    if (action.type === _models.PageAction.TYPES.SUBMIT) {
-      if (_helpers.default.canCYASubmit(pages, validate.pages)) {
-        // Submit.
-        var submissionData = _utils.default.Format.form({
-          pages: pages,
-          components: components
-        }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
-
-        submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true);
-        setData(submissionData); // Now submit the data to the backend...
-
-        hooks.onSubmit(action.type, submissionData, function () {
-          return hooks.onFormComplete();
-        }, function (errors) {
-          return _handlers.default.submissionError(errors, addErrors);
-        });
-      }
-    } // Check to see whether the action is able to proceed, which in
-    // in the case of a submission will validate the fields in the page.
-
-
     if (_helpers.default.canActionProceed(action, formState.page, validate.page)) {
       patch = _helpers.default.cleanHiddenNestedData(patch, formState.page);
 
@@ -274,15 +253,15 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         _handlers.default.navigate(action, pageId, onPageChange);
       } else {
         // Save draft or submit.
-        var _submissionData = _utils.default.Format.form({
+        var submissionData = _utils.default.Format.form({
           pages: pages,
           components: components
         }, _objectSpread(_objectSpread({}, data), patch), _models.EventTypes.SUBMIT);
 
-        _submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData, currentTask, true);
+        submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true);
 
         if (patch) {
-          setData(_submissionData);
+          setData(submissionData);
         }
 
         var pageUpdate = function pageUpdate(next) {
@@ -298,10 +277,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         } // Now submit the data to the backend...
 
 
-        hooks.onSubmit(action.type, _submissionData, function (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.
-          var sData = _objectSpread(_objectSpread({}, _submissionData), response);
+          var sData = _objectSpread(_objectSpread({}, submissionData), response);
 
           setSubmitted({
             data: sData
@@ -364,14 +343,14 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
 
     if (action.type === _models.PageAction.TYPES.SAVE_AND_CONTINUE && hub === _models.HubFormats.TASK) {
       if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
-        var _submissionData2 = _utils.default.Format.form({
+        var _submissionData = _utils.default.Format.form({
           pages: pages,
           components: components
         }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
 
-        _submissionData2.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData2, currentTask, true);
-        setData(_submissionData2);
-        hooks.onSubmit(action.type, _submissionData2, function () {
+        _submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData, currentTask, true);
+        setData(_submissionData);
+        hooks.onSubmit(action.type, _submissionData, function () {
           return onPageChange(_models.FormPages.HUB);
         }, function (errors) {
           return _handlers.default.submissionError(errors, addErrors);
@@ -381,14 +360,14 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
 
     if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
       if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
-        var _submissionData3 = _utils.default.Format.form({
+        var _submissionData2 = _utils.default.Format.form({
           pages: pages,
           components: components
         }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
 
-        _submissionData3.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData3, currentTask);
-        setData(_submissionData3);
-        hooks.onSubmit(action.type, _submissionData3, function () {
+        _submissionData2.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData2, currentTask);
+        setData(_submissionData2);
+        hooks.onSubmit(action.type, _submissionData2, function () {
           if (type === _models.FormTypes.TASK) {
             onPageChange(undefined);
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",