@ukhomeoffice/cop-react-form-renderer 4.28.0 → 4.29.0-beta

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.toLowerCase() === 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.28.0",
+  "version": "4.29.0-beta",
   "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",