@ukhomeoffice/cop-react-form-renderer 4.29.0-alpha → 4.30.0

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

@@ -36,10 +36,6 @@ var _taskList = _interopRequireDefault(require("../../json/taskList.json"));
 
 var _firstForm = _interopRequireDefault(require("../../json/firstForm.json"));
 
-var _multiQuestionTaskListData = _interopRequireDefault(require("../../json/multiQuestionTaskListData.json"));
-
-var _multiQuestionTaskList = _interopRequireDefault(require("../../json/multiQuestionTaskList.json"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -638,21 +634,21 @@ describe('components', function () {
               newPage = container.childNodes[0].childNodes[0];
               expect(newPage.childNodes[0].textContent).toEqual('Event Date');
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[0].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[0].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-day',
                   value: '7'
                 }
               });
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[1].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[1].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-month',
                   value: '7'
                 }
               });
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[2].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[2].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-year',
                   value: '2022'
@@ -667,7 +663,7 @@ describe('components', function () {
               newPage = container.childNodes[0].childNodes[0];
               expect(newPage.childNodes[0].textContent).toEqual('Event Mode');
 
-              _react.fireEvent.click(newPage.childNodes[1].childNodes[2].childNodes[0].childNodes[0], {});
+              _react.fireEvent.click(newPage.childNodes[1].childNodes[0].childNodes[1], {});
 
               continueButton = newPage.childNodes[2].childNodes[0];
 
@@ -675,17 +671,17 @@ describe('components', function () {
 
 
               cyaPageChange = container.childNodes[0].childNodes[0];
-              modeChangeLink = cyaPageChange.childNodes[4].childNodes[0].childNodes[0].childNodes[2].childNodes[0].childNodes[0];
+              modeChangeLink = cyaPageChange.childNodes[0].childNodes[1].childNodes[0].childNodes[0];
 
               _react.fireEvent.click(modeChangeLink, {});
 
               changePage = container.childNodes[0].childNodes[0];
-              expect(changePage.childNodes[0].textContent).toEqual('Event Mode'); // Click on radio for 'Air'
+              expect(changePage.childNodes[1].textContent).toEqual('Event Mode'); // Click on radio for 'Air'
 
-              _react.fireEvent.click(changePage.childNodes[1].childNodes[2].childNodes[1].childNodes[0], {}); // Continue again to CYA page
+              _react.fireEvent.click(changePage.childNodes[2].childNodes[0].childNodes[3].childNodes[1].childNodes[0]); // Continue again to CYA page
 
 
-              continueButton = changePage.childNodes[2].childNodes[0];
+              continueButton = changePage.childNodes[3].childNodes[0];
 
               _react.fireEvent.click(continueButton, {}); //Continue on from CYA page
 
@@ -756,21 +752,21 @@ describe('components', function () {
 
               newPage = container.childNodes[0].childNodes[0];
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[0].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[0].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-day',
                   value: '7'
                 }
               });
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[1].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[1].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-month',
                   value: '7'
                 }
               });
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[2].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[2].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-year',
                   value: '2022'
@@ -782,7 +778,7 @@ describe('components', function () {
 
               newPage = container.childNodes[0].childNodes[0];
 
-              _react.fireEvent.click(newPage.childNodes[1].childNodes[2].childNodes[0].childNodes[0], {});
+              _react.fireEvent.click(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[0].childNodes[0], {});
 
               _react.fireEvent.click(newPage.childNodes[2].childNodes[0], {}); //Continue on from CYA page
 
@@ -847,21 +843,21 @@ describe('components', function () {
 
               newPage = container.childNodes[0].childNodes[0];
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[0].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[0].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-day',
                   value: '7'
                 }
               });
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[1].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[1].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-month',
                   value: '7'
                 }
               });
 
