@ukhomeoffice/cop-react-form-renderer 6.15.10 → 6.15.11

package/dist/components/FormRenderer/FormRenderer.js

@@ -39,6 +39,7 @@ const FormRenderer = _ref => {
   let {
     title,
     type,
+    cleanseHiddenData,
     components,
     pages,
     hub,
@@ -61,6 +62,7 @@ const FormRenderer = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_context.ValidationContextProvider, null, /*#__PURE__*/_react.default.createElement(InternalFormRenderer, {
     title: title,
     type: type,
+    cleanseHiddenData: cleanseHiddenData,
     components: components,
     pages: pages,
     hub: hub,
@@ -84,6 +86,7 @@ const InternalFormRenderer = _ref2 => {
   let {
     title,
     type,
+    cleanseHiddenData,
     components,
     pages: _pages,
     hub: _hub,
@@ -295,7 +298,7 @@ const InternalFormRenderer = _ref2 => {
     actions: (_formState$page$actio = formState.page.actions) === null || _formState$page$actio === void 0 ? void 0 : _formState$page$actio.filter(action => _utils.default.Component.show(action, data))
   }, formState.cya, {
     onAction: action => {
-      (0, _onCYAAction.default)(setPagePoint, action, pages, validate, components, data, setData, type, pageId, currentTask, hooks, addErrors, hub, onPageChange, formState, submitting, setSubmitting);
+      (0, _onCYAAction.default)(setPagePoint, action, pages, validate, cleanseHiddenData, components, data, setData, type, pageId, currentTask, hooks, addErrors, hub, onPageChange, formState, submitting, setSubmitting);
     },
     onRowAction: onCYARowAction,
     summaryListClassModifiers: summaryListClassModifiers,
@@ -316,7 +319,7 @@ const InternalFormRenderer = _ref2 => {
     page: formState.page,
     pages: [].concat(pages),
     onAction: (action, patch, patchLabel) => {
-      (0, _onPageAction.default)(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors, submitting, setSubmitting, errors);
+      (0, _onPageAction.default)(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, cleanseHiddenData, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors, submitting, setSubmitting, errors);
     },
     onChange: onChange,
     hashLink: hashLink,
@@ -329,7 +332,7 @@ const InternalFormRenderer = _ref2 => {
     pages: pages,
     onCollectionChange: onChange,
     onAction: (action, patch, patchLabel) => {
-      (0, _onPageAction.default)(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors, submitting, setSubmitting, errors);
+      (0, _onPageAction.default)(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, cleanseHiddenData, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors, submitting, setSubmitting, errors);
     },
     hashLink: hashLink,
     classModifiers: formState.page.classModifiers,
@@ -363,6 +366,7 @@ const propTypes = {
   pages: _propTypes.default.arrayOf(_propTypes.default.shape({})).isRequired,
   summaryListClassModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
   title: _propTypes.default.string,
+  cleanseHiddenData: _propTypes.default.bool,
   /** See <a href="/?path=/docs/f-json--page#formtypes">FormTypes</a>. */
   type: _propTypes.default.oneOf([_models.FormTypes.CYA, _models.FormTypes.FORM, _models.FormTypes.HUB, _models.FormTypes.TASK, _models.FormTypes.WIZARD, _models.FormTypes.TASK_CYA, _models.FormTypes.FORM_WITH_TASK]).isRequired,
   viewOnly: _propTypes.default.bool,
@@ -388,6 +392,7 @@ const defaultProps = {
   noChangeAction: false,
   summaryListClassModifiers: [],
   title: '',
+  cleanseHiddenData: false,
   viewOnly: true,
   hideBlankRows: false
 };

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

@@ -301,8 +301,8 @@ const cleanseCollectionData = (allCollections, formData, componentByIdMap, compo
  * @param {*} formData 
  * @returns {*} cleansed form data 
  */
-const clearOutUncompletedRoutes = (form, formData) => {
-  if (!form.cleanseHiddenData) return formData;
+const clearOutUncompletedRoutes = (cleanseHiddenData, form, formData) => {
+  if (!cleanseHiddenData) return formData;
 
   // Load components into maps keyed on id and field for subsequent performant access
   const componentByIdMap = new Map(form.components.map(c => [c.id, c]));

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

@@ -175,110 +175,110 @@ describe('FormRenderer', () => {
       it('should not remove upload files from variance breach.', () => {
         const submissionData = JSON.parse(JSON.stringify(_copVarianceBreachWithUploadFiles.default));
         const form = JSON.parse(JSON.stringify(_formVarianceBreach.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(false, form, submissionData);
         expect(result).toEqual(_copVarianceBreachWithUploadFiles.default);
       });
       it('should remove hidden component.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenComponent.default));
         const form = JSON.parse(JSON.stringify(_formHiddenComponent.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenComponentRemoved.default);
       });
       it('should remove hidden component with show_when in page and component.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenComponentShowWhenInComponentAndPage.default));
         const form = JSON.parse(JSON.stringify(_formHiddenComponentShowWhenInComponentAndPage.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenComponentShowWhenInComponentAndPageRemoved.default);
       });
       it('should remove hidden component embedded in page.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenEmbeddedComponent.default));
         const form = JSON.parse(JSON.stringify(_formHiddenEmbeddedComponent.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenEmbeddedComponentRemoved.default);
       });
       it('should remove hidden collection component.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenCollectionComponent.default));
         const form = JSON.parse(JSON.stringify(_formHiddenCollectionComponent.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenCollectionComponentRemoved.default);
       });
       it('should remove hidden embedded collection component.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenEmbeddedCollectionComponent.default));
         const form = JSON.parse(JSON.stringify(_formHiddenEmbeddedCollectionComponent.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenEmbeddedCollectionComponentRemoved.default);
       });
       it('should remove hidden containerised component.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenContainerisedComponent.default));
         const form = JSON.parse(JSON.stringify(_formHiddenContainerisedComponent.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenContainerisedComponentRemoved.default);
       });
       it('should remove hidden multi-level containerised components.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenMultilevelContainerisedComponent.default));
         const form = JSON.parse(JSON.stringify(_formHiddenMultilevelContainerisedComponent.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenMultilevelContainerisedComponentRemoved.default);
       });
       it('should remove hidden leaf-level in a multi-level containerised component.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenMultilevelContainerisedComponentLeafHidden.default));
         const form = JSON.parse(JSON.stringify(_formHiddenMultilevelContainerisedComponentLeafHidden.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenMultilevelContainerisedComponentLeafHiddenRemoved.default);
       });
       it('should remove hidden component with options.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenOptions.default));
         const form = JSON.parse(JSON.stringify(_formHiddenOptions.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenOptionsRemoved.default);
       });
       it('should remove hidden component with nested questions in options.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenComponentWithNestedQuestions.default));
         const form = JSON.parse(JSON.stringify(_formHiddenComponentWithNestedQuestions.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenComponentWithNestedQuestionsRemoved.default);
       });
       it('should remove answers associated with unselected options in a containerised component.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataNestedAnswersHiddenByOption.default));
         const form = JSON.parse(JSON.stringify(_formNestedAnswersHiddenByOption.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataNestedAnswersHiddenByOptionRemoved.default);
       });
       it('should remove hidden page.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenPage.default));
         const form = JSON.parse(JSON.stringify(_formHiddenPage.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenPageRemoved.default);
       });
       it('should remove hidden page with same component reused.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenPageSameComponentReused.default));
         const form = JSON.parse(JSON.stringify(_formHiddenPageSameComponentReused.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenPageSameComponentReusedRemoved.default);
       });
       it('should show component when reused but only one show_when true.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataPageSameComponentReusedOneShown.default));
         const form = JSON.parse(JSON.stringify(_formPageSameComponentReusedOneShown.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataPageSameComponentReusedOneShownRemoved.default);
       });
       it('should remove a hidden collection on a page.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenPageCollection.default));
         const form = JSON.parse(JSON.stringify(_formHiddenPageCollection.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenPageCollectionRemoved.default);
       });
       it('hidden component with show_when rule referring to a collection.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenComponentReferringToCollection.default));
         const form = JSON.parse(JSON.stringify(_formHiddenComponentReferringToCollection.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenComponentReferringToCollectionRemoved.default);
       });
       it('hidden component with show_when rule referring to a hidden collection.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenComponentReferringToHiddenCollection.default));
         const form = JSON.parse(JSON.stringify(_formHiddenComponentReferringToHiddenCollection.default));
         try {
-          _index.default.clearOutUncompletedRoutes(form, submissionData);
+          _index.default.clearOutUncompletedRoutes(true, form, submissionData);
           throw new Error('Expected myFunction to throw an error, but it did not');
         } catch (error) {
           expect(error.message).toContain('It is not possible to reliably clean hidden data when a component is dependent');
@@ -287,103 +287,103 @@ describe('FormRenderer', () => {
       it('should remove hidden collection components whether they are dependent on data inside or outside the collection.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenCollectionComponentDependentOnExternalData.default));
         const form = JSON.parse(JSON.stringify(_formHiddenCollectionComponentDependentOnExternalData.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenCollectionComponentDependentOnExternalDataRemoved.default);
       });
       it('should not remove component on hidden page if component used elsewhere.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataHiddenPageComponentUsedElsewhere.default));
         const form = JSON.parse(JSON.stringify(_formHiddenPageComponentUsedElsewhere.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataHiddenPageComponentUsedElsewhereRemoved.default);
       });
       it('chained show_whens should be resolved from the end of the chain backup to the start.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataChainedComponentShowWhens.default));
         const form = JSON.parse(JSON.stringify(_formChainedComponentShowWhens.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataChainedComponentShowWhensRemoved.default);
       });
       it('chained show_whens when top level dependency is field within refdata object.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataChainedComponentShowWhensRefdata.default));
         const form = JSON.parse(JSON.stringify(_formChainedComponentShowWhensRefdata.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataChainedComponentShowWhensRefdataRemoved.default);
       });
       it('chained show_whens should be resolved from the end of the chain backup to the start, even if the target and dependent components are in containers thus having segmented paths.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataChainedComponentShowWhensContainerised.default));
         const form = JSON.parse(JSON.stringify(_formChainedComponentShowWhensContainerised.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataChainedComponentShowWhensContainerisedRemoved.default);
       });
       it('chained show_whens when the component at the end of the chain is hidden indirectly via page show_when.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataChainedShowWhensPageHidden.default));
         const form = JSON.parse(JSON.stringify(_formChainedShowWhensPageHidden.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataChainedShowWhensPageHiddenRemoved.default);
       });
       it('chained show_whens when the dependent component is nested single question.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataChainedComponentShowWhensDependentComponentNested.default));
         const form = JSON.parse(JSON.stringify(_formChainedComponentShowWhensDependentComponentNested.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataChainedComponentShowWhensDependentComponentNestedRemoved.default);
       });
       it('chained show_whens when the target component is nested.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataChainedComponentShowWhensTargetComponentNested.default));
         const form = JSON.parse(JSON.stringify(_formChainedComponentShowWhensTargetComponentNested.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataChainedComponentShowWhensTargetComponentNestedRemoved.default);
       });
       it('chained show_whens when the dependent component is nested entire block.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataChainedComponentShowWhensDependentComponentNestedBlock.default));
         const form = JSON.parse(JSON.stringify(_formChainedComponentShowWhensDependentComponentNestedBlock.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataChainedComponentShowWhensDependentComponentNestedBlockRemoved.default);
       });
       it('business interests removed from mandec.', () => {
         const submissionData = JSON.parse(JSON.stringify(_copMandecRemoveBusinessInterestsBefore.default));
         const form = JSON.parse(JSON.stringify(_formCopMandec.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_copMandecRemoveBusinessInterestsAfter.default);
       });
       it('criminality removed from mandec.', () => {
         const submissionData = JSON.parse(JSON.stringify(_copMandecRemoveCriminalityBefore.default));
         const form = JSON.parse(JSON.stringify(_formCopMandec.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_copMandecRemoveCriminalityAfter.default);
       });
       it('Unspent convictions removed from mandec.', () => {
         const submissionData = JSON.parse(JSON.stringify(_copMandecRemoveUnspentConvictionsBefore.default));
         const form = JSON.parse(JSON.stringify(_formCopMandec.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_copMandecRemoveUnspentConvictionsAfter.default);
       });
       it('Reassign to RCC form, preserved fields not cleansed.', () => {
         const submissionData = JSON.parse(JSON.stringify(_reassignToRcc.default));
         const form = JSON.parse(JSON.stringify(_copReassignTaskToRcc.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_reassignToRcc.default);
       });
       it('photos removed from airpax.', () => {
         const submissionData = JSON.parse(JSON.stringify(_copAirpaxRemovePhotosBefore.default));
         const form = JSON.parse(JSON.stringify(_formCopAirpax.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_copAirpaxRemovePhotosAfter.default);
       });
       it('carrier not removed from airpax.', () => {
         const submissionData = JSON.parse(JSON.stringify(_copAirpaxCarrier.default));
         const form = JSON.parse(JSON.stringify(_formCopAirpax.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_copAirpaxCarrier.default);
       });
       it('airpax change whatHappened to hide whoDecidedSelection.', () => {
         const submissionData = JSON.parse(JSON.stringify(_copAirpaxChangeWhatHappenedBefore.default));
         const form = JSON.parse(JSON.stringify(_formCopAirpax.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_copAirpaxChangeWhatHappenedAfter.default);
       });
       it('should handle nested option in container componet defined in the page.', () => {
         const submissionData = JSON.parse(JSON.stringify(_dataPageNestedRadioComponent.default));
         const form = JSON.parse(JSON.stringify(_formPageNestedRadioComponent.default));
-        const result = _index.default.clearOutUncompletedRoutes(form, submissionData);
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
         expect(result).toEqual(_dataPageNestedRadioComponentRemoved.default);
       });
     });

package/dist/components/FormRenderer/onCYAAction.js

@@ -18,7 +18,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  * 
  * @param {*} action 
  */
-const onCYAAction = (setPagePoint, action, pages, validate, components, data, setData, type, pageId, currentTask, hooks, addErrors, hub, onPageChange, formState, submitting, setSubmitting) => {
+const onCYAAction = (setPagePoint, action, pages, validate, cleanseHiddenData, components, data, setData, type, pageId, currentTask, hooks, addErrors, hub, onPageChange, formState, submitting, setSubmitting) => {
   // Check to see whether the action is able to proceed, which in
   // in the case of a submission will validate the fields in the page.
   if (action.type === _models.PageAction.TYPES.SUBMIT && hub !== _models.HubFormats.TASK) {
@@ -36,7 +36,7 @@ const onCYAAction = (setPagePoint, action, pages, validate, components, data, se
         pages,
         components
       };
-      _helpers.default.clearOutUncompletedRoutes(formPagesAndComponents, submissionData);
+      _helpers.default.clearOutUncompletedRoutes(cleanseHiddenData, formPagesAndComponents, submissionData);
       submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true);
       setData(submissionData);
       // Now submit the data to the backend...
@@ -80,7 +80,7 @@ const onCYAAction = (setPagePoint, action, pages, validate, components, data, se
           pages,
           components
         };
-        _helpers.default.clearOutUncompletedRoutes(formPagesAndComponents, submissionData);
+        _helpers.default.clearOutUncompletedRoutes(cleanseHiddenData, formPagesAndComponents, submissionData);
         submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true);
         setData(submissionData);
         // Now submit the data to the backend...

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

@@ -57,7 +57,7 @@ jest.mock('./helpers', () => ({
     this.getSubmissionStatusCalls = 0;
   },
   clearOutUncompletedRoutesCalls: 0,
-  clearOutUncompletedRoutes(formPagesAndComponents, formData) {
+  clearOutUncompletedRoutes(cleanseHiddenData, formPagesAndComponents, formData) {
     this.clearOutUncompletedRoutesCalls += 1;
     return formData;
   }
@@ -170,6 +170,7 @@ describe('components.FormRenderer.onCYAAction', () => {
     },
     pages: PAGES,
     validate: () => {},
+    cleanseHiddenData: true,
     components: COMPONENTS,
     data: {},
     setData: mockSetData,

package/dist/components/FormRenderer/onPageAction.js

@@ -19,7 +19,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 // (patch captures payload-ready field name and value, 
 // patchLabel captures non-ID values 
 // for display purposes after submission.)
-const onPageAction = (action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors, submitting, setSubmitting, existingErrors) => {
+const onPageAction = (action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, cleanseHiddenData, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors, submitting, setSubmitting, existingErrors) => {
   // Save a copy of data in case submit errors and we need to revert
   const preSubmitData = _objectSpread({}, data);
   const form = formState;
@@ -112,7 +112,7 @@ const onPageAction = (action, patch, patchLabel, hooks, data, formState, validat
         components
       };
       if (action.type === _models.PageAction.TYPES.SUBMIT) {
-        _helpers.default.clearOutUncompletedRoutes(formPagesAndComponents, submissionData);
+        _helpers.default.clearOutUncompletedRoutes(cleanseHiddenData, formPagesAndComponents, submissionData);
       }
 
       // In case of hub-and-spoke if patchLabel has changed then 

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

@@ -47,7 +47,7 @@ jest.mock('./helpers', () => ({
     return patch;
   },
   clearOutUncompletedRoutesCalls: 0,
-  clearOutUncompletedRoutes(formPagesAndComponents, formData) {
+  clearOutUncompletedRoutes(cleanseHiddenData, formPagesAndComponents, formData) {
     this.clearOutUncompletedRoutesCalls += 1;
     return formData;
   },
@@ -229,6 +229,7 @@ describe('components.FormRenderer.onPageAction', () => {
     validate: MOCK_VALIDATE,
     onPageChange: mockOnPageChange,
     type: _models.FormTypes.FORM_WITH_TASK,
+    cleanseHiddenData: true,
     pages: PAGES,
     components: COMPONENTS,
     pageId: 'alpha',

package/package.json

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