@ukhomeoffice/cop-react-form-renderer 5.65.1 → 5.67.1

package/dist/components/CollectionSummary/RenderListView.js

@@ -27,7 +27,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 _masterPage$childPage;
+  var _config$changeAction, _config$deleteAction, _masterPage$childPage;
   var id = _ref.id,
     entryData = _ref.entryData,
     config = _ref.config,
@@ -50,22 +50,15 @@ 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("div", {
-    className: "govuk-link",
+  }, config.changeAction && typeof onFullEdit === 'function' && /*#__PURE__*/_react.default.createElement("button", {
+    type: "button",
+    className: "govuk-link govuk-link-button",
     onClick: function onClick() {
       return onFullEdit(config.changeAction.page, entryData.id);
     },
-    onKeyDown: function onKeyDown(e) {
-      if (e.key === 'Enter' || e.key === ' ') {
-        onFullEdit(config.changeAction.page, entryData.id);
-      }
-    },
-    role: "button",
-    tabIndex: 0,
-    style: {
-      cursor: 'pointer'
-    },
-    "aria-label": config.changeAction.label
+    "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.changeAction.label || DEFAULT_CHANGE_BUTTON_LABEL)), /*#__PURE__*/_react.default.createElement("li", {
     className: classes('action')
   }, config.deleteAction && typeof onDelete === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
@@ -74,7 +67,9 @@ var RenderListView = function RenderListView(_ref) {
       return onDelete(entryData);
     },
     classModifiers: config.deleteAction.classModifiers || DEFAULT_DELETE_BUTTON_CLASS,
-    "aria-label": config.deleteAction.label
+    "aria-label": _copReactComponents.Utils.interpolateString("".concat(((_config$deleteAction = config.deleteAction) === null || _config$deleteAction === void 0 ? void 0 : _config$deleteAction.label) || DEFAULT_DELETE_BUTTON_LABEL, " ").concat(config.title || DEFAULT_TITLE), _objectSpread(_objectSpread({}, entryData), {}, {
+      index: entryData.index + 1
+    }))
   }, config.deleteAction.label || DEFAULT_DELETE_BUTTON_LABEL)))), /*#__PURE__*/_react.default.createElement("div", {
     className: classes('content')
   }, /*#__PURE__*/_react.default.createElement("dl", {

package/dist/components/CollectionSummary/RenderListView.scss

@@ -275,3 +275,8 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
     border-bottom: none;
   }
 }
+
+.govuk-link-button {
+  background: none;
+  border: none;
+}

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

@@ -189,18 +189,14 @@ describe('components.CollectionSummary.RenderListView', function () {
           masterPage: MASTER_PAGE,
           getComponentRow: getComponentRow
         })),
-        container = _renderWithValidation3.container,
-        queryByRole = _renderWithValidation3.queryByRole;
+        container = _renderWithValidation3.container;
       var listViewDiv = container.querySelector('.govuk-summary-card');
       expect(listViewDiv).not.toBeNull();
 
       // Check for change button
       var changeLink = listViewDiv.querySelector('.govuk-link');
       expect(changeLink.textContent).toEqual(CONFIG.changeAction.label);
