@ukhomeoffice/cop-react-form-renderer 3.18.1 → 3.19.0

package/dist/components/FormPage/FormPage.js

@@ -88,6 +88,7 @@ var FormPage = function FormPage(_ref) {
       label: _utils.default.interpolateString(action.label, page.formData)
     }) : action;
   });
+  page.formData = _objectSpread(_objectSpread({}, page.formData), patch);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: classes('page'),
     key: page.id
@@ -101,7 +102,7 @@ var FormPage = function FormPage(_ref) {
       component: component,
       onChange: onPageChange,
       value: page.formData[component.fieldId] || patch[component.fieldId],
-      formData: _objectSpread(_objectSpread({}, page.formData), patch)
+      formData: page.formData
     });
   }), /*#__PURE__*/_react.default.createElement(_PageActions.default, {
     actions: (_page$actions2 = page.actions) === null || _page$actions2 === void 0 ? void 0 : _page$actions2.filter(function (action) {

package/dist/components/FormRenderer/FormRenderer.js

@@ -74,7 +74,8 @@ var FormRenderer = function FormRenderer(_ref) {
       hide_title = _ref.hide_title,
       summaryListClassModifiers = _ref.summaryListClassModifiers,
       noChangeAction = _ref.noChangeAction,
-      newPageId = _ref.newPageId;
+      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, {
@@ -91,7 +92,8 @@ var FormRenderer = function FormRenderer(_ref) {
     hide_title: hide_title,
     summaryListClassModifiers: summaryListClassModifiers,
     noChangeAction: noChangeAction,
-    newPageId: newPageId
+    newPageId: newPageId,
+    viewOnly: viewOnly
   })));
 };
 
@@ -112,7 +114,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       hide_title = _ref2.hide_title,
       summaryListClassModifiers = _ref2.summaryListClassModifiers,
       noChangeAction = _ref2.noChangeAction,
-      newPageId = _ref2.newPageId;
+      newPageId = _ref2.newPageId,
+      viewOnly = _ref2.viewOnly;
 
   // Set up the initial states.
   var _useState = (0, _react.useState)({}),
@@ -153,7 +156,12 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   var _useState15 = (0, _react.useState)({}),
       _useState16 = _slicedToArray(_useState15, 2),
       hubDetails = _useState16[0],
-      setHubDetails = _useState16[1]; // Set up hooks.
+      setHubDetails = _useState16[1];
+
+  var _useState17 = (0, _react.useState)('start'),
+      _useState18 = _slicedToArray(_useState17, 2),
+      pagePoint = _useState18[0],
+      setPagePoint = _useState18[1]; // Set up hooks.
 
 
   var _useHooks = (0, _hooks.useHooks)(),
@@ -167,7 +175,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
 
 
   (0, _react.useEffect)(function () {
-    if (components && _pages && _data) {
+    if (components && _pages && _data && (['start', 'end'].includes(pagePoint) || viewOnly)) {
       var _data$formStatus;
 
       setData(_utils.default.Data.setupForm(_pages, components, _data));
@@ -176,7 +184,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         setPageId(_data.formStatus.page);
       }
     }
-  }, [components, _pages, _data, setData]); // Setup pages.
+  }, [components, _pages, _data, setData, pagePoint, viewOnly]); // Setup pages.
 
   (0, _react.useEffect)(function () {
     setPages(_utils.default.FormPage.getAll(_pages, components, _objectSpread({}, data)));
@@ -197,6 +205,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   }, [pages, hub, pageId, setFormState]); // Call the onFormLoad hook just when this component first renders.
 
   (0, _react.useEffect)(function () {
+    setPagePoint(undefined);
     hooks.onFormLoad();
   }, [hooks]);
   (0, _react.useEffect)(function () {
@@ -267,11 +276,15 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       if (action.type === _models.PageAction.TYPES.NAVIGATE) {
         _handlers.default.navigate(action, pageId, onPageChange);
       } else {
-        // Save draft or submit.
+        if (action.type === 'submit') {
+          setPagePoint('end');
+        } // Save draft or submit.
+
+
         var submissionData = _utils.default.Format.form({
           pages: pages,
           components: components
-        }, _objectSpread(_objectSpread({}, data), patch), _models.EventTypes.SUBMIT);
+        }, _objectSpread(_objectSpread(_objectSpread({}, data), patch), formState.page.formData), _models.EventTypes.SUBMIT);
 
         submissionData.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, submissionData, currentTask, true);
 
@@ -343,6 +356,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     // 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('end');
+
       if (_helpers.default.canCYASubmit(pages, validate.pages)) {
         // Submit.
         var submissionData = _utils.default.Format.form({
@@ -449,7 +464,8 @@ FormRenderer.propTypes = InternalFormRenderer.propTypes = {
   className: _propTypes.default.string,
   hide_title: _propTypes.default.bool,
   summaryListClassModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
-  noChangeAction: _propTypes.default.bool
+  noChangeAction: _propTypes.default.bool,
+  viewOnly: _propTypes.default.bool
 };
 FormRenderer.defaultProps = InternalFormRenderer.defaultProps = {
   type: _models.FormTypes.HUB,
@@ -459,7 +475,8 @@ FormRenderer.defaultProps = InternalFormRenderer.defaultProps = {
   classModifiers: [],
   hide_title: false,
   summaryListClassModifiers: [],
-  noChangeAction: false
+  noChangeAction: false,
+  viewOnly: true
 };
 var _default = FormRenderer;
 exports.default = _default;

package/dist/utils/Component/getComponent.js

@@ -57,9 +57,13 @@ var getCheckboxes = function getCheckboxes(config) {
 var getCalculation = function getCalculation(config) {
   var calculatedValue = _Data.default.applyFormula(config);
 
+  if (!!calculatedValue) {
+    config.value = calculatedValue;
+    config.formData[config.fieldId] = "" + calculatedValue;
+  }
+
   var attrs = (0, _cleanAttributes.default)(config, ['formula']);
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.TextInput, _extends({}, attrs, {
-    value: calculatedValue,
     readOnly: true
   }));
 };

package/package.json

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