@ukhomeoffice/cop-react-form-renderer 6.0.5-peter → 6.5.1-peter

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/test2.json

@@ -0,0 +1,205 @@
+{
+  "id": "deb97e25-c4e4-11ee-8f7e-2e10af5884e4",
+  "businessKey": "DEV-20240206-415",
+  "modeOfTransport": {
+    "id": 2,
+    "mode": "Scheduled Air Passenger",
+    "modecode": "airpass",
+    "crossingtype": [
+      "air"
+    ],
+    "value": "Scheduled Air Passenger",
+    "label": "Scheduled Air Passenger"
+  },
+  "port": {
+    "id": 3415,
+    "name": "Luton",
+    "sea": false,
+    "air": true,
+    "land": false,
+    "rail": false,
+    "countryid": 234,
+    "iata": "LTN",
+    "value": "3415",
+    "label": "Luton"
+  },
+  "formStatus": {
+    "tasks": {
+      "undefined": {},
+      "Enter event details": {
+        "complete": true,
+        "currentPage": "eventDetailsCya"
+      },
+      "Enter item and storage details": {
+        "complete": true,
+        "currentPage": "whatHappensNext"
+      },
+      "Journey-details-item-abandoned": {
+        "complete": true,
+        "currentPage": "journeyCya"
+      },
+      "Accept and submit": {
+        "complete": false,
+        "currentPage": "submitForm"
+      }
+    },
+    "taskPage": "submitForm"
+  },
+  "formInstanceId": "bc81a157-cbd9-4c14-87fb-3b52d02bf71d",
+  "links": [
+    {
+      "method": "GET",
+      "href": "https://blue.dev.cop.homeoffice.gov.uk/camunda/engine-rest/process-instance/deb97e25-c4e4-11ee-8f7e-2e10af5884e4",
+      "rel": "self"
+    }
+  ],
+  "definitionId": "cop-addABorderEvent:9:113b6e67-b48d-11ee-8088-52b814b55f74",
+  "caseInstanceId": null,
+  "ended": false,
+  "suspended": false,
+  "tenantId": null,
+  "whatHappened": "items",
+  "eventDateTime": {
+    "eventDate": "06-02-2024",
+    "eventTime": "01:01"
+  },
+  "terminal": {
+    "id": 9,
+    "name": "Western Docks",
+    "validfrom": "2019-01-01T00:01:00.000Z",
+    "validto": null,
+    "updatedby": null,
+    "value": "9",
+    "label": "Western Docks"
+  },
+  "subLocation": {
+    "id": 10,
+    "sublocation": "Warehouse",
+    "description": null,
+    "validfrom": "2021-05-07T00:00:03.000Z",
+    "validto": null,
+    "updatedby": "BethStephenson",
+    "uoflocation": false,
+    "value": "10",
+    "label": "Warehouse"
+  },
+  "centaurReference": "E1234567",
+  "leadOfficerEmail": {
+    "email": "jyoti.shetty@digital.homeoffice.gov.uk",
+    "label": "jyoti.shetty@digital.homeoffice.gov.uk",
+    "value": "jyoti.shetty@digital.homeoffice.gov.uk",
+    "defaultteamid": "de8053bf-8ce6-4e60-a4a1-de6862fe158f"
+  },
+  "officerEmails": [],
+  "operationOrExercise": "no",
+  "itemsActiveId": "1707219813475",
+  "itemsNumberedIndex": 1,
+  "items": [
+    {
+      "id": "1707219813475",
+      "sealNumber": "876dsadadad",
+      "exhibitReference": "Exh123",
+      "itemCategory": {
+        "id": 8,
+        "category": "Firearms",
+        "description": "Both lethal and non-lethal firearms.",
+        "validfrom": "2023-01-10T00:00:01.000Z",
+        "validto": null,
+        "updatedby": "Mohammed Abdul Odud",
+        "synonyms": [
+          "'Guns'"
+        ],
+        "value": "8",
+        "label": "Firearms"
+      },
+      "itemSubCategory": {
+        "id": 1426,
+        "name": "Military weapons component",
+        "description": null,
+        "itemcategoriesid": 8,
+        "cites": false,
+        "poao": false,
+        "cbrn": false,
+        "document": false,
+        "tobacco": false,
+        "alcohol": false,
+        "weapons": false,
+        "firearms": true,
+        "ipr": true,
+        "strategic": false,
+        "avtc": false,
+        "oils": false,
+        "commodity": false,
+        "good": false,
+        "plant": false,
+        "animal": false,
+        "drugs": false,
+        "financial": false,
+        "indecent": false,
+        "vehicle": false,
+        "medical": false,
+        "unitid": 5,
+        "seizureqty": null,
+        "ienqty": null,
+        "validfrom": "2023-01-10T00:00:01.000Z",
+        "validto": null,
+        "updatedby": "Mohammed Abdul Odud",
+        "uof": false,
+        "epmscode": 1024,
+        "epmscategory": "ARP",
+        "unitarray": [
+          5
+        ],
+        "categoryarray": [
+          8,
+          9
+        ],
+        "lethalfirearm": null,
+        "nonlethalfirearm": null,
+        "value": "1426",
+        "label": "Military weapons component"
+      },
+      "seizedOrDetained": "detained",
+      "legalReasonForDetaining": {
+        "id": 3,
+        "epmsvalue": 18,
+        "reason": "Immigration Act",
+        "description": "Immigration Act",
+        "validfrom": "2022-09-21T00:00:01.000Z",
+        "validto": null,
+        "updatedby": "Mohammed Abdul Odud",
+        "value": "3",
+        "label": "Immigration Act"
+      },
+      "whatIsTheInitialMovement?": {
+        "id": 3,
+        "epmscode": 5,
+        "description": "Sent For Forensic Examination",
+        "inuse": true,
+        "validfrom": "2022-08-18T00:00:01.000Z",
+        "validto": null,
+        "updatedby": "Mohammed Abdul Odud",
+        "value": "3",
+        "label": "Sent For Forensic Examination"
+      },
+      "giveAReason": "sadad"
+    }
+  ],
+  "lockup": {
+    "value": "LTN",
+    "label": "Luton Airport Lockup",
+    "hidden": true
+  },
+  "epmsSubmitted": true,
+  "doYouHaveTheirFlightNumber": "no",
+  "form": {
+    "formVersionId": "ed41c96b78388228eb887927e45dc8a150a8b333",
+    "title": "Add a border event",
+    "name": "cop-addABorderEvent",
+    "submissionDate": "2024-02-06T11:53:56.499Z",
+    "submittedBy": "jyoti.shetty@digital.homeoffice.gov.uk",
+    "submittingUsersName": "Jyoti",
+    "submissionTeam": "de8053bf-8ce6-4e60-a4a1-de6862fe158f",
+    "formInstanceId": "bc81a157-cbd9-4c14-87fb-3b52d02bf71d"
+  }
+}

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

