@ukhomeoffice/cop-react-form-renderer 4.67.0 → 4.68.1

package/dist/components/FormRenderer/FormRenderer.js

@@ -1,86 +1,59 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.DEFAULT_CLASS = void 0;
-
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _context = require("../../context");
-
 var _hooks = require("../../hooks");
-
 var _models = require("../../models");
-
 var _utils = _interopRequireDefault(require("../../utils"));
-
 var _CheckYourAnswers = _interopRequireDefault(require("../CheckYourAnswers"));
-
 var _CollectionPage = _interopRequireDefault(require("../CollectionPage"));
-
 var _FormPage = _interopRequireDefault(require("../FormPage"));
-
 var _TaskList = _interopRequireDefault(require("../TaskList"));
-
 var _handlers = _interopRequireDefault(require("./handlers"));
-
 var _helpers = _interopRequireDefault(require("./helpers"));
-
 var _onCYAAction = _interopRequireDefault(require("./onCYAAction"));
-
+var _onPageAction = _interopRequireDefault(require("./onPageAction"));
 require("./FormRenderer.scss");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var FormRenderer = function FormRenderer(_ref) {
   var title = _ref.title,
-      type = _ref.type,
-      components = _ref.components,
-      pages = _ref.pages,
-      hub = _ref.hub,
-      cya = _ref.cya,
-      data = _ref.data,
-      hashLink = _ref.hashLink,
-      hooks = _ref.hooks,
-      classBlock = _ref.classBlock,
-      classModifiers = _ref.classModifiers,
-      className = _ref.className,
-      hide_title = _ref.hide_title,
-      summaryListClassModifiers = _ref.summaryListClassModifiers,
-      noChangeAction = _ref.noChangeAction,
-      newPageId = _ref.newPageId,
-      viewOnly = _ref.viewOnly;
+    type = _ref.type,
+    components = _ref.components,
+    pages = _ref.pages,
+    hub = _ref.hub,
+    cya = _ref.cya,
+    data = _ref.data,
+    hashLink = _ref.hashLink,
+    hooks = _ref.hooks,
+    classBlock = _ref.classBlock,
+    classModifiers = _ref.classModifiers,
+    className = _ref.className,
+    hide_title = _ref.hide_title,
+    summaryListClassModifiers = _ref.summaryListClassModifiers,
+    noChangeAction = _ref.noChangeAction,
+    newPageId = _ref.newPageId,
+    viewOnly = _ref.viewOnly;
   return /*#__PURE__*/_react.default.createElement(_context.HooksContextProvider, {
     overrides: hooks
   }, /*#__PURE__*/_react.default.createElement(_context.ValidationContextProvider, null, /*#__PURE__*/_react.default.createElement(InternalFormRenderer, {
@@ -102,175 +75,158 @@ var FormRenderer = function FormRenderer(_ref) {
     viewOnly: viewOnly
   })));
 };
-
 var DEFAULT_CLASS = 'hods-form';
 exports.DEFAULT_CLASS = DEFAULT_CLASS;
-
 var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   var _formState$page4, _formState$page$actio, _formState$cya$hideCh, _formState$cya$hideGr;
-
   var title = _ref2.title,
-      type = _ref2.type,
-      components = _ref2.components,
-      _pages = _ref2.pages,
-      _hub = _ref2.hub,
-      cya = _ref2.cya,
-      _data = _ref2.data,
-      classBlock = _ref2.classBlock,
-      classModifiers = _ref2.classModifiers,
-      className = _ref2.className,
-      hashLink = _ref2.hashLink,
-      hide_title = _ref2.hide_title,
-      summaryListClassModifiers = _ref2.summaryListClassModifiers,
-      noChangeAction = _ref2.noChangeAction,
-      newPageId = _ref2.newPageId,
-      viewOnly = _ref2.viewOnly;
-
+    type = _ref2.type,
+    components = _ref2.components,
+    _pages = _ref2.pages,
+    _hub = _ref2.hub,
+    cya = _ref2.cya,
+    _data = _ref2.data,
+    classBlock = _ref2.classBlock,
+    classModifiers = _ref2.classModifiers,
+    className = _ref2.className,
+    hashLink = _ref2.hashLink,
+    hide_title = _ref2.hide_title,
+    summaryListClassModifiers = _ref2.summaryListClassModifiers,
+    noChangeAction = _ref2.noChangeAction,
+    newPageId = _ref2.newPageId,
+    viewOnly = _ref2.viewOnly;
   // Set up the initial states.
   var _useState = (0, _react.useState)({}),
-      _useState2 = _slicedToArray(_useState, 2),
-      data = _useState2[0],
-      setData = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    data = _useState2[0],
+    setData = _useState2[1];
   var _useState3 = (0, _react.useState)(),
-      _useState4 = _slicedToArray(_useState3, 2),
-      submitted = _useState4[0],
-      setSubmitted = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    submitted = _useState4[0],
+    setSubmitted = _useState4[1];
   var _useState5 = (0, _react.useState)([]),
-      _useState6 = _slicedToArray(_useState5, 2),
-      pages = _useState6[0],
-      setPages = _useState6[1];
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    pages = _useState6[0],
+    setPages = _useState6[1];
   var _useState7 = (0, _react.useState)(undefined),
-      _useState8 = _slicedToArray(_useState7, 2),
-      hub = _useState8[0],
-      setHub = _useState8[1];
-
+    _useState8 = _slicedToArray(_useState7, 2),
+    hub = _useState8[0],
+    setHub = _useState8[1];
   var _useState9 = (0, _react.useState)(_helpers.default.getNextPageId(type, _pages, null, null, _data)),
-      _useState10 = _slicedToArray(_useState9, 2),
-      pageId = _useState10[0],
-      setPageId = _useState10[1];
-
+    _useState10 = _slicedToArray(_useState9, 2),
+    pageId = _useState10[0],
+    setPageId = _useState10[1];
   var _useState11 = (0, _react.useState)(_helpers.default.getFormState(pageId, pages, hub)),
-      _useState12 = _slicedToArray(_useState11, 2),
-      formState = _useState12[0],
-      setFormState = _useState12[1];
-
+    _useState12 = _slicedToArray(_useState11, 2),
+    formState = _useState12[0],
+    setFormState = _useState12[1];
   var _useState13 = (0, _react.useState)({}),
-      _useState14 = _slicedToArray(_useState13, 2),
-      currentTask = _useState14[0],
-      setCurrentTask = _useState14[1];
-
+    _useState14 = _slicedToArray(_useState13, 2),
+    currentTask = _useState14[0],
+    setCurrentTask = _useState14[1];
   var _useState15 = (0, _react.useState)({}),
-      _useState16 = _slicedToArray(_useState15, 2),
-      hubDetails = _useState16[0],
-      setHubDetails = _useState16[1];
-
+    _useState16 = _slicedToArray(_useState15, 2),
+    hubDetails = _useState16[0],
+    setHubDetails = _useState16[1];
   var _useState17 = (0, _react.useState)('load'),
-      _useState18 = _slicedToArray(_useState17, 2),
-      pagePoint = _useState18[0],
-      setPagePoint = _useState18[1];
-
+    _useState18 = _slicedToArray(_useState17, 2),
+    pagePoint = _useState18[0],
+    setPagePoint = _useState18[1];
   var _useState19 = (0, _react.useState)(false),
-      _useState20 = _slicedToArray(_useState19, 2),
-      goingBack = _useState20[0],
-      setGoingBack = _useState20[1]; // Set up hooks.
-
+    _useState20 = _slicedToArray(_useState19, 2),
+    goingBack = _useState20[0],
+    setGoingBack = _useState20[1];
 
+  // Set up hooks.
   var _useHooks = (0, _hooks.useHooks)(),
-      hooks = _useHooks.hooks; // Set up the useValidation hook.
-
+    hooks = _useHooks.hooks;
 
+  // Set up the useValidation hook.
   var _useValidation = (0, _hooks.useValidation)(),
-      addErrors = _useValidation.addErrors,
-      clearErrors = _useValidation.clearErrors,
-      validate = _useValidation.validate; // Need to set submission data when going back
-
+    addErrors = _useValidation.addErrors,
+    clearErrors = _useValidation.clearErrors,
+    validate = _useValidation.validate;
 
+  // Need to set submission data when going back
   window.onpopstate = function (e) {
     var _formState$page;
-
     if (document.location.hash) {
       return;
     }
-
     if (e.state && e.state.fullPages !== undefined) {
       setCurrentTask(function (prev) {
         var _e$state;
-
         return _objectSpread(_objectSpread({}, prev), {}, {
           fullPages: (_e$state = e.state) === null || _e$state === void 0 ? void 0 : _e$state.fullPages
         });
       });
     }
-
     setGoingBack(true);
     hooks.onGoingBack();
     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({
         pages: pages,
         components: components
       }, _objectSpread(_objectSpread({}, data), formState.page.formData), _models.EventTypes.SUBMIT);
-
       setData(submissionData);
     }
-  }; // Setup data.
-
+  };
 
