@ukhomeoffice/cop-react-form-renderer 5.0.0-alpha → 5.0.1

package/dist/components/FormRenderer/FormRenderer.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _propTypes = _interopRequireDefault(require("prop-types"));
 var _context = require("../../context");
 var _hooks = require("../../hooks");
 var _models = require("../../models");
@@ -18,19 +18,27 @@ 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"));
+var _onTaskAction2 = _interopRequireDefault(require("./onTaskAction"));
 require("./FormRenderer.scss");
+var _excluded = ["noTaskCYAs", "nonSequential"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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,
@@ -40,11 +48,12 @@ var FormRenderer = function FormRenderer(_ref) {
     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,
+    hideTitle = _ref.hide_title,
     summaryListClassModifiers = _ref.summaryListClassModifiers,
     noChangeAction = _ref.noChangeAction,
     newPageId = _ref.newPageId,
@@ -62,7 +71,8 @@ var FormRenderer = function FormRenderer(_ref) {
     classBlock: classBlock,
     classModifiers: classModifiers,
     className: className,
-    hide_title: hide_title,
+    hashLink: hashLink,
+    hide_title: hideTitle,
     summaryListClassModifiers: summaryListClassModifiers,
     noChangeAction: noChangeAction,
     newPageId: newPageId,
@@ -72,7 +82,7 @@ var FormRenderer = function FormRenderer(_ref) {
 var DEFAULT_CLASS = 'hods-form';
 exports.DEFAULT_CLASS = DEFAULT_CLASS;
 var InternalFormRenderer = function InternalFormRenderer(_ref2) {
-  var _formState$page4;
+  var _formState$page4, _formState$page$actio, _formState$cya$hideCh, _formState$cya$hideGr;
   var title = _ref2.title,
     type = _ref2.type,
     components = _ref2.components,
@@ -83,7 +93,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     classBlock = _ref2.classBlock,
     classModifiers = _ref2.classModifiers,
     className = _ref2.className,
-    hide_title = _ref2.hide_title,
+    hashLink = _ref2.hashLink,
+    hideTitle = _ref2.hide_title,
     summaryListClassModifiers = _ref2.summaryListClassModifiers,
     noChangeAction = _ref2.noChangeAction,
     newPageId = _ref2.newPageId,
@@ -141,10 +152,21 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     validate = _useValidation.validate;
 
   // Need to set submission data when going back
-  window.onpopstate = function () {
+  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();
+    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({
@@ -197,14 +219,17 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   // Call the onFormLoad hook just when this component first renders.
   (0, _react.useEffect)(function () {
     setPagePoint(undefined);
-    hooks.onFormLoad();
+    // In case of refresh the current task needs to be reset
+    hooks.onFormLoad(function (currentTask) {
+      setCurrentTask(currentTask);
+    });
   }, [hooks]);
   (0, _react.useEffect)(function () {
     setHubDetails(_hub);
   }, [_hub]);
 
   // Calling setData directly within the hooks.onSubmit success handler
-  // resulted in a sychronisation error. Handling it in a useEffect appears
+  // resulted in a synchronisation 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) {
@@ -212,13 +237,17 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       setSubmitted(undefined);
     }
   }, [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
   (0, _react.useEffect)(function () {
     var pages = currentTask.fullPages;
     if (pages) {
       pages.forEach(function (page) {
-        page.formData = data;
+        var p = page;
+        if (p) {
+          p.formData = data;
+        }
       });
       setCurrentTask(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, {
@@ -226,280 +255,165 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         });
       });
     }
-    if (hubDetails !== null && hubDetails !== void 0 && hubDetails.sections) {
+    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(hubDetails.sections, tasks, hubDetails.nonSequential);
+      var updatedSections = _helpers.default.getUpdatedSectionStates(theSections, tasks, nonSequential, data);
       setHubDetails(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), updatedSections);
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          sections: [].concat(updatedSections)
+        });
       });
     }
-  }, [currentTask.fullPages, data, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.sections, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.nonSequential]);
+  }, [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);
+    hooks.onPageChange(newPageId, state);
   };
   (0, _react.useEffect)(function () {
     if (newPageId !== undefined) setPageId(newPageId);
   }, [newPageId]);
 
-  // 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;
-    }
-    // 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:
-            pageUpdate = function pageUpdate() {
-              return _handlers.default.navigate(action, pageId, onPageChange);
-            };
-            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)].filter(function (entry) {
-              return entry.id !== activeId;
-            });
-            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 && 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);
-        }, changedFieldName, changedFieldValue);
-      }
-    }
+  // Handle change to form data in pages.
+  var onChange = function onChange(data) {
+    hooks.onChange(data);
   };
 
   // Handle navigation from "Check your answers".
   // Passing a dataCallback allows changes to formData from the