@@ -4,13 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _showComponent = _interopRequireDefault(require("../../../utils/Component/showComponent"));
 var _mergeCollectionPages = _interopRequireDefault(require("../../../utils/CollectionPage/mergeCollectionPages"));
 var _deleteNodeByPath = _interopRequireDefault(require("./deleteNodeByPath"));
 var _optionIsSelected = _interopRequireDefault(require("../../../utils/Component/optionIsSelected"));
+var _Condition = _interopRequireDefault(require("../../../utils/Condition"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-param-reassign */
 
+var showComponentIncludeHiddenAndDisabled = function showComponentIncludeHiddenAndDisabled(component, data) {
+  var _component$show_when;
+  if (!component) {
+    return false;
+  }
+  if (((_component$show_when = component.show_when) === null || _component$show_when === void 0 ? void 0 : _component$show_when.type) === "or") {
+    return _Condition.default.meetsOne(component, data);
+  }
+  return _Condition.default.meetsAll(component, data);
+};
 var recurseCheckForHiddenComponents = function recurseCheckForHiddenComponents(component, formData, path, candidateComponentForDeletion) {
   path = path ? "".concat(path, ".").concat(component.fieldId) : component.fieldId;
   if (component) {
@@ -19,7 +29,7 @@ var recurseCheckForHiddenComponents = function recurseCheckForHiddenComponents(c
       (_component$components = component.components) === null || _component$components === void 0 || _component$components.forEach(function (c) {
         recurseCheckForHiddenComponents(c, formData, path, candidateComponentForDeletion);
       });
-    } else if ((0, _showComponent.default)(component, formData)) {
+    } else if (showComponentIncludeHiddenAndDisabled(component, formData)) {
       var _component$data;
       if (component !== null && component !== void 0 && (_component$data = component.data) !== null && _component$data !== void 0 && _component$data.options) {
         var _component$data2;
@@ -27,44 +37,56 @@ var recurseCheckForHiddenComponents = function recurseCheckForHiddenComponents(c
           if (!(0, _optionIsSelected.default)(formData[component.id], option) && option.nested) {
             option.nested.forEach(function (nested) {
               path = nested.fieldId;
-              candidateComponentForDeletion.set(path, component);
+              if (path) {
+                candidateComponentForDeletion.set(path, component);
+              }
             });
           }
         });
       }
-    } else if (!(0, _showComponent.default)(component, formData)) {
-      candidateComponentForDeletion.set(path, component);
+    } else if (!showComponentIncludeHiddenAndDisabled(component, formData)) {
+      if (path) {
+        candidateComponentForDeletion.set(path, component);
+      }
     }
   }
 };
 var buildListOfComponentsUsedInVisiblePages = function buildListOfComponentsUsedInVisiblePages(page, form, formData, componentsUsedInVisiblePagesIds) {
   var _page$components;
   (_page$components = page.components) === null || _page$components === void 0 || _page$components.forEach(function (component) {
-    var _form$components$find;
-    var componentObj = (_form$components$find = form.components.find(function (c) {
+    var _ref, _form$components$find;
+    var componentObj = (_ref = (_form$components$find = form.components.find(function (c) {
       return c.fieldId === component.use;
-    })) !== null && _form$components$find !== void 0 ? _form$components$find : component;
-    if (page && (0, _showComponent.default)(page, formData)) {
-      if (componentObj && (0, _showComponent.default)(componentObj, formData)) {
-        componentsUsedInVisiblePagesIds.push(componentObj.fieldId);
+    })) !== null && _form$components$find !== void 0 ? _form$components$find : form.components.find(function (c) {
+      return c.id === component.use;
+    })) !== null && _ref !== void 0 ? _ref : component;
+    if (page && showComponentIncludeHiddenAndDisabled(page, formData)) {
+      if (componentObj && showComponentIncludeHiddenAndDisabled(componentObj, formData)) {
+        if (componentObj.fieldId) {
+          componentsUsedInVisiblePagesIds.push(componentObj.fieldId);
+        } else if (componentObj.id) {
+          componentsUsedInVisiblePagesIds.push(componentObj.id);
+        }
       }
     }
   });
 };
-var recurseDeleteComponents = function recurseDeleteComponents(component, formData, path, checkIfComponentHidden) {
+var recursePopulateComponentPaths = function recursePopulateComponentPaths(component, formData, path, componentPaths, checkIfHidden) {
   path = path ? "".concat(path, ".").concat(component.fieldId) : component.fieldId;
   if (component) {
     if (component.components) {
       var _component$components2;
       (_component$components2 = component.components) === null || _component$components2 === void 0 || _component$components2.forEach(function (c) {
-        recurseDeleteComponents(c, formData, path, checkIfComponentHidden);
+        recursePopulateComponentPaths(c, formData, path, componentPaths);
       });
-    } else if (checkIfComponentHidden) {
-      if (!(0, _showComponent.default)(component, formData)) {
-        delete formData[path];
+    } else if (path) {
+      if (checkIfHidden) {
+        if (showComponentIncludeHiddenAndDisabled(component, formData)) {
+          componentPaths.push(path);
+        }
+      } else {
+        componentPaths.push(path);
       }
-    } else {
-      delete formData[path];
     }
   }
 };
@@ -74,43 +96,87 @@ var markComponentsForDeletion = function markComponentsForDeletion(page, form, f
     return;
   }
   (_page$components2 = page.components) === null || _page$components2 === void 0 || _page$components2.forEach(function (component) {
-    var _form$components$find2;
-    var componentObj = (_form$components$find2 = form.components.find(function (c) {
+    var _ref2, _form$components$find2;
+    var componentObj = (_ref2 = (_form$components$find2 = form.components.find(function (c) {
       return c.fieldId === component.use;
-    })) !== null && _form$components$find2 !== void 0 ? _form$components$find2 : component;
-    if (page && (0, _showComponent.default)(page, formData)) {
+    })) !== null && _form$components$find2 !== void 0 ? _form$components$find2 : form.components.find(function (c) {
+      return c.id === component.use;
+    })) !== null && _ref2 !== void 0 ? _ref2 : component;
+    if (page && showComponentIncludeHiddenAndDisabled(page, formData)) {
       buildListOfComponentsUsedInVisiblePages(page, form, formData, componentsUsedInVisiblePages);
       recurseCheckForHiddenComponents(componentObj, formData, null, candidateComponentForDeletion);
     } else {
-      candidateComponentForDeletion.set(componentObj.fieldId, componentObj);
+      if (componentObj.fieldId) {
+        candidateComponentForDeletion.set(componentObj.fieldId, componentObj);
+      }
+      if (componentObj.id) {
+        candidateComponentForDeletion.set(componentObj.id, componentObj);
+      }
     }
   });
 };
-var deleteHiddenComponent = function deleteHiddenComponent(page, form, collectionData, formData) {
-  if (page.disableClearWhenHidden) {
-    return;
-  }
-  if (page && (0, _showComponent.default)(page, collectionData) || page && (0, _showComponent.default)(page, formData)) {
-    var _page$components3;
-    (_page$components3 = page.components) === null || _page$components3 === void 0 || _page$components3.forEach(function (component) {
-      var _form$components$find3;
-      var componentObj = (_form$components$find3 = form.components.find(function (c) {
-        return c.fieldId === component.use;
-      })) !== null && _form$components$find3 !== void 0 ? _form$components$find3 : component;
-      recurseDeleteComponents(componentObj, collectionData, null, true);
-    });
-  } else {
+var populateComponentPaths = function populateComponentPaths(page, form, collectionData, formData, nonDeleteComponentPaths, allComponentPaths) {
+  if (page) {
     var _page$components4;
-    // recursively delete all components on the page
+    if (showComponentIncludeHiddenAndDisabled(page, formData) || showComponentIncludeHiddenAndDisabled(page, collectionData)) {
+      var _page$components3;
+      (_page$components3 = page.components) === null || _page$components3 === void 0 || _page$components3.forEach(function (component) {
+        var _ref3, _form$components$find3;
+        var componentObj = (_ref3 = (_form$components$find3 = form.components.find(function (c) {
+          return c.fieldId === component.use;
+        })) !== null && _form$components$find3 !== void 0 ? _form$components$find3 : form.components.find(function (c) {
+          return c.id === component.use;
+        })) !== null && _ref3 !== void 0 ? _ref3 : component;
+        recursePopulateComponentPaths(componentObj, collectionData, null, nonDeleteComponentPaths, true);
+      });
+    }
     (_page$components4 = page.components) === null || _page$components4 === void 0 || _page$components4.forEach(function (component) {
-      var _form$components$find4;
-      var componentObj = (_form$components$find4 = form.components.find(function (c) {
+      var _ref4, _form$components$find4;
+      var componentObj = (_ref4 = (_form$components$find4 = form.components.find(function (c) {
         return c.fieldId === component.use;
-      })) !== null && _form$components$find4 !== void 0 ? _form$components$find4 : component;
-      recurseDeleteComponents(componentObj, collectionData, null, false);
+      })) !== null && _form$components$find4 !== void 0 ? _form$components$find4 : form.components.find(function (c) {
+        return c.id === component.use;
+      })) !== null && _ref4 !== void 0 ? _ref4 : component;
+      recursePopulateComponentPaths(componentObj, collectionData, null, allComponentPaths, false);
     });
   }
 };
+function clearUncompletedRoutesForCollections(formData, page, form) {
+  var _page$collection;
+  var nonDeleteComponentPaths = [];
+  var allComponentPaths = [];
+  var collectionDatas = formData[page === null || page === void 0 || (_page$collection = page.collection) === null || _page$collection === void 0 ? void 0 : _page$collection.name];
+  if (collectionDatas) {
+    collectionDatas.forEach(function (collectionData) {
+      var _page$childPages;
+      /* eslint-disable consistent-return */
+      (_page$childPages = page.childPages) === null || _page$childPages === void 0 || _page$childPages.forEach(function (childPage) {
+        if (childPage.disableClearWhenHidden) {
+          return;
+        }
+        if (childPage.deleteCollectionWhenHidden) {
+          if (!showComponentIncludeHiddenAndDisabled(childPage, formData)) {
+            delete formData[childPage.collection.name];
+            return false;
+          }
+        }
+        populateComponentPaths(childPage, form, collectionData, formData, nonDeleteComponentPaths, allComponentPaths);
+      });
+    });
+    nonDeleteComponentPaths = nonDeleteComponentPaths.filter(function (value, index, self) {
+      return self.indexOf(value) === index;
+    });
+    allComponentPaths = allComponentPaths.filter(function (value, index, self) {
+      return self.indexOf(value) === index;
+    });
+    // delete fields not visible
+    allComponentPaths.forEach(function (key) {
+      if (!nonDeleteComponentPaths.includes(key)) {
+        (0, _deleteNodeByPath.default)(collectionDatas, key);
+      }
+    });
+  }
+}
 var clearOutUncompletedRoutes = function clearOutUncompletedRoutes(form, formData) {
   if (form.disableClearWhenHidden) {
     return formData;
@@ -119,29 +185,16 @@ var clearOutUncompletedRoutes = function clearOutUncompletedRoutes(form, formDat
   var candidateComponentForDeletion = new Map();
   var componentsUsedInVisiblePagesIds = [];
   condensedPages === null || condensedPages === void 0 || condensedPages.forEach(function (page) {
-    var _page$collection;
-    if (page !== null && page !== void 0 && (_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.name) {
-      var _page$collection2;
-      var collectionDatas = formData[page === null || page === void 0 || (_page$collection2 = page.collection) === null || _page$collection2 === void 0 ? void 0 : _page$collection2.name];
-      if (collectionDatas) {
-        collectionDatas.forEach(function (collectionData) {
-          var _page$childPages;
-          /* eslint-disable consistent-return */
-          (_page$childPages = page.childPages) === null || _page$childPages === void 0 || _page$childPages.forEach(function (childPage) {
-            if (childPage.deleteCollectionWhenHidden) {
-              if (childPage && !(0, _showComponent.default)(childPage, collectionData) || childPage && !(0, _showComponent.default)(childPage, formData)) {
-                delete formData[childPage.collection.name];
-                return false;
-              }
-            }
-            deleteHiddenComponent(childPage, form, collectionData, formData);
-          });
-        });
-      }
+    var _page$collection2;
+    if (page !== null && page !== void 0 && (_page$collection2 = page.collection) !== null && _page$collection2 !== void 0 && _page$collection2.name) {
+      clearUncompletedRoutesForCollections(formData, page, form);
     } else {
       markComponentsForDeletion(page, form, formData, candidateComponentForDeletion, componentsUsedInVisiblePagesIds);
     }
   });
+  componentsUsedInVisiblePagesIds = componentsUsedInVisiblePagesIds.filter(function (value, index, self) {
+    return self.indexOf(value) === index;
+  });
   componentsUsedInVisiblePagesIds.forEach(function (componentId) {
     return candidateComponentForDeletion.delete(componentId);
   });

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

@@ -14,10 +14,40 @@ var _dataWithComponentsRemoved = _interopRequireDefault(require("../clear-uncomp
 var _formForNestedComponents = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/form-for-nested-components.json"));
 var _dataWithNestedComponents = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/data-with-nested-components.json"));
 var _dataWithNestedComponentRemoved = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/data-with-nested-component-removed.json"));
+var _copEab2Form = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-eab2-form.json"));
+var _copEab2DataBefore = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-eab-2-data-before.json"));
+var _copEab2DataAfter = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-eab-2-data-after.json"));
+var _copMandecForm = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-mandec-form.json"));
+var _copMandecDataBefore = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-mandec-data-before.json"));
+var _copMandecDataAfter = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-mandec-data-after.json"));
+var _copAirpaxBefore = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-airpax-before.json"));
+var _copAirpaxAfter = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-airpax-after.json"));
+var _copAirpaxForm = _interopRequireDefault(require("../clear-uncompleted-routes/test-data/cop-airpax-form.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 describe('FormRenderer', function () {
   describe('helpers', function () {
     describe('clearOutUncompletedRoutes', function () {
+      it('should clear out for cop-eab 2 civil penalty', function () {
+        var form = JSON.parse(JSON.stringify(_copEab2Form.default));
+        var formData = JSON.parse(JSON.stringify(_copEab2DataBefore.default));
+        var clearedFormData = JSON.parse(JSON.stringify(_copEab2DataAfter.default));
+        var result = _index.default.clearOutUncompletedRoutes(form, formData);
+        expect(result).toEqual(clearedFormData);
+      });
+      it('should clear out for cop-eab 2 airpax', function () {
+        var form = JSON.parse(JSON.stringify(_copAirpaxForm.default));
+        var formData = JSON.parse(JSON.stringify(_copAirpaxBefore.default));
+        var clearedFormData = JSON.parse(JSON.stringify(_copAirpaxAfter.default));
+        var result = _index.default.clearOutUncompletedRoutes(form, formData);
+        expect(result).toEqual(clearedFormData);
+      });
+      it('should clear out for cop-mandec', function () {
+        var form = JSON.parse(JSON.stringify(_copMandecForm.default));
+        var formData = JSON.parse(JSON.stringify(_copMandecDataBefore.default));
+        var clearedFormData = JSON.parse(JSON.stringify(_copMandecDataAfter.default));
+        var result = _index.default.clearOutUncompletedRoutes(form, formData);
+        expect(result).toEqual(clearedFormData);
+      });
       it('should not remove hidden component where it is visible in another page', function () {
         var form = JSON.parse(JSON.stringify(_componentUsedInMultiplePagesForm.default));
         var formData = JSON.parse(JSON.stringify(_componentUsedInMultiplePagesData.default));

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

@@ -6,10 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 /* eslint-disable consistent-return */
 var deleteNodeByPath = function deleteNodeByPath(obj, path) {
+  if (Array.isArray(obj)) {
+    // If obj is an array, recursively call deleteNodeByPath on each element
+    for (var i = 0; i < obj.length; i += 1) {
+      deleteNodeByPath(obj[i], path);
+    }
+  }
   var keys = path.split('.');
   var current = obj;
-  for (var i = 0; i < keys.length - 1; i += 1) {
-    current = current[keys[i]];
+  for (var _i = 0; _i < keys.length - 1; _i += 1) {
+    current = current[keys[_i]];
     if (current === undefined) {
       return;
     }

package/dist/components/FormRenderer/onPageAction.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _models = require("../../models");
 var _utils = _interopRequireDefault(require("../../utils"));
+var _setCollectionPageData = _interopRequireDefault(require("../../utils/CollectionPage/setCollectionPageData"));
 var _handlers = _interopRequireDefault(require("./handlers"));
 var _helpers = _interopRequireDefault(require("./helpers"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -48,7 +49,11 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
     if (action.addToFormData) {
       var operations = Array.isArray(action.addToFormData) ? action.addToFormData : [action.addToFormData];
       operations.forEach(function (op) {
-        _utils.default.Data.setDataItem(formState.page.formData, op.field, op.value);
+        if (op.isCollection) {
+          (0, _setCollectionPageData.default)(op.field, op.value, formState.page.formData);
+        } else {
+          _utils.default.Data.setDataItem(formState.page.formData, op.field, op.value);
+        }
       });
       form.page.formData[action.addToFormData.field] = action.addToFormData.value;
     }

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

@@ -581,10 +581,16 @@ describe('components.FormRenderer.onPageAction', function () {
         var ACTION = {
           type: actionType,
           collection: 'testCollection',
-          addToFormData: {
+          addToFormData: [{
             field: 'alpha',
             value: '123'
-          }
+          }, {
+            field: 'parent.child',
+            value: [{
+              id: '12345'
+            }],
+            isCollection: true
+          }]
         };
         var CUSTOM_ARGS = _objectSpread(_objectSpread({}, ARGS), {}, {
           formState: FORM_STATE,
@@ -596,6 +602,7 @@ describe('components.FormRenderer.onPageAction', function () {
         expect(FORM_STATE.page.formData).toMatchObject({
           alpha: '123'
         });
+        expect(FORM_STATE.page.formData.parent[0].child[0].id).toEqual('12345');
       });
     });
     it("should work for the ".concat(_models.PageAction.TYPES.NAVIGATE, " action type"), function () {
@@ -609,10 +616,16 @@ describe('components.FormRenderer.onPageAction', function () {
       var ACTION = {
         type: _models.PageAction.TYPES.NAVIGATE,
         collection: 'testCollection',
-        addToFormData: {
+        addToFormData: [{
           field: 'alpha',
           value: '123'
-        }
+        }, {
+          field: 'parent.child',
+          value: [{
+            id: '12345'
+          }],
+          isCollection: true
+        }]
       };
       var CUSTOM_ARGS = _objectSpread(_objectSpread({}, ARGS), {}, {
         formState: FORM_STATE,
@@ -626,6 +639,7 @@ describe('components.FormRenderer.onPageAction', function () {
       expect(FORM_STATE.page.formData).toMatchObject({
         alpha: '123'
       });
+      expect(FORM_STATE.page.formData.parent[0].child[0].id).toEqual('12345');
     });
     it('should work for an array of formData', function () {
       var FORM_STATE = {

package/dist/components/SummaryList/SummaryList.scss

@@ -1,5 +1,5 @@
-@import 'node_modules/govuk-frontend/govuk/_base';
-@import 'node_modules/govuk-frontend/govuk/components/summary-list/_summary-list';
+@import 'govuk-frontend/dist/govuk/_base';
+@import 'govuk-frontend/dist/govuk/components/summary-list/_summary-list';
 
 .govuk-summary-list__title {
   width: 100%;

package/dist/components/TaskList/TaskList.scss

@@ -1,4 +1,4 @@
-@import 'node_modules/govuk-frontend/govuk/_base';
+@import 'govuk-frontend/dist/govuk/_base';
 
 // Task list pattern