@ukhomeoffice/cop-react-form-renderer 6.15.7 → 6.15.8-charlie

package/dist/components/FormRenderer/FormRenderer.js

@@ -144,10 +144,21 @@ const InternalFormRenderer = _ref2 => {
     setGoingBack(true);
     hooks.onGoingBack(e.state ? e.state : null);
     if (components && pages && data && (_formState$page = formState.page) !== null && _formState$page !== void 0 && _formState$page.formData && pagePoint === undefined) {
+      var _submissionData$formS;
       const submissionData = _utils.default.Format.form({
         pages,
         components
       }, _objectSpread(_objectSpread({}, data), formState.page.formData), _models.EventTypes.SUBMIT);
+      if (submissionData !== null && submissionData !== void 0 && (_submissionData$formS = submissionData.formStatus) !== null && _submissionData$formS !== void 0 && _submissionData$formS.taskPage) {
+        const object = submissionData.formStatus.tasks;
+        Object.keys(object).forEach(key => {
+          const value = object[key];
+          if (value.currentPage && !value.complete) {
+            delete object[key].currentPage;
+          }
+        });
+        delete submissionData.formStatus.taskPage;
+      }
       setData(submissionData);
     }
   };

package/dist/components/FormRenderer/helpers/getUpdatedSectionStates.js

@@ -30,6 +30,12 @@ const getCurrentTaskState = function (_ref) {
   if (currentPage) {
     return _models.TaskStates.TYPES.IN_PROGRESS;
   }
+  // If the user has clicked on the back link (see FormRenderer.jsx window.onpopstate event handler) 
+  // the task will be incomplete and the currentPage deleted
+  // and the task state should be recognised as 'In progress'.
+  if (complete !== undefined && !complete && currentPage === undefined) {
+    return _models.TaskStates.TYPES.IN_PROGRESS;
+  }
   return defaultState;
 };
 

package/dist/components/FormRenderer/helpers/getUpdatedSectionStates.test.js

@@ -115,6 +115,26 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', () => {
       expect(updatedSections[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.IN_PROGRESS);
       expect(updatedSections[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
     });
+    it("should set tasks to '".concat(_models.TaskStates.TYPES.IN_PROGRESS, "' if they have no current page and are not complete"), () => {
+      const SECTIONS = [{
+        name: 'Add event details',
+        tasks: [{
+          name: 'Date, location and mode details',
+          pages: ['eventDate', 'eventMode']
+        }, {
+          name: 'Officer and agency details',
+          pages: ['officeDetails']
+        }]
+      }];
+      const TASKS = {
+        'Date, location and mode details': {
+          complete: false
+        }
+      };
+      const updatedSections = (0, _getUpdatedSectionStates.default)(SECTIONS, TASKS);
+      expect(updatedSections[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.IN_PROGRESS);
+      expect(updatedSections[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
+    });
     it("should set the status of any tasks in a section with a failed show_when to '".concat(_models.TaskStates.TYPES.SKIPPED, "'"), () => {
       const SECTIONS = [{
         name: 'Add event details',

package/package.json

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