@ukhomeoffice/cop-react-form-renderer 5.91.1 → 5.93.0

package/dist/components/CollectionSummary/RenderListView.js

@@ -29,7 +29,7 @@ var DEFAULT_DELETE_BUTTON_LABEL = exports.DEFAULT_DELETE_BUTTON_LABEL = 'Delete'
 var DEFAULT_CHANGE_BUTTON_CLASS = exports.DEFAULT_CHANGE_BUTTON_CLASS = 'secondary';
 var DEFAULT_DELETE_BUTTON_CLASS = exports.DEFAULT_DELETE_BUTTON_CLASS = 'warning';
 var RenderListView = function RenderListView(_ref) {
-  var _config$changeAction, _config$deleteAction, _masterPage$childPage;
+  var _config$changeAction, _config$changeAction2, _config$changeAction3, _config$changeAction4, _config$deleteAction, _masterPage$childPage;
   var id = _ref.id,
     entryData = _ref.entryData,
     config = _ref.config,
@@ -59,16 +59,28 @@ var RenderListView = function RenderListView(_ref) {
     className: classes('actions')
   }, /*#__PURE__*/_react.default.createElement("li", {
     className: classes('action')
-  }, config.changeAction && typeof onFullEdit === 'function' && /*#__PURE__*/_react.default.createElement("button", {
+  }, config.changeAction && typeof onFullEdit === 'function' &&
+  // If passed a value for classModifiers, render a Button with those classModifiers applied - 
+  // otherwise, revert to the default GOVUK List View styling of rendering a Link button instead:
+  config.changeAction.classModifiers ? /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
+    id: "".concat(id, ".changeButton"),
+    onClick: function onClick() {
+      return onFullEdit(config.changeAction.page, entryData.id);
+    },
+    classModifiers: config.changeAction.classModifiers,
+    "aria-label": _copReactComponents.Utils.interpolateString("".concat(((_config$changeAction = config.changeAction) === null || _config$changeAction === void 0 ? void 0 : _config$changeAction.label) || DEFAULT_CHANGE_BUTTON_LABEL, " ").concat(config.title || DEFAULT_TITLE), _objectSpread(_objectSpread({}, entryData), {}, {
+      index: entryData.index + 1
+    }))
+  }, ((_config$changeAction2 = config.changeAction) === null || _config$changeAction2 === void 0 ? void 0 : _config$changeAction2.label) || DEFAULT_CHANGE_BUTTON_LABEL) : /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
     className: "govuk-link govuk-link-button",
     onClick: function onClick() {
       return onFullEdit(config.changeAction.page, entryData.id);
     },
-    "aria-label": _copReactComponents.Utils.interpolateString("".concat(((_config$changeAction = config.changeAction) === null || _config$changeAction === void 0 ? void 0 : _config$changeAction.label) || DEFAULT_CHANGE_BUTTON_LABEL, " ").concat(config.title || DEFAULT_TITLE), _objectSpread(_objectSpread({}, entryData), {}, {
+    "aria-label": _copReactComponents.Utils.interpolateString("".concat(((_config$changeAction3 = config.changeAction) === null || _config$changeAction3 === void 0 ? void 0 : _config$changeAction3.label) || DEFAULT_CHANGE_BUTTON_LABEL, " ").concat(config.title || DEFAULT_TITLE), _objectSpread(_objectSpread({}, entryData), {}, {
       index: entryData.index + 1
     }))
-  }, config.changeAction.label || DEFAULT_CHANGE_BUTTON_LABEL)), /*#__PURE__*/_react.default.createElement("li", {
+  }, ((_config$changeAction4 = config.changeAction) === null || _config$changeAction4 === void 0 ? void 0 : _config$changeAction4.label) || DEFAULT_CHANGE_BUTTON_LABEL)), /*#__PURE__*/_react.default.createElement("li", {
     className: classes('action')
   }, config.deleteAction && typeof onDelete === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".deleteButton"),

package/dist/components/CollectionSummary/RenderListView.scss

@@ -289,3 +289,7 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
   background: none;
   border: none;
 }
+
+.hods-button {
+  margin: 0;
+}

package/dist/components/CollectionSummary/RenderListView.test.js

@@ -224,7 +224,7 @@ describe('components.CollectionSummary.RenderListView', function () {
       onDeleteArgs = [];
       onDeleteCalls = 0;
     });
