@ukhomeoffice/cop-react-form-renderer 4.7.1 → 4.9.0

package/dist/components/FormRenderer/FormRenderer.js

@@ -103,7 +103,7 @@ var DEFAULT_CLASS = 'hods-form';
 exports.DEFAULT_CLASS = DEFAULT_CLASS;
 
 var InternalFormRenderer = function InternalFormRenderer(_ref2) {
-  var _formState$page3;
+  var _formState$page4;
 
   var title = _ref2.title,
       type = _ref2.type,
@@ -165,7 +165,12 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   var _useState17 = (0, _react.useState)('load'),
       _useState18 = _slicedToArray(_useState17, 2),
       pagePoint = _useState18[0],
-      setPagePoint = _useState18[1]; // Set up hooks.
+      setPagePoint = _useState18[1];
+
+  var _useState19 = (0, _react.useState)(false),
+      _useState20 = _slicedToArray(_useState19, 2),
+      goingBack = _useState20[0],
+      setGoingBack = _useState20[1]; // Set up hooks.
 
 
   var _useHooks = (0, _hooks.useHooks)(),
@@ -181,6 +186,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   window.onpopstate = function () {
     var _formState$page;
 
+    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,
@@ -219,8 +228,16 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   }, [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]); // 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);
@@ -304,7 +321,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
 
         switch (action.type) {
           case _models.PageAction.TYPES.SUBMIT:
-            setPagePoint('end');
+            setPagePoint('submit');
             break;
 
           case _models.PageAction.TYPES.SAVE_AND_NAVIGATE:
@@ -353,6 +370,15 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
 
         if (patch) {
           setData(submissionData);
+        } // In case of hub-and-spoke if patch has changed then save field name and value to variables for call to onSubmit hook
+
+
+        var changedFieldName = undefined;
+        var changedFieldValue = undefined;
+
+        if (type === _models.FormTypes.HUB && Object.keys(patch).length > 0) {
+          changedFieldName = formState.page.components[0].cya_label;
+          changedFieldValue = Object.values(patch)[0];
         } // Now submit the data to the backend...
 
 
@@ -367,7 +393,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
           pageUpdate(sData);
         }, function (errors) {
           _handlers.default.submissionError(errors, addErrors);
-        });
+        }, changedFieldName, changedFieldValue);
       }
     }
   }; // Handle navigation from "Check your answers".
@@ -479,9 +505,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
 
     if (action.type === _models.PageAction.TYPES.NAVIGATE) {
-      var _formState$page2;
+      var _formState$page3;
 
-      onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, (_formState$page2 = formState.page) === null || _formState$page2 === void 0 ? void 0 : _formState$page2.formData));
+      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) {
@@ -499,7 +525,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     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({
     pages: _helpers.default.getRelevantPages(formState, pages, currentTask.fullPages)
-  }, cya, ((_formState$page3 = formState.page) === null || _formState$page3 === void 0 ? void 0 : _formState$page3.type) === _models.FormPages.PARTIAL_CYA && {
+  }, cya, ((_formState$page4 = formState.page) === null || _formState$page4 === void 0 ? void 0 : _formState$page4.type) === _models.FormPages.PARTIAL_CYA && {
     actions: formState.page.actions
   }, formState.cya, {
     onAction: onCYAAction,

package/dist/context/HooksContext/HooksContext.js

@@ -32,6 +32,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var DEFAULT_HOOKS = {
+  onGoingBack: function onGoingBack() {},
   onFormComplete: function onFormComplete() {},
   onFormLoad: function onFormLoad() {},
   onGetComponent: function onGetComponent(config, wrap) {
@@ -59,6 +60,7 @@ var HooksContextProvider = function HooksContextProvider(_ref) {
       children = _ref.children;
 
   var _useState = (0, _react.useState)({
+    onGoingBack: (overrides === null || overrides === void 0 ? void 0 : overrides.onGoingBack) || DEFAULT_HOOKS.onGoingBack,
     onFormComplete: (overrides === null || overrides === void 0 ? void 0 : overrides.onFormComplete) || DEFAULT_HOOKS.onFormComplete,
     onFormLoad: (overrides === null || overrides === void 0 ? void 0 : overrides.onFormLoad) || DEFAULT_HOOKS.onFormLoad,
     onGetComponent: (overrides === null || overrides === void 0 ? void 0 : overrides.onGetComponent) || DEFAULT_HOOKS.onGetComponent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.7.1",
+  "version": "4.9.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "2.2.1",
+    "@ukhomeoffice/cop-react-components": "2.2.2",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",