@ukhomeoffice/cop-react-form-renderer 4.73.0 → 4.75.0

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

@@ -40,8 +40,8 @@ describe('components', function () {
             }]
           };
           var updatedPatchRadios = (0, _cleanHiddenNestedData.default)(patchRadios, pageRadios);
-          expect(updatedPatchRadios['nested1']).toBeFalsy();
-          expect(updatedPatchRadios['nested2']).toBeTruthy();
+          expect(updatedPatchRadios.nested1).toBeFalsy();
+          expect(updatedPatchRadios.nested2).toBeTruthy();
         });
         it('should remove data corresponding to hidden nested components in checkboxes', function () {
           var patchCheckboxes = {
@@ -75,8 +75,8 @@ describe('components', function () {
             }]
           };
           var updatedPatchCheckboxes = (0, _cleanHiddenNestedData.default)(patchCheckboxes, pageCheckboxes);
-          expect(updatedPatchCheckboxes['nested1']).toBeFalsy();
-          expect(updatedPatchCheckboxes['nested2']).toBeTruthy();
+          expect(updatedPatchCheckboxes.nested1).toBeFalsy();
+          expect(updatedPatchCheckboxes.nested2).toBeTruthy();
         });
         it('remove data corresponding to hidden nested components within the active collection entry', function () {
           var patch = {
@@ -121,10 +121,10 @@ describe('components', function () {
             }]
           };
           var updatedPatch = (0, _cleanHiddenNestedData.default)(patch, page);
-          expect(updatedPatch['collectionName'][0]['nested1']).toBeTruthy();
-          expect(updatedPatch['collectionName'][0]['nested2']).toBeTruthy();
-          expect(updatedPatch['collectionName'][1]['nested1']).toBeFalsy();
-          expect(updatedPatch['collectionName'][1]['nested2']).toBeTruthy();
+          expect(updatedPatch.collectionName[0].nested1).toBeTruthy();
+          expect(updatedPatch.collectionName[0].nested2).toBeTruthy();
+          expect(updatedPatch.collectionName[1].nested1).toBeFalsy();
+          expect(updatedPatch.collectionName[1].nested2).toBeTruthy();
         });
       });
     });

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

@@ -20,9 +20,12 @@ var getCYA = function getCYA(pageId, pages, hub) {
     return {
       title: ''
     };
-  } else if (pageId === _models.FormPages.CYA) {
+  }
+  ;
+  if (pageId === _models.FormPages.CYA) {
     return {};
   }
+  ;
   var currentPage = pages === null || pages === void 0 ? void 0 : pages.find(function (p) {
     return p.id === pageId;
   });
@@ -34,6 +37,7 @@ var getCYA = function getCYA(pageId, pages, hub) {
       hideGroupActions: pageWithConditionals.hideGroupActions
     };
   }
+  ;
   return undefined;
 };
 var _default = getCYA;

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

@@ -18,11 +18,14 @@ var getNextHubPageId = function getNextHubPageId(action, currentPageId, pages, f
       if ((currentPage === null || currentPage === void 0 ? void 0 : currentPage.type) === 'pre-task-list') {
         return currentPage.id;
       }
+      ;
       return _models.FormPages.HUB;
     }
+    ;
     return pages.length > 0 ? pages[0].id : undefined;
   }