-  // CYA screen. This is necessary to alow changing the active
+  // 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 (page) {
-      _handlers.default.cyaAction(page, pageId, onPageChange);
-    }
-  };
-
-  //Kick off a task, gather required pages and move to the correct point
-  var onTaskAction = function onTaskAction(currentTask) {
-    if (currentTask) {
-      currentTask.fullPages = [];
-      currentTask.pages.forEach(function (page) {
-        currentTask.fullPages.push(_helpers.default.getPage(page, pages));
-      });
-      setCurrentTask(currentTask);
-      if (currentTask.state === _models.TaskStates.TYPES.COMPLETE) {
-        if (hubDetails !== null && hubDetails !== void 0 && hubDetails.noTaskCYAs) {
-          var currentPage = data.formStatus.tasks[currentTask.name].currentPage;
-          onPageChange(currentPage || currentTask.pages[0]);
-        } else {
-          onPageChange(_models.FormPages.CYA);
-        }
-      } else if (currentTask.state === _models.TaskStates.TYPES.IN_PROGRESS) {
-        var _currentPage = data.formStatus.tasks[currentTask.name].currentPage;
-        onPageChange(_currentPage || currentTask.pages[0]);
-      } else if (currentTask.firstPage) {
-        var _currentPage2 = currentTask.firstPage;
-        onPageChange(_currentPage2 || currentTask.pages[0]);
-      } else {
-        onPageChange(currentTask.pages[0]);
-      }
-    }
-  };
-
-  // Handle actions from "Check your answers".
-  var onCYAAction = function onCYAAction(action) {
-    // 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) {
-      setPagePoint('submit');
-      if (_helpers.default.canCYASubmit(pages, validate.pages)) {
-        // Submit.
-        var submissionData = _utils.default.Format.form({
-          pages: pages,
-          components: components
-        }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
-        submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true);
-        setData(submissionData);
-        // Now submit the data to the backend...
-        hooks.onSubmit(action.type, submissionData, function () {
-          return hooks.onFormComplete();
-        }, function (errors) {
-          return _handlers.default.submissionError(errors, addErrors);
-        });
-      }
-    }
-    if (action.type === _models.PageAction.TYPES.SAVE_AND_CONTINUE && hub === _models.HubFormats.TASK) {
-      if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
-        var _submissionData = _utils.default.Format.form({
-          pages: pages,
-          components: components
-        }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
-        _submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData, currentTask, true);
-        setData(_submissionData);
-        hooks.onSubmit(action.type, _submissionData, function () {
-          return onPageChange(_models.FormPages.HUB);
-        }, function (errors) {
-          return _handlers.default.submissionError(errors, addErrors);
-        });
-      }
-    }
-    if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
-      if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
-        var _submissionData2 = _utils.default.Format.form({
-          pages: pages,
-          components: components
-        }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
-        _submissionData2.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData2, currentTask);
-        setData(_submissionData2);
-        hooks.onSubmit(action.type, _submissionData2, function () {
-          if (type === _models.FormTypes.TASK) {
-            onPageChange(undefined);
-          } else {
-            onPageChange(_models.FormPages.HUB);
+    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) {
+          if (task.pages.includes(page.pageId) && task.name !== currentTask.name) {
+            (0, _onTaskAction2.default)(task, pages, setCurrentTask, hubDetails, data, onPageChange);
+            return false;
           }
-        }, function (errors) {
-          return _handlers.default.submissionError(errors, addErrors);
+          return true;
         });
-      }
-    }
-    if (action.type === _models.PageAction.TYPES.NAVIGATE) {
-      var _formState$page3;
-      onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, (_formState$page3 = formState.page) === null || _formState$page3 === void 0 ? void 0 : _formState$page3.formData));
+      });
     }
-    if (action.type === _models.PageAction.TYPES.CANCEL) {
-      hooks.onCancel();
+    if (page) {
+      _handlers.default.cyaAction(page, pageId, onPageChange);
     }
   };
   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];
+    var currentCYA = cya;
+    currentCYA.actions = [_models.PageAction.TYPES.SAVE_AND_CONTINUE, _models.PageAction.TYPES.SAVE_AND_RETURN];
   }
