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

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.28.0",
+  "version": "4.29.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",