-    it('should render and handle action buttons correctly', function () {
+    it('should render and handle action buttons correctly, including a GOVUK default Change Link when no classModifiers are passed in', function () {
       var _renderWithValidation4 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_RenderListView.default, {
           id: ID,
           entryData: ENTRY,
@@ -238,7 +238,7 @@ describe('components.CollectionSummary.RenderListView', function () {
       var listViewDiv = container.querySelector('.govuk-summary-card');
       expect(listViewDiv).not.toBeNull();
 
-      // Check for change button
+      // Check for change link
       var changeLink = listViewDiv.querySelector('.govuk-link');
       expect(changeLink.textContent).toEqual(CONFIG.changeAction.label);
       expect(changeLink.getAttribute('aria-label')).toEqual("".concat(CONFIG.changeAction.label, " ").concat(CONFIG.title));
@@ -257,5 +257,38 @@ describe('components.CollectionSummary.RenderListView', function () {
       expect(onDeleteCalls).toEqual(1);
       expect(onDeleteArgs[0]).toEqual(ENTRY);
     });
+    it('should render and handle an Update button instead of the GOVUK default Change link when classModifiers are passed in', function () {
+      var CONFIG_WITH_BUTTON = _objectSpread(_objectSpread({}, CONFIG), {}, {
+        changeAction: {
+          label: 'Update label',
+          page: 'testPage',
+          classModifiers: 'primary'
+        }
+      });
+      var _renderWithValidation5 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_RenderListView.default, {
+          id: ID,
+          entryData: ENTRY,
+          config: CONFIG_WITH_BUTTON,
+          onFullEdit: ON_CHANGE,
+          onDelete: ON_DELETE,
+          masterPage: MASTER_PAGE,
+          getComponentRow: getComponentRow
+        })),
+        container = _renderWithValidation5.container;
+      var listViewDiv = container.querySelector('.govuk-summary-card');
+      expect(listViewDiv).not.toBeNull();
+
+      // Check for update button
+      var changeButton = listViewDiv.querySelector('.hods-button');
+      expect(changeButton.classList).toContain('hods-button--primary');
+      expect(changeButton.textContent).toEqual(CONFIG_WITH_BUTTON.changeAction.label);
+      expect(changeButton.getAttribute('aria-label')).toEqual("".concat(CONFIG_WITH_BUTTON.changeAction.label, " ").concat(CONFIG_WITH_BUTTON.title));
+      _react.fireEvent.click(changeButton, {});
+      expect(onChangeCalls).toEqual(1);
+      expect(onChangeArgs[0]).toMatchObject({
+        page: CONFIG_WITH_BUTTON.changeAction.page,
+        id: ENTRY.id
+      });
+    });
   });
 });

package/dist/utils/Validate/validateEmail.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 // eslint-disable-next-line no-control-regex
 // const EMAIL_REGEX = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/i;
 var HODS_EMAIL_REGEX = /^[a-z0-9._\-']+@(digital\.)?homeoffice.gov.uk$/i;
+var JMSC_EMAIL_REGEX = /^[a-z0-9._\-']+@jmsc.gov.uk$/i;
 
 /**
  * Validates an email address, ensuring it is in the correct domain and
@@ -26,7 +27,7 @@ var validateEmail = function validateEmail(value) {
   if (!!value) {
     var name = label ? label.toLowerCase() : 'email address';
     if (typeof value === 'string') {
-      if (HODS_EMAIL_REGEX.test(value)) {
+      if (HODS_EMAIL_REGEX.test(value) || JMSC_EMAIL_REGEX.test(value)) {
         return undefined;
       }
     }

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

@@ -14,6 +14,9 @@ describe('utils', function () {
       it('should return no error when the value is a valid .gov.uk address', function () {
         expect((0, _validateEmail.default)('alpha@homeoffice.gov.uk', LABEL)).toBeUndefined();
       });
+      it('should return no error when the value is a valid jmsc.gov.uk address', function () {
+        expect((0, _validateEmail.default)('alpha@jmsc.gov.uk', LABEL)).toBeUndefined();
+      });
       it('should return no error when the value is a capitalised digital.homeoffice.gov.uk address', function () {
         expect((0, _validateEmail.default)('ALPHA.BRAVO@DIGITAL.HOMEOFFICE.GOV.UK', LABEL)).toBeUndefined();
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.91.1",
+  "version": "5.93.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",