@ukhomeoffice/cop-react-form-renderer 5.68.0 → 5.68.1

package/dist/components/CollectionSummary/CollectionSummary.js

@@ -57,6 +57,7 @@ var CollectionSummary = function CollectionSummary(_ref) {
     formData = _ref.formData,
     onAction = _ref.onAction,
     onChange = _ref.onChange,
+    onTopLevelChange = _ref.onTopLevelChange,
     pages = _ref.pages;
   var _useHooks = (0, _hooks.useHooks)(),
     hooks = _useHooks.hooks;
@@ -121,7 +122,7 @@ var CollectionSummary = function CollectionSummary(_ref) {
       // validating.
       var childPages = masterPage === null || masterPage === void 0 ? void 0 : masterPage.childPages.map(function (page) {
         return _objectSpread(_objectSpread({}, page), {}, {
-          formData: _objectSpread(_objectSpread({}, masterPage.formData), {}, _defineProperty({}, "".concat(config.collectionName, "ActiveId"), entry.id))
+          formData: _objectSpread(_objectSpread({}, formData), {}, _defineProperty({}, "".concat(config.collectionName.split('.').pop(), "ActiveId"), entry.id))
         });
       });
       var allPagesErrors = (childPages === null || childPages === void 0 ? void 0 : childPages.flatMap(function (page) {
@@ -182,14 +183,14 @@ var CollectionSummary = function CollectionSummary(_ref) {
     _utils.default.CollectionPage.duplicateEntry(config.collectionName, formData, entry.id, ((_config$card = config.card) === null || _config$card === void 0 || (_config$card = _config$card.duplicateAction) === null || _config$card === void 0 ? void 0 : _config$card.fieldsToIgnore) || [], {
       isDuplicate: true
     });
-    var parentCollection = config.collectionName.split('.').shift();
+    var topLevelCollectionName = config.collectionName.split('.').shift();
     // Report the whole top-level collection as being changed. We have to do this
     // because of how patch is applied to formData on a page submission.
-    if (typeof onChange === 'function') {
-      onChange({
+    if (typeof onTopLevelChange === 'function') {
+      onTopLevelChange({
         target: {
-          name: parentCollection,
-          value: _utils.default.CollectionPage.getData(parentCollection, formData)
+          name: topLevelCollectionName,
+          value: _utils.default.CollectionPage.getData(topLevelCollectionName, formData)
         }
       });
       validateEntries();
@@ -200,14 +201,14 @@ var CollectionSummary = function CollectionSummary(_ref) {
       return;
     }
     _utils.default.CollectionPage.removeEntry(config.collectionName, formData, entryToDelete.id);
-    var parentCollection = config.collectionName.split('.').shift();
+    var topLevelCollectionName = config.collectionName.split('.').shift();
     // Report the whole top-level collection as being changed. We have to do this
     // because of how patch is applied to formData on a page submission.
-    if (typeof onChange === 'function') {
-      onChange({
+    if (typeof onTopLevelChange === 'function') {
+      onTopLevelChange({
         target: {
-          name: parentCollection,
-          value: _utils.default.CollectionPage.getData(parentCollection, formData)
+          name: topLevelCollectionName,
+          value: _utils.default.CollectionPage.getData(topLevelCollectionName, formData)
         }
       });
     }
@@ -362,12 +363,14 @@ CollectionSummary.propTypes = {
   }).isRequired,
   onAction: _propTypes.default.func,
   onChange: _propTypes.default.func,
+  onTopLevelChange: _propTypes.default.func,
   formData: _propTypes.default.shape({}).isRequired,
   pages: _propTypes.default.arrayOf(_propTypes.default.shape({}))
 };
 CollectionSummary.defaultProps = {
   onAction: null,
   onChange: null,
+  onTopLevelChange: null,
   pages: []
 };
 var _default = exports.default = CollectionSummary;

package/dist/components/FormComponent/FormComponent.js

@@ -130,6 +130,7 @@ var FormComponent = function FormComponent(_ref) {
       formData: formData,
       onAction: onAction,
       onChange: onChange,
+      onTopLevelChange: onTopLevelChange,
       pages: pages
     })));
   }

package/dist/components/FormRenderer/FormRenderer.js

@@ -302,7 +302,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         setData(newData);
       }
     }
-    if (((_formState$page3 = formState.page) === null || _formState$page3 === void 0 ? void 0 : _formState$page3.type) === _models.FormPages.PARTIAL_CYA) {
+    if (((_formState$page3 = formState.page) === null || _formState$page3 === void 0 ? void 0 : _formState$page3.type) === _models.FormPages.PARTIAL_CYA && !cya.disableTaskSwitch) {
       hubDetails.sections.every(function (section) {
         return section.tasks.every(function (task) {
           if (task.pages.includes(page.pageId) && task.name !== currentTask.name) {
@@ -383,7 +383,8 @@ var propTypes = {
   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]))
+    actions: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.shape({}), _propTypes.default.string])),
+    disableTaskSwitch: _propTypes.default.bool
   }),
   data: _propTypes.default.shape({
     formStatus: _propTypes.default.shape({
@@ -412,7 +413,8 @@ var defaultProps = {
   className: '',
   classModifiers: [],
   cya: {
-    actions: []
+    actions: [],
+    disableTaskSwitch: false
   },
   data: null,
   hashLink: false,

package/dist/context/ValidationContext/ValidationContext.js

@@ -112,7 +112,6 @@ var ValidationContextProvider = function ValidationContextProvider(_ref) {
       var pageErrors = _utils.default.Validate.page(_page, queuedErrors);
       var allErrors = hooks.onValidate(_page, pageErrors);
       setErrors(allErrors);
-      setQueuedErrors([]);
       return allErrors;
     },
     pages: function pages(_pages) {
@@ -123,7 +122,6 @@ var ValidationContextProvider = function ValidationContextProvider(_ref) {
         return hooks.onValidate(page, pageErrors[index]);
       });
       setErrors(allErrors);
-      setQueuedErrors([]);
       return allErrors;
     }
   };

package/dist/utils/Validate/validatePage.js

@@ -8,6 +8,7 @@ var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _validateComponent = _interopRequireDefault(require("./validateComponent"));
 var _CollectionPage = _interopRequireDefault(require("../CollectionPage"));
 var _showFormPage = _interopRequireDefault(require("../FormPage/showFormPage"));
+var _showComponent = _interopRequireDefault(require("../Component/showComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -34,6 +35,9 @@ var validatePage = function validatePage(page) {
   }
   if ((0, _showFormPage.default)(page, data) && Array.isArray(page.components)) {
     var errs = page.components.reduce(function (errors, component) {
+      if (!(0, _showComponent.default)(component, data)) {
+        return errors;
+      }
       var queuedComponentErrors = queuedErrors.length > 0 ? queuedErrors.filter(function (e) {
         return e.showFor ? e.showFor === component.id : e.id === component.id;
       }) : [];

package/dist/utils/Validate/validatePage.test.js

@@ -762,5 +762,30 @@ describe('utils.Validate.Page', function () {
       expect(RESULT[0]).toEqual(_objectSpread({}, QUEUED_ERRORS[0]));
       expect(RESULT[1]).toEqual(_objectSpread({}, QUEUED_ERRORS[1]));
     });
+    it('should return any queued errors if the component is not shown', function () {
+      var COMPONENTS = [_objectSpread(_objectSpread({}, setup('a', _models.ComponentTypes.TEXT, 'Alpha', true)), {}, {
+        show_when: [{
+          field: 'b',
+          op: '=',
+          value: 'yes'
+        }]
+      })];
+      var PAGE = {
+        components: COMPONENTS,
+        formData: {
+          a: 'Value',
+          b: 'no'
+        }
+      };
+      var QUEUED_ERRORS = [{
+        id: 'a',
+        error: 'Error queued for Alpha 1'
+      }, {
+        id: 'a',
+        error: 'Error queued for Alpha 2'
+      }];
+      var RESULT = (0, _validatePage.default)(PAGE, QUEUED_ERRORS);
+      expect(RESULT.length).toEqual(0);
+    });
   });
 });

package/package.json

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