-      var changeButton = queryByRole('button', {
-        name: CONFIG.changeAction.label
-      });
-      expect(changeButton).toBeTruthy();
+      expect(changeLink.getAttribute('aria-label')).toEqual("".concat(CONFIG.changeAction.label, " ").concat(CONFIG.title));
       _react.fireEvent.click(changeLink, {});
       expect(onChangeCalls).toEqual(1);
       expect(onChangeArgs[0]).toMatchObject({
@@ -211,10 +207,7 @@ describe('components.CollectionSummary.RenderListView', function () {
       // Check for delete button
       var deleteButton = listViewDiv.querySelector('[id$=".deleteButton"]');
       expect(deleteButton.textContent).toEqual(CONFIG.deleteAction.label);
-      var deleteButtonElement = queryByRole('button', {
-        name: CONFIG.deleteAction.label
-      });
-      expect(deleteButtonElement).toBeTruthy();
+      expect(deleteButton.getAttribute('aria-label')).toEqual("".concat(CONFIG.deleteAction.label, " ").concat(CONFIG.title));
       _react.fireEvent.click(deleteButton, {});
       expect(onDeleteCalls).toEqual(1);
       expect(onDeleteArgs[0]).toEqual(ENTRY);

package/dist/components/CollectionSummary/SummaryCard.js

@@ -21,13 +21,13 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -47,7 +47,7 @@ var DEFAULT_DUPLICATE_BUTTON_LABEL = exports.DEFAULT_DUPLICATE_BUTTON_LABEL = 'D
 var DEFAULT_DETAILS_TITLE = exports.DEFAULT_DETAILS_TITLE = 'Full details';
 var DEFAULT_CHANGE_BUTTON_CLASS = exports.DEFAULT_CHANGE_BUTTON_CLASS = 'secondary';
 var SummaryCard = function SummaryCard(_ref) {
-  var _config$changeAction2, _config$changeAction3, _config$deleteAction, _config$duplicateActi;
+  var _config$changeAction2, _config$changeAction3, _config$changeAction4, _config$deleteAction, _config$deleteAction2, _config$duplicateActi, _config$duplicateActi2;
   var id = _ref.id,
     entryData = _ref.entryData,
     config = _ref.config,
@@ -81,7 +81,7 @@ var SummaryCard = function SummaryCard(_ref) {
     hooks = _useHooks.hooks;
   var _onAction = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(action, patch) {
-      var errors, hookErrors, allErrors, allData, _allData$entryData$in, isDuplicate, newEntry;
+      var validationData, errors, hookErrors, allErrors, allData, _allData$entryData$in, isDuplicate, newEntry;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -91,23 +91,25 @@ var SummaryCard = function SummaryCard(_ref) {
               });
               resetQuickEditErrors === null || resetQuickEditErrors === void 0 || resetQuickEditErrors();
             }
-            if (!(action.type === 'save' && typeof onQuickEdit === 'function' && Object.keys(patch).length)) {
-              _context.next = 10;
+            if (!(action.type === 'save' && typeof onQuickEdit === 'function')) {
+              _context.next = 11;
               break;
             }
-            // Local validation
-            errors = validate.page(quickEditPage);
+            validationData = _objectSpread(_objectSpread(_objectSpread({}, quickEditPage.formData), patch), {}, _defineProperty({}, "".concat(parentCollectionName, "ActiveId"), entryData.id)); // Local validation
+            errors = validate.page(_objectSpread(_objectSpread({}, quickEditPage), {}, {
+              formData: validationData
+            }));
             if (!errors.length) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
             return _context.abrupt("return");
-          case 5:
-            _context.next = 7;
-            return hooks.onSubmit('quickEdit', patch, function () {}, function (e) {
+          case 6:
+            _context.next = 8;
+            return hooks.onSubmit('quickEdit', validationData, function () {}, function (e) {
               hookErrors = e;
             });
-          case 7:
+          case 8:
             if (hookErrors) {
               addErrors(hookErrors);
             }
@@ -133,7 +135,7 @@ var SummaryCard = function SummaryCard(_ref) {
                 return !prevState;
               });
             }
-          case 10:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -190,20 +192,23 @@ var SummaryCard = function SummaryCard(_ref) {
       var _config$changeAction;
       return onFullEdit((_config$changeAction = config.changeAction) === null || _config$changeAction === void 0 ? void 0 : _config$changeAction.page, entryData.id);
     },
-    classModifiers: ((_config$changeAction2 = config.changeAction) === null || _config$changeAction2 === void 0 ? void 0 : _config$changeAction2.classModifiers) || DEFAULT_CHANGE_BUTTON_CLASS
-  }, ((_config$changeAction3 = config.changeAction) === null || _config$changeAction3 === void 0 ? void 0 : _config$changeAction3.label) || DEFAULT_CHANGE_BUTTON_LABEL), config.deleteAction && typeof onDelete === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
+    classModifiers: ((_config$changeAction2 = config.changeAction) === null || _config$changeAction2 === void 0 ? void 0 : _config$changeAction2.classModifiers) || DEFAULT_CHANGE_BUTTON_CLASS,
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$changeAction3 = config.changeAction) === null || _config$changeAction3 === void 0 ? void 0 : _config$changeAction3.aria_label, entryData)
+  }, ((_config$changeAction4 = config.changeAction) === null || _config$changeAction4 === void 0 ? void 0 : _config$changeAction4.label) || DEFAULT_CHANGE_BUTTON_LABEL), config.deleteAction && typeof onDelete === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".deleteButton"),
     onClick: function onClick() {
       return onDelete(entryData);
     },