+  // Setup data.
   (0, _react.useEffect)(function () {
     if (components && _pages && _data && (pagePoint === 'load' || viewOnly)) {
       var _data$formStatus;
-
       setData(_utils.default.Data.setupForm(_pages, components, _data));
-
       if ((_data$formStatus = _data.formStatus) !== null && _data$formStatus !== void 0 && _data$formStatus.page) {
         setPageId(_data.formStatus.page);
       }
     }
-  }, [components, _pages, _data, setData, pagePoint, viewOnly]); // Setup pages.
+  }, [components, _pages, _data, setData, pagePoint, viewOnly]);
 
+  // Setup pages.
   (0, _react.useEffect)(function () {
     setPages(_utils.default.FormPage.getAll(_pages, components, _objectSpread({}, data)));
-  }, [components, _pages, data, setPages]); // Setup initial pageId.
+  }, [components, _pages, data, setPages]);
 
+  // Setup initial pageId.
   (0, _react.useEffect)(function () {
     setPageId(function (prev) {
       return prev || _helpers.default.getNextPageId(type, pages);
     });
-  }, [type, pages, setPageId]); // Setup hub.
+  }, [type, pages, setPageId]);
 
+  // Setup hub.
   (0, _react.useEffect)(function () {
     setHub(_utils.default.Hub.get(type, _hub, components, _objectSpread({}, data)));
-  }, [type, _hub, data, components, setHub]); // Form state.
+  }, [type, _hub, data, components, setHub]);
 