+
+  // filter out invalid attribs
+  var _noCYA = hubDetails.noTaskCYAs,
+    _nonSeq = hubDetails.nonSequential,
+    taskDetails = _objectWithoutProperties(hubDetails, _excluded);
   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({
+  }, title && !hideTitle && pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, title), formState.cya && /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, _extends({
     pages: _helpers.default.getRelevantPages(formState, pages, currentTask.fullPages)
   }, cya, ((_formState$page4 = formState.page) === null || _formState$page4 === void 0 ? void 0 : _formState$page4.type) === _models.FormPages.PARTIAL_CYA && {
-    actions: formState.page.actions
+    actions: (_formState$page$actio = formState.page.actions) === null || _formState$page$actio === void 0 ? void 0 : _formState$page$actio.filter(function (action) {
+      return _utils.default.Component.show(action, data);
+    })
   }, formState.cya, {
-    onAction: onCYAAction,
+    onAction: function onAction(action) {
+      (0, _onCYAAction.default)(setPagePoint, action, pages, validate, components, data, setData, type, pageId, currentTask, hooks, addErrors, hub, onPageChange, formState);
+    },
     onRowAction: onCYARowAction,
     summaryListClassModifiers: summaryListClassModifiers,
-    hide_title: hide_title,
-    noChangeAction: noChangeAction,
+    hide_title: hideTitle,
+    noChangeAction: (_formState$cya$hideCh = formState.cya.hideChangeActions) !== null && _formState$cya$hideCh !== void 0 ? _formState$cya$hideCh : noChangeAction,
+    noGroupAction: (_formState$cya$hideGr = formState.cya.hideGroupActions) !== null && _formState$cya$hideGr !== void 0 ? _formState$cya$hideGr : false,
     sections: typeof hubDetails !== 'undefined' ? hubDetails.sections : [],
     type: type
-  })), hub === _models.HubFormats.TASK && formState.pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_TaskList.default, _extends({}, hubDetails, {
+  })), hub === _models.HubFormats.TASK && formState.pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_TaskList.default, _extends({}, taskDetails, {
     refNumber: data.businessKey,
-    onTaskAction: onTaskAction
+    onTaskAction: function onTaskAction(task) {
+      (0, _onTaskAction2.default)(task, pages, setCurrentTask, hubDetails, data, onPageChange);
+    },
+    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
   }), formState.page && !formState.cya && formState.page.collection && /*#__PURE__*/_react.default.createElement(_CollectionPage.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);
+    },
+    classModifiers: formState.page.classModifiers,
+    className: formState.page.className
   }));
 };
-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,
-  pages: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
-  hub: _propTypes.default.object,
-  cya: _propTypes.default.object,
-  data: _propTypes.default.object,
-  hooks: _propTypes.default.object,
+var propTypes = {
   classBlock: _propTypes.default.string,
   classModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
   className: _propTypes.default.string,
+  components: _propTypes.default.arrayOf(_propTypes.default.shape({})).isRequired,
+  cya: _propTypes.default.shape({
+    actions: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.shape({}), _propTypes.default.string]))
+  }),
+  data: _propTypes.default.shape({
+    formStatus: _propTypes.default.shape({
+      page: _propTypes.default.shape({})
+    })
+  }),
+  hashLink: _propTypes.default.bool,
   hide_title: _propTypes.default.bool,
-  summaryListClassModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
+  hooks: _propTypes.default.shape({}),
+  hub: _propTypes.default.shape({
+    nonSequential: _propTypes.default.bool,
+    sections: _propTypes.default.arrayOf(_propTypes.default.shape({}))
+  }),
+  newPageId: _propTypes.default.string,
   noChangeAction: _propTypes.default.bool,
+  pages: _propTypes.default.arrayOf(_propTypes.default.shape({})).isRequired,
+  summaryListClassModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
+  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,
   viewOnly: _propTypes.default.bool
 };
-FormRenderer.defaultProps = InternalFormRenderer.defaultProps = {
-  type: _models.FormTypes.HUB,
-  components: [],
-  pages: [],
+var defaultProps = {
   classBlock: DEFAULT_CLASS,
+  className: '',
   classModifiers: [],
+  cya: {
+    actions: []
+  },
+  data: null,
+  hashLink: false,
   hide_title: false,
-  summaryListClassModifiers: [],
+  hooks: null,
+  hub: {
+    nonSequential: false,
+    sections: []
+  },
+  newPageId: '',
   noChangeAction: false,
+  summaryListClassModifiers: [],
+  title: '',
   viewOnly: true
 };
+FormRenderer.propTypes = propTypes;
+InternalFormRenderer.propTypes = propTypes;
+FormRenderer.defaultProps = defaultProps;
+InternalFormRenderer.defaultProps = defaultProps;
 var _default = FormRenderer;
 exports.default = _default;