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

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/CollectionSummary/SummaryCard.js

@@ -185,7 +185,8 @@ var SummaryCard = function SummaryCard(_ref) {
       });
     },
     classModifiers: "primary",
-    disabled: quickEdit
+    disabled: quickEdit,
+    name: "QuickEdit"
   }, DEFAULT_EDIT_LABEL), config.changeAction && typeof onFullEdit === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".changeButton"),
     onClick: function onClick() {
@@ -193,21 +194,24 @@ var SummaryCard = function SummaryCard(_ref) {
       return onFullEdit((_config$changeAction = config.changeAction) === null || _config$changeAction === void 0 ? void 0 : _config$changeAction.page, entryData.id);
     },
     classModifiers: ((_config$changeAction2 = config.changeAction) === null || _config$changeAction2 === void 0 ? void 0 : _config$changeAction2.classModifiers) || DEFAULT_CHANGE_BUTTON_CLASS,
-    "aria-label": _utils.default.FormPage.getConditionalText((_config$changeAction3 = config.changeAction) === null || _config$changeAction3 === void 0 ? void 0 : _config$changeAction3.aria_label, entryData)
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$changeAction3 = config.changeAction) === null || _config$changeAction3 === void 0 ? void 0 : _config$changeAction3.aria_label, entryData),
+    name: "Change"
   }, ((_config$changeAction4 = config.changeAction) === null || _config$changeAction4 === void 0 ? void 0 : _config$changeAction4.label) || DEFAULT_CHANGE_BUTTON_LABEL), config.deleteAction && typeof onDelete === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".deleteButton"),
     onClick: function onClick() {
       return onDelete(entryData);
     },
     classModifiers: "secondary",
-    "aria-label": _utils.default.FormPage.getConditionalText((_config$deleteAction = config.deleteAction) === null || _config$deleteAction === void 0 ? void 0 : _config$deleteAction.aria_label, entryData)
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$deleteAction = config.deleteAction) === null || _config$deleteAction === void 0 ? void 0 : _config$deleteAction.aria_label, entryData),
+    name: "Delete"
   }, ((_config$deleteAction2 = config.deleteAction) === null || _config$deleteAction2 === void 0 ? void 0 : _config$deleteAction2.label) || DEFAULT_DELETE_BUTTON_LABEL), config.duplicateAction && typeof onDuplicate === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".duplicateButton"),
     onClick: function onClick() {
       onDuplicate(entryData);
     },
     classModifiers: "secondary",
-    "aria-label": _utils.default.FormPage.getConditionalText((_config$duplicateActi = config.duplicateAction) === null || _config$duplicateActi === void 0 ? void 0 : _config$duplicateActi.aria_label, entryData)
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$duplicateActi = config.duplicateAction) === null || _config$duplicateActi === void 0 ? void 0 : _config$duplicateActi.aria_label, entryData),
+    name: "Duplicate"
   }, ((_config$duplicateActi2 = config.duplicateAction) === null || _config$duplicateActi2 === void 0 ? void 0 : _config$duplicateActi2.label) || DEFAULT_DUPLICATE_BUTTON_LABEL))), quickEdit && quickEditPage && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: quickEditPage,
     onAction: function onAction(action, patch) {

package/dist/components/CollectionSummary/SummaryCard.test.js

@@ -278,6 +278,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
         headerActionDiv = _checkSetup7.headerActionDiv;
       expect(headerActionDiv.children.length).toEqual(1);
       var changeButton = headerActionDiv.children[0];
+      expect(changeButton.name).toEqual('Change');
       expect(changeButton.tagName).toEqual('BUTTON');
       expect(changeButton.textContent).toEqual(CONFIG.changeAction.label);
       expect(changeButton.getAttribute('aria-label')).toEqual(CONFIG.changeAction.aria_label[0].text);
@@ -389,6 +390,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
         headerActionDiv = _checkSetup11.headerActionDiv;
       expect(headerActionDiv.children.length).toEqual(1);
       var deleteButton = headerActionDiv.children[0];
+      expect(deleteButton.name).toEqual('Delete');
       expect(deleteButton.tagName).toEqual('BUTTON');
       expect(deleteButton.textContent).toEqual(CONFIG.deleteAction.label);
       expect(deleteButton.getAttribute('aria-label')).toEqual(CONFIG.deleteAction.aria_label[0].text);
@@ -512,6 +514,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
         headerActionDiv = _checkSetup15.headerActionDiv;
       expect(headerActionDiv.children.length).toEqual(1);
       var duplicateButton = headerActionDiv.children[0];
+      expect(duplicateButton.name).toEqual('Duplicate');
       expect(duplicateButton.tagName).toEqual('BUTTON');
       expect(duplicateButton.textContent).toEqual(CONFIG.duplicateAction.label);
       _react.fireEvent.click(duplicateButton, {});
@@ -625,6 +628,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
 
       // Shows edit button but no quick edit
       var editButton = headerActionDiv.children[0];
+      expect(editButton.name).toEqual('QuickEdit');
       expect(editButton.tagName).toEqual('BUTTON');
       expect(editButton.textContent).toEqual('Quick Edit');
       expect(container.childNodes[0].childNodes.length).toEqual(2); // Quick edit hidden

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

@@ -174,9 +174,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         });
       });
     }
+    clearErrors();
     setGoingBack(true);
     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({
         pages: pages,
@@ -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/CollectionPage/getQuickEditPage.js

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _meetsAllConditions = _interopRequireDefault(require("../Condition/meetsAllConditions"));
 var _showFormPage = _interopRequireDefault(require("../FormPage/showFormPage"));
+var _excluded = ["id"];
 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 _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(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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -104,7 +107,10 @@ var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
   }];
 
   // Need to have the collection data at the top level
-  pageToReturn.formData = _objectSpread(_objectSpread({}, pageToReturn.formData), entryData);
+  // Remove ID to stop overwriting top-level form ID.
+  var id = entryData.id,
+    entryWithNoId = _objectWithoutProperties(entryData, _excluded);
+  pageToReturn.formData = _objectSpread(_objectSpread({}, pageToReturn.formData), entryWithNoId);
   delete pageToReturn.title;
   delete pageToReturn.collection;
   return pageToReturn;

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.2",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",