@ukhomeoffice/cop-react-form-renderer 6.15.9-gamma → 6.15.12-alpha

package/dist/components/FormRenderer/FormRenderer.js

@@ -142,23 +142,12 @@ const InternalFormRenderer = _ref2 => {
     }
     clearErrors();
     setGoingBack(true);
-    hooks.onGoingBack(e.state ? e.state : null, _objectSpread({}, formState.page.formData));
+    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);
     }
   };
@@ -200,6 +189,17 @@ const InternalFormRenderer = _ref2 => {
     setFormState(_helpers.default.getFormState(pageId, pages, hub));
   }, [pages, hub, pageId, setFormState, type, goingBack, data, formState.page]);
 
+  // page rendered page
+  (0, _react.useEffect)(() => {
+    if (document) {
+      const element = document.getElementsByTagName("h1")[0];
+      if (element) {
+        element.setAttribute("tabIndex", "-1");
+        element.focus();
+      }
+    }
+  }, [formState.page]);
+
   // Call the onFormLoad hook just when this component first renders.
   (0, _react.useEffect)(() => {
     setPagePoint(undefined);

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

@@ -30,12 +30,6 @@ 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,26 +115,6 @@ 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.9-gamma",
+  "version": "6.15.12-alpha",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",