+  // Form state.
   (0, _react.useEffect)(function () {
     var _formState$page2;
-
     // revert formData changes if going back in hub-and-spoke
     if (type === _models.FormTypes.HUB && goingBack && data && (_formState$page2 = formState.page) !== null && _formState$page2 !== void 0 && _formState$page2.formData) {
       formState.page.formData = _objectSpread({}, data);
     }
-
     setGoingBack(false);
     setFormState(_helpers.default.getFormState(pageId, pages, hub));
-  }, [pages, hub, pageId, setFormState, type, goingBack, data, formState.page]); // Call the onFormLoad hook just when this component first renders.
+  }, [pages, hub, pageId, setFormState, type, goingBack, data, formState.page]);
 
+  // Call the onFormLoad hook just when this component first renders.
   (0, _react.useEffect)(function () {
-    setPagePoint(undefined); // In case of refresh the current task needs to be reset
-
+    setPagePoint(undefined);
+    // In case of refresh the current task needs to be reset
     hooks.onFormLoad(function (currentTask) {
       return setCurrentTask(currentTask);
     });
   }, [hooks]);
   (0, _react.useEffect)(function () {
     setHubDetails(_hub);
-  }, [_hub]); // Calling setData directly within the hooks.onSubmit success handler
+  }, [_hub]);
+
+  // Calling setData directly within the hooks.onSubmit success handler
   // resulted in a sychronisation error. Handling it in a useEffect appears
   // to be the way to deal with this... and it certainly seems to work.
