@ukhomeoffice/cop-react-form-renderer 2.7.4 → 2.8.4

package/dist/components/CheckYourAnswers/CheckYourAnswers.test.js

@@ -22,6 +22,10 @@ var _userProfileData = _interopRequireDefault(require("../../json/userProfile.da
 
 var _userProfile = _interopRequireDefault(require("../../json/userProfile.json"));
 
+var _groupData = _interopRequireDefault(require("../../json/group.data.json"));
+
+var _group = _interopRequireDefault(require("../../json/group.json"));
+
 var _groupOfRow = _interopRequireDefault(require("../../json/groupOfRow.json"));
 
 var _utils = _interopRequireDefault(require("../../utils"));
@@ -378,14 +382,15 @@ describe('components', function () {
         }
       }, _callee12);
     })));
-    it('should render a group with one action button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
-      var GROUP_PAGES, cya, namesGroup, firstNameRow, surname, changeButtonDiv, changeButton;
+    it('Show answers from multiple address fields into in one DL', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
+      var DATA, GROUP_PAGES, cya, groupedComponent, keyGroup, valueGroup, changeButtonDiv, changeButton;
       return regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) {
           switch (_context14.prev = _context14.next) {
             case 0:
-              GROUP_PAGES = _utils.default.FormPage.getAll(_groupOfRow.default.pages, _groupOfRow.default.components, _objectSpread({}, DATA));
-              _context14.next = 3;
+              DATA = _utils.default.Data.setupForm(_group.default.pages, _group.default.components, _groupData.default);
+              GROUP_PAGES = _utils.default.FormPage.getAll(_group.default.pages, _group.default.components, _objectSpread({}, DATA));
+              _context14.next = 4;
               return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
                 return regeneratorRuntime.wrap(function _callee13$(_context13) {
                   while (1) {
@@ -395,7 +400,7 @@ describe('components', function () {
                           pages: GROUP_PAGES,
                           onRowAction: ON_ROW_ACTION,
                           onAction: ON_ACTION,
-                          groups: _groupOfRow.default.cya.groups
+                          hide_title: true
                         }), container);
 
                       case 1:
@@ -406,6 +411,60 @@ describe('components', function () {
                 }, _callee13);
               })));
 
+            case 4:
+              cya = checkCYA(container);
+              groupedComponent = cya.childNodes[10];
+              keyGroup = groupedComponent.childNodes[0].childNodes[0].childNodes[0];
+              expect(keyGroup.tagName).toEqual('DT');
+              expect(keyGroup.textContent).toEqual('Address details (optional)');
+              valueGroup = groupedComponent.childNodes[0].childNodes[0].childNodes[1];
+              expect(valueGroup.childNodes.length).toEqual(4);
+              expect(valueGroup.tagName).toEqual('DD');
+              expect(valueGroup.childNodes[0].textContent).toContain('10 Downing Street');
+              expect(valueGroup.childNodes[1].textContent).toContain('City of Westminster');
+              expect(valueGroup.childNodes[2].textContent).toContain('London');
+              expect(valueGroup.childNodes[3].textContent).toContain('SW1A 2AA');
+              changeButtonDiv = groupedComponent.childNodes[0].childNodes[0].childNodes[2];
+              expect(changeButtonDiv.classList).toContain('govuk-summary-list__actions');
+              changeButton = changeButtonDiv.childNodes[0];
+              expect(changeButton.tagName).toEqual('A');
+              expect(changeButton.textContent).toEqual('Change address details');
+
+            case 21:
+            case "end":
+              return _context14.stop();
+          }
+        }
+      }, _callee14);
+    })));
+    it('should render a group with one action button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
+      var GROUP_PAGES, cya, namesGroup, firstNameRow, surname, changeButtonDiv, changeButton;
+      return regeneratorRuntime.wrap(function _callee16$(_context16) {
+        while (1) {
+          switch (_context16.prev = _context16.next) {
+            case 0:
+              GROUP_PAGES = _utils.default.FormPage.getAll(_groupOfRow.default.pages, _groupOfRow.default.components, _objectSpread({}, DATA));
+              _context16.next = 3;
+              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
+                return regeneratorRuntime.wrap(function _callee15$(_context15) {
+                  while (1) {
+                    switch (_context15.prev = _context15.next) {
+                      case 0:
+                        (0, _reactDom.render)( /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, {
+                          pages: GROUP_PAGES,
+                          onRowAction: ON_ROW_ACTION,
+                          onAction: ON_ACTION,
+                          groups: _groupOfRow.default.cya.groups
+                        }), container);
+
+                      case 1:
+                      case "end":
+                        return _context15.stop();
+                    }
+                  }
+                }, _callee15);
+              })));
+
             case 3:
               cya = checkCYA(container);
               namesGroup = cya.childNodes[2];
@@ -429,10 +488,10 @@ describe('components', function () {
 
             case 22:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
         }
-      }, _callee14);
+      }, _callee16);
     })));
   });
 });

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