-              _react.fireEvent.change(newPage.childNodes[1].childNodes[2].childNodes[2].childNodes[1], {
+              _react.fireEvent.change(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[2].childNodes[0].childNodes[1], {
                 target: {
                   name: 'date-year',
                   value: '2022'
@@ -871,9 +867,9 @@ describe('components', function () {
               _react.fireEvent.click(newPage.childNodes[2].childNodes[0], {}); // Fill second page
 
 
-              newPage = container.childNodes[0].childNodes[0];
+              newPage = container.childNodes[0].childNodes[0]; // expect(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[0].childNodes[0]).toEqual('');
 
-              _react.fireEvent.click(newPage.childNodes[1].childNodes[2].childNodes[0].childNodes[0], {});
+              _react.fireEvent.click(newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[0].childNodes[0], {});
 
               _react.fireEvent.click(newPage.childNodes[2].childNodes[0], {}); // Launch same task again
 
@@ -1006,59 +1002,5 @@ describe('components', function () {
         }
       }, _callee28);
     })));
-    it('should display CYSA page when resuming an in-progress form, with Action buttons replaced with a single Continue button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee30() {
-      var ON_SUBMIT, HOOKS, taskList;
-      return regeneratorRuntime.wrap(function _callee30$(_context30) {
-        while (1) {
-          switch (_context30.prev = _context30.next) {
-            case 0:
-              ON_SUBMIT = function ON_SUBMIT(type, payload, onSuccess, onError) {
-                onSuccess();
-              };
-
-              HOOKS = {
-                onSubmit: ON_SUBMIT
-              };
-              _context30.next = 4;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee29() {
-                return regeneratorRuntime.wrap(function _callee29$(_context29) {
-                  while (1) {
-                    switch (_context29.prev = _context29.next) {
-                      case 0:
-                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _multiQuestionTaskList.default, {
-                          data: _multiQuestionTaskListData.default,
-                          hooks: HOOKS
-                        })), container);
-
-                      case 1:
-                      case "end":
-                        return _context29.stop();
-                    }
-                  }
-                }, _callee29);
-              })));
-
-            case 4:
-              taskList = container.childNodes[0].childNodes[1]; //Resume the first task
-
-              _react.fireEvent.click(taskList.childNodes[5].childNodes[1].childNodes[0].childNodes[0], {}); // Verify the correct title has been rendered, and the Action buttons have been changed to Continue Only
-
-
-              expect(container.childNodes[0].childNodes[0].childNodes[0].textContent).toEqual('Check your saved answers');
-              expect(container.childNodes[0].childNodes[0].childNodes[5].childNodes[0].childNodes[0].textContent).toEqual('Continue'); // Click Continue
-
-              _react.fireEvent.click(container.childNodes[0].childNodes[0].childNodes[5].childNodes[0].childNodes[0], {}); // Verify that Save & Continue / Save and Return Later buttons are restored on the next screen
-
-
-              expect(container.childNodes[0].childNodes[0].childNodes[6].childNodes[0].textContent).toEqual('Save and continue');
-              expect(container.childNodes[0].childNodes[0].childNodes[6].childNodes[1].textContent).toEqual('Save and return later');
-
-            case 11:
-            case "end":
-              return _context30.stop();
-          }
-        }
-      }, _callee30);
-    })));
   });
 });

package/dist/components/FormRenderer/handlers/navigate.js

@@ -16,11 +16,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {string} currentPageId The current pageId.
  * @param {Function} onNavigate The handler to call if the pageId is different to the currentPageId.
  */
