@ukhomeoffice/cop-react-form-renderer 4.39.0 → 4.41.0

package/dist/components/FormComponent/FormComponent.js

@@ -90,6 +90,10 @@ var FormComponent = function FormComponent(_ref) {
     var target = _ref2.target;
 
     if (typeof onChange === 'function') {
+      if (component.type === _models.ComponentTypes.EMAIL) {
+        target['value'] = target.value.trim();
+      }
+
       target = (0, _helpers.addLabel)(target, component, data);
       onChange({
         target: target

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

@@ -44,13 +44,16 @@ describe('utils.Component.get', function () {
         container = _render.container;
 
     var _getAllByTestId = (0, _react.getAllByTestId)(container, ID),
-        _getAllByTestId2 = _slicedToArray(_getAllByTestId, 2),
-        formGroup = _getAllByTestId2[0],
-        wrapper = _getAllByTestId2[1];
+        _getAllByTestId2 = _slicedToArray(_getAllByTestId, 1),
+        formGroup = _getAllByTestId2[0];
 
-    var input = wrapper.querySelector('#dropzone').children[0];
     expect(formGroup.tagName).toEqual('DIV');
     expect(formGroup.classList).toContain('govuk-form-group');
+    var wrapper = container.querySelector("#".concat(ID));
+    expect(wrapper.tagName).toEqual('DIV');
+    expect(wrapper.classList).toContain('cop-multi-file-upload');
+    expect(wrapper.id).toEqual(ID);
+    var input = wrapper.children[1].children[0];
     var label = undefined;
     formGroup.childNodes[0].childNodes.forEach(function (node) {
       // Check if it's an element.
@@ -61,9 +64,6 @@ describe('utils.Component.get', function () {
     expect(label).toBeDefined();
     expect(label.innerHTML).toContain(LABEL);
     expect(label.getAttribute('for')).toEqual(ID);
-    expect(wrapper.tagName).toEqual('DIV');
-    expect(wrapper.classList).toContain('cop-multi-file-upload');
-    expect(wrapper.id).toEqual(ID);
     var str = JSON.stringify({
       alpha: 'bravo'
     });

package/dist/utils/Validate/validateComponent.js

@@ -67,7 +67,7 @@ var validateComponent = function validateComponent(component, outerData, formDat
 
       case _models.ComponentTypes.EMAIL:
         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);
+        error = (0, _validateEmail.default)(value, component.label, userEmail, component.custom_errors);
         break;
 
       case _models.ComponentTypes.DATE:

package/dist/utils/Validate/validateEmail.js

@@ -22,6 +22,7 @@ var HODS_EMAIL_REGEX = /^[a-z0-9._-]+@(digital\.)?homeoffice.gov.uk$/i;
 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] : '';
+  var customErrors = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
 
   if (!!value) {
     var name = label ? label.toLowerCase() : 'email address';
@@ -29,7 +30,7 @@ var validateEmail = function validateEmail(value) {
     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");
+        return "".concat(label, " cannot be your own email");
       }
 
       if (HODS_EMAIL_REGEX.test(value)) {
@@ -37,6 +38,16 @@ var validateEmail = function validateEmail(value) {
       }
     }
 
+    if (Array.isArray(customErrors)) {
+      var result = customErrors.filter(function (error) {
+        return error.type === 'format';
+      });
+
+      if (result && result.length > 0 && result[0].message) {
+        return result[0].message;
+      }
+    }
+
     return "Enter ".concat(name, " in the correct format, like jane.doe@homeoffice.gov.uk");
   }
 

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

@@ -52,12 +52,20 @@ 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 use a custom format error message when specified', function () {
+        var customErrors = [{
+          'type': 'format',
+          'message': 'Enter email address in the correct format'
+        }];
+        var CUSTOM_ERROR = 'Enter email address in the correct format';
+        expect((0, _validateEmail.default)('bob', '', '', customErrors)).toEqual(CUSTOM_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';
+        var USER_EMAIL_ERROR = 'Line manager email cannot be your own email';
         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';
+        var USER_EMAIL_ERROR = 'Delegate email address cannot be your own email';
         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.39.0",
+  "version": "4.41.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.8.0",
+    "@ukhomeoffice/cop-react-components": "2.9.0",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",