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

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/input/data-hidden-entire-collection.json

@@ -0,0 +1,20 @@
+{
+  "alpha": "alpha-value",
+  "itemsActiveId": "8b9b7671-d06d-447e-a907-e9215072741a",
+  "items": [
+    {
+      "id": "da056129-34e9-4218-8e98-574856977727",
+      "itemCategory": "alcohol",
+      "itemSubCategory": "itemSubCategory-value",
+      "brandText": "brandText-value",
+      "abvDetails": "abv-value"
+    },
+    {
+      "id": "da056129-34e9-4218-8e98-574856977727",
+      "itemCategory": "weapons",
+      "itemSubCategory": "ARM",
+      "brandText": "brandText-value",
+      "firearmCheck": "firearmCheck-value"
+    }
+  ]
+}

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/output/data-hidden-entire-collection-removed.json

@@ -0,0 +1,3 @@
+{
+  "alpha": "alpha-value"
+}

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 }; }
@@ -67,7 +68,8 @@ const createComponentMapsFromForm = (condensedPages, componentByIdMap, component
       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));
@@ -210,7 +212,10 @@ const resolveComponentDependenciesGraph = (allDependencyRelationships, allCompon
  * rules for each payload object.
  * 
  * Some of the rules may be dependent on payload items outside the collection. These will already have been cleansed
- * so will be in a reliable state.   
+ * so will be in a reliable state. 
+ * 
+ * It is possible in the form spec to specify in the master page that the whole collection has a show_when rule.
+ * If this is the case, evaluate the rule and if false delete the entire collection array.  
  * 
  * @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
@@ -219,6 +224,11 @@ const resolveComponentDependenciesGraph = (allDependencyRelationships, allCompon
  */
 const cleanseCollectionData = (allCollections, formData, componentByIdMap, componentByFieldIdMap) => {
   allCollections === null || allCollections === void 0 || allCollections.forEach((collection, collectionName) => {
+    if (!Utils.isShowEntity(collection, formData)) {
+      // Delete the entire collection array (including activeId) if the master page has an unmet rule
+      delete formData[collectionName];
+      delete formData["".concat(collectionName, "ActiveId")];
+    }
     const collectionDataArray = formData[collectionName];
     collectionDataArray === null || collectionDataArray === void 0 || collectionDataArray.forEach(collectionDataEntry => {
       var _collection$childPage2;
@@ -299,7 +309,9 @@ 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]));

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

@@ -75,6 +75,9 @@ var _dataChainedComponentShowWhensTargetComponentNestedRemoved = _interopRequire
 var _formHiddenPageCollection = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-hidden-page-collection.json"));
 var _dataHiddenPageCollection = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/data-hidden-page-collection.json"));
 var _dataHiddenPageCollectionRemoved = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/data-hidden-page-collection-removed.json"));
+var _formHiddenEntireCollection = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-hidden-entire-collection.json"));
+var _dataHiddenEntireCollection = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/data-hidden-entire-collection.json"));
+var _dataHiddenEntireCollectionRemoved = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/data-hidden-entire-collection-removed.json"));
 var _formHiddenCollectionComponentDependentOnExternalData = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/forms/form-hidden-collection-component-dependent-on-external-data.json"));
 var _dataHiddenCollectionComponentDependentOnExternalData = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/input/data-hidden-collection-component-dependent-on-external-data.json"));
 var _dataHiddenCollectionComponentDependentOnExternalDataRemoved = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/output/data-hidden-collection-component-dependent-on-external-data-removed.json"));
@@ -93,6 +96,11 @@ var _copAirpaxRemovePhotosAfter = _interopRequireDefault(require("../clear-uncom
 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
 
@@ -144,6 +152,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 
 // Hidden page collection
 
+// Should remove all collection components if show_when at the master page level
+
 // Hidden collection component, dependent on data external to and internal to collection payload
 
 // Mandec business interests
@@ -160,110 +170,120 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 
 // 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');
@@ -272,99 +292,111 @@ 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('should remove all collection components if show_when at the master page level.', () => {
+        const submissionData = JSON.parse(JSON.stringify(_dataHiddenEntireCollection.default));
+        const form = JSON.parse(JSON.stringify(_formHiddenEntireCollection.default));
+        const result = _index.default.clearOutUncompletedRoutes(true, form, submissionData);
+        expect(result).toEqual(_dataHiddenEntireCollectionRemoved.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(true, form, submissionData);
+        expect(result).toEqual(_dataPageNestedRadioComponentRemoved.default);
+      });
     });
   });
 });

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

@@ -30,6 +30,12 @@ const getCurrentTaskState = function (_ref) {
   if (currentPage) {
     return _models.TaskStates.TYPES.IN_PROGRESS;
   }
+  // If the user has clicked on the back link (see FormRenderer.jsx window.onpopstate event handler) 
+  // the task will be incomplete and the currentPage deleted
+  // and the task state should be recognised as 'In progress'.
+  if (complete !== undefined && !complete && currentPage === undefined) {
+    return _models.TaskStates.TYPES.IN_PROGRESS;
+  }
   return defaultState;
 };
 

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

@@ -115,6 +115,26 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', () => {
       expect(updatedSections[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.IN_PROGRESS);
       expect(updatedSections[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
     });
+    it("should set tasks to '".concat(_models.TaskStates.TYPES.IN_PROGRESS, "' if they have no current page and are not complete"), () => {
+      const SECTIONS = [{
+        name: 'Add event details',
+        tasks: [{
+          name: 'Date, location and mode details',
+          pages: ['eventDate', 'eventMode']
+        }, {
+          name: 'Officer and agency details',
+          pages: ['officeDetails']
+        }]
+      }];
+      const TASKS = {
+        'Date, location and mode details': {
+          complete: false
+        }
+      };
+      const updatedSections = (0, _getUpdatedSectionStates.default)(SECTIONS, TASKS);
+      expect(updatedSections[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.IN_PROGRESS);
+      expect(updatedSections[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
+    });
     it("should set the status of any tasks in a section with a failed show_when to '".concat(_models.TaskStates.TYPES.SKIPPED, "'"), () => {
       const SECTIONS = [{
         name: 'Add event details',

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/dist/utils/CollectionPage/mergeCollectionPages.js

@@ -25,11 +25,17 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 * can be one of either:
 * - A regular form page.
 * - The master page for a child collection, with its own array of child pages.
+*
+* To specify that an entire collection (including labels and actions) is hidden, 
+* then add a show_when to the 1st collection entry in the form.
 */
 
-const createMasterPage = page => ({
+const createMasterPage = page => _objectSpread(_objectSpread({
   id: page.id,
-  name: page.name,
+  name: page.name
+}, page.collection.show_when && {
+  show_when: page.collection.show_when
+}), {}, {
   orderInForm: page.orderInForm,
   deleteCollectionWhenHidden: page.deleteCollectionWhenHidden,
   collection: _objectSpread({

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "6.15.12-alpha",
+  "version": "6.15.12",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
     "test": "react-scripts test",
     "test:coverage": "yarn test --coverage --watchAll=false",
     "lint": "eslint --ext .js,.jsx src",
+    "lint:fix": "eslint --ext .js,.jsx src --fix",
     "storybook:start": "start-storybook --docs -s src/assets --no-manager-cache -p 6007",
     "storybook:build": "build-storybook --docs -s src/assets",
     "storybook": "yarn storybook:start",