-    classModifiers: "secondary"
-  }, ((_config$deleteAction = config.deleteAction) === null || _config$deleteAction === void 0 ? void 0 : _config$deleteAction.label) || DEFAULT_DELETE_BUTTON_LABEL), config.duplicateAction && typeof onDuplicate === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
+    classModifiers: "secondary",
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$deleteAction = config.deleteAction) === null || _config$deleteAction === void 0 ? void 0 : _config$deleteAction.aria_label, entryData)
+  }, ((_config$deleteAction2 = config.deleteAction) === null || _config$deleteAction2 === void 0 ? void 0 : _config$deleteAction2.label) || DEFAULT_DELETE_BUTTON_LABEL), config.duplicateAction && typeof onDuplicate === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".duplicateButton"),
     onClick: function onClick() {
       onDuplicate(entryData);
     },
-    classModifiers: "secondary"
-  }, ((_config$duplicateActi = config.duplicateAction) === null || _config$duplicateActi === void 0 ? void 0 : _config$duplicateActi.label) || DEFAULT_DUPLICATE_BUTTON_LABEL))), quickEdit && quickEditPage && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
+    classModifiers: "secondary",
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$duplicateActi = config.duplicateAction) === null || _config$duplicateActi === void 0 ? void 0 : _config$duplicateActi.aria_label, entryData)
+  }, ((_config$duplicateActi2 = config.duplicateAction) === null || _config$duplicateActi2 === void 0 ? void 0 : _config$duplicateActi2.label) || DEFAULT_DUPLICATE_BUTTON_LABEL))), quickEdit && quickEditPage && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: quickEditPage,
     onAction: function onAction(action, patch) {
       return _onAction(action, patch);
@@ -235,13 +240,16 @@ SummaryCard.propTypes = {
     changeAction: _propTypes.default.shape({
       label: _propTypes.default.string,
       page: _propTypes.default.string.isRequired,
-      classModifiers: _propTypes.default.string
+      classModifiers: _propTypes.default.string,
+      aria_label: _propTypes.default.string
     }),
     deleteAction: _propTypes.default.shape({
-      label: _propTypes.default.string
+      label: _propTypes.default.string,
+      aria_label: _propTypes.default.string
     }),
     duplicateAction: _propTypes.default.shape({
-      label: _propTypes.default.string
+      label: _propTypes.default.string,
+      aria_label: _propTypes.default.string
     }),
     quickEdit: _propTypes.default.shape({
       components: _propTypes.default.arrayOf(_propTypes.default.shape({

package/dist/components/CollectionSummary/SummaryCard.scss

@@ -51,6 +51,7 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
 
     &-actions {
       width: 35%;
+      text-align: center;
 
       .hods-button--primary {
         @extend .hods-button--primary;

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

@@ -256,7 +256,10 @@ describe('components.CollectionSummary.SummaryCard', function () {
       var CONFIG = {
         changeAction: {
           label: 'Change label',
-          page: 'testPage'
+          page: 'testPage',
+          aria_label: [{
+            text: 'testText'
+          }]
         }
       };
       var _renderWithValidation7 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_SummaryCard.default, {
@@ -277,6 +280,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
       var changeButton = headerActionDiv.children[0];
       expect(changeButton.tagName).toEqual('BUTTON');
       expect(changeButton.textContent).toEqual(CONFIG.changeAction.label);
+      expect(changeButton.getAttribute('aria-label')).toEqual(CONFIG.changeAction.aria_label[0].text);
       _react.fireEvent.click(changeButton, {});
       expect(onChangeCalls).toEqual(1);
       expect(onChangeArgs[0]).toMatchObject({
@@ -363,7 +367,10 @@ describe('components.CollectionSummary.SummaryCard', function () {
     it('should render correctly', function () {
       var CONFIG = {
         deleteAction: {
-          label: 'Delete label'
+          label: 'Delete label',
+          aria_label: [{
+            text: 'testText'
+          }]
         }
       };
       var _renderWithValidation11 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_SummaryCard.default, {
@@ -384,6 +391,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
       var deleteButton = headerActionDiv.children[0];
       expect(deleteButton.tagName).toEqual('BUTTON');
       expect(deleteButton.textContent).toEqual(CONFIG.deleteAction.label);
+      expect(deleteButton.getAttribute('aria-label')).toEqual(CONFIG.deleteAction.aria_label[0].text);
       _react.fireEvent.click(deleteButton, {});
       expect(onDeleteCalls).toEqual(1);
       expect(onDeleteArgs[0]).toMatchObject(ENTRY);
@@ -1006,7 +1014,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
         }
       }, _callee6);
     })));
-    it('should run hook validation when a value changes and local validation is passed', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+    it('should run hook validation when local validation is passed', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
       var ON_SUBMIT_CALLS, hooks, ON_QUICK_EDIT_CALLS, ON_QUICK_EDIT, _renderWithValidation27, container, _checkSetup26, headerActionDiv, editButton, quickEdit, component, componentInput, quickEditButtons, saveButton;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
@@ -1069,7 +1077,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
               }, _callee7);
             })));
           case 16:
-            expect(ON_SUBMIT_CALLS[0]).toEqual({
+            expect(ON_SUBMIT_CALLS[0]).toMatchObject({
               testText: 'new value'
             });
             expect(ON_QUICK_EDIT_CALLS.length).toEqual(0);

package/dist/utils/Data/nestInRefdataOptions.js

@@ -13,13 +13,14 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 /**
  * Combines refdata options with custom options with the use of `from_refdata` in the custom option
  * Allowing for nesting of components within refdata lists of checkboxes or radios
+ * Also allows appending custom options to refdata options list
  * @param {Array} refdataOptions The list of options coming from refdata
  * @param {Array} options The list of options being defined in the form
  * @returns A combined list of refdata options and custom options to be rendered
  */
 var nestInRefdataOptions = function nestInRefdataOptions(refdataOptions, options) {
   var nestedRefdataOptions = refdataOptions;
-  options.forEach(function (option) {
+  options.forEach(function (option, index) {
     if (option.refdata_match) {
       var refdataMatch = option.refdata_match;
       var refdataKey = Object.keys(refdataMatch)[0];
@@ -32,6 +33,16 @@ var nestInRefdataOptions = function nestInRefdataOptions(refdataOptions, options
         });
       }
     }
+
+    // checks if already exists in `nestedRefdataOptions` else
+    // re-renders would cause array to grow with each render
+    if (option.combineWithRefdata && !nestedRefdataOptions.includes(option)) {
+      // adds previous array entry if string e.g. "or" operator
+      if (index > 0 && typeof options[index - 1] === 'string') {
+        nestedRefdataOptions.push(options[index - 1]);
+      }
+      nestedRefdataOptions.push(option);
+    }
   });
   return nestedRefdataOptions;
 };

package/dist/utils/Data/nestInRefdataOptions.test.js

@@ -2,101 +2,235 @@
 
 var _nestInRefdataOptions = _interopRequireDefault(require("./nestInRefdataOptions"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe("utils.Data.combineOptions", function () {
-  it("should combine refdata options with a custom option", function () {
+describe('utils.Data.combineOptions', function () {
+  it('should combine refdata options with a custom option', function () {
     var refdataOptions = [{
       id: 1,
-      description: "First refdata item",
-      value: "firstValue",
-      label: "First label"
+      description: 'First refdata item',
+      value: 'firstValue',
+      label: 'First label'
     }, {
       id: 2,
-      description: "Second refdata item",
-      value: "secondValue",
-      label: "Second label"
+      description: 'Second refdata item',
+      value: 'secondValue',
+      label: 'Second label'
     }, {
       id: 3,
-      description: "Third refdata item",
-      value: "thirdValue",
-      label: "Third label"
+      description: 'Third refdata item',
+      value: 'thirdValue',
+      label: 'Third label'
     }];
     var customOptions = [{
       refdata_match: {
         id: 2
       },
       nested: [{
-        id: "nestedComponent",
-        fieldId: "nestedComponent",
-        type: "text",
-        label: "Nested Component"
+        id: 'nestedComponent',
+        fieldId: 'nestedComponent',
+        type: 'text',
+        label: 'Nested Component'
       }]
     }];
     expect((0, _nestInRefdataOptions.default)(refdataOptions, customOptions)).toEqual([{
-      description: "First refdata item",
+      description: 'First refdata item',
       id: 1,
-      label: "First label",
-      value: "firstValue"
+      label: 'First label',
+      value: 'firstValue'
     }, {
-      description: "Second refdata item",
+      description: 'Second refdata item',
       id: 2,
-      label: "Second label",
+      label: 'Second label',
       nested: [{
-        id: "nestedComponent",
-        fieldId: "nestedComponent",
-        type: "text",
-        label: "Nested Component"
+        id: 'nestedComponent',
+        fieldId: 'nestedComponent',
+        type: 'text',
+        label: 'Nested Component'
       }],
-      value: "secondValue"
+      value: 'secondValue'
     }, {
-      description: "Third refdata item",
+      description: 'Third refdata item',
       id: 3,
-      label: "Third label",
-      value: "thirdValue"
+      label: 'Third label',
+      value: 'thirdValue'
     }]);
   });
-  it("should not combine options if it can't find a matching refdata option", function () {
+  it('should not combine options if it can`t find a matching refdata option', function () {
     var refdataOptions = [{
       id: 1,
-      description: "First refdata item",
-      value: "firstValue",
-      label: "First label"
+      description: 'First refdata item',
+      value: 'firstValue',
+      label: 'First label'
     }, {
       id: 2,
-      description: "Second refdata item",
-      value: "secondValue",
-      label: "Second label"
+      description: 'Second refdata item',
+      value: 'secondValue',
+      label: 'Second label'
     }, {
       id: 3,
-      description: "Third refdata item",
-      value: "thirdValue",
-      label: "Third label"
+      description: 'Third refdata item',
+      value: 'thirdValue',
+      label: 'Third label'
     }];
     var customOptions = [{
       refdata_match: {
         id: 4
       },
       nested: [{
-        id: "nestedComponent",
-        fieldId: "nestedComponent",
-        type: "text",
-        label: "Nested Component"
+        id: 'nestedComponent',
+        fieldId: 'nestedComponent',
+        type: 'text',
+        label: 'Nested Component'
       }]
     }];
     expect((0, _nestInRefdataOptions.default)(refdataOptions, customOptions)).toEqual([{
-      description: "First refdata item",
+      description: 'First refdata item',
       id: 1,
-      label: "First label",
-      value: "firstValue"
+      label: 'First label',
+      value: 'firstValue'
     }, {
-      description: "Second refdata item",
+      description: 'Second refdata item',
       id: 2,
-      label: "Second label",
-      value: "secondValue"
+      label: 'Second label',
+      value: 'secondValue'
     }, {
-      description: "Third refdata item",
+      description: 'Third refdata item',
       id: 3,
-      label: "Third label",
-      value: "thirdValue"
+      label: 'Third label',
+      value: 'thirdValue'
+    }]);
+  });
+  it('should append refdata options with a custom option when `combineWithRefdata` flag is set', function () {
+    var refdataOptions = [{
+      id: 1,
+      description: 'First refdata item',
+      value: 'firstValue',
+      label: 'First label'
+    }, {
+      id: 2,
+      description: 'Second refdata item',
+      value: 'secondValue',
+      label: 'Second label'
+    }, {
+      id: 3,
+      description: 'Third refdata item',
+      value: 'thirdValue',
+      label: 'Third label'
+    }];
+    var customOptions = [{
+      combineWithRefdata: true,
+      id: 'otherComponent',
+      fieldId: 'otherComponent',
+      type: 'text',
+      label: 'Other Component'
+    }];
+    expect((0, _nestInRefdataOptions.default)(refdataOptions, customOptions)).toEqual([{
+      description: 'First refdata item',
+      id: 1,
+      label: 'First label',
+      value: 'firstValue'
+    }, {
+      description: 'Second refdata item',
+      id: 2,
+      label: 'Second label',
+      value: 'secondValue'
+    }, {
+      description: 'Third refdata item',
+      id: 3,
+      label: 'Third label',
+      value: 'thirdValue'
+    }, {
+      combineWithRefdata: true,
+      id: 'otherComponent',
+      fieldId: 'otherComponent',
+      type: 'text',
+      label: 'Other Component'
+    }]);
+  });
+  it('should not append refdata options with a custom option when `combineWithRefdata` flag is not set', function () {
+    var refdataOptions = [{
+      id: 1,
+      description: 'First refdata item',
+      value: 'firstValue',
+      label: 'First label'
+    }, {
+      id: 2,
+      description: 'Second refdata item',
+      value: 'secondValue',
+      label: 'Second label'
+    }, {
+      id: 3,
+      description: 'Third refdata item',
+      value: 'thirdValue',
+      label: 'Third label'
+    }];
+    var customOptions = [{
+      id: 'otherComponent',
+      fieldId: 'otherComponent',
+      type: 'text',
+      label: 'Other Component'
+    }];
+    expect((0, _nestInRefdataOptions.default)(refdataOptions, customOptions)).toEqual([{
+      description: 'First refdata item',
+      id: 1,
+      label: 'First label',
+      value: 'firstValue'
+    }, {
+      description: 'Second refdata item',
+      id: 2,
+      label: 'Second label',
+      value: 'secondValue'
+    }, {
+      description: 'Third refdata item',
+      id: 3,
+      label: 'Third label',
+      value: 'thirdValue'
+    }]);
+  });
+  it('should append refdata options with a string when `combineWithRefdata` flag is set and custom option comes after string', function () {
+    var refdataOptions = [{
+      id: 1,
+      description: 'First refdata item',
+      value: 'firstValue',
+      label: 'First label'
+    }, {
+      id: 2,
+      description: 'Second refdata item',
+      value: 'secondValue',
+      label: 'Second label'
+    }, {
+      id: 3,
+      description: 'Third refdata item',
+      value: 'thirdValue',
+      label: 'Third label'
+    }];
+    var customOptions = ["or", {
+      combineWithRefdata: true,
+      id: 'otherComponent',
+      fieldId: 'otherComponent',
+      type: 'text',
+      label: 'Other Component'
+    }];
+    expect((0, _nestInRefdataOptions.default)(refdataOptions, customOptions)).toEqual([{
+      description: 'First refdata item',
+      id: 1,
+      label: 'First label',
+      value: 'firstValue'
+    }, {
+      description: 'Second refdata item',
+      id: 2,
+      label: 'Second label',
+      value: 'secondValue'
+    }, {
+      description: 'Third refdata item',
+      id: 3,
+      label: 'Third label',
+      value: 'thirdValue'
+    }, "or", {
+      combineWithRefdata: true,
+      id: 'otherComponent',
+      fieldId: 'otherComponent',
+      type: 'text',
+      label: 'Other Component'
     }]);
   });
 });

package/package.json

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