@ukhomeoffice/cop-react-form-renderer 6.0.6-peter → 6.6.1

package/dist/components/FormComponent/Collection.js

@@ -90,22 +90,6 @@ var Collection = function Collection(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  (0, _react.useEffect)(function () {
-    if (config.focusOnAdd && Array.isArray(value) && value.length) {
-      if (value.length > config.minimumEntries || !config.minimumEntries) {
-        var _value2, _document$getElementB, _focusable$;
-        var containerId = (_value2 = value[value.length - 1]) === null || _value2 === void 0 ? void 0 : _value2.id;
-        var container = (_document$getElementB = document.getElementById(containerId)) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.childNodes[0];
-        var focusable = container === null || container === void 0 ? void 0 : container.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
-        (_focusable$ = focusable[0]) === null || _focusable$ === void 0 || _focusable$.focus();
-      }
-    }
-  }, [value.length, config.focusOnAdd, config.minimumEntries]);
-  (0, _react.useEffect)(function () {
-    if (config.minimumEntries && !value.length) {
-      onAddAnother();
-    }
-  }, [config.minimumEntries, value.length]);
   var onRemoveItem = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -124,6 +108,28 @@ var Collection = function Collection(_ref) {
       return _ref4.apply(this, arguments);
     };
   }();
+  var getAddLabel = function getAddLabel(labels) {
+    if (labels.initial && !value.length) {
+      return labels.initial;
+    }
+    return labels.add;
+  };
+  (0, _react.useEffect)(function () {
+    if (config.focusOnAdd && Array.isArray(value) && value.length) {
+      if (value.length > config.minimumEntries || !config.minimumEntries) {
+        var _value2, _document$getElementB, _focusable$;
+        var containerId = (_value2 = value[value.length - 1]) === null || _value2 === void 0 ? void 0 : _value2.id;
+        var container = (_document$getElementB = document.getElementById(containerId)) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.childNodes[0];
+        var focusable = container === null || container === void 0 ? void 0 : container.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])');
+        (_focusable$ = focusable[0]) === null || _focusable$ === void 0 || _focusable$.focus();
+      }
+    }
+  }, [value.length, config.focusOnAdd, config.minimumEntries]);
+  (0, _react.useEffect)(function () {
+    if (config.minimumEntries && !value.length) {
+      onAddAnother();
+    }
+  }, [config.minimumEntries, value.length]);
   var labels = _objectSpread(_objectSpread({}, _models.CollectionLabels), config.labels);
   var classes = _utils.default.classBuilder(DEFAULT_CLASS, [], config.className);
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -203,7 +209,7 @@ var Collection = function Collection(_ref) {
   }), !config.disableAddAndRemove && /*#__PURE__*/_react.default.createElement(_copReactComponents.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     onClick: onAddAnother,
     classModifiers: "secondary"
-  }, labels.add)));
+  }, getAddLabel(labels))));
 };
 Collection.propTypes = {
   config: _propTypes.default.shape({
@@ -220,6 +226,7 @@ Collection.propTypes = {
     })),
     label: _propTypes.default.string,
     labels: _propTypes.default.shape({
+      initial: _propTypes.default.string,
       item: _propTypes.default.string,
       add: _propTypes.default.string,
       remove: _propTypes.default.string

package/dist/components/FormComponent/Collection.test.js

@@ -964,4 +964,142 @@ describe('components.FormComponent.Collection', function () {
       }
     }, _callee18);
   })));
