@ukhomeoffice/cop-react-form-renderer 2.8.1 → 2.8.3

package/dist/components/FormRenderer/FormRenderer.js

@@ -208,7 +208,7 @@ var FormRenderer = function FormRenderer(_ref) {
           components: components
         }, _objectSpread(_objectSpread({}, data), patch), _models.EventTypes.SUBMIT);
 
-        submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask);
+        submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true);
 
         if (patch) {
           setData(submissionData);
@@ -256,6 +256,9 @@ var FormRenderer = function FormRenderer(_ref) {
 
       if (currentTask.state === _models.TaskStates.TYPES.COMPLETE) {
         onPageChange(_models.FormPages.CYA);
+      } else if (currentTask.state === _models.TaskStates.TYPES.IN_PROGRESS) {
+        var currentPage = data.formStatus.tasks[currentTask.name].currentPage;
+        onPageChange(currentPage || currentTask.pages[0]);
       } else {
         onPageChange(currentTask.pages[0]);
       }
@@ -274,7 +277,7 @@ var FormRenderer = function FormRenderer(_ref) {
           components: components
         }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
 
-        submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action);
+        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 () {
@@ -285,14 +288,14 @@ var FormRenderer = function FormRenderer(_ref) {
       }
     }
 
-    if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
+    if (action.type === _models.PageAction.TYPES.SAVE_AND_CONTINUE && hub === _models.HubFormats.TASK) {
       if (_helpers.default.canCYASubmit(currentTask.fullPages, onError)) {
         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);
+        _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);
@@ -301,16 +304,33 @@ var FormRenderer = function FormRenderer(_ref) {
         });
       }
     }