-
   (0, _react.useEffect)(function () {
     if (submitted !== null && submitted !== void 0 && submitted.data) {
       setData(submitted.data);
@@ -278,11 +234,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
   }, [submitted, setData, setSubmitted]);
   var theSections = _hub === null || _hub === void 0 ? void 0 : _hub.sections;
-  var nonSequential = _hub === null || _hub === void 0 ? void 0 : _hub.nonSequential; // Update task list pages with form data and update states
-
+  var nonSequential = _hub === null || _hub === void 0 ? void 0 : _hub.nonSequential;
+  // Update task list pages with form data and update states
   (0, _react.useEffect)(function () {
     var pages = currentTask.fullPages;
-
     if (pages) {
       pages.forEach(function (page) {
         if (page) {
@@ -295,14 +250,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         });
       });
     }
-
     if (theSections) {
       var _data$formStatus2;
-
       var tasks = (data === null || data === void 0 ? void 0 : (_data$formStatus2 = data.formStatus) === null || _data$formStatus2 === void 0 ? void 0 : _data$formStatus2.tasks) || {};
-
       var updatedSections = _helpers.default.getUpdatedSectionStates(theSections, tasks, nonSequential, data);
-
       setHubDetails(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, {
           sections: [].concat(updatedSections)
@@ -310,165 +261,33 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       });
     }
   }, [currentTask.fullPages, data, theSections, nonSequential]);
-
   var onPageChange = function onPageChange(newPageId) {
     var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     clearErrors();
     setPageId(newPageId);
     hooks.onPageChange(newPageId, state);
   };
-
   (0, _react.useEffect)(function () {
     if (newPageId !== undefined) setPageId(newPageId);
-  }, [newPageId]); // Handle change to form data in pages.
+  }, [newPageId]);
 
+  // Handle change to form data in pages.
   var onChange = function onChange(data) {
     hooks.onChange(data);
-  }; // Handle actions from pages.
-  // (patch captures payload-ready field name and value, 
-  // patchLabel captures non-ID values 
-  // for display purposes after submission.)
-
-
-  var onPageAction = function onPageAction(action, patch, patchLabel) {
-    if (action.type === _models.PageAction.TYPES.CANCEL) {
-      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); // 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 (action.addToFormData) {
-        formState.page.formData[action.addToFormData.field] = action.addToFormData.value;
-      }
-
-      if (action.type === _models.PageAction.TYPES.NAVIGATE) {
-        _handlers.default.navigate(action, pageId, onPageChange);
-      } else {
-        var pageUpdate = function pageUpdate(next) {
-          return onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, next));
-        };
-
-        switch (action.type) {
-          case _models.PageAction.TYPES.SUBMIT:
-            setPagePoint('submit');
-            break;
-
-          case _models.PageAction.TYPES.SAVE_AND_NAVIGATE:
-            var state = _objectSpread({}, currentTask);
-
-            pageUpdate = function pageUpdate() {
-              return _handlers.default.navigate(action, pageId, onPageChange, state);
-            };
-
-            break;
-
-          case _models.PageAction.TYPES.COLLECTION_ADD:
-            formState.page.formData["".concat(action.collection, "ActiveId")] = Date.now().toString();
-
-            pageUpdate = function pageUpdate() {
-              return _handlers.default.navigate(action, pageId, onPageChange);
-            };
-
-            break;
-
-          case _models.PageAction.TYPES.COLLECTION_DUPLICATE:
-            if (_utils.default.CollectionPage.duplicateActiveEntry(action.collection, formState.page.formData)) {
-              pageUpdate = function pageUpdate() {
-                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) {
-              if (entry.id === activeId) {
-                // Store the entry.
-                if (action.recordRemoval) {
-                  formState.page.formData["".concat(action.collection, "LastRemoved")] = _objectSpread({}, entry);
-                }
-
-                return null;
-              }
-
-              return entry;
-            }).filter(function (e) {
-              return !!e;
-            });
-            break;
-
-          default:
-            break;
-        } // 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) {
-          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 && patchLabel && Object.keys(patchLabel).length > 0) {
-          changedFieldName = Object.keys(patchLabel)[0];
-          changedFieldValue = Object.values(patchLabel)[0];
-        } // Now submit the data to the backend...
-
-
-        hooks.onSubmit(action.type, submissionData, function (response) {
-          // The backend response may well contain data we need so apply it...
-          // ... but this needs to happen in a useEffect, not right away.
-          var sData = _objectSpread(_objectSpread({}, submissionData), response);
-
-          setSubmitted({
-            data: sData
-          });
-          pageUpdate(sData);
-        }, function (errors) {
-          _handlers.default.submissionError(errors, addErrors);
+  };
 
-          setData(_objectSpread({}, preSubmitData));
-        }, changedFieldName, changedFieldValue);
-      }
-    }
-  }; // Handle navigation from "Check your answers".
+  // Handle navigation from "Check your answers".
   // Passing a dataCallback allows changes to formData from the
   // CYA screen. This is necessary to allow changing the active
   // entry in page collections.