-  var nextPage = undefined;
+  ;
+  var nextPage;
   action === null || action === void 0 ? void 0 : (_action$pages = action.pages) === null || _action$pages === void 0 ? void 0 : _action$pages.forEach(function (page) {
     if (_FormPage.default.show({
       show_when: page.show_when
@@ -33,9 +36,6 @@ var getNextHubPageId = function getNextHubPageId(action, currentPageId, pages, f
   });
   return nextPage || (action === null || action === void 0 ? void 0 : action.page) || _models.FormPages.HUB;
 };
-var getNextCYAPageId = function getNextCYAPageId(pages, currentPageId, formData) {
-  return getNextWizardPageId(pages, currentPageId, formData) || _models.FormPages.CYA;
-};
 var getNextWizardPageId = function getNextWizardPageId(pages, currentPageId, formData) {
   var _page;
   var nextIndex = pages.findIndex(function (p) {
@@ -43,14 +43,20 @@ var getNextWizardPageId = function getNextWizardPageId(pages, currentPageId, for
   }) + 1;
   var page = pages[nextIndex];
   while (page && !_FormPage.default.show(page, formData)) {
-    nextIndex++;
+    nextIndex += 1;
     page = pages[nextIndex];
   }
+  ;
   return ((_page = page) === null || _page === void 0 ? void 0 : _page.id) || undefined;
 };
+var getNextCYAPageId = function getNextCYAPageId(pages, currentPageId, formData) {
+  return getNextWizardPageId(pages, currentPageId, formData) || _models.FormPages.CYA;
+};
 var getNextFormPageId = function getNextFormPageId(pages) {
-  // A form has a single page... so always return that id.
-  return pages.length > 0 ? pages[0].id : undefined;
+  return (
+    // A form has a single page... so always return that id.
+    pages.length > 0 ? pages[0].id : undefined
+  );
 };
 var getNextPageId = function getNextPageId(formType, pages, currentPageId, action, formData) {
   if (action) {

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

@@ -7,7 +7,10 @@ exports.default = void 0;
 var _models = require("../../../models");
 var slicePages = function slicePages(pages, currentPageId) {
   return pages.slice(0, pages.findIndex(function (p) {
-    return (p === null || p === void 0 ? void 0 : p.id) === currentPageId ? true : false;
+    if ((p === null || p === void 0 ? void 0 : p.id) === currentPageId) {
+      return true;
+    }
+    return false;
   }));
 };
 var getRelevantPages = function getRelevantPages(formState, pages, currentTaskPages) {
@@ -15,7 +18,12 @@ var getRelevantPages = function getRelevantPages(formState, pages, currentTaskPa
   if (((_formState$page = formState.page) === null || _formState$page === void 0 ? void 0 : _formState$page.type) === _models.FormPages.PARTIAL_CYA) {
     return currentTaskPages ? slicePages(currentTaskPages, formState.pageId) : slicePages(pages, formState.pageId);
   }
-  return currentTaskPages ? currentTaskPages : pages;
+  ;
+  if (currentTaskPages) {
+    return currentTaskPages;
+  }
+  ;
+  return pages;
 };
 var _default = getRelevantPages;
 exports.default = _default;

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

@@ -1,7 +1,7 @@
 "use strict";
 
 var _models = require("../../../models");
-var _getRelevantPages = _interopRequireDefault(require("../helpers/getRelevantPages"));
+var _getRelevantPages = _interopRequireDefault(require("./getRelevantPages"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 

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

@@ -45,6 +45,16 @@ var allDependentTasksComplete = function allDependentTasksComplete(tasks, mustBe
     return allComplete && ((_tasks$taskName = tasks[taskName]) === null || _tasks$taskName === void 0 ? void 0 : _tasks$taskName.complete);
   }, true);
 };
+var isPreviousTaskComplete = function isPreviousTaskComplete(tasks, taskIndex) {
+  var lastTaskState = tasks[taskIndex - 1].state;
+  if (lastTaskState === _models.TaskStates.TYPES.COMPLETE) {
+    return true;
+  }
+  if (lastTaskState === _models.TaskStates.TYPES.SKIPPED) {
+    return taskIndex - 1 === 0 ? true : isPreviousTaskComplete(tasks, taskIndex - 1);
+  }
+  return false;
+};
 
 /**
  * return updated task state
@@ -63,11 +73,20 @@ var updateTaskState = function updateTaskState(task, taskIndex, taskList, tasks)
   if (tasks[task.name]) {
     return getCurrentTaskState(tasks[task.name], task.state);
   }
-  return nonSequential ? task.depends_on && !allDependentTasksComplete(tasks, task.depends_on) ? _models.TaskStates.TYPES.CANNOT_START_YET : _models.TaskStates.TYPES.NOT_STARTED : (
-  // First task in taskList
-  taskIndex ?
-  // any task after a complete task in same section
-  isPreviousTaskComplete(taskList, taskIndex) : allowFirst) ? _models.TaskStates.TYPES.NOT_STARTED : _models.TaskStates.TYPES.CANNOT_START_YET;
+  if (nonSequential) {
+    if (task.depends_on && !allDependentTasksComplete(tasks, task.depends_on)) {
+      return _models.TaskStates.TYPES.CANNOT_START_YET;
+    }
+    return _models.TaskStates.TYPES.NOT_STARTED;
+  }
+  var notStarted = allowFirst;
+  if (taskIndex) {
+    notStarted = isPreviousTaskComplete(taskList, taskIndex);
+  }
+  if (notStarted) {
+    return _models.TaskStates.TYPES.NOT_STARTED;
+  }
+  return _models.TaskStates.TYPES.CANNOT_START_YET;
 };
 
 /**
@@ -84,27 +103,20 @@ var updateTasks = function updateTasks(section, tasks, nonSequential, allowFirst
     return _objectSpread({}, a);
   });
   clone.forEach(function (task, taskIndex, taskList) {
-    var _task$show_when;
+    var _currentTask$show_whe;
+    var currentTask = task;
     if (section.skipped) {
-      task.state = _models.TaskStates.TYPES.SKIPPED;
-    } else if (data && !_utils.default.Condition.met(task.show_when, data[(_task$show_when = task.show_when) === null || _task$show_when === void 0 ? void 0 : _task$show_when.field])) {
-      task.state = _models.TaskStates.TYPES.SKIPPED;
+      currentTask.state = _models.TaskStates.TYPES.SKIPPED;
+    } else if (data && !_utils.default.Condition.met(currentTask.show_when, data[(_currentTask$show_whe = currentTask.show_when) === null || _currentTask$show_whe === void 0 ? void 0 : _currentTask$show_whe.field])) {
+      currentTask.state = _models.TaskStates.TYPES.SKIPPED;
     } else {
-      task.state = updateTaskState(task, taskIndex, taskList, tasks, nonSequential, allowFirst);
+      var _task = task;
+      _task.state = updateTaskState(currentTask, taskIndex, taskList, tasks, nonSequential, allowFirst);
     }
+    ;
   });
   return clone;
 };
-var isPreviousTaskComplete = function isPreviousTaskComplete(tasks, taskIndex) {
-  var lastTaskState = tasks[taskIndex - 1].state;
-  if (lastTaskState === _models.TaskStates.TYPES.COMPLETE) {
-    return true;
-  }
-  if (lastTaskState === _models.TaskStates.TYPES.SKIPPED) {
-    return taskIndex - 1 === 0 ? true : isPreviousTaskComplete(tasks, taskIndex - 1);
-  }
-  return false;
-};
 
 /**
  * Checks if the previous section has been completed. If the last section
@@ -142,14 +154,16 @@ var getUpdatedSectionStates = function getUpdatedSectionStates(sections, tasks)
     return _objectSpread({}, a);
   });
   clone.forEach(function (section, sectionIndex, sectionList) {
-    var _section$show_when;
+    var _currentSection$show_;
+    var currentSection = section;
     var allowFirst = sectionIndex === 0 || isPreviousSectionComplete(sectionList, sectionIndex);
     // Support a single show_when check on a section. Support for an
     // array of checks will have to be added if required.
-    if (data && !_utils.default.Condition.met(section.show_when, data[(_section$show_when = section.show_when) === null || _section$show_when === void 0 ? void 0 : _section$show_when.field])) {
-      section.skipped = true;
+    if (data && !_utils.default.Condition.met(currentSection.show_when, data[(_currentSection$show_ = currentSection.show_when) === null || _currentSection$show_ === void 0 ? void 0 : _currentSection$show_.field])) {
+      currentSection.skipped = true;
     }
-    section.tasks = updateTasks(section, tasks, nonSequential, allowFirst, data);
+    ;
+    currentSection.tasks = updateTasks(currentSection, tasks, nonSequential, allowFirst, data);
   });
   return clone;
 };

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.helpers = exports.default = void 0;
+exports.default = void 0;
 var _canActionProceed = _interopRequireDefault(require("./canActionProceed"));
 var _canCYASubmit = _interopRequireDefault(require("./canCYASubmit"));
 var _cleanHiddenNestedData = _interopRequireDefault(require("./cleanHiddenNestedData"));
@@ -27,6 +27,5 @@ var helpers = {
   getSubmissionStatus: _getSubmissionStatus.default,
   getUpdatedSectionStates: _getUpdatedSectionStates.default
 };
-exports.helpers = helpers;
 var _default = helpers;
 exports.default = _default;

package/dist/components/FormRenderer/onCYAAction.js

@@ -41,7 +41,7 @@ var onCYAAction = function onCYAAction(setPagePoint, action, pages, validate, co
     }
   }
   if (action.type === _models.PageAction.TYPES.SAVE_AND_CONTINUE && hub === _models.HubFormats.TASK) {
-    var shouldValidate = !(action.hasOwnProperty('validate') && !action.validate);
+    var shouldValidate = !(Object.prototype.hasOwnProperty.call(action, 'validate') && !action.validate);
     var canSubmit = shouldValidate ? _helpers.default.canCYASubmit(currentTask.fullPages, validate.pages) : true;
     if (canSubmit) {
       var _submissionData = _utils.default.Format.form({
@@ -76,7 +76,7 @@ var onCYAAction = function onCYAAction(setPagePoint, action, pages, validate, co
     }
   }
   if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
-    var _shouldValidate = !(action.hasOwnProperty('validate') && !action.validate);
+    var _shouldValidate = !(Object.prototype.hasOwnProperty.call(action, 'validate') && !action.validate);
     var _canSubmit = _shouldValidate ? _helpers.default.canCYASubmit(currentTask.fullPages, validate.pages) : true;
     if (_canSubmit) {
       var _submissionData3 = _utils.default.Format.form({

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

@@ -17,7 +17,7 @@ jest.mock('./handlers', function () {
     submissionErrorCalls: 0,
     submissionErrorArgs: [],
     submissionError: function submissionError(errors, addErrors) {
-      this.submissionErrorCalls++;
+      this.submissionErrorCalls += 1;
       this.submissionErrorArgs.push(errors);
       if (typeof addErrors === 'function') {
         addErrors(errors);
@@ -34,22 +34,22 @@ jest.mock('./helpers', function () {
     canCYASubmitResult: true,
     canCYASubmitCalls: 0,
     canCYASubmit: function canCYASubmit() {
-      this.canCYASubmitCalls++;
+      this.canCYASubmitCalls += 1;
       return this.canCYASubmitResult;
     },
     getNextPageIdCalls: 0,
     getNextPageId: function getNextPageId() {
-      this.getNextPageIdCalls++;
+      this.getNextPageIdCalls += 1;
       return 'page2';
     },
     getFormStateCalls: 0,
     getFormState: function getFormState() {
-      this.getFormStateCalls++;
+      this.getFormStateCalls += 1;
       return {};
     },
     getSubmissionStatusCalls: 0,
     getSubmissionStatus: function getSubmissionStatus() {
-      this.getSubmissionStatusCalls++;
+      this.getSubmissionStatusCalls += 1;
       return 'Good to go!';
     },
     reset: function reset() {
@@ -67,7 +67,7 @@ jest.mock('../../utils', function () {
     Format: {
       formCalls: 0,
       form: function form() {
-        this.formCalls++;
+        this.formCalls += 1;
         return {
           id: 'formId'
         };
@@ -83,7 +83,7 @@ describe('components.FormRenderer.onCYAAction', function () {
     onSubmitCalls: 0,
     onSubmitArgs: [],
     onSubmit: function onSubmit(type, payload, onSuccess, onError) {
-      this.onSubmitCalls++;
+      this.onSubmitCalls += 1;
       this.onSubmitArgs.push({
         type: type,
         payload: payload
@@ -100,11 +100,11 @@ describe('components.FormRenderer.onCYAAction', function () {
     },
     onFormCompleteCalls: 0,
     onFormComplete: function onFormComplete() {
-      this.onFormCompleteCalls++;
+      this.onFormCompleteCalls += 1;
     },
     onCancelCalls: 0,
     onCancel: function onCancel() {
-      this.onCancelCalls++;
+      this.onCancelCalls += 1;
     },
     reset: function reset() {
       this.onSubmitCalls = 0;
@@ -116,25 +116,25 @@ describe('components.FormRenderer.onCYAAction', function () {
   var setPagePointCalls = 0;
   var setPagePointArgs = [];
   var mockSetPagePoint = function mockSetPagePoint(point) {
-    setPagePointCalls++;
+    setPagePointCalls += 1;
     setPagePointArgs.push(point);
   };
   var setDataCalls = 0;
   var setDataArgs = [];
   var mockSetData = function mockSetData(data) {
-    setDataCalls++;
+    setDataCalls += 1;
     setDataArgs.push(data);
   };
   var onPageChangeCalls = 0;
   var onPageChangeArgs = [];
   var mockOnPageChange = function mockOnPageChange(pageId) {
-    onPageChangeCalls++;
+    onPageChangeCalls += 1;
     onPageChangeArgs.push(pageId);
   };
   var addErrorsCalls = 0;
   var addErrorsArgs = [];
   var mockAddErrors = function mockAddErrors(errors) {
-    addErrorsCalls++;
+    addErrorsCalls += 1;
     addErrorsArgs.push(errors);
   };
   var COMPONENTS = [{

package/dist/components/FormRenderer/onPageAction.js

@@ -24,18 +24,25 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
     hooks.onCancel();
     return;
   }
+  ;
   // Save a copy of data in case submit errors and we need to revert
   var preSubmitData = _objectSpread({}, data);
   // Re-apply the patch to the page's formData.
   // This should normally have no effect but will prevent issues 
   // with validation if formData happens to have been wiped.
-  formState.page.formData = _objectSpread(_objectSpread({}, formState.page.formData), patch);
+  var form = formState;
+  form.page.formData = _objectSpread(_objectSpread({}, form.page.formData), patch);
   // 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 (_helpers.default.canActionProceed(action, formState.page, validate.page)) {
-    patch = _helpers.default.cleanHiddenNestedData(patch, formState.page);
+  if (_helpers.default.canActionProceed(action, form.page, validate.page)) {
+    var _patch = patch;
+    _patch = _helpers.default.cleanHiddenNestedData(patch, form.page);
     if (action.addToFormData) {
-      formState.page.formData[action.addToFormData.field] = action.addToFormData.value;
+      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);
+      });
+      form.page.formData[action.addToFormData.field] = action.addToFormData.value;
     }
     if (action.type === _models.PageAction.TYPES.NAVIGATE) {
       _handlers.default.navigate(action, pageId, onPageChange);
@@ -43,6 +50,7 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
       var pageUpdate = function pageUpdate(next) {
         return onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, next));
       };
+      /* eslint-disable no-case-declarations */
       switch (action.type) {
         case _models.PageAction.TYPES.SUBMIT:
           setPagePoint('submit');
@@ -54,7 +62,7 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
           };
           break;
         case _models.PageAction.TYPES.COLLECTION_ADD:
-          formState.page.formData["".concat(action.collection, "ActiveId")] = Date.now().toString();
+          form.page.formData["".concat(action.collection, "ActiveId")] = Date.now().toString();
           pageUpdate = function pageUpdate() {
             return _handlers.default.navigate(action, pageId, onPageChange);
           };
@@ -65,17 +73,19 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
               return _handlers.default.navigate(action, pageId, onPageChange);
             };
           }
+          ;
           break;
         case _models.PageAction.TYPES.COLLECTION_REMOVE:
-          var activeId = formState.page.formData["".concat(action.collection, "ActiveId")];
-          formState.page.formData["".concat(action.collection)] = formState.page.formData["".concat(action.collection)].map(function (entry) {
+          var activeId = form.page.formData["".concat(action.collection, "ActiveId")];
+          form.page.formData["".concat(action.collection)] = form.page.formData["".concat(action.collection)].map(function (entry) {
             if (entry.id === activeId) {
               // Store the entry.
               if (action.recordRemoval) {
-                formState.page.formData["".concat(action.collection, "LastRemoved")] = _objectSpread({}, entry);
+                form.page.formData["".concat(action.collection, "LastRemoved")] = _objectSpread({}, entry);
               }
               return null;
             }
+            ;
             return entry;
           }).filter(function (e) {
             return !!e;
@@ -84,24 +94,31 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
         default:
           break;
       }
+      ;
+      /* eslint-enable no-case-declarations */
+
       // Save draft or submit.
       var submissionData = _utils.default.Format.form({
         pages: pages,
         components: components
       }, _objectSpread(_objectSpread(_objectSpread({}, data), patch), formState.page.formData), _models.EventTypes.SUBMIT);
       submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.sections);
-      if (patch) {
+      if (_patch) {
         setData(submissionData);
       }
+      ;
 
       // In case of hub-and-spoke if patchLabel has changed then 
       // save name and value to variables for call to onSubmit hook
       var changedFieldName;
       var changedFieldValue;
       if (type === _models.FormTypes.HUB && Object.keys(patchLabel).length > 0) {
+        /* eslint-disable prefer-destructuring */
         changedFieldName = Object.keys(patchLabel)[0];
         changedFieldValue = Object.values(patchLabel)[0];
+        /* eslint-enable prefer-destructuring */
       }
+      ;
 
       // Now submit the data to the backend...
       hooks.onSubmit(action.type, submissionData, function (response) {
@@ -117,7 +134,9 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
         setData(_objectSpread({}, preSubmitData));
       }, changedFieldName, changedFieldValue, pageId);
     }
+    ;
   }
+  ;
 };
 var _default = onPageAction;
 exports.default = _default;

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

@@ -16,12 +16,12 @@ jest.mock('./handlers', function () {
   return {
     navigateCalls: 0,
     navigate: function navigate() {
-      this.navigateCalls++;
+      this.navigateCalls += 1;
     },
     submissionErrorCalls: 0,
     submissionErrorArgs: [],
     submissionError: function submissionError(errors, addErrors) {
-      this.submissionErrorCalls++;
+      this.submissionErrorCalls += 1;
       this.submissionErrorArgs.push(errors);
       if (typeof addErrors === 'function') {
         addErrors(errors);
@@ -39,7 +39,7 @@ jest.mock('./helpers', function () {
     canActionProceedCalls: 0,
     canActionProceedResult: true,
     canActionProceed: function canActionProceed(action, page, validator) {
-      this.canActionProceedCalls++;
+      this.canActionProceedCalls += 1;
       if (typeof validator === 'function') {
         validator();
       }
@@ -47,17 +47,17 @@ jest.mock('./helpers', function () {
     },
     cleanHiddenNestedDataCalls: 0,
     cleanHiddenNestedData: function cleanHiddenNestedData(patch) {
-      this.cleanHiddenNestedDataCalls++;
+      this.cleanHiddenNestedDataCalls += 1;
       return patch;
     },
     getNextPageIdCalls: 0,
     getNextPageId: function getNextPageId() {
-      this.getNextPageIdCalls++;
+      this.getNextPageIdCalls += 1;
       return 'page2';
     },
     getSubmissionStatusCalls: 0,
     getSubmissionStatus: function getSubmissionStatus() {
-      this.getSubmissionStatusCalls++;
+      this.getSubmissionStatusCalls += 1;
       return 'Good to go!';
     },
     reset: function reset() {
@@ -71,11 +71,12 @@ jest.mock('./helpers', function () {
   };
 });
 jest.mock('../../utils', function () {
-  return {
+  var originalModule = jest.requireActual('../../utils');
+  return _objectSpread(_objectSpread({}, originalModule.default), {}, {
     Format: {
       formCalls: 0,
-      form: function form(_form, data, eventType) {
-        this.formCalls++;
+      form: function form(_form, data) {
+        this.formCalls += 1;
         return data;
       }
     },
@@ -83,7 +84,7 @@ jest.mock('../../utils', function () {
       duplicateActiveEntryCalls: 0,
       duplicateActiveEntryResult: true,
       duplicateActiveEntry: function duplicateActiveEntry() {
-        this.duplicateActiveEntryCalls++;
+        this.duplicateActiveEntryCalls += 1;
         return this.duplicateActiveEntryResult;
       }
     },
@@ -92,14 +93,14 @@ jest.mock('../../utils', function () {
       this.CollectionPage.duplicateActiveEntryCalls = 0;
       this.duplicateActiveEntryResult = true;
     }
-  };
+  });
 });
 describe('components.FormRenderer.onPageAction', function () {
   var MOCK_HOOKS = {
     onSubmitCalls: 0,
     onSubmitArgs: [],
     onSubmit: function onSubmit(type, payload, onSuccess, onError, changedFieldName, changedFieldValue) {
-      this.onSubmitCalls++;
+      this.onSubmitCalls += 1;
       this.onSubmitArgs.push({
         type: type,
         payload: payload,
@@ -118,11 +119,11 @@ describe('components.FormRenderer.onPageAction', function () {
     },
     onFormCompleteCalls: 0,
     onFormComplete: function onFormComplete() {
-      this.onFormCompleteCalls++;
+      this.onFormCompleteCalls += 1;
     },
     onCancelCalls: 0,
     onCancel: function onCancel() {
-      this.onCancelCalls++;
+      this.onCancelCalls += 1;
     },
     reset: function reset() {
       this.onSubmitCalls = 0;
@@ -134,7 +135,7 @@ describe('components.FormRenderer.onPageAction', function () {
   var MOCK_VALIDATE = {
     pageCalls: 0,
     page: function page() {
-      MOCK_VALIDATE.pageCalls++;
+      MOCK_VALIDATE.pageCalls += 1;
     },
     reset: function reset() {
       this.pageCalls = 0;
@@ -143,19 +144,19 @@ describe('components.FormRenderer.onPageAction', function () {
   var setPagePointCalls = 0;
   var setPagePointArgs = [];
   var mockSetPagePoint = function mockSetPagePoint(point) {
-    setPagePointCalls++;
+    setPagePointCalls += 1;
     setPagePointArgs.push(point);
   };
   var setDataCalls = 0;
   var setDataArgs = [];
   var mockSetData = function mockSetData(data) {
-    setDataCalls++;
+    setDataCalls += 1;
     setDataArgs.push(data);
   };
   var onPageChangeCalls = 0;
   var onPageChangeArgs = [];
   var mockOnPageChange = function mockOnPageChange(pageId) {
-    onPageChangeCalls++;
+    onPageChangeCalls += 1;
     onPageChangeArgs.push(pageId);
   };
   var addErrorsArgs = [];
@@ -594,6 +595,41 @@ describe('components.FormRenderer.onPageAction', function () {
         alpha: '123'
       });
     });
+    it('should work for an array of formData', function () {
+      var FORM_STATE = {
+        page: {
+          formData: {
+            testCollection: []
+          }
+        }
+      };
+      var ACTION = {
+        type: _models.PageAction.TYPES.NAVIGATE,
+        collection: 'testCollection',
+        addToFormData: [{
+          field: 'alpha',
+          value: '123'
+        }, {
+          field: 'beta.gamma',
+          value: '456'
+        }]
+      };
+      var CUSTOM_ARGS = _objectSpread(_objectSpread({}, ARGS), {}, {
+        formState: FORM_STATE,
+        action: ACTION
+      });
+      _onPageAction.default.apply(void 0, Object.values(CUSTOM_ARGS));
+      preActionChecks();
+      // Not doing the usual post-action checks here
+      // as a navigate action should stop at calling
+      // hooks.navigate.
+      expect(FORM_STATE.page.formData).toMatchObject({
+        alpha: '123',
+        beta: {
+          gamma: '456'
+        }
+      });
+    });
   });
   describe('recording patchLabel fields correctly when it is defined', function () {
     var VALID_ACTIONS = Object.values(_models.PageAction.TYPES).filter(function (a) {