+  it('should display the initial cta add label and revert to default cta label on subsequent additions', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+    var COLLECTION, container, c, addButton, item, label;
+    return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+      while (1) switch (_context20.prev = _context20.next) {
+        case 0:
+          COLLECTION = {
+            id: ID,
+            fieldId: ID,
+            type: _models.ComponentTypes.COLLECTION,
+            item: [TEXT_COMPONENT],
+            // eslint-disable-next-line no-template-curly-in-string
+            labels: {
+              add: 'Add another item',
+              initial: 'Add an item',
+              item: 'Item ${index}'
+            }
+          };
+          container = document.createElement('div');
+          document.body.appendChild(container);
+          _context20.next = 5;
+          return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+            return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+              while (1) switch (_context19.prev = _context19.next) {
+                case 0:
+                  (0, _setupTests.renderDomWithValidation)( /*#__PURE__*/_react2.default.createElement(_FormComponent.default, {
+                    component: COLLECTION
+                  }), container);
+                case 1:
+                case "end":
+                  return _context19.stop();
+              }
+            }, _callee19);
+          })));
+        case 5:
+          // Check the container itself.
+          c = container.childNodes[0];
+          expect(c.tagName).toEqual('DIV');
+          expect(c.classList).toContain(_Collection.DEFAULT_CLASS);
+
+          // And now make sure it has no children OTHER than the button to add an item.
+          expect(c.childNodes.length).toEqual(1);
+
+          // Get hold of that "Add another" button and click it.
+          addButton = c.childNodes[0].childNodes[0];
+          expect(addButton.textContent).toContain('Add an item');
+          _react.fireEvent.click(addButton, {});
+
+          // Make sure an item has been added.
+          expect(c.childNodes.length).toEqual(2);
+          item = c.childNodes[0];
+          label = item.childNodes[0];
+          expect(label.textContent).toContain(_utils.default.interpolateString(_models.CollectionLabels.item, {
+            index: 1
+          }));
+
+          // Check label of subsequent call to action button has updated
+          expect(addButton.textContent).toContain('Add another item');
+        case 17:
+        case "end":
+          return _context20.stop();
+      }
+    }, _callee20);
+  })));
+  it('should revert back to the initial cta add label on adding and removing an item', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+    var COLLECTION, container, c, addButton, item, label, removeButton;
+    return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+      while (1) switch (_context22.prev = _context22.next) {
+        case 0:
+          COLLECTION = {
+            id: ID,
+            fieldId: ID,
+            type: _models.ComponentTypes.COLLECTION,
+            item: [TEXT_COMPONENT],
+            // eslint-disable-next-line no-template-curly-in-string
+            labels: {
+              add: 'Add another item',
+              initial: 'Add an item',
+              item: 'Item ${index}'
+            }
+          };
+          container = document.createElement('div');
+          document.body.appendChild(container);
+          _context22.next = 5;
+          return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+            return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+              while (1) switch (_context21.prev = _context21.next) {
+                case 0:
+                  (0, _setupTests.renderDomWithValidation)( /*#__PURE__*/_react2.default.createElement(_FormComponent.default, {
+                    component: COLLECTION
+                  }), container);
+                case 1:
+                case "end":
+                  return _context21.stop();
+              }
+            }, _callee21);
+          })));
+        case 5:
+          // Check the container itself.
+          c = container.childNodes[0];
+          expect(c.tagName).toEqual('DIV');
+          expect(c.classList).toContain(_Collection.DEFAULT_CLASS);
+
+          // And now make sure it has no children OTHER than the button to add an item.
+          expect(c.childNodes.length).toEqual(1);
+
+          // Get hold of that "Add another" button and click it.
+          addButton = c.childNodes[0].childNodes[0];
+          expect(addButton.textContent).toContain('Add an item');
+          _react.fireEvent.click(addButton, {});
+
+          // Make sure an item has been added.
+          expect(c.childNodes.length).toEqual(2);
+          item = c.childNodes[0];
+          label = item.childNodes[0];
+          expect(label.textContent).toContain(_utils.default.interpolateString(_models.CollectionLabels.item, {
+            index: 1
+          }));
+
+          // Check label of subsequent call to action button has updated
+          expect(addButton.textContent).toContain('Add another item');
+
+          // Get hold of the newly-add item's "Remove" button.
+          removeButton = label.childNodes[1];
+          expect(removeButton.tagName).toEqual('BUTTON');
+          expect(removeButton.classList).toContain('hods-button--secondary');
+          expect(removeButton.textContent).toContain(_models.CollectionLabels.remove);
+
+          // Click the "Remove" button
+          _react.fireEvent.click(removeButton, {});
+
+          // Check label of subsequent call to action button has updated
+          expect(addButton.textContent).toContain('Add an item');
+        case 23:
+        case "end":
+          return _context22.stop();
+      }
+    }, _callee22);
+  })));
 });

package/dist/components/FormComponent/FormComponent.js

@@ -67,6 +67,17 @@ var FormComponent = function FormComponent(_ref) {
         // eslint-disable-next-line no-param-reassign
         target.value = target.value.trim();
       }
