@ukhomeoffice/cop-react-form-renderer 6.7.0-alpha → 6.12.0

package/dist/components/FormRenderer/handlers/cyaAction.js

@@ -13,8 +13,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {string} currentPageId The current pageId.
  * @param {Function} onChange The handler to call if the pageId is different to the currentPageId.
  */
-const cyaAction = (page, currentPageId, onChange) => {
-  const pageId = (0, _getPageId.default)(page.action, page.pageId);
+var cyaAction = function cyaAction(page, currentPageId, onChange) {
+  var pageId = (0, _getPageId.default)(page.action, page.pageId);
   if (pageId !== currentPageId) {
     onChange(pageId);
   }

package/dist/components/FormRenderer/handlers/getPageId.js

@@ -10,5 +10,7 @@ exports.default = void 0;
  * @param {string} pageId The id of the page on which the action was invoked.
  * @returns A page id.
  */
-const getPageId = (action, pageId) => (action === null || action === void 0 ? void 0 : action.page) || pageId;
+var getPageId = function getPageId(action, pageId) {
+  return (action === null || action === void 0 ? void 0 : action.page) || pageId;
+};
 var _default = exports.default = getPageId;

package/dist/components/FormRenderer/handlers/getPageId.test.js

@@ -4,26 +4,26 @@ var _getPageId = _interopRequireDefault(require("./getPageId"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('components', () => {
-  describe('FormRenderer', () => {
-    describe('handlers', () => {
-      describe('getPageId', () => {
-        it('should return the pageId when the action is null', () => {
-          const PAGE_ID = 'alpha';
-          const ACTION = null;
+describe('components', function () {
+  describe('FormRenderer', function () {
+    describe('handlers', function () {
+      describe('getPageId', function () {
+        it('should return the pageId when the action is null', function () {
+          var PAGE_ID = 'alpha';
+          var ACTION = null;
           expect((0, _getPageId.default)(ACTION, PAGE_ID)).toEqual(PAGE_ID);
         });
-        it('should return the pageId when the action contains no page', () => {
-          const PAGE_ID = 'alpha';
-          const ACTION = {
+        it('should return the pageId when the action contains no page', function () {
+          var PAGE_ID = 'alpha';
+          var ACTION = {
             id: 'bravo'
           };
           expect((0, _getPageId.default)(ACTION, PAGE_ID)).toEqual(PAGE_ID);
         });
-        it('should return the page when provided', () => {
-          const NAVIGATE_TO = 'delta';
-          const PAGE_ID = 'alpha';
-          const ACTION = {
+        it('should return the page when provided', function () {
+          var NAVIGATE_TO = 'delta';
+          var PAGE_ID = 'alpha';
+          var ACTION = {
             page: NAVIGATE_TO
           };
           expect((0, _getPageId.default)(ACTION, PAGE_ID)).toEqual(NAVIGATE_TO);

package/dist/components/FormRenderer/handlers/handlers.test.js

@@ -4,30 +4,30 @@ var _ = _interopRequireDefault(require("."));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('components', () => {
-  describe('FormRenderer', () => {
-    describe('handlers', () => {
-      describe('cyaAction', () => {
-        it('should not call the onChange method when the page is unchanged', () => {
-          const CURRENT_PAGE_ID = 'alpha';
-          const PAGE = {
+describe('components', function () {
+  describe('FormRenderer', function () {
+    describe('handlers', function () {
+      describe('cyaAction', function () {
+        it('should not call the onChange method when the page is unchanged', function () {
+          var CURRENT_PAGE_ID = 'alpha';
+          var PAGE = {
             pageId: CURRENT_PAGE_ID
           };
-          const ON_CHANGE_CALLS = [];
-          const ON_CHANGE = pageId => {
+          var ON_CHANGE_CALLS = [];
+          var ON_CHANGE = function ON_CHANGE(pageId) {
             ON_CHANGE_CALLS.push(pageId);
           };
           _.default.cyaAction(PAGE, CURRENT_PAGE_ID, ON_CHANGE);
           expect(ON_CHANGE_CALLS.length).toEqual(0);
         });
-        it('should call the onChange method when the page has changed', () => {
-          const CURRENT_PAGE_ID = 'alpha';
-          const NEW_PAGE_ID = 'bravo';
-          const PAGE = {
+        it('should call the onChange method when the page has changed', function () {
+          var CURRENT_PAGE_ID = 'alpha';
+          var NEW_PAGE_ID = 'bravo';
+          var PAGE = {
             pageId: NEW_PAGE_ID
           };
-          const ON_CHANGE_CALLS = [];
-          const ON_CHANGE = pageId => {
+          var ON_CHANGE_CALLS = [];
+          var ON_CHANGE = function ON_CHANGE(pageId) {
             ON_CHANGE_CALLS.push(pageId);
           };
           _.default.cyaAction(PAGE, CURRENT_PAGE_ID, ON_CHANGE);
@@ -35,27 +35,27 @@ describe('components', () => {
           expect(ON_CHANGE_CALLS[0]).toEqual(NEW_PAGE_ID);
         });
       });
-      describe('navigate', () => {
-        it('should not call the onNavigate method when the page is unchanged', () => {
-          const CURRENT_PAGE_ID = 'alpha';
-          const ACTION = {
+      describe('navigate', function () {
+        it('should not call the onNavigate method when the page is unchanged', function () {
+          var CURRENT_PAGE_ID = 'alpha';
+          var ACTION = {
             page: CURRENT_PAGE_ID
           };
-          const ON_NAVIGATE_CALLS = [];
-          const ON_NAVIGATE = pageId => {
+          var ON_NAVIGATE_CALLS = [];
+          var ON_NAVIGATE = function ON_NAVIGATE(pageId) {
             ON_NAVIGATE_CALLS.push(pageId);
           };
           _.default.navigate(ACTION, CURRENT_PAGE_ID, ON_NAVIGATE);
           expect(ON_NAVIGATE_CALLS.length).toEqual(0);
         });
-        it('should call the onNavigate method when the page has changed', () => {
-          const CURRENT_PAGE_ID = 'alpha';
-          const NEW_PAGE_ID = 'bravo';
-          const ACTION = {
+        it('should call the onNavigate method when the page has changed', function () {
+          var CURRENT_PAGE_ID = 'alpha';
+          var NEW_PAGE_ID = 'bravo';
+          var ACTION = {
             page: NEW_PAGE_ID
           };
-          const ON_NAVIGATE_CALLS = [];
-          const ON_NAVIGATE = pageId => {
+          var ON_NAVIGATE_CALLS = [];
+          var ON_NAVIGATE = function ON_NAVIGATE(pageId) {
             ON_NAVIGATE_CALLS.push(pageId);
           };
           _.default.navigate(ACTION, CURRENT_PAGE_ID, ON_NAVIGATE);
@@ -63,13 +63,13 @@ describe('components', () => {
           expect(ON_NAVIGATE_CALLS[0]).toEqual(NEW_PAGE_ID);
         });
       });
-      describe('submissionError', () => {
-        it('should call the onError method with the same errors', () => {
-          const ON_ERROR_CALLS = [];
-          const ON_ERROR = errors => {
+      describe('submissionError', function () {
+        it('should call the onError method with the same errors', function () {
+          var ON_ERROR_CALLS = [];
+          var ON_ERROR = function ON_ERROR(errors) {
             ON_ERROR_CALLS.push(errors);
           };
-          const ERRORS = ['alpha', 'bravo', 'charlie'];
+          var ERRORS = ['alpha', 'bravo', 'charlie'];
           _.default.submissionError(ERRORS, ON_ERROR);
           expect(ON_ERROR_CALLS.length).toEqual(1);
           expect(ON_ERROR_CALLS[0]).toEqual(ERRORS);

package/dist/components/FormRenderer/handlers/index.js

@@ -8,7 +8,7 @@ var _cyaAction = _interopRequireDefault(require("./cyaAction"));
 var _navigate = _interopRequireDefault(require("./navigate"));
 var _submissionError = _interopRequireDefault(require("./submissionError"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const handlers = {
+var handlers = {
   cyaAction: _cyaAction.default,
   navigate: _navigate.default,
   submissionError: _submissionError.default

package/dist/components/FormRenderer/handlers/navigate.js

@@ -14,9 +14,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {Function} onNavigate The handler to call if the pageId is different to the currentPageId.
  * @param {object|undefined} state State to pass to the handler on change
  */
-const navigate = function (action, currentPageId, onNavigate) {
-  let state = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
-  const pageId = (0, _getPageId.default)(action, currentPageId);
+var navigate = function navigate(action, currentPageId, onNavigate) {
+  var state = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
+  var pageId = (0, _getPageId.default)(action, currentPageId);
   if (pageId !== currentPageId) {
     onNavigate(pageId, state);
   }

package/dist/components/FormRenderer/handlers/submissionError.js

@@ -9,7 +9,7 @@ exports.default = void 0;
  * @param {Array} errors The errors returned by the backend when submitting.
  * @param {Function} onError The handler to call with the formatted errors.
  */
-const submissionError = (errors, onError) => {
+var submissionError = function submissionError(errors, onError) {
   // For now, simply pass them straight through as we don't yet know
   // what the errors will look like.
   onError(errors);

package/dist/components/FormRenderer/helpers/canActionProceed.js

@@ -14,7 +14,7 @@ exports.default = void 0;
  * @param {Array} errors An array of existing errors.
  * @returns A boolean where `true` means the action can proceed and `false` means it cannot.
  */
-const canActionProceed = (action, page, pageValidator, errors) => {
+var canActionProceed = function canActionProceed(action, page, pageValidator, errors) {
   if (action.validate) {
     if (action.checkPreexistingErrors && errors.length !== 0) {
       return false;

package/dist/components/FormRenderer/helpers/canActionProceed.test.js

@@ -5,18 +5,18 @@ var _canActionProceed = _interopRequireDefault(require("./canActionProceed"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('components.FormRenderer.helpers.canActionProceed', () => {
-  it('should return true when the action does not require validation', () => {
-    const ACTION = {
+describe('components.FormRenderer.helpers.canActionProceed', function () {
+  it('should return true when the action does not require validation', function () {
+    var ACTION = {
       validate: false
     };
     expect((0, _canActionProceed.default)(ACTION, {}, _Validate.default.page)).toBeTruthy();
   });
-  it('should return true when the page is valid', () => {
-    const ACTION = {
+  it('should return true when the page is valid', function () {
+    var ACTION = {
       validate: true
     };
-    const PAGE = {
+    var PAGE = {
       components: [{
         id: 'a',
         fieldId: 'a',
@@ -29,11 +29,11 @@ describe('components.FormRenderer.helpers.canActionProceed', () => {
     };
     expect((0, _canActionProceed.default)(ACTION, PAGE, _Validate.default.page, [])).toBeTruthy();
   });
-  it('should return false when the page is invalid', () => {
-    const ACTION = {
+  it('should return false when the page is invalid', function () {
+    var ACTION = {
       validate: true
     };
-    const PAGE = {
+    var PAGE = {
       components: [{
         id: 'a',
         fieldId: 'a',
@@ -44,12 +44,12 @@ describe('components.FormRenderer.helpers.canActionProceed', () => {
     };
     expect((0, _canActionProceed.default)(ACTION, PAGE, _Validate.default.page, [])).toBeFalsy();
   });
-  it('should return false when the action has checkPreexistingErrors and errors is not empty', () => {
-    const ACTION = {
+  it('should return false when the action has checkPreexistingErrors and errors is not empty', function () {
+    var ACTION = {
       validate: true,
       checkPreexistingErrors: true
     };
-    const PAGE = {
+    var PAGE = {
       components: [{
         id: 'a',
         fieldId: 'a',
@@ -62,12 +62,12 @@ describe('components.FormRenderer.helpers.canActionProceed', () => {
     };
     expect((0, _canActionProceed.default)(ACTION, PAGE, _Validate.default.page, ['anError'])).toBeFalsy();
   });
-  it('should return true when the action has checkPreexistingErrors and errors is empty', () => {
-    const ACTION = {
+  it('should return true when the action has checkPreexistingErrors and errors is empty', function () {
+    var ACTION = {
       validate: true,
       checkPreexistingErrors: true
     };
-    const PAGE = {
+    var PAGE = {
       components: [{
         id: 'a',
         fieldId: 'a',

package/dist/components/FormRenderer/helpers/canCYASubmit.js

@@ -12,5 +12,7 @@ exports.default = void 0;
  * @param {Function} pagesValidator A function to validate the page.
  * @returns A boolean where `true` means the CYA can submit and `false` means it cannot.
  */
-const canCYASubmit = (pages, pagesValidator) => pagesValidator(pages).length === 0;
+var canCYASubmit = function canCYASubmit(pages, pagesValidator) {
+  return pagesValidator(pages).length === 0;
+};
 var _default = exports.default = canCYASubmit;

package/dist/components/FormRenderer/helpers/canCYASubmit.test.js

@@ -5,28 +5,32 @@ var _canCYASubmit = _interopRequireDefault(require("./canCYASubmit"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('components.FormRenderer.helpers.canCYASubmit', () => {
-  const ALPHA = {
+describe('components.FormRenderer.helpers.canCYASubmit', function () {
+  var ALPHA = {
     id: 'a',
     fieldId: 'a',
     label: 'Alpha',
     required: true
   };
-  const CHARLIE = {
+  var CHARLIE = {
     id: 'c',
     fieldId: 'c',
     label: 'Charlie',
     required: true
   };
-  const validatePages = pages => pages.flatMap(page => _Validate.default.page(page));
-  it('should return true when all pages are valid', () => {
-    const PAGE_1 = {
+  var validatePages = function validatePages(pages) {
+    return pages.flatMap(function (page) {
+      return _Validate.default.page(page);
+    });
+  };
+  it('should return true when all pages are valid', function () {
+    var PAGE_1 = {
       components: [ALPHA],
       formData: {
         a: 'Bravo'
       }
     };
-    const PAGE_2 = {
+    var PAGE_2 = {
       components: [CHARLIE],
       formData: {
         c: 'Delta'
@@ -34,12 +38,12 @@ describe('components.FormRenderer.helpers.canCYASubmit', () => {
     };
     expect((0, _canCYASubmit.default)([PAGE_1, PAGE_2], validatePages)).toBeTruthy();
   });
-  it('should return false when the first page is invalid', () => {
-    const PAGE_1 = {
+  it('should return false when the first page is invalid', function () {
+    var PAGE_1 = {
       components: [ALPHA],
       formData: {}
     };
-    const PAGE_2 = {
+    var PAGE_2 = {
       components: [CHARLIE],
       formData: {
         c: 'Delta'
@@ -47,25 +51,25 @@ describe('components.FormRenderer.helpers.canCYASubmit', () => {
     };
     expect((0, _canCYASubmit.default)([PAGE_1, PAGE_2], validatePages)).toBeFalsy();
   });
-  it('should return false when the second page is invalid', () => {
-    const PAGE_1 = {
+  it('should return false when the second page is invalid', function () {
+    var PAGE_1 = {
       components: [ALPHA],
       formData: {
         a: 'Bravo'
       }
     };
-    const PAGE_2 = {
+    var PAGE_2 = {
       components: [CHARLIE],
       formData: {}
     };
     expect((0, _canCYASubmit.default)([PAGE_1, PAGE_2], validatePages)).toBeFalsy();
   });
-  it('should return false when the both pages are invalid', () => {
-    const PAGE_1 = {
+  it('should return false when the both pages are invalid', function () {
+    var PAGE_1 = {
       components: [ALPHA],
       formData: {}
     };
-    const PAGE_2 = {
+    var PAGE_2 = {
       components: [CHARLIE],
       formData: {}
     };

package/dist/components/FormRenderer/helpers/cleanHiddenNestedData.js

@@ -5,44 +5,61 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _optionIsSelected = _interopRequireDefault(require("../../../utils/Component/optionIsSelected"));
+var _getCollectionPageActiveId = _interopRequireDefault(require("../../../utils/CollectionPage/getCollectionPageActiveId"));
+var _getCollectionPageData = _interopRequireDefault(require("../../../utils/CollectionPage/getCollectionPageData"));
+var _setCollectionPageData = _interopRequireDefault(require("../../../utils/CollectionPage/setCollectionPageData"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// Local imports
-
-const parentComponents = ['radios', 'checkboxes'];
+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
+var parentComponents = ['radios', 'checkboxes'];
+var getActiveIds = function getActiveIds(collectionName, formData) {
+  var nameParts = collectionName.split('.');
+  var result = {};
+  nameParts.forEach(function (part) {
+    result["".concat(part, "ActiveId")] = formData["".concat(part, "ActiveId")];
+  });
+  return result;
+};
 function getIdsToDelete(component, selectedValue) {
   var _component$data;
-  const idsToDelete = [];
-  component === null || component === void 0 || (_component$data = component.data) === null || _component$data === void 0 || (_component$data = _component$data.options) === null || _component$data === void 0 || _component$data.forEach(option => {
+  var idsToDelete = [];
+  component === null || component === void 0 || (_component$data = component.data) === null || _component$data === void 0 || (_component$data = _component$data.options) === null || _component$data === void 0 || _component$data.forEach(function (option) {
     if (!(0, _optionIsSelected.default)(selectedValue, option) && option.nested) {
-      option.nested.forEach(nested => {
+      option.nested.forEach(function (nested) {
         idsToDelete.push(nested.id);
       });
     }
   });
   return idsToDelete;
 }
-;
-const cleanHiddenNestedData = (patch, page) => {
-  page.components.forEach(component => {
+var cleanHiddenNestedData = function cleanHiddenNestedData(patch, page) {
+  var _patch = patch;
+  page.components.forEach(function (component) {
     if (!parentComponents.includes(component.type)) {
       return;
     }
-    const _patch = patch;
-    const idsToDelete = getIdsToDelete(component, _patch[component.id]);
-    idsToDelete.forEach(id => {
+    var idsToDelete = getIdsToDelete(component, _patch[component.id]);
+    idsToDelete.forEach(function (id) {
       delete _patch[id];
     });
   });
-  if (page.collection && patch[page.collection.name]) {
-    var _page$formData;
-    const activeId = patch["".concat(page.collection.name, "ActiveId")] || ((_page$formData = page.formData) === null || _page$formData === void 0 ? void 0 : _page$formData["".concat(page.collection.name, "ActiveId")]);
-    const _patch = patch;
-    _patch[page.collection.name] = _patch[page.collection.name].map(entry => entry.id === activeId ? cleanHiddenNestedData(entry, {
-      ...page,
-      collection: undefined
-    }) : entry);
+  if (page.collection) {
+    _patch = _objectSpread(_objectSpread({}, getActiveIds(page.collection.name, page.formData)), _patch);
+    var collectionData = (0, _getCollectionPageData.default)(page.collection.name, _patch);
+    if (collectionData) {
+      var activeId = (0, _getCollectionPageActiveId.default)(page.collection.name, _patch);
+      var modifiedCollection = collectionData.map(function (entry) {
+        return entry.id === activeId ? cleanHiddenNestedData(entry, _objectSpread(_objectSpread({}, page), {}, {
+          collection: undefined
+        })) : entry;
+      });
+      (0, _setCollectionPageData.default)(page.collection.name, modifiedCollection, _patch);
+    }
   }
-  ;
-  return patch;
+  return _patch;
 };
 var _default = exports.default = cleanHiddenNestedData;

package/dist/components/FormRenderer/helpers/cleanHiddenNestedData.test.js

@@ -4,17 +4,17 @@ var _cleanHiddenNestedData = _interopRequireDefault(require("./cleanHiddenNested
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('components', () => {
-  describe('FormRenderer', () => {
-    describe('helpers', () => {
-      describe('cleanHiddenNestedData', () => {
-        it('should remove data corresponding to hidden nested components in radios', () => {
-          const patchRadios = {
+describe('components', function () {
+  describe('FormRenderer', function () {
+    describe('helpers', function () {
+      describe('cleanHiddenNestedData', function () {
+        it('should remove data corresponding to hidden nested components in radios', function () {
+          var patchRadios = {
             parent: 'option2',
             nested1: 'should not be included',
             nested2: 'should be included'
           };
-          const pageRadios = {
+          var pageRadios = {
             id: 'page',
             name: 'page',
             title: 'Page',
@@ -39,17 +39,17 @@ describe('components', () => {
               }
             }]
           };
-          const updatedPatchRadios = (0, _cleanHiddenNestedData.default)(patchRadios, pageRadios);
+          var updatedPatchRadios = (0, _cleanHiddenNestedData.default)(patchRadios, pageRadios);
           expect(updatedPatchRadios.nested1).toBeFalsy();
           expect(updatedPatchRadios.nested2).toBeTruthy();
         });
-        it('should remove data corresponding to hidden nested components in checkboxes', () => {
-          const patchCheckboxes = {
+        it('should remove data corresponding to hidden nested components in checkboxes', function () {
+          var patchCheckboxes = {
             parent: ['option2'],
             nested1: 'should not be included',
             nested2: 'should be included'
           };
-          const pageCheckboxes = {
+          var pageCheckboxes = {
             id: 'page',
             name: 'page',
             title: 'Page',
@@ -74,12 +74,12 @@ describe('components', () => {
               }
             }]
           };
-          const updatedPatchCheckboxes = (0, _cleanHiddenNestedData.default)(patchCheckboxes, pageCheckboxes);
+          var updatedPatchCheckboxes = (0, _cleanHiddenNestedData.default)(patchCheckboxes, pageCheckboxes);
           expect(updatedPatchCheckboxes.nested1).toBeFalsy();
           expect(updatedPatchCheckboxes.nested2).toBeTruthy();
         });
-        it('remove data corresponding to hidden nested components within the active collection entry', () => {
-          const patch = {
+        it('should remove data corresponding to hidden nested components within the active collection entry', function () {
+          var patch = {
             collectionNameActiveId: '456',
             collectionName: [{
               id: '123',
@@ -93,13 +93,16 @@ describe('components', () => {
               nested2: 'should be included'
             }]
           };
-          const page = {
+          var page = {
             id: 'page',
             name: 'page',
             title: 'Page',
             collection: {
               name: 'collectionName'
             },
+            formData: {
+              collectionNameActiveId: '456'
+            },
             components: [{
               id: 'parent',
               type: 'radios',
@@ -120,12 +123,67 @@ describe('components', () => {
               }
             }]
           };
-          const updatedPatch = (0, _cleanHiddenNestedData.default)(patch, page);
+          var updatedPatch = (0, _cleanHiddenNestedData.default)(patch, page);
           expect(updatedPatch.collectionName[0].nested1).toBeTruthy();
           expect(updatedPatch.collectionName[0].nested2).toBeTruthy();
           expect(updatedPatch.collectionName[1].nested1).toBeFalsy();
           expect(updatedPatch.collectionName[1].nested2).toBeTruthy();
         });
+        it('should remove data corresponding to hidden nested components when collection is nested within an entity', function () {
+          var patch = {
+            collectionNameActiveId: '456',
+            entities: [{
+              id: '777',
+              collectionName: [{
+                id: '123',
+                parent: 'option1',
+                nested1: 'should be included',
+                nested2: 'should be included'
+              }, {
+                id: '456',
+                parent: 'option2',
+                nested1: 'should not be included',
+                nested2: 'should be included'
+              }]
+            }]
+          };
+          var page = {
+            id: 'page',
+            name: 'page',
+            title: 'Page',
+            collection: {
+              name: 'entities.collectionName'
+            },
+            formData: {
+              collectionNameActiveId: '456',
+              entitiesActiveId: '777'
+            },
+            components: [{
+              id: 'parent',
+              type: 'radios',
+              data: {
+                options: [{
+                  value: 'option1',
+                  nested: [{
+                    id: 'nested1',
+                    fieldId: 'nested1'
+                  }]
+                }, {
+                  value: 'option2',
+                  nested: [{
+                    id: 'nested2',
+                    fieldId: 'nested2'
+                  }]
+                }]
+              }
+            }]
+          };
+          var updatedPatch = (0, _cleanHiddenNestedData.default)(patch, page);
+          expect(updatedPatch.entities[0].collectionName[0].nested1).toBeTruthy();
+          expect(updatedPatch.entities[0].collectionName[0].nested2).toBeTruthy();
+          expect(updatedPatch.entities[0].collectionName[1].nested1).toBeFalsy();
+          expect(updatedPatch.entities[0].collectionName[1].nested2).toBeTruthy();
+        });
       });
     });
   });

package/dist/components/FormRenderer/helpers/getCYA.js

@@ -15,7 +15,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {object} hub The hub, if there is one.
  * @returns A configuration object for the Check your answers screen.
  */
-const getCYA = (pageId, pages, hub) => {
+var getCYA = function getCYA(pageId, pages, hub) {
   if (pageId === _models.FormPages.HUB && hub === _models.HubFormats.CYA) {
     return {
       title: ''
@@ -26,9 +26,11 @@ const getCYA = (pageId, pages, hub) => {
     return {};
   }
   ;
-  const currentPage = pages === null || pages === void 0 ? void 0 : pages.find(p => p.id === pageId);
+  var currentPage = pages === null || pages === void 0 ? void 0 : pages.find(function (p) {
+    return p.id === pageId;
+  });
   if ((currentPage === null || currentPage === void 0 ? void 0 : currentPage.type) === _models.FormPages.PARTIAL_CYA) {
-    const pageWithConditionals = _utils.default.FormPage.applyConditionalProperties(currentPage);
+    var pageWithConditionals = _utils.default.FormPage.applyConditionalProperties(currentPage);
     return {
       title: pageWithConditionals.title,
       hideChangeActions: pageWithConditionals.hideChangeActions,