-var navigate = function navigate(action, currentPageId, onNavigate, state) {
+var navigate = function navigate(action, currentPageId, onNavigate) {
   var pageId = (0, _getPageId.default)(action, currentPageId);
 
   if (pageId !== currentPageId) {
-    onNavigate(pageId, state);
+    onNavigate(pageId);
   }
 };
 

package/dist/models/PageAction.js

@@ -14,7 +14,6 @@ var TYPE_COLLECTION_ADD = 'collectionAdd';
 var TYPE_COLLECTION_DUPLICATE = 'collectionDuplicate';
 var TYPE_COLLECTION_REMOVE = 'collectionRemove';
 var TYPE_NAVIGATE = 'navigate';
-var TYPE_CONTINUE = 'continue';
 var TYPE_SAVE_AND_CONTINUE = 'saveAndContinue';
 var TYPE_SAVE_AND_NAVIGATE = 'saveAndNavigate';
 var TYPE_SAVE_AND_RETURN = 'saveAndReturn';
@@ -25,7 +24,6 @@ var PageActionTypes = {
   COLLECTION_DUPLICATE: TYPE_COLLECTION_DUPLICATE,
   COLLECTION_REMOVE: TYPE_COLLECTION_REMOVE,
   NAVIGATE: TYPE_NAVIGATE,
-  CONTINUE: TYPE_CONTINUE,
   SAVE_AND_CONTINUE: TYPE_SAVE_AND_CONTINUE,
   SAVE_AND_NAVIGATE: TYPE_SAVE_AND_NAVIGATE,
   SAVE_AND_RETURN: TYPE_SAVE_AND_RETURN,
@@ -37,11 +35,7 @@ var DefaultPageActions = (_DefaultPageActions = {}, _defineProperty(_DefaultPage
   validate: false,
   label: 'Cancel',
   classModifiers: 'secondary'
-}), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_ADD, undefined), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_DUPLICATE, undefined), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_REMOVE, undefined), _defineProperty(_DefaultPageActions, TYPE_NAVIGATE, undefined), _defineProperty(_DefaultPageActions, TYPE_CONTINUE, {
-  type: TYPE_CONTINUE,
-  validate: true,
-  label: 'Continue'
-}), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_CONTINUE, {
+}), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_ADD, undefined), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_DUPLICATE, undefined), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_REMOVE, undefined), _defineProperty(_DefaultPageActions, TYPE_NAVIGATE, undefined), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_CONTINUE, {
   type: TYPE_SAVE_AND_CONTINUE,
   validate: true,
   label: 'Save and continue'

package/dist/utils/Component/getComponentTests/getComponent.autocomplete.test.js

@@ -37,11 +37,12 @@ describe('utils.Component.get', function () {
     var autocompleteWrapper = undefined;
     var autocomplete = undefined;
     var autocompleteInput = undefined;
-    formGroup.childNodes.forEach(function (node) {
+    var fieldSet = formGroup.childNodes[0];
+    fieldSet.childNodes.forEach(function (node) {
       // Check if it's an element.
       if (node instanceof Element) {
-        if (node.tagName === 'LABEL') {
-          label = node;
+        if (node.tagName === 'LEGEND') {
+          label = node.childNodes[0];
         } else if (node.classList.contains('hods-autocomplete__outer-wrapper')) {
           autocompleteWrapper = node;
           var autocompleteInner = node.childNodes[0];

package/dist/utils/Component/getComponentTests/getComponent.calculation.test.js

@@ -154,7 +154,7 @@ describe('utils.Component.get', function () {
               _getAllByTestId = (0, _react.getAllByTestId)(container, ID), _getAllByTestId2 = _slicedToArray(_getAllByTestId, 2), formGroup = _getAllByTestId2[0], input = _getAllByTestId2[1];
               expect(formGroup.tagName).toEqual('DIV');
               expect(formGroup.classList).toContain('govuk-form-group');
-              label = formGroup.childNodes[0];
+              label = formGroup.childNodes[0].childNodes[0].childNodes[0];
               expect(label.tagName).toEqual('LABEL');
               expect(label.classList).toContain('govuk-label');
               expect(label.textContent).toContain(LABEL);
@@ -268,7 +268,7 @@ describe('utils.Component.get', function () {
 
       expect(formGroup.tagName).toEqual('DIV');
       expect(formGroup.classList).toContain('govuk-form-group');
-      var label = formGroup.childNodes[0];
+      var label = formGroup.childNodes[0].childNodes[0].childNodes[0];
       expect(label.tagName).toEqual('LABEL');
       expect(label.classList).toContain('govuk-label');
       expect(label.textContent).toContain(LABEL);

package/dist/utils/Component/getComponentTests/getComponent.checkboxes.test.js

@@ -60,12 +60,13 @@ describe('utils.Component.get', function () {
 
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
+    var fieldSet = formGroup.childNodes[0];
     var label = undefined;
-    formGroup.childNodes.forEach(function (node) {
+    fieldSet.childNodes.forEach(function (node) {
       // Check if it's an element.
       if (node instanceof Element) {
-        if (node.tagName === 'LABEL') {
-          label = node;
+        if (node.tagName === 'LEGEND') {
+          label = node.childNodes[0];
         }
       }
     });

package/dist/utils/Component/getComponentTests/getComponent.date.test.js

@@ -50,7 +50,7 @@ describe('utils.Component.get', function () {
 
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
-    var label = formGroup.childNodes[0];
+    var label = formGroup.childNodes[0].childNodes[0].childNodes[0];
     expect(label.innerHTML).toContain(LABEL);
     expect(label.getAttribute('for')).toEqual(ID);
     expect(dateinput.tagName).toEqual('DIV');
@@ -59,31 +59,31 @@ describe('utils.Component.get', function () {
     var dayitem = dateinput.childNodes[0];
     expect(dayitem.tagName).toEqual('DIV');
     expect(dayitem.classList).toContain('govuk-date-input__item');
-    var daylabel = dayitem.childNodes[0];
+    var daylabel = dayitem.childNodes[0].childNodes[0].childNodes[0];
     expect(daylabel.tagName).toEqual('LABEL');
     expect(daylabel.classList).toContain('govuk-label');
     expect(daylabel.textContent).toEqual('Day');
-    var dayinput = dayitem.childNodes[1];
+    var dayinput = dayitem.childNodes[0].childNodes[1];
     expect(dayinput.tagName).toEqual('INPUT');
     expect(dayinput.id).toEqual("".concat(ID, "-day"));
     var monthitem = dateinput.childNodes[1];
     expect(monthitem.tagName).toEqual('DIV');
     expect(monthitem.classList).toContain('govuk-date-input__item');
-    var monthlabel = monthitem.childNodes[0];
+    var monthlabel = monthitem.childNodes[0].childNodes[0].childNodes[0];
     expect(monthlabel.tagName).toEqual('LABEL');
     expect(monthlabel.classList).toContain('govuk-label');
     expect(monthlabel.textContent).toEqual('Month');
-    var monthinput = monthitem.childNodes[1];
+    var monthinput = monthitem.childNodes[0].childNodes[1];
     expect(monthinput.tagName).toEqual('INPUT');
     expect(monthinput.id).toEqual("".concat(ID, "-month"));
     var yearitem = dateinput.childNodes[2];
     expect(yearitem.tagName).toEqual('DIV');
     expect(yearitem.classList).toContain('govuk-date-input__item');
-    var yearlabel = yearitem.childNodes[0];
+    var yearlabel = yearitem.childNodes[0].childNodes[0].childNodes[0];
     expect(yearlabel.tagName).toEqual('LABEL');
     expect(yearlabel.classList).toContain('govuk-label');
     expect(yearlabel.textContent).toEqual('Year');
-    var yearinput = yearitem.childNodes[1];
+    var yearinput = yearitem.childNodes[0].childNodes[1];
     expect(yearinput.tagName).toEqual('INPUT');
     expect(yearinput.id).toEqual("".concat(ID, "-year")); // Add something to the day and make sure it fires.
 

package/dist/utils/Component/getComponentTests/getComponent.email.test.js

@@ -51,10 +51,10 @@ describe('utils.Component.get', function () {
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
     var label = undefined;
-    formGroup.childNodes.forEach(function (node) {
+    formGroup.childNodes[0].childNodes.forEach(function (node) {
       // Check if it's an element.
-      if (node instanceof Element && node.tagName === 'LABEL') {
-        label = node;
+      if (node instanceof Element && node.tagName === 'LEGEND') {
+        label = node.childNodes[0];
       }
     });
     expect(label).toBeDefined();

package/dist/utils/Component/getComponentTests/getComponent.file.test.js

@@ -53,10 +53,10 @@ describe('utils.Component.get', function () {
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
     var label = undefined;
-    formGroup.childNodes.forEach(function (node) {
+    formGroup.childNodes[0].childNodes.forEach(function (node) {
       // Check if it's an element.
-      if (node instanceof Element && node.tagName === 'LABEL') {
-        label = node;
+      if (node instanceof Element && node.tagName === 'LEGEND') {
+        label = node.childNodes[0];
       }
     });
     expect(label).toBeDefined();

package/dist/utils/Component/getComponentTests/getComponent.nested.test.js

@@ -47,29 +47,29 @@ describe('utils.Component.get', function () {
             }];
             _renderWithValidation = (0, _setupTests.renderWithValidation)((0, _getComponent.getChildrenJsx)(PARENT_CONFIG, NESTED_CONFIG)), container = _renderWithValidation.container;
             child = container.childNodes[0];
-            expect(child.childNodes.length).toEqual(3);
+            expect(child.childNodes[0].childNodes.length).toEqual(3);
             expect(child.classList).toContain('govuk-form-group');
             label = child.childNodes[0];
             expect(label).toBeDefined();
             expect(label.innerHTML).toContain(LABEL);
-            input = child.childNodes[2];
+            input = child.childNodes[0].childNodes[2];
             expect(input.tagName).toEqual('INPUT');
             expect(input.classList).toContain('govuk-input');
             expect(input.id).toEqual(ID);
             expect(input.value).toEqual(VALUE);
             child2 = container.childNodes[1];
-            expect(child2.childNodes.length).toEqual(3);
+            expect(child2.childNodes[0].childNodes.length).toEqual(3);
             expect(child2.classList).toContain('govuk-form-group');
             label2 = child2.childNodes[0];
             expect(label2).toBeDefined();
             expect(label2.innerHTML).toContain(LABEL2);
-            input2 = child2.childNodes[2];
+            input2 = child2.childNodes[0].childNodes[2];
             expect(input2.tagName).toEqual('DIV');
             expect(input2.classList).toContain('govuk-date-input');
             expect(input2.id).toEqual(ID2);
-            expect(input2.childNodes[0].childNodes[1].value).toEqual('1');
-            expect(input2.childNodes[1].childNodes[1].value).toEqual('2');
-            expect(input2.childNodes[2].childNodes[1].value).toEqual('2022');
+            expect(input2.childNodes[0].childNodes[0].childNodes[1].value).toEqual('1');
+            expect(input2.childNodes[1].childNodes[0].childNodes[1].value).toEqual('2');
+            expect(input2.childNodes[2].childNodes[0].childNodes[1].value).toEqual('2022');
 
           case 35:
           case "end":
@@ -137,12 +137,12 @@ describe('utils.Component.get', function () {
             }];
             _renderWithValidation2 = (0, _setupTests.renderWithValidation)((0, _getComponent.getChildrenJsx)(PARENT_CONFIG, NESTED_CONFIG)), container = _renderWithValidation2.container;
             child = container.childNodes[0];
-            expect(child.childNodes.length).toEqual(3);
+            expect(child.childNodes[0].childNodes.length).toEqual(3);
             expect(child.classList).toContain('govuk-form-group');
             label = child.childNodes[0];
             expect(label).toBeDefined();
             expect(label.innerHTML).toContain(LABEL);
-            input = child.childNodes[2];
+            input = child.childNodes[0].childNodes[2];
             expect(input.tagName).toEqual('INPUT');
             expect(input.classList).toContain('govuk-input');
             expect(input.id).toEqual("".concat(CONTAINER_ID, ".").concat(FIELD_ID));
@@ -180,12 +180,12 @@ describe('utils.Component.get', function () {
             }];
             _renderWithValidation3 = (0, _setupTests.renderWithValidation)((0, _getComponent.getChildrenJsx)(PARENT_CONFIG, NESTED_CONFIG)), container = _renderWithValidation3.container;
             child = container.childNodes[0];
-            expect(child.childNodes.length).toEqual(3);
+            expect(child.childNodes[0].childNodes.length).toEqual(3);
             expect(child.classList).toContain('govuk-form-group');
             label = child.childNodes[0];
             expect(label).toBeDefined();
             expect(label.innerHTML).toContain(LABEL);
-            input = child.childNodes[2];
+            input = child.childNodes[0].childNodes[2];
             expect(input.tagName).toEqual('INPUT');
             expect(input.classList).toContain('govuk-input');
             expect(input.id).toEqual("".concat(COLLECTION_ID, "[0].").concat(FIELD_ID));

package/dist/utils/Component/getComponentTests/getComponent.phoneNumber.test.js

@@ -51,10 +51,10 @@ describe('utils.Component.get', function () {
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
     var label = undefined;
-    formGroup.childNodes.forEach(function (node) {
+    formGroup.childNodes[0].childNodes.forEach(function (node) {
       // Check if it's an element.
-      if (node instanceof Element && node.tagName === 'LABEL') {
-        label = node;
+      if (node instanceof Element && node.tagName === 'LEGEND') {
+        label = node.childNodes[0];
       }
     });
     expect(label).toBeDefined();

package/dist/utils/Component/getComponentTests/getComponent.radios.test.js

@@ -61,11 +61,11 @@ describe('utils.Component.get', function () {
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
     var label = undefined;
-    formGroup.childNodes.forEach(function (node) {
+    formGroup.childNodes[0].childNodes.forEach(function (node) {
       // Check if it's an element.
       if (node instanceof Element) {
-        if (node.tagName === 'LABEL') {
-          label = node;
+        if (node.tagName === 'LEGEND') {
+          label = node.childNodes[0];
         }
       }
     });

package/dist/utils/Component/getComponentTests/getComponent.select.test.js

@@ -58,13 +58,7 @@ describe('utils.Component.get', function () {
 
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
-    var label = undefined;
-    formGroup.childNodes.forEach(function (node) {
-      // Check if it's an element.
-      if (node instanceof Element && node.tagName === 'LABEL') {
-        label = node;
-      }
-    });
+    var label = formGroup.childNodes[0].childNodes[0].childNodes[0];
     expect(label).toBeDefined();
     expect(label.innerHTML).toContain(LABEL);
     expect(label.getAttribute('for')).toEqual(ID);

package/dist/utils/Component/getComponentTests/getComponent.text.test.js

@@ -51,10 +51,10 @@ describe('utils.Component.get', function () {
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
     var label = undefined;
-    formGroup.childNodes.forEach(function (node) {
+    formGroup.childNodes[0].childNodes.forEach(function (node) {
       // Check if it's an element.
-      if (node instanceof Element && node.tagName === 'LABEL') {
-        label = node;
+      if (node instanceof Element && node.tagName === 'LEGEND') {
+        label = node.childNodes[0];
       }
     });
     expect(label).toBeDefined();

package/dist/utils/Component/getComponentTests/getComponent.textarea.test.js

@@ -52,7 +52,7 @@ describe('utils.Component.get', function () {
 
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
-    var label = formGroup.childNodes[0];
+    var label = formGroup.childNodes[0].childNodes[0].childNodes[0];
     expect(label.innerHTML).toContain(LABEL);
     expect(label.getAttribute('for')).toEqual(ID);
     expect(textarea.tagName).toEqual('TEXTAREA');

package/dist/utils/Component/getComponentTests/getComponent.time.test.js

@@ -50,7 +50,7 @@ describe('utils.Component.get', function () {
 
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
-    var label = formGroup.childNodes[0];
+    var label = formGroup.childNodes[0].childNodes[0].childNodes[0];
     expect(label.innerHTML).toContain(LABEL);
     expect(label.getAttribute('for')).toEqual(ID);
     expect(timeInput.tagName).toEqual('DIV');
@@ -78,12 +78,12 @@ describe('utils.Component.get', function () {
       expect(part.item.tagName).toEqual('DIV');
       expect(part.item.classList).toContain('govuk-date-input__item');
 
-      var _part$item$childNodes = _slicedToArray(part.item.childNodes, 2),
+      var _part$item$childNodes = _slicedToArray(part.item.childNodes[0].childNodes, 2),
           label = _part$item$childNodes[0],
           input = _part$item$childNodes[1];
 
-      expect(label.tagName).toEqual('LABEL');
-      expect(label.classList).toContain('govuk-label');
+      expect(label.childNodes[0].tagName).toEqual('LABEL');
+      expect(label.childNodes[0].classList).toContain('govuk-label');
       expect(label.textContent).toEqual(part.label);
       expect(input.tagName).toEqual('INPUT');
       expect(input.id).toEqual("".concat(ID, "-").concat(part.id)); // Put something in the input and make sure it fires.

package/dist/utils/Validate/validateComponent.js

@@ -37,7 +37,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
  * @returns The first encountered error with the component.
  */
 var validateComponent = function validateComponent(component, outerData, formData) {
-  var _component$data$optio;
+  var _fd$keycloakContext, _component$data$optio;
 
   var fd = formData || outerData;
 
@@ -64,7 +64,8 @@ var validateComponent = function validateComponent(component, outerData, formDat
         return (0, _validateCollection.default)(component, value, fd);
 
       case _models.ComponentTypes.EMAIL:
-        error = (0, _validateEmail.default)(value, component.label);
+        var userEmail = fd === null ? '' : (_fd$keycloakContext = fd.keycloakContext) === null || _fd$keycloakContext === void 0 ? void 0 : _fd$keycloakContext.email;
+        error = (0, _validateEmail.default)(value, component.label, userEmail);
         break;
 
       case _models.ComponentTypes.DATE:

package/dist/utils/Validate/validateEmail.js

@@ -15,20 +15,28 @@ var HODS_EMAIL_REGEX = /^[a-z0-9._-]+@(digital\.)?homeoffice.gov.uk$/i;
  * validateRequired (Validate.required) for that sort of validation.
  * @param {*} value The value to validate.
  * @param {string} label The label to use in any error message.
+ * @param {string} userEmail The user email to use for validation.
  * @returns An error if the email address is invalid.
  */
 
 var validateEmail = function validateEmail(value) {
   var label = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var userEmail = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
 
   if (!!value) {
+    var name = label ? label.toLowerCase() : 'email address';
+
     if (typeof value === 'string') {
+      // The following is an interim fix pending a mechanism for validating against specific values
+      if (['Line manager email', 'Delegate email address'].includes(label) && value === userEmail) {
+        return "".concat(label, " cannot be the same as the user email address");
+      }
+
       if (HODS_EMAIL_REGEX.test(value)) {
         return undefined;
       }
     }
 
-    var name = label ? label.toLowerCase() : 'email address';
     return "Enter ".concat(name, " in the correct format, like jane.doe@homeoffice.gov.uk");
   }
 

package/dist/utils/Validate/validateEmail.test.js

@@ -52,6 +52,14 @@ describe('utils', function () {
         var DEFAULT_ERROR = 'Enter email address in the correct format, like jane.doe@homeoffice.gov.uk';
         expect((0, _validateEmail.default)(['bob'], undefined)).toEqual(DEFAULT_ERROR);
       });
+      it('should return an error when line manager email is same as user email', function () {
+        var USER_EMAIL_ERROR = 'Line manager email cannot be the same as the user email address';
+        expect((0, _validateEmail.default)('joe.bloggs@digital.homeoffice.gov.uk', 'Line manager email', 'joe.bloggs@digital.homeoffice.gov.uk')).toEqual(USER_EMAIL_ERROR);
+      });
+      it('should return an error when delegate email is same as user email', function () {
+        var USER_EMAIL_ERROR = 'Delegate email address cannot be the same as the user email address';
+        expect((0, _validateEmail.default)('joe.bloggs@digital.homeoffice.gov.uk', 'Delegate email address', 'joe.bloggs@digital.homeoffice.gov.uk')).toEqual(USER_EMAIL_ERROR);
+      });
     });
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.29.0-alpha",
+  "version": "4.30.0",
   "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": "2.4.0",
+    "@ukhomeoffice/cop-react-components": "2.5.0",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",