@@ -581,12 +581,12 @@ describe('components', function () {
             case 5:
               taskList = container.childNodes[0].childNodes[1]; //Check status's are correct
 
-              firstTaskStatus = taskList.childNodes[5].childNodes[0].childNodes[1];
+              firstTaskStatus = taskList.childNodes[3].childNodes[0].childNodes[1];
               expect(firstTaskStatus.textContent).toEqual(_models.TaskStates.DETAILS[_models.TaskStates.TYPES.NOT_STARTED].label);
-              secondTaskStatus = taskList.childNodes[5].childNodes[1].childNodes[1];
+              secondTaskStatus = taskList.childNodes[3].childNodes[1].childNodes[1];
               expect(secondTaskStatus.textContent).toEqual(_models.TaskStates.DETAILS[_models.TaskStates.TYPES.CANNOT_START_YET].label); //Launch first task
 
-              firstTask = taskList.childNodes[5].childNodes[0].childNodes[0].childNodes[0];
+              firstTask = taskList.childNodes[3].childNodes[0].childNodes[0].childNodes[0];
               expect(firstTask.textContent).toEqual('Date, location and mode details');
 
               _react.fireEvent.click(firstTask, {}); //Fill first page and navigate
@@ -633,16 +633,17 @@ 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
 
 
               expect(container.childNodes[0].childNodes[0].textContent).toEqual('Task List Form'); //Check status's are correct
 
-              firstTaskStatus = container.childNodes[0].childNodes[1].childNodes[5].childNodes[0].childNodes[1];
+              firstTaskStatus = container.childNodes[0].childNodes[1].childNodes[3].childNodes[0].childNodes[1];
               expect(firstTaskStatus.textContent).toEqual(_models.TaskStates.DETAILS[_models.TaskStates.TYPES.COMPLETE].label);
-              secondTaskStatus = container.childNodes[0].childNodes[1].childNodes[5].childNodes[1].childNodes[1];
+              secondTaskStatus = container.childNodes[0].childNodes[1].childNodes[3].childNodes[1].childNodes[1];
               expect(secondTaskStatus.textContent).toEqual(_models.TaskStates.DETAILS[_models.TaskStates.TYPES.NOT_STARTED].label); //Check final data submitted to backend is as expected
 
               finalSubmit = ON_SUBMIT_CALLS[ON_SUBMIT_CALLS.length - 1];
@@ -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();
           }
@@ -691,7 +692,7 @@ describe('components', function () {
             case 4:
               taskList = container.childNodes[0].childNodes[1]; //Launch first task
 
-              _react.fireEvent.click(taskList.childNodes[5].childNodes[0].childNodes[0].childNodes[0], {}); //Fill first page and navigate
+              _react.fireEvent.click(taskList.childNodes[3].childNodes[0].childNodes[0].childNodes[0], {}); //Fill first page and navigate
 
 
               newPage = container.childNodes[0].childNodes[0];
@@ -730,7 +731,7 @@ describe('components', function () {
               _react.fireEvent.click(container.childNodes[0].childNodes[0].childNodes[5].childNodes[0], {}); //Launch same task again
 
 
-              _react.fireEvent.click(container.childNodes[0].childNodes[1].childNodes[5].childNodes[0].childNodes[0].childNodes[0], {}); //Should be at CYA page
+              _react.fireEvent.click(container.childNodes[0].childNodes[1].childNodes[3].childNodes[0].childNodes[0].childNodes[0], {}); //Should be at CYA page
 
 
               expect(container.childNodes[0].childNodes[0].childNodes[0].textContent).toEqual('Check your answers');

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

@@ -11,18 +11,25 @@ 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 if ((action === null || action === void 0 ? void 0 : action.type) === _models.PageAction.TYPES.SAVE_AND_NAVIGATE) {
+      console.log('pg action sc');
+      formStatus.tasks[currentTask.name] = {
+        complete: false,
+        currentPage: (0, _getNextPageId.default)(formType, pages, currentPageId, action, formData)
+      };
     } else {
+      console.log('got to else stmt');
       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 next page is not '".concat(_models.FormPages.CYA, "'"), function () {
             var CURRENT_PAGE_ID = 'eventDate';
             var TASK_NAME = 'taskName';
             var CURRENT_TASK = {

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.js

@@ -67,11 +67,11 @@ var TaskList = function TaskList(_ref) {
 
   return /*#__PURE__*/_react.default.createElement("div", _extends({}, attrs, {
     className: classes()
-  }), /*#__PURE__*/_react.default.createElement("h2", {
+  }), refNumber && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h2", {
     className: "hods-task-reference-description govuk-heading-s govuk-!-margin-bottom-2 govuk-!-padding-right-1"
   }, "".concat(refTitle)), /*#__PURE__*/_react.default.createElement("h2", {
-    className: "govuk-heading-s hods-task-reference"
-  }, "".concat(refNumber)), numberOfSections !== numberOfCompleteSections && /*#__PURE__*/_react.default.createElement("h2", {
+    className: "govuk-heading-s govuk-!-font-weight-regular"
+  }, "".concat(refNumber))), numberOfSections !== numberOfCompleteSections && /*#__PURE__*/_react.default.createElement("h2", {
     className: "govuk-heading-s govuk-!-margin-bottom-2"
   }, "Incomplete form"), /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-7"

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{
@@ -58,9 +60,6 @@
   }
 }
 
-.hods-task-reference{
-  font-weight: normal;
-}
 
 // The `hods-task-list__task-completed` class was previously used on the task
 // list for the completed tag (changed in 86c90ec) – it's still included here to

package/dist/json/group.data.json

@@ -0,0 +1,21 @@
+{
+  "urls": {
+    "refData": "/ref-data"
+  },
+  "currentUser": {
+    "givenName": "John",
+    "familyName": "Smith"
+  },
+  "areYouACivilServant": "yes",
+  "userDetails": {
+    "linemanagerEmail": "line.manager@digital.homeoffice.gov.uk",
+    "delegateEmails": "del.egate@digital.homeoffice.gov.uk"
+  },
+  "addressDetails": {
+    "firstLineOfTheAddress": "10 Downing Street",
+    "city": "London",
+    "town": "City of Westminster",
+    "postCode": "SW1A 2AA"
+  },
+  "businessKey": "123456789"
+}