@ukhomeoffice/cop-react-form-renderer 3.32.4 → 3.32.5

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

@@ -17,7 +17,15 @@ var getNextHubPageId = function getNextHubPageId(action, currentPageId, pages, f
   if (!currentPageId && formType === _models.FormTypes.FORM_WITH_TASK) {
     var _formData$formStatus;
 
-    if (formData !== null && formData !== void 0 && (_formData$formStatus = formData.formStatus) !== null && _formData$formStatus !== void 0 && _formData$formStatus.tasks) {
+    if (formData !== null && formData !== void 0 && (_formData$formStatus = formData.formStatus) !== null && _formData$formStatus !== void 0 && _formData$formStatus.taskPage) {
+      var currentPage = pages.find(function (page) {
+        return page.id === formData.formStatus.taskPage;
+      });
+
+      if ((currentPage === null || currentPage === void 0 ? void 0 : currentPage.type) === 'pre-task-list') {
+        return currentPage.id;
+      }
+
       return _models.FormPages.HUB;
     }
 

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

@@ -233,6 +233,60 @@ describe('components', function () {
               fieldOne: 'valueTwo'
             })).toEqual(FORM_WITH_TASK_PAGES[3].id);
           });
+          it("should take the user to the hub if they saved and returned mid task", function () {
+            var EXIT_MID_TASK_PAGES = [{
+              id: 'alpha',
+              type: 'pre-task-list'
+            }, {
+              id: 'bravo',
+              type: 'pre-task-list'
+            }, {
+              id: 'charlie',
+              components: [RADIOS]
+            }, {
+              id: 'delta',
+              components: [TEXT]
+            }, {
+              id: 'echo',
+              components: [HTML]
+            }, {
+              id: 'foxtrot',
+              components: [TEXT]
+            }];
+            var EXIT_MID_TASK_DATA = {
+              formStatus: {
+                taskPage: 'charlie'
+              }
+            };
+            expect((0, _getNextPageId.default)(FORM_TYPE, EXIT_MID_TASK_PAGES, undefined, undefined, EXIT_MID_TASK_DATA)).toEqual(_models.FormPages.HUB);
+          });
+          it('should take the user to the pre task page if they saved and exited before reaching the task list', function () {
+            var EXIT_MID_TASK_PAGES = [{
+              id: 'alpha',
+              type: 'pre-task-list'
+            }, {
+              id: 'bravo',
+              type: 'pre-task-list'
+            }, {
+              id: 'charlie',
+              components: [RADIOS]
+            }, {
+              id: 'delta',
+              components: [TEXT]
+            }, {
+              id: 'echo',
+              components: [HTML]
+            }, {
+              id: 'foxtrot',
+              components: [TEXT]
+            }];
+            var EXIT_PRE_TASK_DATA = {
+              formStatus: {
+                taskPage: 'bravo'
+              }
+            };
+            expect((0, _getNextPageId.default)(FORM_TYPE, EXIT_MID_TASK_PAGES, undefined, undefined, EXIT_PRE_TASK_DATA)).toEqual('bravo');
+          });
         });
       });
     });

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

@@ -31,6 +31,7 @@ var getSubmissionStatus = function getSubmissionStatus(formType, pages, currentP
       };
     }
 
+    formStatus.taskPage = formStatus.tasks[currentTask.name].currentPage;
     return formStatus;
   }
 

package/package.json

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