-
-
   var onCYARowAction = function onCYARowAction(page, dataCallback) {
     var _formState$page3;
-
     if (typeof dataCallback === 'function') {
       var newData = dataCallback(_objectSpread({}, data));
-
       if (newData) {
         setData(newData);
       }
     }
-
     if (((_formState$page3 = formState.page) === null || _formState$page3 === void 0 ? void 0 : _formState$page3.type) === _models.FormPages.PARTIAL_CYA) {
       hubDetails.sections.every(function (section) {
         return section.tasks.every(function (task) {
@@ -476,18 +295,16 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
             onTaskAction(task);
             return false;
           }
-
           return true;
         });
       });
     }
-
     if (page) {
       _handlers.default.cyaAction(page, pageId, onPageChange);
     }
-  }; //Kick off a task, gather required pages and move to the correct point
-
+  };
 
+  //Kick off a task, gather required pages and move to the correct point
   var onTaskAction = function onTaskAction(currentTask) {
     if (currentTask) {
       currentTask.fullPages = [];
@@ -495,9 +312,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         currentTask.fullPages.push(_helpers.default.getPage(page, pages));
       });
       setCurrentTask(currentTask);
-
       var state = _objectSpread({}, currentTask);
-
       if (currentTask.state === _models.TaskStates.TYPES.COMPLETE) {
         if (hubDetails !== null && hubDetails !== void 0 && hubDetails.noTaskCYAs) {
           // If the task is complete and there are no CYA's then show user first page
@@ -519,13 +334,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       }
     }
   };
-
   var classes = _utils.default.classBuilder(classBlock, classModifiers, className);
-
   if (hub === _models.HubFormats.TASK) {
     cya.actions = [_models.PageAction.TYPES.SAVE_AND_CONTINUE, _models.PageAction.TYPES.SAVE_AND_RETURN];
   }
-
   return /*#__PURE__*/_react.default.createElement("div", {
     className: classes()
   }, title && !hide_title && pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, title), formState.cya && /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, _extends({
@@ -551,22 +363,20 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     formData: data
   })), formState.page && !formState.cya && !formState.page.collection && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: formState.page,
-    onAction: onPageAction,
+    onAction: function onAction(action, patch, patchLabel) {
+      (0, _onPageAction.default)(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors);
+    },
     onChange: onChange,
-    hashLink: hashLink,
-    classModifiers: formState.page.classModifiers,
-    className: formState.page.className
+    hashLink: hashLink
   }), formState.page && !formState.cya && formState.page.collection && /*#__PURE__*/_react.default.createElement(_CollectionPage.default, {
     page: formState.page,
-    onAction: onPageAction,
-    classModifiers: formState.page.classModifiers,
-    className: formState.page.className
+    onAction: function onAction(action, patch, patchLabel) {
+      (0, _onPageAction.default)(action, patch, patchLabel, hooks, data, formState, validate, onPageChange, type, pages, components, pageId, setPagePoint, currentTask, setData, hubDetails, setSubmitted, addErrors);
+    }
   }));
 };
-
 FormRenderer.propTypes = InternalFormRenderer.propTypes = {
   title: _propTypes.default.string,
-
   /** See <a href="/?path=/docs/f-json--page#formtypes">FormTypes</a>. */
   type: _propTypes.default.oneOf([_models.FormTypes.CYA, _models.FormTypes.FORM, _models.FormTypes.HUB, _models.FormTypes.TASK, _models.FormTypes.WIZARD, _models.FormTypes.TASK_CYA, _models.FormTypes.FORM_WITH_TASK]).isRequired,
   components: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,