@ukhomeoffice/cop-react-form-renderer 5.90.0 → 5.90.1

package/dist/utils/CheckYourAnswers/getCYARowForGroup.js

@@ -7,14 +7,8 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _FormComponent = _interopRequireDefault(require("../../components/FormComponent"));
 var _getCYAAction = _interopRequireDefault(require("./getCYAAction"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-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); }
-var getRowValue = function getRowValue(row) {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const getRowValue = row => {
   if (!row.value) {
     return null;
   }
@@ -24,43 +18,43 @@ var getRowValue = function getRowValue(row) {
   return /*#__PURE__*/_react.default.createElement("div", {
     key: row.id
   }, /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
-    component: _objectSpread(_objectSpread({}, row.component), {}, {
+    component: {
+      ...row.component,
       readonly: true
-    }),
+    },
     wrap: false,
     value: row.value
   }));
 };
-var getGroupValue = function getGroupValue(group, rows) {
-  var firstComponentIndex = -1;
-  var value = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, group.components.map(function (componentId) {
-    var rowIndex = rows.findIndex(function (r) {
-      return r.id === componentId;
-    });
+const getGroupValue = (group, rows) => {
+  let firstComponentIndex = -1;
+  const value = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, group.components.map(componentId => {
+    const rowIndex = rows.findIndex(r => r.id === componentId);
     if (firstComponentIndex < 0) {
       firstComponentIndex = rowIndex;
     }
     return rowIndex > -1 ? getRowValue(rows[rowIndex]) : null;
   }));
   return {
-    value: value,
-    firstComponentIndex: firstComponentIndex
+    value,
+    firstComponentIndex
   };
 };
-var getCYARowForGroup = function getCYARowForGroup(page, group, rows, onAction) {
-  var _getGroupValue = getGroupValue(group, rows),
-    value = _getGroupValue.value,
-    firstComponentIndex = _getGroupValue.firstComponentIndex;
-  var row = {
+const getCYARowForGroup = (page, group, rows, onAction) => {
+  const {
+    value,
+    firstComponentIndex
+  } = getGroupValue(group, rows);
+  const row = {
     pageId: page.id,
     fieldId: group.id,
     key: group.label,
     required: group.required,
-    value: value,
+    value,
     action: (0, _getCYAAction.default)(false, page, onAction)
   };
   return {
-    row: row,
+    row,
     insertAt: firstComponentIndex
   };
 };

package/dist/utils/CheckYourAnswers/getCYARowForGroup.test.js

@@ -3,38 +3,38 @@
 var _setupTests = require("../../setupTests");
 var _getCYARowForGroup = _interopRequireDefault(require("./getCYARowForGroup"));
 var _getCYARow = _interopRequireDefault(require("./getCYARow"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Local imports 
 
-describe('utils', function () {
-  describe('CheckYourAnswers', function () {
-    describe('getCYARowsForGroup', function () {
-      it('should check address values block', function () {
-        var COMPONENT_ADDRESS = {
+describe('utils', () => {
+  describe('CheckYourAnswers', () => {
+    describe('getCYARowsForGroup', () => {
+      it('should check address values block', () => {
+        const COMPONENT_ADDRESS = {
           id: 'firstLineOfTheAddress',
           fieldId: 'firstLineOfTheAddress',
           label: 'address',
           type: 'text'
         };
-        var COMPONENT_TOWN = {
+        const COMPONENT_TOWN = {
           id: 'town',
           fieldId: 'town',
           label: 'Town',
           type: 'text'
         };
-        var COMPONENT_CITY = {
+        const COMPONENT_CITY = {
           id: 'city',
           fieldId: 'city',
           label: 'City',
           type: 'text'
         };
-        var COMPONENT_POSTCODE = {
+        const COMPONENT_POSTCODE = {
           id: 'postCode',
           fieldId: 'postCode',
           label: 'postCode',
           type: 'text'
         };
-        var PAGE = {
+        const PAGE = {
           components: [COMPONENT_ADDRESS, COMPONENT_TOWN, COMPONENT_CITY, COMPONENT_POSTCODE],
           id: 'addressDetails',
           fieldId: 'UK address',
@@ -52,14 +52,13 @@ describe('utils', function () {
             postCode: 'SW1A 2AA'
           }
         };
-        var ON_ACTION = function ON_ACTION() {};
-        var rows = PAGE.components.map(function (component) {
-          return (0, _getCYARow.default)(PAGE, component, ON_ACTION);
-        });
-        var _renderWithValidation = (0, _setupTests.renderWithValidation)((0, _getCYARowForGroup.default)(PAGE, PAGE.groups[0], rows, ON_ACTION).row.value),
-          container = _renderWithValidation.container;
+        const ON_ACTION = () => {};
+        const rows = PAGE.components.map(component => (0, _getCYARow.default)(PAGE, component, ON_ACTION));
+        const {
+          container
+        } = (0, _setupTests.renderWithValidation)((0, _getCYARowForGroup.default)(PAGE, PAGE.groups[0], rows, ON_ACTION).row.value);
         expect(container.childNodes.length).toEqual(4);
-        var addressValues = container.childNodes;
+        const addressValues = container.childNodes;
         expect(addressValues[0].childNodes[0].textContent).toEqual('10 Downing Street');
         expect(addressValues[1].childNodes[0].textContent).toEqual('City of Westminster');
         expect(addressValues[2].childNodes[0].textContent).toEqual('London');

package/dist/utils/CheckYourAnswers/getCYARowsForCollection.js

@@ -10,67 +10,61 @@ var _getCYAAction = _interopRequireDefault(require("./getCYAAction"));
 var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
 var _setupContainerComponentsPath = _interopRequireDefault(require("../Component/setupContainerComponentsPath"));
 var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-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); } // Global imports
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Global imports
+
 // Local imports
-var getEntryToCollectionRow = function getEntryToCollectionRow(page, onAction) {
-  var _page$components$0$la;
-  return [{
-    pageId: page.id,
-    key: ((_page$components$0$la = page.components[0].labels) === null || _page$components$0$la === void 0 ? void 0 : _page$components$0$la.empty) || 'Nothing entered',
-    required: page.required,
-    action: (0, _getCYAAction.default)(false, page, onAction)
-  }];
-};
-var getContainerForItem = function getContainerForItem(collection, item, labelCount, fullPath) {
-  return {
-    id: item.id,
-    fieldId: item.id,
-    type: _models.ComponentTypes.CONTAINER,
-    required: collection.required,
-    full_path: fullPath,
-    components: collection.item.map(function (component) {
-      return _objectSpread(_objectSpread({}, component), {}, {
-        label: _copReactComponents.Utils.interpolateString(component.label, _objectSpread(_objectSpread({}, item), {}, {
-          index: labelCount
-        })),
-        full_path: "".concat(fullPath, ".").concat(component.fieldId)
-      });
-    })
+
+const getEntryToCollectionRow = (page, onAction) => [{
+  pageId: page.id,
+  key: page.components[0].labels?.empty || 'Nothing entered',
+  required: page.required,
+  action: (0, _getCYAAction.default)(false, page, onAction)
+}];
+const getContainerForItem = (collection, item, labelCount, fullPath) => ({
+  id: item.id,
+  fieldId: item.id,
+  type: _models.ComponentTypes.CONTAINER,
+  required: collection.required,
+  full_path: fullPath,
+  components: collection.item.map(component => ({
+    ...component,
+    label: _copReactComponents.Utils.interpolateString(component.label, {
+      ...item,
+      index: labelCount
+    }),
+    full_path: `${fullPath}.${component.fieldId}`
+  }))
+});
+const getTitleRowForItem = (collection, item, pageId, labelCount, fullPath) => {
+  const labels = {
+    ..._models.CollectionLabels,
+    ...collection.labels
   };
-};
-var getTitleRowForItem = function getTitleRowForItem(collection, item, pageId, labelCount, fullPath) {
-  var labels = _objectSpread(_objectSpread({}, _models.CollectionLabels), collection.labels);
   if (labels.item) {
     return {
-      pageId: pageId,
+      pageId,
       fieldId: collection.fieldId,
       full_path: fullPath,
-      key: _copReactComponents.Utils.interpolateString(labels.item, _objectSpread(_objectSpread({}, item), {}, {
+      key: _copReactComponents.Utils.interpolateString(labels.item, {
+        ...item,
         index: labelCount
-      })),
+      }),
       type: 'title',
       action: null
     };
   }
   return null;
 };
-var getCYARowsForCollection = function getCYARowsForCollection(page, collection, items, onAction, fnOverride) {
+const getCYARowsForCollection = (page, collection, items, onAction, fnOverride) => {
   if (Array.isArray(items) && items.length && (0, _showComponentCYA.default)(collection, page.formData)) {
-    return items.flatMap(function (item, index) {
-      var labelCount = (collection.countOffset || 0) + index + 1;
-      var fullPath = "".concat(collection.full_path || collection.fieldId, "[").concat(index, "]");
-      var container = getContainerForItem(collection, item, labelCount, fullPath);
+    return items.flatMap((item, index) => {
+      const labelCount = (collection.countOffset || 0) + index + 1;
+      const fullPath = `${collection.full_path || collection.fieldId}[${index}]`;
+      let container = getContainerForItem(collection, item, labelCount, fullPath);
       container = (0, _setupContainerComponentsPath.default)(container);
       return [getTitleRowForItem(collection, item, page.id, labelCount, fullPath)].concat((0, _getCYARowsForContainer.default)(page, container, item, onAction, fnOverride));
-    }).filter(function (r) {
-      return !!r;
-    });
+    }).filter(r => !!r);
   }
   return getEntryToCollectionRow(page, onAction);
 };

package/dist/utils/CheckYourAnswers/getCYARowsForCollection.test.js

@@ -3,17 +3,13 @@
 var _models = require("../../models");
 var _setupTests = require("../../setupTests");
 var _getCYARowsForCollection = _interopRequireDefault(require("./getCYARowsForCollection"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-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); } // Local imports
-describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
-  it('should get a single entry point row when there are no items', function () {
-    var FORM_DATA = undefined;
-    var PAGE = {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Local imports
+
+describe('utils.CheckYourAnswers.getCYARowsForCollection', () => {
+  it('should get a single entry point row when there are no items', () => {
+    const FORM_DATA = undefined;
+    const PAGE = {
       id: 'page',
       components: [{
         labels: {
@@ -23,42 +19,42 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
       formData: FORM_DATA,
       cya_link: {}
     };
-    var COMPONENT = {
+    const COMPONENT = {
       type: 'text',
       readonly: true,
       id: 'a',
       fieldId: 'a',
       label: 'Alpha'
     };
-    var COLLECTION = {
+    const COLLECTION = {
       id: 'collection',
       fieldId: 'collection',
       type: _models.ComponentTypes.COLLECTION,
       item: [COMPONENT]
     };
-    var ON_ACTION = function ON_ACTION() {};
-    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, undefined, ON_ACTION);
+    const ON_ACTION = () => {};
+    const ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, undefined, ON_ACTION);
     expect(ROWS.length).toEqual(1);
   });
-  it('should get an appropriate row for a collection with a single readonly text component', function () {
-    var FORM_DATA = {
+  it('should get an appropriate row for a collection with a single readonly text component', () => {
+    const FORM_DATA = {
       collection: [{
         a: 'Bravo'
       }]
     };
-    var PAGE = {
+    const PAGE = {
       id: 'page',
       formData: FORM_DATA,
       cya_link: {}
     };
-    var COMPONENT = {
+    const COMPONENT = {
       type: 'text',
       readonly: true,
       id: 'a',
       fieldId: 'a',
       label: 'Alpha'
     };
-    var COLLECTION = {
+    const COLLECTION = {
       id: 'collection',
       fieldId: 'collection',
       type: _models.ComponentTypes.COLLECTION,
@@ -67,13 +63,13 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
       value: FORM_DATA.collection,
       formData: FORM_DATA
     };
-    var ON_ACTION = function ON_ACTION() {};
-    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
+    const ON_ACTION = () => {};
+    const ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
     expect(ROWS.length).toEqual(2); // Item title row + component row
     (0, _setupTests.expectObjectLike)(ROWS[0], {
       pageId: PAGE.id,
       fieldId: COLLECTION.fieldId,
-      full_path: "".concat(COLLECTION.fieldId, "[0]"),
+      full_path: `${COLLECTION.fieldId}[0]`,
       key: 'Item 23',
       // includes countOffset
       type: 'title',
@@ -82,34 +78,35 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
     (0, _setupTests.expectObjectLike)(ROWS[1], {
       pageId: PAGE.id,
       fieldId: COMPONENT.fieldId,
-      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      full_path: `${COLLECTION.fieldId}[0].${COMPONENT.fieldId}`,
       key: COMPONENT.label,
       action: null,
-      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
-        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId)
-      }),
+      component: {
+        ...COMPONENT,
+        full_path: `${COLLECTION.fieldId}[0].${COMPONENT.fieldId}`
+      },
       value: 'Bravo'
     });
   });
-  it('should get an appropriate row for a collection with a single readonly text component where the item label is an empty string', function () {
-    var FORM_DATA = {
+  it('should get an appropriate row for a collection with a single readonly text component where the item label is an empty string', () => {
+    const FORM_DATA = {
       collection: [{
         a: 'Bravo'
       }]
     };
-    var PAGE = {
+    const PAGE = {
       id: 'page',
       formData: FORM_DATA,
       cya_link: {}
     };
-    var COMPONENT = {
+    const COMPONENT = {
       type: 'text',
       readonly: true,
       id: 'a',
       fieldId: 'a',
       label: 'Alpha'
     };
-    var COLLECTION = {
+    const COLLECTION = {
       id: 'collection',
       fieldId: 'collection',
       type: _models.ComponentTypes.COLLECTION,
@@ -121,41 +118,42 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
       value: FORM_DATA.collection,
       formData: FORM_DATA
     };
-    var ON_ACTION = function ON_ACTION() {};
-    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
+    const ON_ACTION = () => {};
+    const ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
     expect(ROWS.length).toEqual(1); // Just the component row, no title row
     (0, _setupTests.expectObjectLike)(ROWS[0], {
       pageId: PAGE.id,
       fieldId: COMPONENT.fieldId,
-      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      full_path: `${COLLECTION.fieldId}[0].${COMPONENT.fieldId}`,
       key: COMPONENT.label,
       action: null,
-      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
-        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId)
-      }),
+      component: {
+        ...COMPONENT,
+        full_path: `${COLLECTION.fieldId}[0].${COMPONENT.fieldId}`
+      },
       value: 'Bravo'
     });
   });
-  it('should interpolate a field label appropriately', function () {
-    var FORM_DATA = {
+  it('should interpolate a field label appropriately', () => {
+    const FORM_DATA = {
       collection: [{
         a: 'Bravo'
       }]
     };
-    var PAGE = {
+    const PAGE = {
       id: 'page',
       formData: FORM_DATA,
       cya_link: {}
     };
     // eslint-disable-next-line no-template-curly-in-string
-    var COMPONENT = {
+    const COMPONENT = {
       type: 'text',
       readonly: true,
       id: 'a',
       fieldId: 'a',
       label: 'Alpha ${index}'
     };
-    var COLLECTION = {
+    const COLLECTION = {
       id: 'collection',
       fieldId: 'collection',
       type: _models.ComponentTypes.COLLECTION,
@@ -163,43 +161,43 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
       value: FORM_DATA.collection,
       formData: FORM_DATA
     };
-    var ON_ACTION = function ON_ACTION() {};
-    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
+    const ON_ACTION = () => {};
+    const ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
     expect(ROWS.length).toEqual(2); // Title and item row.
     (0, _setupTests.expectObjectLike)(ROWS[1], {
       pageId: PAGE.id,
       fieldId: COMPONENT.fieldId,
-      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      full_path: `${COLLECTION.fieldId}[0].${COMPONENT.fieldId}`,
       key: 'Alpha 1',
       // no countOffset
       action: null,
-      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
-        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      component: {
+        ...COMPONENT,
+        full_path: `${COLLECTION.fieldId}[0].${COMPONENT.fieldId}`,
         label: 'Alpha 1' // no countOffset
-      }),
-
+      },
       value: 'Bravo'
     });
   });
-  it('should ignore the result of the override function if it returns nullish', function () {
-    var FORM_DATA = {
+  it('should ignore the result of the override function if it returns nullish', () => {
+    const FORM_DATA = {
       collection: [{
         a: 'Bravo'
       }]
     };
-    var PAGE = {
+    const PAGE = {
       id: 'page',
       formData: FORM_DATA,
       cya_link: {}
     };
-    var COMPONENT = {
+    const COMPONENT = {
       type: 'text',
       readonly: true,
       id: 'a',
       fieldId: 'a',
       label: 'Alpha'
     };
-    var COLLECTION = {
+    const COLLECTION = {
       id: 'collection',
       fieldId: 'collection',
       type: _models.ComponentTypes.COLLECTION,
@@ -208,15 +206,13 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
       value: FORM_DATA.collection,
       formData: FORM_DATA
     };
-    var ON_ACTION = function ON_ACTION() {};
-    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION, function () {
-      return null;
-    });
+    const ON_ACTION = () => {};
+    const ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION, () => null);
     expect(ROWS.length).toEqual(2); // Item title row + component row
     (0, _setupTests.expectObjectLike)(ROWS[0], {
       pageId: PAGE.id,
       fieldId: COLLECTION.fieldId,
-      full_path: "".concat(COLLECTION.fieldId, "[0]"),
+      full_path: `${COLLECTION.fieldId}[0]`,
       key: 'Item 23',
       // includes countOffset
       type: 'title',
@@ -225,34 +221,35 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
     (0, _setupTests.expectObjectLike)(ROWS[1], {
       pageId: PAGE.id,
       fieldId: COMPONENT.fieldId,
-      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      full_path: `${COLLECTION.fieldId}[0].${COMPONENT.fieldId}`,
       key: COMPONENT.label,
       action: null,
-      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
-        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId)
-      }),
+      component: {
+        ...COMPONENT,
+        full_path: `${COLLECTION.fieldId}[0].${COMPONENT.fieldId}`
+      },
       value: 'Bravo'
     });
   });
-  it('should use rows produced by the override function if provided', function () {
-    var FORM_DATA = {
+  it('should use rows produced by the override function if provided', () => {
+    const FORM_DATA = {
       collection: [{
         a: 'Bravo'
       }]
     };
-    var PAGE = {
+    const PAGE = {
       id: 'page',
       formData: FORM_DATA,
       cya_link: {}
     };
-    var COMPONENT = {
+    const COMPONENT = {
       type: 'text',
       readonly: true,
       id: 'a',
       fieldId: 'a',
       label: 'Alpha'
     };
-    var COLLECTION = {
+    const COLLECTION = {
       id: 'collection',
       fieldId: 'collection',
       type: _models.ComponentTypes.COLLECTION,
@@ -261,28 +258,28 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
       value: FORM_DATA.collection,
       formData: FORM_DATA
     };
-    var ON_ACTION = function ON_ACTION() {};
+    const ON_ACTION = () => {};
     // eslint-disable-next-line arrow-body-style
-    var OVERRIDE = function OVERRIDE(page, comp) {
+    const OVERRIDE = (page, comp) => {
       // This will be called for each component in the collection,
       // returning a custom row object.
       return {
-        key: "CustomRowFor".concat(comp.label)
+        key: `CustomRowFor${comp.label}`
       };
     };
-    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION, OVERRIDE);
+    const ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION, OVERRIDE);
     expect(ROWS.length).toEqual(2); // Item title row + component row
     (0, _setupTests.expectObjectLike)(ROWS[0], {
       pageId: PAGE.id,
       fieldId: COLLECTION.fieldId,
-      full_path: "".concat(COLLECTION.fieldId, "[0]"),
+      full_path: `${COLLECTION.fieldId}[0]`,
       key: 'Item 23',
       // includes countOffset
       type: 'title',
       action: null
     });
     (0, _setupTests.expectObjectLike)(ROWS[1], {
-      key: "CustomRowFor".concat(COMPONENT.label)
+      key: `CustomRowFor${COMPONENT.label}`
     });
   });
 });