+
+    if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
+      if (_helpers.default.canCYASubmit(currentTask.fullPages, onError)) {
+        var _submissionData2 = _utils.default.Format.form({
+          pages: pages,
+          components: components
+        }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
+
+        _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 {
+            onPageChange(_models.FormPages.HUB);
+          }
+        }, function (errors) {
+          return _handlers.default.submissionError(errors, onError);
+        });
+      }
+    }
   };
 
   var classes = _utils.default.classBuilder(classBlock, classModifiers, className);
 
   if (hub === _models.HubFormats.TASK) {
-    cya.actions = [{
-      type: _models.PageAction.TYPES.SAVE_AND_RETURN,
-      label: 'Submit',
-      validate: true
-    }];
+    cya.actions = [_models.PageAction.TYPES.SAVE_AND_CONTINUE, _models.PageAction.TYPES.SAVE_AND_RETURN];
   }
 
   return /*#__PURE__*/_react.default.createElement("div", {

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

@@ -633,7 +633,8 @@ describe('components', function () {
 
               cyaPage = container.childNodes[0].childNodes[0];
               expect(cyaPage.childNodes[0].textContent).toEqual('Check your answers');
-              expect(cyaPage.childNodes[5].textContent).toEqual('Submit');
+              expect(cyaPage.childNodes[5].childNodes[0].textContent).toEqual('Save and continue');
+              expect(cyaPage.childNodes[5].childNodes[1].textContent).toEqual('Save and return later');
 
               _react.fireEvent.click(cyaPage.childNodes[5].childNodes[0], {}); //Should be back at task list
 
@@ -650,7 +651,7 @@ describe('components', function () {
               expect(finalSubmit.mode).toEqual('sea');
               expect(finalSubmit.formStatus.tasks['Date, location and mode details'].complete).toEqual(true);
 
-            case 38:
+            case 39:
             case "end":
               return _context18.stop();
           }

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

@@ -11,18 +11,18 @@ var _getNextPageId = _interopRequireDefault(require("./getNextPageId"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var getSubmissionStatus = function getSubmissionStatus(formType, pages, currentPageId, action, formData, currentTask) {
+var getSubmissionStatus = function getSubmissionStatus(formType, pages, currentPageId, action, formData, currentTask, isCompleted) {
   if (formType === _models.FormTypes.TASK) {
     var formStatus = formData.formStatus ? formData.formStatus : {};
     formStatus.tasks = formStatus.tasks ? formStatus.tasks : {};
     formStatus.tasks[currentTask.name] = formStatus.tasks[currentTask.name] ? formStatus.tasks[currentTask.name] : {};
 
-    if (currentPageId === _models.FormPages.CYA) {
+    if (currentPageId === (_models.FormPages.CYA || 'submitForm') && isCompleted) {
       formStatus.tasks[currentTask.name].complete = true;
     } else {
       formStatus.tasks[currentTask.name] = {
         complete: false,
-        currentPage: action.page
+        currentPage: currentPageId
       };
     }
 

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

@@ -210,19 +210,19 @@ describe('components', function () {
         });
         describe("when the form type is '".concat(_models.FormTypes.TASK, "'"), function () {
           var FORM_TYPE = _models.FormTypes.TASK;
-          it("should mark the current task as complete if the current page is '".concat(_models.FormPages.CYA, "'"), function () {
+          it("should mark the current task as complete if the current page is '".concat(_models.FormPages.CYA, "' and it is marked as complete"), function () {
             var CURRENT_PAGE_ID = _models.FormPages.CYA;
             var TASK_NAME = 'taskName';
             var CURRENT_TASK = {
               name: TASK_NAME
             };
-            expect((0, _getSubmissionStatus.default)(FORM_TYPE, PAGES, CURRENT_PAGE_ID, undefined, {}, CURRENT_TASK)).toMatchObject({
+            expect((0, _getSubmissionStatus.default)(FORM_TYPE, PAGES, CURRENT_PAGE_ID, undefined, {}, CURRENT_TASK, true)).toMatchObject({
               tasks: _defineProperty({}, TASK_NAME, {
                 complete: true
               })
             });
           });
-          it("should update the current task with the next page and a false complete flag if the current page is not '".concat(_models.FormPages.CYA, "'"), function () {
+          it("should update the current task with the current page and a false complete flag if the current page is not '".concat(_models.FormPages.CYA, "'"), function () {
             var CURRENT_PAGE_ID = 'eventDate';
             var TASK_NAME = 'taskName';
             var CURRENT_TASK = {
@@ -236,7 +236,7 @@ describe('components', function () {
             expect((0, _getSubmissionStatus.default)(FORM_TYPE, PAGES, CURRENT_PAGE_ID, ACTION, {}, CURRENT_TASK)).toMatchObject({
               tasks: _defineProperty({}, TASK_NAME, {
                 complete: false,
-                currentPage: NEXT_PAGE_ID
+                currentPage: CURRENT_PAGE_ID
               })
             });
           });

package/dist/components/TaskList/Task.js

@@ -65,7 +65,13 @@ var Task = function Task(_ref) {
   }, linkActive ? /*#__PURE__*/_react.default.createElement(_copReactComponents.Link, {
     onClick: function onClick() {
       return _onClick(task);
-    }
+    },
+    onKeyPress: function onKeyPress(event) {
+      if (event.key === 'Enter') {
+        _onClick(task);
+      }
+    },
+    tabIndex: "0"
   }, task.name) : task.name), /*#__PURE__*/_react.default.createElement(_TaskState.default, {
     state: currentState
   }));

package/dist/components/TaskList/TaskList.scss

@@ -11,7 +11,7 @@
     min-width: 550px;
   }
   .hods-task-list__items {
-    @include govuk-font($size: 19);
+   font-size: 19px;
     @include govuk-responsive-margin(9, 'bottom');
     list-style: none;
     padding-left: 0;
@@ -21,7 +21,8 @@
 
 .hods-task-list__section {
   display: table;
-  @include govuk-font($size: 24, $weight: bold);
+ font-size: 24px;
+ font-weight: bold;
 }
 
 .hods-task-list__section-number {
@@ -46,10 +47,11 @@
 
 .hods-task-list__task-name {
   display: block;
-  cursor: pointer;
+  cursor: auto;
   @include govuk-media-query($from: 450px) {
     float: left;
   }
+  font-weight: normal;
 }
 
 .hods-task-reference-description{

package/package.json

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