@ukhomeoffice/cop-react-form-renderer 5.14.0 → 5.14.4

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

@@ -1,27 +1,23 @@
 "use strict";
 
 var _getCYARowsForCollectionPage = _interopRequireDefault(require("./getCYARowsForCollectionPage"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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); }
-describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
-  var TEXT_COMP = {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Local imports
+
+describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', () => {
+  const TEXT_COMP = {
     id: 'testText',
     fieldId: 'testText',
     label: 'Test text',
     type: 'text'
   };
-  var DATE_COMP = {
+  const DATE_COMP = {
     id: 'testDate',
     fieldId: 'testDate',
     label: 'Test date',
     type: 'date'
   };
-  var PAGES = [{
+  const PAGES = [{
     id: 'page1',
     collection: {
       name: 'collection'
@@ -34,7 +30,7 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     },
     components: [DATE_COMP]
   }];
-  var MASTER_PAGE = {
+  const MASTER_PAGE = {
     id: 'page1',
     collection: {
       name: 'collection',
@@ -55,73 +51,80 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     },
     collectionPages: PAGES
   };
-  it('should return no rows for a collection if it does not exist in formData', function () {
-    var FORM_DATA = {};
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+  it('should return no rows for a collection if it does not exist in formData', () => {
+    const FORM_DATA = {};
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(0);
   });
-  it('should return no rows for a collection if it has no entries', function () {
-    var FORM_DATA = {
+  it('should return no rows for a collection if it has no entries', () => {
+    const FORM_DATA = {
       collection: []
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(0);
   });
-  it('should accept the hideNameFromCYA collection flag', function () {
-    var FORM_DATA = {
+  it('should accept the hideNameFromCYA collection flag', () => {
+    const FORM_DATA = {
       collection: [{
         testText: 'hello'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA,
-      collection: _objectSpread(_objectSpread({}, MASTER_PAGE.collection), {}, {
+      collection: {
+        ...MASTER_PAGE.collection,
         hideNameFromCYA: true
-      })
-    });
-    var TITLE_FIELD_ID = "".concat(PAGE.collection.name, "Title");
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+      }
+    };
+    const TITLE_FIELD_ID = `${PAGE.collection.name}Title`;
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS[0].fieldId).not.toEqual(TITLE_FIELD_ID);
   });
-  it('should format titles correctly when collection.labels.item is specified', function () {
-    var FORM_DATA = {
+  it('should format titles correctly when collection.labels.item is specified', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(7); // Collection title, item title, action rows & component rows
     expect(ROWS[1].key).toEqual('Collection entry 1');
   });
-  it('should provide default titles if collection.labels.item is not specified', function () {
-    var FORM_DATA = {
+  it('should provide default titles if collection.labels.item is not specified', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
-      collection: _objectSpread(_objectSpread({}, MASTER_PAGE.collection), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
+      collection: {
+        ...MASTER_PAGE.collection,
         labels: {}
-      }),
+      },
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(7); // Collection title, item title, action rows & component rows
     expect(ROWS[1].key).toEqual('Item 1');
   });
-  it('should return correctly formatted rows for mutliple entries', function () {
-    var FORM_DATA = {
+  it('should return correctly formatted rows for mutliple entries', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
@@ -130,10 +133,11 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(13); // Title row + component row for each item
     expect(ROWS[0]).toMatchObject({
       type: 'heading',
@@ -170,8 +174,8 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
       key: 'Test date'
     });
   });
-  it('should exclude components that should not be shown', function () {
-    var FD = {
+  it('should exclude components that should not be shown', () => {
+    const FD = {
       collection: [{
         id: '01',
         otherField: 'yes',
@@ -182,12 +186,14 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
         testText: 'testing'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       collection: {
         name: 'collection'
       },
       formData: FD,
-      collectionPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+      collectionPages: [{
+        ...PAGES[0],
         components: [{
           id: 'testText',
           fieldId: 'testText',
@@ -199,9 +205,9 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
             value: "yes"
           }
         }]
-      })]
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+      }]
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(4);
     expect(ROWS[0]).toMatchObject({
       type: 'heading',
@@ -220,28 +226,30 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
       key: 'Test text'
     });
   });
-  it('should exclude pages that should not be shown', function () {
-    var FD = {
+  it('should exclude pages that should not be shown', () => {
+    const FD = {
       collection: [{
         id: '01',
         otherField: 'yes',
         testText: 'testing'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       collection: {
         name: 'collection'
       },
       formData: FD,
-      collectionPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+      collectionPages: [{
+        ...PAGES[0],
         show_when: {
           field: "otherField",
           op: "!=",
           value: "yes"
         }
-      }), PAGES[1]]
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+      }, PAGES[1]]
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(3); // Missing the page with the text component on.
     expect(ROWS[0]).toMatchObject({
       type: 'heading',
@@ -256,25 +264,28 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
       key: 'Test date'
     });
   });
-  it('should include rows for custom headings', function () {
-    var FORM_DATA = {
+  it('should include rows for custom headings', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA,
-      collectionPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
-        collection: _objectSpread(_objectSpread({}, PAGES[0].collection), {}, {
+      collectionPages: [{
+        ...PAGES[0],
+        collection: {
+          ...PAGES[0].collection,
           heading: {
             size: 'm',
             text: 'Custom page heading'
           }
-        })
-      })]
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+        }
+      }]
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(7);
     expect(ROWS[0]).toMatchObject({
       type: 'heading',
@@ -297,99 +308,106 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
       key: 'Test text'
     });
   });
-  it('should default to a title size of small if one is not specified', function () {
-    var FORM_DATA = {
+  it('should default to a title size of small if one is not specified', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA,
-      collectionPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
-        collection: _objectSpread(_objectSpread({}, PAGES[0].collection), {}, {
+      collectionPages: [{
+        ...PAGES[0],
+        collection: {
+          ...PAGES[0].collection,
           heading: {
             text: 'Custom page heading'
           }
-        })
-      })]
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+        }
+      }]
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS[5]).toMatchObject({
       type: 'heading',
       key: 'Custom page heading',
       size: 's'
     });
   });
-  it('should position actions under the title if actionPosition flag is not specified', function () {
-    var FORM_DATA = {
+  it('should position actions under the title if actionPosition flag is not specified', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS[2].action.label).toEqual('Change');
     expect(ROWS[3].action.label).toEqual('custom remove label');
     expect(ROWS[4].action.label).toEqual('custom change label');
   });
-  it('should position actions under the title if actionPosition flag is top', function () {
-    var FORM_DATA = {
+  it('should position actions under the title if actionPosition flag is top', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
-      collection: _objectSpread(_objectSpread({}, MASTER_PAGE.collection), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
+      collection: {
+        ...MASTER_PAGE.collection,
         actionPosition: 'top'
-      }),
+      },
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS[2].action.label).toEqual('Change');
     expect(ROWS[3].action.label).toEqual('custom remove label');
     expect(ROWS[4].action.label).toEqual('custom change label');
   });
-  it('should position actions under all other rows if actionPosition flag is bottom', function () {
-    var FORM_DATA = {
+  it('should position actions under all other rows if actionPosition flag is bottom', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
-      collection: _objectSpread(_objectSpread({}, MASTER_PAGE.collection), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
+      collection: {
+        ...MASTER_PAGE.collection,
         actionPosition: 'bottom'
-      }),
+      },
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS[ROWS.length - 3].action.label).toEqual('Change');
     expect(ROWS[ROWS.length - 2].action.label).toEqual('custom remove label');
     expect(ROWS[ROWS.length - 1].action.label).toEqual('custom change label');
   });
-  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: [{
         id: '01',
         testText: 'value'
       }]
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null, function () {
-      return null;
-    });
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null, () => null);
     expect(ROWS.length).toEqual(7); // Collection title, item title, action rows & component rows
-    expect(ROWS[5].key).toEqual("Test text");
+    expect(ROWS[5].key).toEqual(`Test text`);
   });
-  it('should use the rows produced by the override function if provided', function () {
-    var FORM_DATA = {
+  it('should use the rows produced by the override function if provided', () => {
+    const FORM_DATA = {
       collection: [{
         id: '01',
         testText: 'value'
@@ -397,18 +415,19 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     };
 
     // eslint-disable-next-line arrow-body-style
-    var OVERRIDE = function OVERRIDE(page, comp) {
+    const OVERRIDE = (page, comp) => {
       // This will be called for each component on the page,
       // returning a custom row object.
       return {
-        key: "CustomRowFor".concat(comp.label)
+        key: `CustomRowFor${comp.label}`
       };
     };
-    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+    const PAGE = {
+      ...MASTER_PAGE,
       formData: FORM_DATA
-    });
-    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null, OVERRIDE);
+    };
+    const ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null, OVERRIDE);
     expect(ROWS.length).toEqual(7); // Collection title, item title, action rows & component rows
-    expect(ROWS[5].key).toEqual("CustomRowFor".concat(TEXT_COMP.label));
+    expect(ROWS[5].key).toEqual(`CustomRowFor${TEXT_COMP.label}`);
   });
 });

package/dist/utils/CheckYourAnswers/getCYARowsForContainer.js

@@ -9,40 +9,44 @@ var _elevateNestedComponents = _interopRequireDefault(require("../Component/elev
 var _getCYARow = _interopRequireDefault(require("./getCYARow"));
 var _getCYARowsForCollection = _interopRequireDefault(require("./getCYARowsForCollection"));
 var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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 getCYARowsForContainer = function getCYARowsForContainer(page, container, formData, onAction, fnOverride) {
-  if ((0, _showComponentCYA.default)(container, _objectSpread(_objectSpread({}, page.formData), formData))) {
-    var allComponents = (0, _elevateNestedComponents.default)(container.components, formData);
-    return allComponents.filter(function (c) {
-      return (0, _showComponentCYA.default)(c, _objectSpread(_objectSpread({}, page.formData), formData));
-    }).flatMap(function (component) {
-      var fd = formData ? formData[component.fieldId] : undefined;
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Local imports
+
+const getCYARowsForContainer = (page, container, formData, onAction, fnOverride) => {
+  if ((0, _showComponentCYA.default)(container, {
+    ...page.formData,
+    ...formData
+  })) {
+    const allComponents = (0, _elevateNestedComponents.default)(container.components, formData);
+    return allComponents.filter(c => (0, _showComponentCYA.default)(c, {
+      ...page.formData,
+      ...formData
+    })).flatMap(component => {
+      const fd = formData ? formData[component.fieldId] : undefined;
       if (typeof fnOverride === 'function') {
-        var overrideRows = fnOverride(_objectSpread(_objectSpread({}, page), {}, {
-          formData: formData
-        }), component, onAction);
+        const overrideRows = fnOverride({
+          ...page,
+          formData
+        }, component, onAction);
         if (overrideRows) {
           return overrideRows;
         }
       }
       if (component.type === _models.ComponentTypes.CONTAINER) {
-        return getCYARowsForContainer(page, component, _objectSpread(_objectSpread({}, fd), formData), onAction, fnOverride);
+        return getCYARowsForContainer(page, component, {
+          ...fd,
+          ...formData
+        }, onAction, fnOverride);
       }
       if (component.type === _models.ComponentTypes.COLLECTION) {
         return (0, _getCYARowsForCollection.default)(page, component, fd, onAction, fnOverride);
       }
-      return (0, _getCYARow.default)(_objectSpread(_objectSpread({}, page), {}, {
-        formData: formData
-      }), component, onAction);
+      return (0, _getCYARow.default)({
+        ...page,
+        formData
+      }, component, onAction);
     });
   }
   return null;
 };
-var _default = getCYARowsForContainer;
-exports.default = _default;
+var _default = exports.default = getCYARowsForContainer;