@ukhomeoffice/cop-react-form-renderer 6.0.5-peter → 6.5.1-peter

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;

package/dist/utils/CollectionPage/addCollectionPageEntry.test.js

@@ -3,34 +3,14 @@
 var _addCollectionPageEntry = _interopRequireDefault(require("./addCollectionPageEntry"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 describe('Utils.CollectionPage.addCollectionPageEntry', function () {
-  it('should correctly add a new entry for a top-level collection', function () {
+  it('should set active ID as null for a top-level collection', function () {
     var FORM_DATA = {};
     (0, _addCollectionPageEntry.default)('testCollection', FORM_DATA);
-    expect(FORM_DATA.testCollectionActiveId).toBeTruthy();
+    expect(FORM_DATA.testCollectionActiveId).toBeFalsy();
   });
-  it('should correctly add a new entry for a nested collection', function () {
+  it('should set a active ID as null for a nested collection', function () {
     var FORM_DATA = {};
     (0, _addCollectionPageEntry.default)('parent.child.grandchild', FORM_DATA);
-    expect(FORM_DATA.grandchildActiveId).toBeTruthy();
-  });
-  it('should correctly set the active ID for a top-level collection', function () {
-    var FORM_DATA = {};
-    (0, _addCollectionPageEntry.default)('testCollection', FORM_DATA);
-    expect(FORM_DATA.testCollectionActiveId).toBe('0');
-  });
-  it('should correctly set the active ID for a nested collection', function () {
-    var FORM_DATA = {};
-    (0, _addCollectionPageEntry.default)('parent.child.grandchild', FORM_DATA);
-    expect(FORM_DATA.grandchildActiveId).toBe('0');
-  });
-  it('should correctly increment the numbered index for a top-level collection', function () {
-    var FORM_DATA = {};
-    (0, _addCollectionPageEntry.default)('testCollection', FORM_DATA);
-    expect(FORM_DATA.testCollectionNumberedIndex).toBe(1);
-  });
-  it('should correctly increment the numbered index for a nested collection', function () {
-    var FORM_DATA = {};
-    (0, _addCollectionPageEntry.default)('parent.child.grandchild', FORM_DATA);
-    expect(FORM_DATA.grandchildNumberedIndex).toBe(1);
+    expect(FORM_DATA.grandchildActiveId).toBeFalsy();
   });
 });

package/dist/utils/CollectionPage/duplicateCollectionPageEntry.js

@@ -12,8 +12,20 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+/**
+ * Duplicates an entry with the given ID in the given collection, optionally
+ * ignoring named fields or adding extras to the duplicate if they're provided.
+ * 
+ * @param {string} collectionName The name of the collection the entry to duplicate is in.
+ * @param {object} formData The top-level formData object.
+ * @param {string} entryId The ID of the entry to duplicate.
+ * @param {array} fieldsToIgnore An array of field names that shouldn't be copied to the duplicate.
+ * @param {object} fieldsToAdd An object that will be spread to the new entry.
+ * @returns The ID of the duplicate entry.
+ */
 var duplicateCollectionPageEntry = function duplicateCollectionPageEntry(collectionName, formData, entryId) {
   var fieldsToIgnore = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var fieldsToAdd = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var collectionData = (0, _getCollectionPageData.default)(collectionName, formData);
   var entryToDuplicate = collectionData === null || collectionData === void 0 ? void 0 : collectionData.find(function (entry) {
     return entry.id === entryId;
@@ -22,7 +34,7 @@ var duplicateCollectionPageEntry = function duplicateCollectionPageEntry(collect
     return null;
   }
   var newEntryId = Date.now().toString();
-  var newEntry = _objectSpread(_objectSpread({}, entryToDuplicate), {}, {
+  var newEntry = _objectSpread(_objectSpread(_objectSpread({}, entryToDuplicate), fieldsToAdd), {}, {
     id: newEntryId
   });
   fieldsToIgnore.forEach(function (field) {

package/dist/utils/CollectionPage/duplicateCollectionPageEntry.test.js

@@ -65,10 +65,25 @@ describe('utils.CollectionPage.duplicateCollectionPageEntry', function () {
     expect(FORM_DATA[COLLECTION_NAME][1].id).toBeTruthy();
     expect(FORM_DATA[COLLECTION_NAME][1].value).toBeUndefined();
   });
-  it('should do nothing if an entry with the given id does not exist', function () {
-    var _FORM_DATA3, _expect$toEqual;
+  it('should add fields from the fieldsToAdd object', function () {
+    var _FORM_DATA3;
     var FORM_DATA = (_FORM_DATA3 = {}, _defineProperty(_FORM_DATA3, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA3, COLLECTION_NAME, [OBJ]), _FORM_DATA3);
     ;
+    var FIELDS_TO_ADD = {
+      addedKey: 'addedValue'
+    };
+    (0, _duplicateCollectionPageEntry.default)(COLLECTION_NAME, FORM_DATA, '1', [], FIELDS_TO_ADD);
+    expect(FORM_DATA[COLLECTION_NAME].length).toEqual(2);
+    expect(FORM_DATA[COLLECTION_NAME][0].id).toBeTruthy();
+    expect(FORM_DATA[COLLECTION_NAME][0].value).toBeTruthy();
+    expect(FORM_DATA[COLLECTION_NAME][1].id).toBeTruthy();
+    expect(FORM_DATA[COLLECTION_NAME][1].value).toBeTruthy();
+    expect(FORM_DATA[COLLECTION_NAME][1].addedKey).toEqual('addedValue');
+  });
+  it('should do nothing if an entry with the given id does not exist', function () {
+    var _FORM_DATA4, _expect$toEqual;
+    var FORM_DATA = (_FORM_DATA4 = {}, _defineProperty(_FORM_DATA4, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA4, COLLECTION_NAME, [OBJ]), _FORM_DATA4);
+    ;
     (0, _duplicateCollectionPageEntry.default)(COLLECTION_NAME, FORM_DATA, '0');
     expect(FORM_DATA).toEqual((_expect$toEqual = {}, _defineProperty(_expect$toEqual, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_expect$toEqual, COLLECTION_NAME, [OBJ]), _expect$toEqual));
   });

package/dist/utils/CollectionPage/getErrorsForCollection.js

@@ -0,0 +1,55 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _ = _interopRequireDefault(require(".."));
+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; }
+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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var getErrorsForCollection = function getErrorsForCollection(config, masterPage, formData, hooks) {
+  var activeIds = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  if (!masterPage) {
+    return [];
+  }
+  // Get data for current collection
+  var collectionData = _.default.CollectionPage.getData(masterPage.collection.name, masterPage.formData) || [];
+  var allErrors = [];
+
+  // Loop over each entry in the collection data
+  collectionData.forEach(function (entry) {
+    var _masterPage$childPage;
+    // eslint-disable-next-line no-param-reassign
+    activeIds = _objectSpread(_objectSpread({}, activeIds), {}, _defineProperty({}, "".concat(masterPage.collection.name.split('.').pop(), "ActiveId"), entry.id));
+
+    // Loop over child pages and validate each one
+    var allPagesErrors = (_masterPage$childPage = masterPage.childPages) === null || _masterPage$childPage === void 0 ? void 0 : _masterPage$childPage.flatMap(function (page) {
+      var pageWithIds = _objectSpread(_objectSpread({}, page), {}, {
+        formData: _objectSpread(_objectSpread({}, formData), activeIds)
+      });
+
+      // Handle nested collections
+      if (page.childPages) {
+        return getErrorsForCollection(config, pageWithIds, formData, hooks, activeIds);
+      }
+      var pageErrors = _.default.Validate.page(pageWithIds);
+      return hooks.onValidate(pageWithIds, pageErrors);
+    });
+
+    // For each error add the entryId so we know what Summary Card we have to pass it to.
+    allErrors = allErrors.concat(allPagesErrors.map(function (e) {
+      return _objectSpread(_objectSpread({}, e), {}, {
+        entryId: entry.id,
+        showFor: config.id,
+        raisedBy: config.id
+      });
+    }));
+  });
+  return allErrors;
+};
+var _default = exports.default = getErrorsForCollection;

package/dist/utils/CollectionPage/getErrorsForCollection.test.js

@@ -0,0 +1,155 @@
+"use strict";
+
+var _getErrorsForCollection = _interopRequireDefault(require("./getErrorsForCollection"));
+var _models = require("../../models");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+describe('Utils.CollectionPage.getErrorsForCollection', function () {
+  var HOOKS = {
+    onValidate: function onValidate(_, errors) {
+      return errors;
+    }
+  };
+  var CONFIG = {
+    id: 'testId'
+  };
+  var FORM_DATA = {
+    collection: [{
+      id: 22,
+      item1: 'blue',
+      child: [{
+        id: 11,
+        item4: 'red'
+      }]
+    }]
+  };
+  var FORM_DATA_MISSING_TOP = {
+    collection: [{
+      id: 22,
+      item2: 'blue',
+      child: [{
+        id: 11,
+        item4: 'red'
+      }]
+    }]
+  };
+  var FORM_DATA_MISSING_NESTED = {
+    collection: [{
+      id: 22,
+      item1: 'blue',
+      child: [{
+        id: 11,
+        item9: 'red'
+      }]
+    }]
+  };
+  var FORM_DATA_MISSING_BOTH = {
+    collection: [{
+      id: 22,
+      item9: 'blue',
+      child: [{
+        id: 11,
+        item9: 'red'
+      }]
+    }]
+  };
+  var MASTER_PAGE = {
+    id: 'masterPage',
+    collection: {
+      name: 'collection',
+      masterPage: true
+    },
+    formData: FORM_DATA,
+    childPages: [{
+      id: 'page1',
+      collection: {
+        name: 'collection'
+      },
+      formData: FORM_DATA,
+      components: [{
+        id: 'item1',
+        fieldId: 'item1',
+        label: 'Item 1',
+        required: true,
+        type: _models.ComponentTypes.TEXT
+      }, {
+        id: 'item2',
+        fieldId: 'item2',
+        label: 'Item 2',
+        type: _models.ComponentTypes.TEXT
+      }]
+    }]
+  };
+  var MASTER_PAGE_WITH_NESTED = {
+    id: 'masterPage',
+    collection: {
+      name: 'collection',
+      masterPage: true
+    },
+    formData: FORM_DATA,
+    childPages: [{
+      id: 'page1',
+      collection: {
+        name: 'collection'
+      },
+      formData: FORM_DATA,
+      components: [{
+        id: 'item1',
+        fieldId: 'item1',
+        label: 'Item 1',
+        required: true,
+        type: _models.ComponentTypes.TEXT
+      }, {
+        id: 'item2',
+        fieldId: 'item2',
+        label: 'Item 2',
+        type: _models.ComponentTypes.TEXT
+      }]
+    }, {
+      id: 'page2',
+      formData: FORM_DATA,
+      collection: {
+        name: 'collection.child',
+        masterPage: true
+      },
+      childPages: [{
+        id: 'nestedPage',
+        formData: FORM_DATA,
+        collection: {
+          name: 'collection.child'
+        },
+        components: [{
+          id: 'item4',
+          fieldId: 'item4',
+          label: 'Item 4',
+          required: true,
+          type: _models.ComponentTypes.TEXT
+        }, {
+          id: 'item5',
+          fieldId: 'item5',
+          label: 'Item 5',
+          type: _models.ComponentTypes.TEXT
+        }]
+      }]
+    }]
+  };
+  it('should return nothing for a master page without errors', function () {
+    var errors = (0, _getErrorsForCollection.default)(CONFIG, MASTER_PAGE, FORM_DATA, HOOKS);
+    expect(errors.length).toEqual(0);
+  });
+  it('should return erorrs for a master page with errors', function () {
+    var errors = (0, _getErrorsForCollection.default)(CONFIG, MASTER_PAGE, FORM_DATA_MISSING_TOP, HOOKS);
+    expect(errors.length).toEqual(1);
+  });
+  it('should return nothing for a master page with a nested master page without errors', function () {
+    var errors = (0, _getErrorsForCollection.default)(CONFIG, MASTER_PAGE_WITH_NESTED, FORM_DATA, HOOKS);
+    expect(errors.length).toEqual(0);
+  });
+  it('should return errors for a master page with a nested master page without errors', function () {
+    var errors = (0, _getErrorsForCollection.default)(CONFIG, MASTER_PAGE_WITH_NESTED, FORM_DATA_MISSING_NESTED, HOOKS);
+    expect(errors.length).toEqual(1);
+  });
+  it('should return errors for a master page with errors with a nested master page with errors', function () {
+    var errors = (0, _getErrorsForCollection.default)(CONFIG, MASTER_PAGE_WITH_NESTED, FORM_DATA_MISSING_BOTH, HOOKS);
+    expect(errors.length).toEqual(2);
+  });
+});

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/CollectionPage/index.js

@@ -10,6 +10,7 @@ var _duplicateCollectionPageEntry = _interopRequireDefault(require("./duplicateC
 var _getCollectionPageActiveId = _interopRequireDefault(require("./getCollectionPageActiveId"));
 var _getCollectionPageActiveIndex = _interopRequireDefault(require("./getCollectionPageActiveIndex"));
 var _getCollectionPageData = _interopRequireDefault(require("./getCollectionPageData"));
+var _getErrorsForCollection = _interopRequireDefault(require("./getErrorsForCollection"));
 var _mergeCollectionPages = _interopRequireDefault(require("./mergeCollectionPages"));
 var _removeCollectionPageEntry = _interopRequireDefault(require("./removeCollectionPageEntry"));
 var _setCollectionPageData = _interopRequireDefault(require("./setCollectionPageData"));
@@ -23,6 +24,7 @@ var CollectionPage = {
   getActiveId: _getCollectionPageActiveId.default,
   getActiveIndex: _getCollectionPageActiveIndex.default,
   getData: _getCollectionPageData.default,
+  getErrorsForCollection: _getErrorsForCollection.default,
   mergePages: _mergeCollectionPages.default,
   removeEntry: _removeCollectionPageEntry.default,
   setData: _setCollectionPageData.default

package/dist/utils/CollectionPage/setCollectionPageData.js

@@ -28,15 +28,20 @@ var setCollectionPageData = function setCollectionPageData(collectionName, newDa
   var data = formData;
   nameParts.some(function (name) {
     var _data$name;
-    // Current collection doesn't exist, so create it,
-    // add an entry and set the active id.
+    // Current collection doesn't exist, so create it
     if (!data[name]) {
+      data[name] = [];
+    }
+    // If the entry matching the active ID doesn't exist in the collection, create it. 
+    if (!data[name].find(function (e) {
+      return e.id === formData["".concat(name, "ActiveId")];
+    })) {
       var newEntryId = Date.now().toString();
       // eslint-disable-next-line no-param-reassign
       formData["".concat(name, "ActiveId")] = formData["".concat(name, "ActiveId")] || newEntryId;
-      data[name] = [{
+      data[name].push({
         id: formData["".concat(name, "ActiveId")]
-      }];
+      });
     }
     // We're at the target collection's level, so 
     // set the new data.

package/dist/utils/CollectionPage/setCollectionPageData.test.js

@@ -160,4 +160,22 @@ describe('Utils.CollectionPage.setCollectionPageData', function () {
       value: 'newValue'
     });
   });
+  it('creates a new entry and updates active ID if no matching active ID is found', function () {
+    var formData = {};
+    var collectionName = 'testCollection';
+    var newData = [{
+      id: 'dataId',
+      value: 'testValue'
+    }];
+    (0, _setCollectionPageData.default)(collectionName, newData, formData);
+
+    // Check if formData has been updated
+    expect(formData["".concat(collectionName, "ActiveId")]).toBeDefined();
+
+    // Check if the new entry was added to the collection
+    expect(formData[collectionName]).toBeDefined();
+    expect(formData[collectionName].length).toBe(1);
+    expect(formData[collectionName][0].id).toBe(newData[0].id);
+    expect(formData[collectionName][0]).toEqual(expect.objectContaining(newData[0]));
+  });
 });

package/dist/utils/Component/isEditable.js

@@ -7,7 +7,7 @@ exports.default = exports.EDITABLE_TYPES = void 0;
 var _models = require("../../models");
 // Local imports
 
-var EDITABLE_TYPES = exports.EDITABLE_TYPES = [_models.ComponentTypes.AUTOCOMPLETE, _models.ComponentTypes.CALCULATION, _models.ComponentTypes.CHECKBOXES, _models.ComponentTypes.DATE, _models.ComponentTypes.EMAIL, _models.ComponentTypes.FILE, _models.ComponentTypes.MULTI_FILE, _models.ComponentTypes.PHONE_NUMBER, _models.ComponentTypes.RADIOS, _models.ComponentTypes.SELECT, _models.ComponentTypes.TEXT, _models.ComponentTypes.TEXT_AREA, _models.ComponentTypes.TIME];
+var EDITABLE_TYPES = exports.EDITABLE_TYPES = [_models.ComponentTypes.AUTOCOMPLETE, _models.ComponentTypes.CALCULATION, _models.ComponentTypes.CHECKBOXES, _models.ComponentTypes.COLLECTION_SUMMARY, _models.ComponentTypes.DATE, _models.ComponentTypes.EMAIL, _models.ComponentTypes.FILE, _models.ComponentTypes.MULTI_FILE, _models.ComponentTypes.PHONE_NUMBER, _models.ComponentTypes.RADIOS, _models.ComponentTypes.SELECT, _models.ComponentTypes.TEXT, _models.ComponentTypes.TEXT_AREA, _models.ComponentTypes.TIME];
 var isEditable = function isEditable(options) {
   return EDITABLE_TYPES.includes(options === null || options === void 0 ? void 0 : options.type) || (options === null || options === void 0 ? void 0 : options.isEditable) || false;
 };

package/dist/utils/Condition/meetsAllConditions.js

@@ -4,10 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _Data = _interopRequireDefault(require("../Data"));
 var _meetsCondition = _interopRequireDefault(require("./meetsCondition"));
 var _setupConditions = _interopRequireDefault(require("./setupConditions"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// Global imports
+
 // Local imports
 
 var testConditions = function testConditions(conditions, data) {
@@ -17,7 +20,8 @@ var testConditions = function testConditions(conditions, data) {
     if (Array.isArray(condition.conditions)) {
       return testConditions(condition.conditions, data, condition.type);
     }
-    var sourceDataValue = _Data.default.getSource(data, condition.field);
+    var field = condition.field.startsWith('interpolate::') ? _copReactComponents.Utils.interpolateString(condition.field, data).replace('interpolate::', '') : condition.field;
+    var sourceDataValue = _Data.default.getSource(data, field);
     return (0, _meetsCondition.default)(condition, sourceDataValue, data);
   };
   return type === 'and' ? arr.every(testCallback) : arr.some(testCallback);