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

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,13 +34,21 @@ 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) {
     return delete newEntry[field];
   });
-  collectionData.push(newEntry);
+  var insertionIndex = collectionData.findIndex(function (entry) {
+    return entry.id === entryId;
+  }) + 1;
+  if (insertionIndex === -1) {
+    collectionData.push(newEntry);
+  } else {
+    collectionData.splice(insertionIndex, 0, newEntry);
+  }
+
   // eslint-disable-next-line no-param-reassign
   formData["".concat(collectionName.split('.').pop(), "ActiveId")] = newEntry.id;
   return newEntryId;

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

@@ -24,6 +24,26 @@ describe('utils.CollectionPage.duplicateCollectionPageEntry', function () {
     expect(FORM_DATA["".concat(COLLECTION_NAME, "ActiveId")]).toBeTruthy();
     expect(FORM_DATA["".concat(COLLECTION_NAME, "ActiveId")] === '1').toBeFalsy();
   });
+  it('should put the new entry under the original one', function () {
+    var _FORM_DATA2;
+    var FORM_DATA = (_FORM_DATA2 = {}, _defineProperty(_FORM_DATA2, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA2, COLLECTION_NAME, [{
+      id: '1',
+      value: 'value1'
+    }, {
+      id: '2',
+      value: 'value2'
+    }, {
+      id: '3',
+      value: 'value1'
+    }]), _FORM_DATA2);
+    (0, _duplicateCollectionPageEntry.default)(COLLECTION_NAME, FORM_DATA, '1');
+    expect(FORM_DATA[COLLECTION_NAME].length).toEqual(4);
+    expect(FORM_DATA[COLLECTION_NAME][1].value).toEqual(FORM_DATA[COLLECTION_NAME][0].value);
+    expect(FORM_DATA[COLLECTION_NAME][1].id).toBeTruthy();
+    expect(FORM_DATA[COLLECTION_NAME][1].id === '1').toBeFalsy();
+    expect(FORM_DATA["".concat(COLLECTION_NAME, "ActiveId")]).toBeTruthy();
+    expect(FORM_DATA["".concat(COLLECTION_NAME, "ActiveId")] === '1').toBeFalsy();
+  });
   it('should duplicate entries in nested collections correctly', function () {
     var FORM_DATA = {
       parentsActiveId: '2',
@@ -54,8 +74,8 @@ describe('utils.CollectionPage.duplicateCollectionPageEntry', function () {
     expect((0, _getCollectionPageActiveId.default)('parents.children', FORM_DATA) === '2').toBeFalsy();
   });
   it('should ignore fields in the fieldToIgnore array', function () {
-    var _FORM_DATA2;
-    var FORM_DATA = (_FORM_DATA2 = {}, _defineProperty(_FORM_DATA2, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA2, COLLECTION_NAME, [OBJ]), _FORM_DATA2);
+    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_IGNORE = ['value'];
     (0, _duplicateCollectionPageEntry.default)(COLLECTION_NAME, FORM_DATA, '1', FIELDS_TO_IGNORE);
@@ -65,9 +85,24 @@ describe('utils.CollectionPage.duplicateCollectionPageEntry', function () {
     expect(FORM_DATA[COLLECTION_NAME][1].id).toBeTruthy();
     expect(FORM_DATA[COLLECTION_NAME][1].value).toBeUndefined();
   });
+  it('should add fields from the fieldsToAdd object', function () {
+    var _FORM_DATA4;
+    var FORM_DATA = (_FORM_DATA4 = {}, _defineProperty(_FORM_DATA4, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA4, COLLECTION_NAME, [OBJ]), _FORM_DATA4);
+    ;
+    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_DATA3, _expect$toEqual;
-    var FORM_DATA = (_FORM_DATA3 = {}, _defineProperty(_FORM_DATA3, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA3, COLLECTION_NAME, [OBJ]), _FORM_DATA3);
+    var _FORM_DATA5, _expect$toEqual;
+    var FORM_DATA = (_FORM_DATA5 = {}, _defineProperty(_FORM_DATA5, "".concat(COLLECTION_NAME, "ActiveId"), '1'), _defineProperty(_FORM_DATA5, COLLECTION_NAME, [OBJ]), _FORM_DATA5);
     ;
     (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; }
@@ -47,16 +50,17 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * editable or not. 
  * 
  * @param {object} masterPage The master page for the collection.
+ * @param {object} formData The top-level formData object.
  * @param {object} entryData The data for the current collection entry.
  * @returns Page suitble for rendering in a QuickEdit
  */
-var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
+var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData) {
   if (!masterPage) {
     return null;
   }
   var fullComponents = [];
   masterPage.childPages.forEach(function (page) {
-    if (!page.summaryQuickEdit || !(0, _showFormPage.default)(page, _objectSpread(_objectSpread({}, page.formData), entryData))) {
+    if (!page.summaryQuickEdit || !(0, _showFormPage.default)(page, _objectSpread(_objectSpread({}, formData), entryData))) {
       return;
     }
     page.summaryQuickEdit.forEach(function (quickEditComponent) {
@@ -78,7 +82,7 @@ var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
       // that as a specific test for when the component should be quick
       // editable - it doesn't get spread to the merged object.
       if (quickEditComponent.show_when) {
-        if ((0, _meetsAllConditions.default)(quickEditComponent.show_when, _objectSpread(_objectSpread({}, page.formData), entryData))) {
+        if ((0, _meetsAllConditions.default)(quickEditComponent.show_when, _objectSpread(_objectSpread({}, formData), entryData))) {
           fullComponents.push(_objectSpread(_objectSpread({}, mergedComponent), {}, {
             show_when: originalComponent.show_when || []
           }));
@@ -90,7 +94,9 @@ var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
   });
 
   // Put components and actions onto page object
-  var pageToReturn = _objectSpread({}, masterPage.childPages[0]);
+  var pageToReturn = _objectSpread(_objectSpread({}, masterPage.childPages[0]), {}, {
+    formData: formData
+  });
   pageToReturn.components = fullComponents;
   pageToReturn.actions = [{
     type: 'save',
@@ -104,7 +110,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/getQuickEditPage.test.js

@@ -9,6 +9,15 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 describe('Utils.CollectionPage.getQuickEditPage', function () {
+  var FORM_DATA = {
+    items: [{
+      id: '123',
+      testText1: 'value 1',
+      testText2: 'value 2',
+      conditionText: 'true',
+      testText3: 'value 3'
+    }]
+  };
   var MASTER_PAGE = {
     childPages: [{
       id: 'firstPage',
@@ -44,15 +53,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
         fieldId: 'testText2',
         required: true
       }],
-      formData: {
-        items: [{
-          id: '123',
-          testText1: 'value 1',
-          testText2: 'value 2',
-          conditionText: 'true',
-          testText3: 'value 3'
-        }]
-      },
+      formData: FORM_DATA,
       summaryQuickEdit: [{
         use: "testText2",
         show_when: {
@@ -69,15 +70,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
         fieldId: 'testText3',
         required: true
       }],
-      formData: {
-        items: [{
-          id: '123',
-          testText1: 'value 1',
-          testText2: 'value 2',
-          conditionText: 'true',
-          testText3: 'value 3'
-        }]
-      },
+      formData: FORM_DATA,
       summaryQuickEdit: ["testText3"]
     }]
   };
@@ -103,15 +96,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
       fieldId: 'testText3',
       required: true
     }],
-    formData: {
-      items: [{
-        id: '123',
-        testText1: 'value 1',
-        testText2: 'value 2',
-        conditionText: 'true',
-        testText3: 'value 3'
-      }]
-    },
+    formData: FORM_DATA,
     actions: [{
       type: 'save',
       label: 'Save',
@@ -131,7 +116,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
     testText3: 'value 3'
   };
   it('should return a quick edit page', function () {
-    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, ENTRY_DATA);
+    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, ENTRY_DATA);
     expect(createdPage).toMatchObject(EXPECTED_OUTPUT);
   });
   it('should return a quick edit page without components that fail the quick edit show_when', function () {
@@ -144,7 +129,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
     var CUSTOM_ENTRY_DATA = _objectSpread(_objectSpread({}, ENTRY_DATA), {}, {
       conditionText: 'false'
     });
-    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, CUSTOM_ENTRY_DATA);
+    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, CUSTOM_ENTRY_DATA);
     expect(createdPage).toMatchObject(CUSTOM_OUTPUT);
   });
 });

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/mergeCollectionPages.js

@@ -32,7 +32,6 @@ var createMasterPage = function createMasterPage(page) {
   return {
     id: page.id,
     name: page.name,
-    deleteCollectionWhenHidden: page.deleteCollectionWhenHidden,
     collection: _objectSpread({
       masterPage: true
     }, page.collection),

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/meetsCondition.js

@@ -108,6 +108,24 @@ var meetsCondition = function meetsCondition(condition, value, data) {
           }
           return true;
         }
+      case 'includesObjectProp':
+        {
+          if (Array.isArray(value)) {
+            return value.some(function (v) {
+              return v[condition.key] === compare;
+            });
+          }
+          return false;
+        }
+      case '!includesObjectProp':
+        {
+          if (Array.isArray(value)) {
+            return !value.some(function (v) {
+              return v[condition.key] === compare;
+            });
+          }
+          return true;
+        }
       case 'includesAllOf':
         {
           if (Array.isArray(value)) {