@ukhomeoffice/cop-react-form-renderer 2.7.1 → 2.7.3

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[4].childNodes[0].childNodes[1];
+              firstTaskStatus = taskList.childNodes[5].childNodes[0].childNodes[1];
               expect(firstTaskStatus.textContent).toEqual(_models.TaskStates.DETAILS[_models.TaskStates.TYPES.NOT_STARTED].label);
-              secondTaskStatus = taskList.childNodes[4].childNodes[1].childNodes[1];
+              secondTaskStatus = taskList.childNodes[5].childNodes[1].childNodes[1];
               expect(secondTaskStatus.textContent).toEqual(_models.TaskStates.DETAILS[_models.TaskStates.TYPES.CANNOT_START_YET].label); //Launch first task
 
-              firstTask = taskList.childNodes[4].childNodes[0].childNodes[0].childNodes[0];
+              firstTask = taskList.childNodes[5].childNodes[0].childNodes[0].childNodes[0];
               expect(firstTask.textContent).toEqual('Date, location and mode details');
 
               _react.fireEvent.click(firstTask, {}); //Fill first page and navigate
@@ -640,9 +640,9 @@ describe('components', function () {
 
               expect(container.childNodes[0].childNodes[0].textContent).toEqual('Event at the border'); //Check status's are correct
 
-              firstTaskStatus = container.childNodes[0].childNodes[1].childNodes[4].childNodes[0].childNodes[1];
+              firstTaskStatus = container.childNodes[0].childNodes[1].childNodes[5].childNodes[0].childNodes[1];
               expect(firstTaskStatus.textContent).toEqual(_models.TaskStates.DETAILS[_models.TaskStates.TYPES.COMPLETE].label);
-              secondTaskStatus = container.childNodes[0].childNodes[1].childNodes[4].childNodes[1].childNodes[1];
+              secondTaskStatus = container.childNodes[0].childNodes[1].childNodes[5].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];
@@ -691,7 +691,7 @@ describe('components', function () {
             case 4:
               taskList = container.childNodes[0].childNodes[1]; //Launch first task
 
-              _react.fireEvent.click(taskList.childNodes[4].childNodes[0].childNodes[0].childNodes[0], {}); //Fill first page and navigate
+              _react.fireEvent.click(taskList.childNodes[5].childNodes[0].childNodes[0].childNodes[0], {}); //Fill first page and navigate
 
 
               newPage = container.childNodes[0].childNodes[0];
@@ -730,7 +730,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[4].childNodes[0].childNodes[0].childNodes[0], {}); //Should be at CYA page
+              _react.fireEvent.click(container.childNodes[0].childNodes[1].childNodes[5].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/TaskList/TaskList.js

@@ -68,8 +68,10 @@ var TaskList = function TaskList(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", _extends({}, attrs, {
     className: classes()
   }), /*#__PURE__*/_react.default.createElement("h2", {
-    className: "govuk-heading-s govuk-!-margin-bottom-2"
-  }, "".concat(refTitle, " ").concat(refNumber)), numberOfSections !== numberOfCompleteSections && /*#__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-!-margin-bottom-2"
   }, "Incomplete form"), /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-7"

package/dist/components/TaskList/TaskList.scss

@@ -15,9 +15,7 @@
     @include govuk-responsive-margin(9, 'bottom');
     list-style: none;
     padding-left: 0;
-    @include govuk-media-query($from: tablet) {
-      padding-left: govuk-spacing(6);
-    }
+    padding-left: govuk-spacing(4);
   }
 }
 
@@ -54,6 +52,16 @@
   }
 }
 
+.hods-task-reference-description{
+  @include govuk-media-query($from: 450px) {
+    float: left;
+  }
+}
+
+.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
 // avoid breaking task lists in existing prototypes.

package/dist/components/TaskList/TaskList.test.js

@@ -57,23 +57,26 @@ describe('components', function () {
       expect(container.childNodes.length).toEqual(1);
       var referenceHeading = container.childNodes[0].childNodes[0];
       expect(referenceHeading.tagName).toEqual('H2');
-      expect(referenceHeading.textContent).toEqual('COP reference number 123');
-      var incompleteForm = container.childNodes[0].childNodes[1];
+      expect(referenceHeading.textContent).toEqual('COP reference number');
+      var referenceNumber = container.childNodes[0].childNodes[1];
+      expect(referenceNumber.tagName).toEqual('H2');
+      expect(referenceNumber.textContent).toEqual('123');
+      var incompleteForm = container.childNodes[0].childNodes[2];
       expect(incompleteForm.tagName).toEqual('H2');
       expect(incompleteForm.textContent).toEqual('Incomplete form');
-      var numComplete = container.childNodes[0].childNodes[2];
+      var numComplete = container.childNodes[0].childNodes[3];
       expect(numComplete.tagName).toEqual('P');
       expect(numComplete.textContent).toEqual('You have completed 2 of 6 sections');
-      expect(container.childNodes[0].childNodes.length).toEqual(7);
-      var subSectionOneHeading = container.childNodes[0].childNodes[3];
+      expect(container.childNodes[0].childNodes.length).toEqual(8);
+      var subSectionOneHeading = container.childNodes[0].childNodes[4];
       expect(subSectionOneHeading.tagName).toEqual('H2');
       expect(subSectionOneHeading.textContent).toEqual('1. These are your tasks');
-      var subSectionOneList = container.childNodes[0].childNodes[4];
+      var subSectionOneList = container.childNodes[0].childNodes[5];
       expect(subSectionOneList.childNodes.length).toEqual(3);
-      var subSectionTwoHeading = container.childNodes[0].childNodes[5];
+      var subSectionTwoHeading = container.childNodes[0].childNodes[6];
       expect(subSectionTwoHeading.tagName).toEqual('H2');
       expect(subSectionTwoHeading.textContent).toEqual('2. These are your extra bonus tasks');
-      var subSectionTwoList = container.childNodes[0].childNodes[6];
+      var subSectionTwoList = container.childNodes[0].childNodes[7];
       expect(subSectionTwoList.childNodes.length).toEqual(3);
     });
     it('should not show incomplete form if form is complete', function () {
@@ -118,11 +121,14 @@ describe('components', function () {
       })),
           container = _render2.container;
 
-      expect(container.childNodes[0].childNodes.length).toEqual(6);
+      expect(container.childNodes[0].childNodes.length).toEqual(7);
       var referenceHeading = container.childNodes[0].childNodes[0];
       expect(referenceHeading.tagName).toEqual('H2');
-      expect(referenceHeading.textContent).toEqual('COP reference number 123');
-      var numComplete = container.childNodes[0].childNodes[1];
+      expect(referenceHeading.textContent).toEqual('COP reference number');
+      var referenceNumber = container.childNodes[0].childNodes[1];
+      expect(referenceNumber.tagName).toEqual('H2');
+      expect(referenceNumber.textContent).toEqual('123');
+      var numComplete = container.childNodes[0].childNodes[2];
       expect(numComplete.tagName).toEqual('P');
       expect(numComplete.textContent).toEqual('You have completed 6 of 6 sections');
     });
@@ -153,7 +159,7 @@ describe('components', function () {
       })),
           container = _render3.container;
 
-      var subSectionOne = container.childNodes[0].childNodes[3];
+      var subSectionOne = container.childNodes[0].childNodes[4];
       expect(subSectionOne.childNodes[0].textContent).toEqual('');
       expect(subSectionOne.childNodes[1].textContent).toEqual('These are your tasks');
     });
@@ -192,9 +198,9 @@ describe('components', function () {
     })),
         container = _render4.container;
 
-    var firstTask = container.childNodes[0].childNodes[4].childNodes[0].childNodes[0].childNodes[0];
-    var secondTask = container.childNodes[0].childNodes[4].childNodes[1].childNodes[0].childNodes[0];
-    var thirdTask = container.childNodes[0].childNodes[4].childNodes[2].childNodes[0].childNodes[0];
+    var firstTask = container.childNodes[0].childNodes[5].childNodes[0].childNodes[0].childNodes[0];
+    var secondTask = container.childNodes[0].childNodes[5].childNodes[1].childNodes[0].childNodes[0];
+    var thirdTask = container.childNodes[0].childNodes[5].childNodes[2].childNodes[0].childNodes[0];
 
     _react.fireEvent.click(firstTask.childNodes[0]);
 

package/dist/json/groupOfRow.json

@@ -1,8 +1,8 @@
 {
-  "id": "userProfile",
+  "id": "cop-secondForm",
   "version": "1",
-  "name": "userProfile",
-  "title": "Your profile",
+  "name": "cop-secondForm",
+  "title": "Cop - Second Form",
   "type": "cya",
   "components": [
     {
@@ -10,20 +10,14 @@
       "fieldId": "firstName",
       "label": "First name",
       "type": "text",
-      "readonly": false,
-      "source": {
-        "field": "currentUser.givenName"
-      }
+      "readonly": false
     },
     {
       "id": "surname",
       "fieldId": "surname",
       "label": "Last name",
       "type": "text",
-      "readonly": false,
-      "source": {
-        "field": "currentUser.familyName"
-      }
+      "readonly": false
     },
     {
       "id": "dateGroup",
@@ -31,10 +25,7 @@
       "label": "Date",
       "type": "date",
       "required": true,
-      "readonly": false,
-      "source": {
-        "field": "dateGroupField"
-      }
+      "readonly": false
     },
     {
       "id": "timeGroup",
@@ -42,10 +33,7 @@
       "label": "Time",
       "type": "time",
       "required": true,
-      "readonly": false,
-      "source": {
-        "field": "timeGroupField"
-      }
+      "readonly": false
     },
     {
       "id": "portGroup",
@@ -53,10 +41,7 @@
       "label": "Port",
       "type": "text",
       "required": true,
-      "readonly": false,
-      "source": {
-        "field": "portGroupField"
-      }
+      "readonly": false
     },
     {
       "id": "whereGroup",
@@ -64,10 +49,7 @@
       "label": "Where did you see the incident take place",
       "type": "text",
       "required": true,
-      "readonly": false,
-      "source": {
-        "field": "whereGroupField"
-      }
+      "readonly": false
     },
     {
       "id": "extraDetails",
@@ -94,9 +76,7 @@
         "page": "names",
         "aria_suffix": "names"
       },
-      "actions": [
-        "submit"
-      ]
+      "actions": [ "saveAndContinue", "saveAndReturn" ]
     },
     {
       "id": "dateLocDet",
@@ -120,9 +100,7 @@
         "page": "dateLocDet",
         "aria_suffix": "Date and location details"
       },
-      "actions": [
-        "submit"
-      ]
+      "actions": [ "saveAndContinue", "saveAndReturn" ]
     },
     {
       "id": "additional-info",
@@ -137,14 +115,12 @@
         "page": "additional-info",
         "aria_suffix": "Additional Information"
       },
-      "actions": [
-        "submit"
-      ]
+      "actions": [ "saveAndContinue", "saveAndReturn" ]
     }
   ],
   "cya": {
-    "hide_page_titles": true,
-    "hide_actions": true,
+    "hide_page_titles": false,
+    "hide_actions": false,
     "groups": [
       {
         "pageId": "dateLocDet"
@@ -153,6 +129,9 @@
         "pageId": "names",
         "title": "Names"
       }
+    ],
+    "actions": [
+      { "type": "submit", "label": "Submit", "validate": true }
     ]
   }
 }

package/dist/json/taskList.json

@@ -72,8 +72,10 @@
       "actions": [
         {
           "type": "saveAndNavigate",
-          "page": "eventMode"
-        }
+          "page": "eventMode",
+          "label": "Save and continue"
+        },
+        "saveAndReturn"
       ],
       "cya_link": {
         "page": "eventDate",
@@ -93,7 +95,8 @@
         {
           "type": "saveAndNavigate",
           "page": "cya"
-        }
+        },
+        "saveAndReturn"
       ],
       "cya_link": {
         "page": "eventMode",
@@ -113,7 +116,8 @@
         {
           "type": "saveAndNavigate",
           "page": "cya"
-        }
+        },
+        "saveAndReturn"
       ],
       "cya_link": {
         "page": "officeDetails",
@@ -133,7 +137,8 @@
         {
           "type": "saveAndNavigate",
           "page": "cya"
-        }
+        },
+        "saveAndReturn"
       ],
       "cya_link": {
         "page": "immigrationDate",
@@ -153,7 +158,8 @@
         {
           "type": "saveAndNavigate",
           "page": "surname"
-        }
+        },
+        "saveAndReturn"
       ],
       "cya_link": {
         "page": "firstName",
@@ -173,7 +179,8 @@
         {
           "type": "saveAndNavigate",
           "page": "cya"
-        }
+        },
+        "saveAndReturn"
       ],
       "cya_link": {
         "page": "surname",
@@ -223,6 +230,9 @@
     ]
   },
   "cya": {
-    "hide_page_titles": false
+    "hide_page_titles": false,
+    "actions": [
+      { "type": "saveAndContinue", "label": "save cont", "validate": true }
+    ]
   }
 }

package/dist/models/PageAction.js

@@ -28,7 +28,8 @@ var DefaultPageActions = (_DefaultPageActions = {}, _defineProperty(_DefaultPage
   label: 'Save and continue'
 }), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_NAVIGATE, {
   type: TYPE_SAVE_AND_NAVIGATE,
-  validate: true
+  validate: true,
+  label: 'Save and continue'
 }), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_RETURN, {
   type: TYPE_SAVE_AND_RETURN,
   validate: false,

package/dist/models/TaskStates.js

@@ -22,16 +22,16 @@ var StateTypes = {
 exports.StateTypes = StateTypes;
 var StateDetails = (_StateDetails = {}, _defineProperty(_StateDetails, TYPE_COMPLETE, {
   label: 'Completed',
-  colour: ''
+  colour: 'dark-blue'
 }), _defineProperty(_StateDetails, TYPE_IN_PROGRESS, {
   label: 'In Progress',
-  colour: 'blue'
+  colour: 'white'
 }), _defineProperty(_StateDetails, TYPE_NOT_STARTED, {
   label: 'Not Started',
-  colour: 'grey'
+  colour: 'dark-grey'
 }), _defineProperty(_StateDetails, TYPE_CANNOT_START_YET, {
   label: 'Cannot Start Yet',
-  colour: 'grey'
+  colour: 'dark-grey'
 }), _StateDetails);
 var TaskStates = {
   TYPES: StateTypes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "1.3.0",
+    "@ukhomeoffice/cop-react-components": "1.5.1",
     "axios": "^0.21.1",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^3.13.0",