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

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/input/data-page-nested-radio-component.json

@@ -0,0 +1,45 @@
+{
+    "id": "8d4674c4-1adb-11f0-a7ba-620783054865",
+    "businessKey": "DEV-20250416-1142",
+    "port": {
+        "id": 1639,
+        "name": "Dover",
+        "sea": true,
+        "air": false,
+        "land": false,
+        "rail": false,
+        "countryid": 234,
+        "iata": null,
+        "value": "1639",
+        "label": "Dover",
+        "hint": ""
+    },
+    "modeOfTransport": {
+        "id": 9,
+        "mode": "RoRo Tourist",
+        "modecode": "rorotour",
+        "crossingtype": [
+            "sea"
+        ],
+        "value": "RoRo Tourist",
+        "label": "RoRo Tourist"
+    },
+    "whatHappened": "peopleHidingVehicle",
+    "formInstanceId": "5b3b4c37-df21-4e61-bffe-3034c55d4429",
+    "driverOwnVehicle": "noSomeoneElseOwns",
+    "otherVehicleOwner": {
+        "vehicleOwnerAddress": "no",
+        "fullName": "Robert Flecher",
+        "telephoneNumber": "07835442994",
+        "emailAddress": "robrotheram@gmail.com",
+        "nonUkAddressText": "Dickinson St",
+        "country": {
+            "id": 211,
+            "name": "Sudan (the)",
+            "iso31661alpha3": "SDN",
+            "value": "211",
+            "label": "Sudan (the)",
+            "hint": ""
+        }
+    }
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/input/reassign-to-rcc.json

@@ -0,0 +1,72 @@
+{
+    "businessKey": "SIT-20250312-1016",
+    "definitionKey": "cop-ncc-task-form",
+    "port": {
+        "fixedpcp": null,
+        "updatedby": "Michaela Cook",
+        "geolong": "-3.3391",
+        "municipality": null,
+        "nonoperational": false,
+        "air": true,
+        "commandid": 22,
+        "juxtaposed": false,
+        "sea": false,
+        "subdivision": "NA",
+        "land": false,
+        "id": 9937,
+        "helipad": false,
+        "value": "9937",
+        "portablepcp": null,
+        "unlocode": null,
+        "rail": false,
+        "geolat": "51.39859",
+        "localcode": null,
+        "label": "Cardiff International Airport",
+        "countryid": 234,
+        "addressid": null,
+        "egates": null,
+        "iata": "CWL",
+        "locationid": null,
+        "hint": "",
+        "name": "Cardiff International Airport",
+        "icao": "EGFF",
+        "portsizeid": 1,
+        "validfrom": "2025-03-04T00:01:01.000Z",
+        "freightparcelposthub": false,
+        "validto": null
+    },
+    "terminal": null,
+    "leadOfficerEmail": null,
+    "officerEmails": null,
+    "regionalCommandCentre": {
+        "code": "BFCENT",
+        "updatedby": null,
+        "directorateid": 2,
+        "hint": "",
+        "name": "Central",
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "id": 23,
+        "label": "Central",
+        "value": "23",
+        "validto": null
+    },
+    "autoClose": "13 March 2025",
+    "assignWhere": "RCC",
+    "assignMessage": "test message",
+    "formStatus": {
+        "page": "cya"
+    },
+    "formInstanceId": "46d1b27d-5a6e-428b-a20e-4a432e37875f",
+    "form": {
+        "formVersionId": "7b941ec0bb281e2b93ba32058b81e1a88f0f0a9a",
+        "title": "Assign task to RCC",
+        "name": "cop-reassign-task-to-rcc",
+        "submissionDate": "2025-03-12T15:41:08.880Z",
+        "submittedBy": "acceptance.portuser1@system.local",
+        "submittingUsersName": "acceptance.portuser1",
+        "draftForm": true,
+        "submissionStartDate": "2025-03-12T15:41:08.880Z",
+        "formInstanceId": "46d1b27d-5a6e-428b-a20e-4a432e37875f",
+        "submissionTeam": "96e2d9db-8b3f-4b36-9ec3-eb1b7506d8c2"
+    }
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/output/data-page-nested-radio-component-removed.json

@@ -0,0 +1,45 @@
+{
+    "id": "8d4674c4-1adb-11f0-a7ba-620783054865",
+    "businessKey": "DEV-20250416-1142",
+    "port": {
+        "id": 1639,
+        "name": "Dover",
+        "sea": true,
+        "air": false,
+        "land": false,
+        "rail": false,
+        "countryid": 234,
+        "iata": null,
+        "value": "1639",
+        "label": "Dover",
+        "hint": ""
+    },
+    "modeOfTransport": {
+        "id": 9,
+        "mode": "RoRo Tourist",
+        "modecode": "rorotour",
+        "crossingtype": [
+            "sea"
+        ],
+        "value": "RoRo Tourist",
+        "label": "RoRo Tourist"
+    },
+    "whatHappened": "peopleHidingVehicle",
+    "formInstanceId": "5b3b4c37-df21-4e61-bffe-3034c55d4429",
+    "driverOwnVehicle": "noSomeoneElseOwns",
+    "otherVehicleOwner": {
+        "vehicleOwnerAddress": "no",
+        "fullName": "Robert Flecher",
+        "telephoneNumber": "07835442994",
+        "emailAddress": "robrotheram@gmail.com",
+        "nonUkAddressText": "Dickinson St",
+        "country": {
+            "id": 211,
+            "name": "Sudan (the)",
+            "iso31661alpha3": "SDN",
+            "value": "211",
+            "label": "Sudan (the)",
+            "hint": ""
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ exports.default = void 0;
 var _mergeCollectionPages = _interopRequireDefault(require("../../../utils/CollectionPage/mergeCollectionPages"));
 var Utils = _interopRequireWildcard(require("./clearOutUncompletedRoutesUtils"));
 var _optionIsSelected = _interopRequireDefault(require("../../../utils/Component/optionIsSelected"));
+var _getSourceData = _interopRequireDefault(require("../../../utils/Data/getSourceData"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -30,15 +31,19 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  *      once with the same path). 
  * 
  * @param {Array} condensedPages All pages in the form, with the collection pages collated into a single object per collection
- * @param {Map} allCollections A map of collection objects, which are a grouping of the pages that make up a single collection  
  * @param {Object} formData The form payload
  * @param {Map} componentByIdMap Map of all components, to enable performant lookup by id
  * @param {Map} componentByFieldIdMap Map of all components, to enable performant lookup by fieldId
- * @param {Map} allComponents All components in form (including nested), keyed by path
- * @param {Object} componentsToKeep A count of how many times each component is used, to prevent us deleting components defined > 1 times
- * @return allComponents and componentsToKeep updated in place
+ * @param {Object} 
+ * @return {Map, Object, Map} allComponents All components in form (including nested), keyed by path: 
+ *                              componentsToKeep A count of how many times each component is used, to prevent us deleting components defined > 1 times
+ *                              allCollections A map of collection objects, which are a grouping of the pages that make up a single collection 
  */
-const createComponentMapsFromForm = (condensedPages, allCollections, componentByIdMap, componentByFieldIdMap, allComponents, componentsToKeep, formData) => {
+const createComponentMapsFromForm = (condensedPages, componentByIdMap, componentByFieldIdMap, formData) => {
+  const allComponents = new Map();
+  const componentsToKeep = {};
+  const allCollections = new Map();
+
   /*
    * Inner function to support the recursion required to traverse through the nested structures of the form
    */
@@ -63,7 +68,8 @@ const createComponentMapsFromForm = (condensedPages, allCollections, componentBy
       var _component$data2;
       component === null || component === void 0 || (_component$data2 = component.data) === null || _component$data2 === void 0 || (_component$data2 = _component$data2.options) === null || _component$data2 === void 0 || _component$data2.forEach(option => {
         if (option.nested) {
-          if (!(0, _optionIsSelected.default)(formData[component.id], option)) {
+          // in container need to use the JPath for the data since the field that the component is looking at is nested in the container.
+          if (!(0, _optionIsSelected.default)((0, _getSourceData.default)(formData, path), option)) {
             option.nested.forEach(nestedComponent => {
               // delete hidden nested question payload items when the parent option is not selected
               Utils.deleteNodeByPath(formData, Utils.getNestedQuestionPath(path, nestedComponent.fieldId));
@@ -80,6 +86,7 @@ const createComponentMapsFromForm = (condensedPages, allCollections, componentBy
       });
     }
   };
+
   // Entry point for the recursive traverse of the form specification. 
   condensedPages === null || condensedPages === void 0 || condensedPages.forEach(page => {
     // Make the distinction between collections (which will be processed separately) and non-collections, which will be processed here.
@@ -89,10 +96,15 @@ const createComponentMapsFromForm = (condensedPages, allCollections, componentBy
       var _page$components;
       (_page$components = page.components) === null || _page$components === void 0 || _page$components.forEach(useComponentInPage => {
         const componentObj = Utils.findComponentDefinitionInForm(useComponentInPage, componentByIdMap, componentByFieldIdMap);
-        recursivelyMapFieldsAndDeleteHiddenNested(page, componentObj, null);
+        recursivelyMapFieldsAndDeleteHiddenNested(page, componentObj, null, allComponents, componentsToKeep, formData);
       });
     }
   });
+  return {
+    allComponents,
+    componentsToKeep,
+    allCollections
+  };
 };
 /**
  *  
@@ -102,9 +114,10 @@ const createComponentMapsFromForm = (condensedPages, allCollections, componentBy
  * 
  * @param {Map} allDependencyRelationships A map of each component with dependencies. The key is the fully qualified path and the value is a Set of all the paths that this component is dependent on.   
  * @param {Map} allComponents All components in form (including nested), keyed by path. Used to build the allDependencyRelationships
- * @return allDependencyRelationships updated in place
+ * @return {Map }allDependencyRelationships graph of the relationships between all entities
  */
-const createComponentDependenciesGraph = (allComponents, allDependencyRelationships) => {
+const createComponentDependenciesGraph = allComponents => {
+  const allDependencyRelationships = new Map();
   allComponents === null || allComponents === void 0 || allComponents.forEach(componentArray => {
     componentArray === null || componentArray === void 0 || componentArray.forEach(component => {
       if (!component.fieldId) return;
@@ -119,6 +132,7 @@ const createComponentDependenciesGraph = (allComponents, allDependencyRelationsh
       }
     });
   });
+  return allDependencyRelationships;
 };
 
 /**
@@ -287,22 +301,22 @@ const cleanseCollectionData = (allCollections, formData, componentByIdMap, compo
  * @param {*} formData 
  * @returns {*} cleansed form data 
  */
-const clearOutUncompletedRoutes = (form, 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]));
   const componentByFieldIdMap = new Map(form.components.map(c => [c.fieldId, c]));
 
-  // Instantiate data structures to hold the form specification and the dependency graph   
-  const allComponents = new Map();
-  const componentsToKeep = {};
-  const allCollections = new Map();
-  const allDependencyRelationships = new Map();
-
   // Group all pages relating to a page-collection into a single object to aid collection 
   // processing, and to allow us to differentiate between a collection and non-collection page.
   const condensedPages = (0, _mergeCollectionPages.default)(form.pages);
-  createComponentMapsFromForm(condensedPages, allCollections, componentByIdMap, componentByFieldIdMap, allComponents, componentsToKeep, formData);
-  createComponentDependenciesGraph(allComponents, allDependencyRelationships);
+  const {
+    allComponents,
+    componentsToKeep,
+    allCollections
+  } = createComponentMapsFromForm(condensedPages, componentByIdMap, componentByFieldIdMap, formData);
+  const allDependencyRelationships = createComponentDependenciesGraph(allComponents);
   resolveComponentDependenciesGraph(allDependencyRelationships, allComponents, componentsToKeep, allCollections, form, formData);
   cleanseCollectionData(allCollections, formData, componentByIdMap, componentByFieldIdMap);
 

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

@@ -85,11 +85,19 @@ var _copMandecRemoveCriminalityBefore = _interopRequireDefault(require("../clear
 var _copMandecRemoveCriminalityAfter = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/cop-mandec-remove-criminality-after.json"));
 var _copMandecRemoveUnspentConvictionsBefore = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/cop-mandec-remove-unspent-convictions-before.json"));
 var _copMandecRemoveUnspentConvictionsAfter = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/cop-mandec-remove-unspent-convictions-after.json"));
+var _copReassignTaskToRcc = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/cop-reassign-task-to-rcc.json"));
+var _reassignToRcc = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/reassign-to-rcc.json"));
 var _formCopAirpax = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-cop-airpax.json"));
 var _copAirpaxRemovePhotosBefore = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/cop-airpax-remove-photos-before.json"));
 var _copAirpaxRemovePhotosAfter = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/cop-airpax-remove-photos-after.json"));
 var _copAirpaxChangeWhatHappenedBefore = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/cop-airpax-change-what-happened-before.json"));
 var _copAirpaxChangeWhatHappenedAfter = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/cop-airpax-change-what-happened-after.json"));
+var _copAirpaxCarrier = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/cop-airpax-carrier.json"));
+var _formPageNestedRadioComponent = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-page-nested-radio-component.json"));
+var _dataPageNestedRadioComponent = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/data-page-nested-radio-component.json"));
+var _dataPageNestedRadioComponentRemoved = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/data-page-nested-radio-component-removed.json"));
+var _formVarianceBreach = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-variance-breach.json"));
+var _copVarianceBreachWithUploadFiles = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/cop-variance-breach-with-upload-files.json"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Hidden component
 
@@ -149,112 +157,128 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 
 // Mandec Unspent convictions
 
+// TMS reassign-task-to-rcc
+
 // Airpax photos
 
+// Who decided
+
+// Carrier not removed
+
+// Form with no componets but componet listed in page. 
+
+// Upload files not removed from variance breach on in-flight forms with no 'cleanseHiddenData' flag.
+
 describe('FormRenderer', () => {
   describe('helpers', () => {
     describe('clearOutUncompletedRoutes', () => {
+      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(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');
@@ -263,87 +287,105 @@ 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(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(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(true, form, submissionData);
+        expect(result).toEqual(_dataPageNestedRadioComponentRemoved.default);
+      });
     });
   });
 });