@ukhomeoffice/cop-react-form-renderer 4.72.2 → 4.74.0

package/dist/components/FormRenderer/FormRenderer.js

@@ -163,7 +163,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       });
     }
     setGoingBack(true);
-    hooks.onGoingBack();
+    hooks.onGoingBack(e.state ? e.state : null);
     clearErrors();
     if (components && pages && data && (_formState$page = formState.page) !== null && _formState$page !== void 0 && _formState$page.formData && pagePoint === undefined) {
       var submissionData = _utils.default.Format.form({

package/dist/components/FormRenderer/handlers/navigate.js

@@ -12,8 +12,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {object} action The invoked action.
  * @param {string} currentPageId The current pageId.
  * @param {Function} onNavigate The handler to call if the pageId is different to the currentPageId.
+ * @param {object|undefined} state State to pass to the handler on change
  */
-var navigate = function navigate(action, currentPageId, onNavigate, state) {
+var navigate = function navigate(action, currentPageId, onNavigate) {
+  var state = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
   var pageId = (0, _getPageId.default)(action, currentPageId);
   if (pageId !== currentPageId) {
     onNavigate(pageId, state);

package/dist/components/FormRenderer/onPageAction.js

@@ -24,18 +24,21 @@ 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
+  // 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);
-  // 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.
+  // Check to see whether the action is able to proceed
+  // which 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 (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);
+      });
     }
     if (action.type === _models.PageAction.TYPES.NAVIGATE) {
       _handlers.default.navigate(action, pageId, onPageChange);

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

@@ -71,7 +71,8 @@ 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) {
@@ -92,7 +93,7 @@ jest.mock('../../utils', function () {
       this.CollectionPage.duplicateActiveEntryCalls = 0;
       this.duplicateActiveEntryResult = true;
     }
-  };
+  });
 });
 describe('components.FormRenderer.onPageAction', function () {
   var MOCK_HOOKS = {
@@ -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) {

package/dist/utils/Operate/getFirstOf.test.js

@@ -2,7 +2,7 @@
 
 var _getFirstOf = _interopRequireDefault(require("./getFirstOf"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('Utils.Operate.addToFormData', function () {
+describe('Utils.Operate.getFirstOf', function () {
   var DATA = {
     name: 'sam',
     id: 1,

package/dist/utils/Operate/setValueInFormData.test.js

@@ -2,7 +2,7 @@
 
 var _setValueInFormData = _interopRequireDefault(require("./setValueInFormData"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('Utils.Operate.addToFormData', function () {
+describe('Utils.Operate.setValueInFormData', function () {
   var DATA = {
     a: '1',
     b: ['2', '3'],

package/package.json

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