+      if (component.type === _models.ComponentTypes.CHECKBOXES && Array.isArray(target.value)) {
+        target.value.forEach(function (item) {
+          if (item.children && item.nested) {
+            // eslint-disable-next-line no-param-reassign
+            delete item.children;
+            // eslint-disable-next-line no-param-reassign
+            delete item.nested;
+          }
+        });
+      }
+
       // eslint-disable-next-line no-param-reassign
       target = (0, _helpers.addLabel)(target, component, data);
       onChange({
@@ -119,6 +130,7 @@ var FormComponent = function FormComponent(_ref) {
       formData: formData,
       onAction: onAction,
       onChange: onChange,
+      onTopLevelChange: onTopLevelChange,
       pages: pages
     })));
   }

package/dist/components/FormPage/FormPage.scss

@@ -1,4 +1,4 @@
-@import "node_modules/govuk-frontend/govuk/_base";
+@import "govuk-frontend/dist/govuk/_base";
 
 .hods-form {
   &__page {

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) {
@@ -366,6 +366,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     submitting: submitting
   }), formState.page && !formState.cya && formState.page.collection && /*#__PURE__*/_react.default.createElement(_CollectionPage.default, {
     page: formState.page,
+    pages: pages,
     onCollectionChange: onChange,
     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, submitting, setSubmitting, errors);
@@ -382,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({
@@ -411,7 +413,8 @@ var defaultProps = {
   className: '',
   classModifiers: [],
   cya: {
-    actions: []
+    actions: [],
+    disableTaskSwitch: false
   },
   data: null,
   hashLink: false,

package/dist/components/FormRenderer/FormRenderer.scss

@@ -1,4 +1,4 @@
-@import "node_modules/govuk-frontend/govuk/_base";
+@import "govuk-frontend/dist/govuk/_base";
 
 .hods-form {
   display: block;

package/dist/components/FormRenderer/helpers/index.js

@@ -13,7 +13,6 @@ var _getNextPageId = _interopRequireDefault(require("./getNextPageId"));
 var _getPage = _interopRequireDefault(require("./getPage"));
 var _getSubmissionStatus = _interopRequireDefault(require("./getSubmissionStatus"));
 var _getUpdatedSectionStates = _interopRequireDefault(require("./getUpdatedSectionStates"));
-var _clearOutUncompletedRoutes = _interopRequireDefault(require("./clearOutUncompletedRoutes"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
@@ -26,7 +25,6 @@ var helpers = {
   getNextPageId: _getNextPageId.default,
   getPage: _getPage.default,
   getSubmissionStatus: _getSubmissionStatus.default,
-  getUpdatedSectionStates: _getUpdatedSectionStates.default,
-  clearOutUncompletedRoutes: _clearOutUncompletedRoutes.default
+  getUpdatedSectionStates: _getUpdatedSectionStates.default
 };
 var _default = exports.default = helpers;

package/dist/components/FormRenderer/onPageAction.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _models = require("../../models");
 var _utils = _interopRequireDefault(require("../../utils"));
+var _setCollectionPageData = _interopRequireDefault(require("../../utils/CollectionPage/setCollectionPageData"));
 var _handlers = _interopRequireDefault(require("./handlers"));
 var _helpers = _interopRequireDefault(require("./helpers"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -48,7 +49,11 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
     if (action.addToFormData) {
       var operations = Array.isArray(action.addToFormData) ? action.addToFormData : [action.addToFormData];
       operations.forEach(function (op) {
-        _utils.default.Data.setDataItem(formState.page.formData, op.field, op.value);
+        if (op.isCollection) {
+          (0, _setCollectionPageData.default)(op.field, op.value, formState.page.formData);
+        } else {
+          _utils.default.Data.setDataItem(formState.page.formData, op.field, op.value);
+        }
       });
       form.page.formData[action.addToFormData.field] = action.addToFormData.value;
     }
@@ -107,15 +112,8 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
         setData(submissionData);
       }
       ;
-      var formPagesAndComponents = {
-        pages: pages,
-        components: components
-      };
-      if (action.type === _models.PageAction.TYPES.SUBMIT) {
-        _helpers.default.clearOutUncompletedRoutes(formPagesAndComponents, submissionData);
-      }
 
-      // In case of hub-and-spoke if patchLabel has changed then
+      // 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;

package/dist/components/FormRenderer/onPageAction.test.js

@@ -50,11 +50,6 @@ jest.mock('./helpers', function () {
       this.cleanHiddenNestedDataCalls += 1;
       return patch;
     },
-    clearOutUncompletedRoutesCalls: 0,
-    clearOutUncompletedRoutes: function clearOutUncompletedRoutes(pages, allComponents, formData) {
-      this.clearOutUncompletedRoutesCalls += 1;
-      return formData;
-    },
     getNextPageIdCalls: 0,
     getNextPageId: function getNextPageId() {
       this.getNextPageIdCalls += 1;
@@ -581,10 +576,16 @@ describe('components.FormRenderer.onPageAction', function () {
         var ACTION = {
           type: actionType,
           collection: 'testCollection',
-          addToFormData: {
+          addToFormData: [{
             field: 'alpha',
             value: '123'
-          }
+          }, {
+            field: 'parent.child',
+            value: [{
+              id: '12345'
+            }],
+            isCollection: true
+          }]
         };
         var CUSTOM_ARGS = _objectSpread(_objectSpread({}, ARGS), {}, {
           formState: FORM_STATE,
@@ -596,6 +597,7 @@ describe('components.FormRenderer.onPageAction', function () {
         expect(FORM_STATE.page.formData).toMatchObject({
           alpha: '123'
         });
+        expect(FORM_STATE.page.formData.parent[0].child[0].id).toEqual('12345');
       });
     });
     it("should work for the ".concat(_models.PageAction.TYPES.NAVIGATE, " action type"), function () {
@@ -609,10 +611,16 @@ describe('components.FormRenderer.onPageAction', function () {
       var ACTION = {
         type: _models.PageAction.TYPES.NAVIGATE,
         collection: 'testCollection',
-        addToFormData: {
+        addToFormData: [{
           field: 'alpha',
           value: '123'
-        }
+        }, {
+          field: 'parent.child',
+          value: [{
+            id: '12345'
+          }],
+          isCollection: true
+        }]
       };
       var CUSTOM_ARGS = _objectSpread(_objectSpread({}, ARGS), {}, {
         formState: FORM_STATE,
@@ -626,6 +634,7 @@ describe('components.FormRenderer.onPageAction', function () {
       expect(FORM_STATE.page.formData).toMatchObject({
         alpha: '123'
       });
+      expect(FORM_STATE.page.formData.parent[0].child[0].id).toEqual('12345');
     });
     it('should work for an array of formData', function () {
       var FORM_STATE = {

package/dist/components/SummaryList/SummaryList.scss

@@ -1,5 +1,5 @@
-@import 'node_modules/govuk-frontend/govuk/_base';
-@import 'node_modules/govuk-frontend/govuk/components/summary-list/_summary-list';
+@import 'govuk-frontend/dist/govuk/_base';
+@import 'govuk-frontend/dist/govuk/components/summary-list/_summary-list';
 
 .govuk-summary-list__title {
   width: 100%;

package/dist/components/TaskList/TaskList.scss

@@ -1,4 +1,4 @@
-@import 'node_modules/govuk-frontend/govuk/_base';
+@import 'govuk-frontend/dist/govuk/_base';
 
 // Task list pattern
 

package/dist/context/ValidationContext/ValidationContext.js

@@ -31,6 +31,45 @@ var ValidationContextProvider = function ValidationContextProvider(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     errors = _useState2[0],
     setErrors = _useState2[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    queuedErrors = _useState4[0],
+    setQueuedErrors = _useState4[1];
+
+  /**
+   * Queues errors to be displayed when the next validation takes place.
+   * 
+   * @param {array} errors An array of errors to queue.
+   */
+  var enqueueErrors = function enqueueErrors(errors) {
+    setQueuedErrors(function (prev) {
+      return [].concat(prev, errors).filter(function (e) {
+        return !!e;
+      });
+    });
+  };
+
+  /**
+   * Removed errors from the queue if they match the given criteria.
+   * 
+   * @param {function} matcher A function that should take an error and return true if that 
+   *                           error should be removed from the queue.
+   */
+  var dequeueErrors = function dequeueErrors(matcher) {
+    if (typeof matcher !== 'function') {
+      return;
+    }
+    setQueuedErrors(function (prev) {
+      return prev.filter(function (e) {
+        return !matcher(e);
+      });
+    });
+  };
+  var clearQueuedErrors = function clearQueuedErrors() {
+    if (queuedErrors.length) {
+      setQueuedErrors([]);
+    }
+  };
   var addErrors = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(errors) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -56,8 +95,9 @@ var ValidationContextProvider = function ValidationContextProvider(_ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            setQueuedErrors([]);
             setErrors([]);
-          case 1:
+          case 2:
           case "end":
             return _context2.stop();
         }
@@ -69,17 +109,17 @@ var ValidationContextProvider = function ValidationContextProvider(_ref) {
   }();
   var validate = {
     page: function page(_page) {
-      var pageErrors = _utils.default.Validate.page(_page);
+      var pageErrors = _utils.default.Validate.page(_page, queuedErrors);
       var allErrors = hooks.onValidate(_page, pageErrors);
       setErrors(allErrors);
       return allErrors;
     },
     pages: function pages(_pages) {
-      var allPagesErrors = _pages.map(function (page) {
-        return _utils.default.Validate.page(page);
+      var pageErrors = _pages.map(function (page) {
+        return _utils.default.Validate.page(page, queuedErrors);
       });
       var allErrors = _pages.flatMap(function (page, index) {
-        return hooks.onValidate(page, allPagesErrors[index]);
+        return hooks.onValidate(page, pageErrors[index]);
       });
       setErrors(allErrors);
       return allErrors;
@@ -90,6 +130,10 @@ var ValidationContextProvider = function ValidationContextProvider(_ref) {
       errors: errors,
       addErrors: addErrors,
       clearErrors: clearErrors,
+      queuedErrors: queuedErrors,
+      enqueueErrors: enqueueErrors,
+      dequeueErrors: dequeueErrors,
+      clearQueuedErrors: clearQueuedErrors,
       validate: validate
     }
   }, children);

package/dist/context/ValidationContext/ValidationContext.test.js

@@ -6,8 +6,8 @@ var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _react2 = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _hooks = require("../../hooks");
-var _ValidationContext = _interopRequireDefault(require("./ValidationContext"));
 var _HooksContext = _interopRequireDefault(require("../HooksContext"));
+var _ValidationContext = _interopRequireDefault(require("./ValidationContext"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -20,6 +20,9 @@ var TestComponent = function TestComponent(_ref) {
   var _useValidation = (0, _hooks.useValidation)(),
     addErrors = _useValidation.addErrors,
     clearErrors = _useValidation.clearErrors,
+    enqueueErrors = _useValidation.enqueueErrors,
+    dequeueErrors = _useValidation.dequeueErrors,
+    clearQueuedErrors = _useValidation.clearQueuedErrors,
     errors = _useValidation.errors,
     validate = _useValidation.validate;
   (0, _react2.useEffect)(function () {
@@ -27,7 +30,7 @@ var TestComponent = function TestComponent(_ref) {
       addErrors(customErrors);
     }
   }, [customErrors]);
-  return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, typeof addErrors === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "addErrors is a function"), typeof clearErrors === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "clearErrors is a function"), typeof validate.page === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "validate.page is a function"), Array.isArray(errors) && /*#__PURE__*/_react2.default.createElement("span", null, "errors is an array of length ", errors.length), (errors === null || errors === void 0 ? void 0 : errors.length) > 0 && /*#__PURE__*/_react2.default.createElement(_copReactComponents.ErrorSummary, {
+  return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, typeof addErrors === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "addErrors is a function"), typeof clearErrors === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "clearErrors is a function"), typeof enqueueErrors === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "enqueueErrors is a function"), typeof dequeueErrors === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "dequeueErrors is a function"), typeof clearQueuedErrors === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "clearQueuedErrors is a function"), typeof validate.page === 'function' && /*#__PURE__*/_react2.default.createElement("span", null, "validate.page is a function"), Array.isArray(errors) && /*#__PURE__*/_react2.default.createElement("span", null, "errors is an array of length ", errors.length), (errors === null || errors === void 0 ? void 0 : errors.length) > 0 && /*#__PURE__*/_react2.default.createElement(_copReactComponents.ErrorSummary, {
     errors: errors
   }));
 };
@@ -38,12 +41,15 @@ describe('context.ValidationContext', function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _render = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_HooksContext.default, null, /*#__PURE__*/_react2.default.createElement(_ValidationContext.default, null, /*#__PURE__*/_react2.default.createElement(TestComponent, null)))), container = _render.container;
-          expect(container.childNodes.length).toEqual(4);
+          expect(container.childNodes.length).toEqual(7);
           expect(container.textContent).toContain('addErrors is a function');
           expect(container.textContent).toContain('clearErrors is a function');
+          expect(container.textContent).toContain('enqueueErrors is a function');
+          expect(container.textContent).toContain('dequeueErrors is a function');
+          expect(container.textContent).toContain('clearQueuedErrors is a function');
           expect(container.textContent).toContain('validate.page is a function');
           expect(container.textContent).toContain('errors is an array of length 0');
-        case 6:
+        case 9:
         case "end":
           return _context.stop();
       }
@@ -61,16 +67,19 @@ describe('context.ValidationContext', function () {
           _render2 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_HooksContext.default, null, /*#__PURE__*/_react2.default.createElement(_ValidationContext.default, null, /*#__PURE__*/_react2.default.createElement(TestComponent, {
             customErrors: CUSTOM_ERRORS
           })))), container = _render2.container;
-          expect(container.childNodes.length).toEqual(5);
+          expect(container.childNodes.length).toEqual(8);
           expect(container.textContent).toContain('addErrors is a function');
           expect(container.textContent).toContain('clearErrors is a function');
+          expect(container.textContent).toContain('enqueueErrors is a function');
+          expect(container.textContent).toContain('dequeueErrors is a function');
+          expect(container.textContent).toContain('clearQueuedErrors is a function');
           expect(container.textContent).toContain('validate.page is a function');
           expect(container.textContent).toContain('errors is an array of length 1');
-          errorSummary = container.childNodes[4];
+          errorSummary = container.childNodes[7];
           expect(errorSummary.tagName).toEqual('DIV');
           expect(errorSummary.classList).toContain('govuk-error-summary');
           expect(errorSummary.textContent).toContain(CUSTOM_ERRORS[0].error);
-        case 11:
+        case 14:
         case "end":
           return _context2.stop();
       }

package/dist/hooks/useRefData.js

@@ -29,7 +29,7 @@ var STATUS_COMPLETE = exports.STATUS_COMPLETE = 'complete';
 var getRefDataUrl = function getRefDataUrl(component) {
   // eslint-disable-next-line prefer-destructuring
   var data = component.data;
-  if (data && !data.options) {
+  if (data && !data.options || data !== null && data !== void 0 && data.url) {
     return _copReactComponents.Utils.interpolateString(data.url, component.formData);
   }
   return undefined;

package/dist/utils/CheckYourAnswers/showComponentCYA.js

@@ -9,10 +9,9 @@ var _Component = _interopRequireDefault(require("../Component"));
 var _Container = _interopRequireDefault(require("../Container"));
 var _getSourceData = _interopRequireDefault(require("../Data/getSourceData"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/* eslint-disable no-console */
 // Local imports
 
-var EXCLUDE_FROM_CYA = exports.EXCLUDE_FROM_CYA = [_models.ComponentTypes.ALERT, _models.ComponentTypes.COLLECTION_SUMMARY, _models.ComponentTypes.HEADING, _models.ComponentTypes.HTML, _models.ComponentTypes.INSET_TEXT];
+var EXCLUDE_FROM_CYA = exports.EXCLUDE_FROM_CYA = [_models.ComponentTypes.ALERT, _models.ComponentTypes.COLLECTION_SUMMARY, _models.ComponentTypes.DETAILS, _models.ComponentTypes.HEADING, _models.ComponentTypes.HTML, _models.ComponentTypes.INSET_TEXT];
 
 /**
  * Determines whether a given component should display on the Check your answers screen.

package/dist/utils/CheckYourAnswers/showComponentCYA.test.js

@@ -31,6 +31,11 @@ describe('utils', function () {
           type: _models.ComponentTypes.INSET_TEXT
         }, null)).toBeFalsy();
       });
+      it('should not show when it is a details type', function () {
+        expect((0, _showComponentCYA.default)({
+          type: _models.ComponentTypes.DETAILS
+        }, null)).toBeFalsy();
+      });
       it('should not show when it hidden and disabled', function () {
         expect((0, _showComponentCYA.default)({
           hidden: true,

package/dist/utils/CollectionPage/addCollectionPageEntry.js

@@ -17,7 +17,6 @@ exports.default = void 0;
  */
 var addCollectionPageEntry = function addCollectionPageEntry(collectionName, formData) {
   var fieldName = collectionName.split('.').pop();
-  formData["".concat(fieldName, "ActiveId")] = '0';
-  formData["".concat(fieldName, "NumberedIndex")] = Number(formData["".concat(fieldName, "ActiveId")]) + 1;
+  formData["".concat(fieldName, "ActiveId")] = null;
 };
 var _default = exports.default = addCollectionPageEntry;