@ukhomeoffice/cop-react-form-renderer 5.89.0 → 5.90.1

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

@@ -1,14 +1,14 @@
 "use strict";
 
 var _getCollectionPageActiveIndex = _interopRequireDefault(require("./getCollectionPageActiveIndex"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Local imports
 
-describe('utils.CollectionPage.getCollectionPageActiveIndex', function () {
-  it('should return the index of the active item in the collection, if one exists', function () {
-    var COLLECTION_NAME = 'test';
-    var ACTIVE_ID = '002';
-    var FORM_DATA = {
+describe('utils.CollectionPage.getCollectionPageActiveIndex', () => {
+  it('should return the index of the active item in the collection, if one exists', () => {
+    const COLLECTION_NAME = 'test';
+    const ACTIVE_ID = '002';
+    const FORM_DATA = {
       testActiveId: ACTIVE_ID,
       test: [{
         id: '001'
@@ -16,7 +16,7 @@ describe('utils.CollectionPage.getCollectionPageActiveIndex', function () {
         id: '002'
       }]
     };
-    var PAGE = {
+    const PAGE = {
       collection: {
         name: COLLECTION_NAME
       },
@@ -24,10 +24,10 @@ describe('utils.CollectionPage.getCollectionPageActiveIndex', function () {
     };
     expect((0, _getCollectionPageActiveIndex.default)(PAGE.collection.name, PAGE.formData)).toEqual(1);
   });
-  it('should return the index of the active item in the nested collection, if one exists', function () {
-    var COLLECTION_NAME = 'parent.child';
-    var ACTIVE_ID = '001';
-    var FORM_DATA = {
+  it('should return the index of the active item in the nested collection, if one exists', () => {
+    const COLLECTION_NAME = 'parent.child';
+    const ACTIVE_ID = '001';
+    const FORM_DATA = {
       parentActiveId: '001',
       childActiveId: ACTIVE_ID,
       parent: [{
@@ -42,16 +42,16 @@ describe('utils.CollectionPage.getCollectionPageActiveIndex', function () {
     };
     expect((0, _getCollectionPageActiveIndex.default)(COLLECTION_NAME, FORM_DATA)).toEqual(0);
   });
-  it('should return null if no active item can be found in the collection', function () {
-    var COLLECTION_NAME = 'test';
-    var ACTIVE_ID = '002';
-    var FORM_DATA = {
+  it('should return null if no active item can be found in the collection', () => {
+    const COLLECTION_NAME = 'test';
+    const ACTIVE_ID = '002';
+    const FORM_DATA = {
       testActiveId: ACTIVE_ID,
       test: [{
         id: '001'
       }]
     };
-    var PAGE = {
+    const PAGE = {
       collection: {
         name: COLLECTION_NAME
       },
@@ -59,10 +59,10 @@ describe('utils.CollectionPage.getCollectionPageActiveIndex', function () {
     };
     expect((0, _getCollectionPageActiveIndex.default)(PAGE.collection.name, PAGE.formData)).toEqual(null);
   });
-  it('should return null if no active item can be found in the nested collection', function () {
-    var COLLECTION_NAME = 'parent.child';
-    var ACTIVE_ID = '002';
-    var FORM_DATA = {
+  it('should return null if no active item can be found in the nested collection', () => {
+    const COLLECTION_NAME = 'parent.child';
+    const ACTIVE_ID = '002';
+    const FORM_DATA = {
       parentActiveId: '001',
       childActiveId: ACTIVE_ID,
       parent: [{
@@ -75,9 +75,9 @@ describe('utils.CollectionPage.getCollectionPageActiveIndex', function () {
     };
     expect((0, _getCollectionPageActiveIndex.default)(COLLECTION_NAME, FORM_DATA)).toEqual(null);
   });
-  it('should return null if formData is null', function () {
-    var COLLECTION_NAME = 'test';
-    var PAGE = {
+  it('should return null if formData is null', () => {
+    const COLLECTION_NAME = 'test';
+    const PAGE = {
       collection: {
         name: COLLECTION_NAME
       }

package/dist/utils/CollectionPage/getCollectionPageData.js

@@ -4,26 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var isValidIndex = function isValidIndex(value) {
-  return typeof value === 'number' && value >= 0;
-};
-var getLastDataInChain = function getLastDataInChain(collectionNames, data, formData) {
-  var _data$currentName;
-  var currentName = collectionNames[0];
+const isValidIndex = value => typeof value === 'number' && value >= 0;
+const getLastDataInChain = (collectionNames, data, formData) => {
+  const currentName = collectionNames[0];
   // If we're at the last collection in the chain, then just
   // try and grab its data.
   if (collectionNames.length === 1) {
     return data[currentName] || null;
   }
-  var activeId = (formData === null || formData === void 0 ? void 0 : formData["".concat(currentName, "ActiveId")]) || null;
+  const activeId = formData?.[`${currentName}ActiveId`] || null;
   // No active ID for the current collection - the chain
   // has been broken!
   if (!activeId) {
     return null;
   }
-  var activeIndex = (_data$currentName = data[currentName]) === null || _data$currentName === void 0 ? void 0 : _data$currentName.findIndex(function (item) {
-    return item.id === activeId;
-  });
+  const activeIndex = data[currentName]?.findIndex(item => item.id === activeId);
   // No entry that matches the active ID - the chain
   // has been broken!
   if (!isValidIndex(activeIndex)) {
@@ -48,9 +43,9 @@ var getLastDataInChain = function getLastDataInChain(collectionNames, data, form
  * @param {object} data The top level formData object.
  * @returns The active index for the collection, or null if it doesn't exist.
  */
-var getCollectionPageData = function getCollectionPageData(collectionName, formData) {
-  var nameParts = collectionName.split('.');
-  var result = getLastDataInChain(nameParts, formData, formData);
+const getCollectionPageData = (collectionName, formData) => {
+  const nameParts = collectionName.split('.');
+  const result = getLastDataInChain(nameParts, formData, formData);
   return result;
 };
 var _default = exports.default = getCollectionPageData;

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

@@ -1,15 +1,15 @@
 "use strict";
 
 var _getCollectionPageData = _interopRequireDefault(require("./getCollectionPageData"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('utils.CollectionPage.getCollectionPageData', function () {
-  it('should return null if the collection does not exist', function () {
-    var data = (0, _getCollectionPageData.default)('testCollection', {});
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('utils.CollectionPage.getCollectionPageData', () => {
+  it('should return null if the collection does not exist', () => {
+    const data = (0, _getCollectionPageData.default)('testCollection', {});
     expect(data).toEqual(null);
   });
-  describe('when failing to retrieve a nested collection', function () {
-    it('should return null if a parent collection does not exist', function () {
-      var FORM_DATA = {
+  describe('when failing to retrieve a nested collection', () => {
+    it('should return null if a parent collection does not exist', () => {
+      const FORM_DATA = {
         parentsActiveId: '1',
         childrenActiveId: '1',
         grandchildrenActiveId: '1',
@@ -24,11 +24,11 @@ describe('utils.CollectionPage.getCollectionPageData', function () {
           }]
         }]
       };
-      var data = (0, _getCollectionPageData.default)('parents.chainbreak.grandchildren', FORM_DATA);
+      const data = (0, _getCollectionPageData.default)('parents.chainbreak.grandchildren', FORM_DATA);
       expect(data).toEqual(null);
     });
-    it('should return null if there is no active entry in a parent collection', function () {
-      var FORM_DATA = {
+    it('should return null if there is no active entry in a parent collection', () => {
+      const FORM_DATA = {
         parentsActiveId: '1',
         grandchildrenActiveId: '1',
         parents: [{
@@ -42,11 +42,11 @@ describe('utils.CollectionPage.getCollectionPageData', function () {
           }]
         }]
       };
-      var data = (0, _getCollectionPageData.default)('parents.children.grandchildren', FORM_DATA);
+      const data = (0, _getCollectionPageData.default)('parents.children.grandchildren', FORM_DATA);
       expect(data).toEqual(null);
     });
-    it('should return null if the target collection does not exist', function () {
-      var FORM_DATA = {
+    it('should return null if the target collection does not exist', () => {
+      const FORM_DATA = {
         parentsActiveId: '1',
         grandchildrenActiveId: '1',
         parents: [{
@@ -56,18 +56,18 @@ describe('utils.CollectionPage.getCollectionPageData', function () {
           }]
         }]
       };
-      var data = (0, _getCollectionPageData.default)('parents.children.grandchildren', FORM_DATA);
+      const data = (0, _getCollectionPageData.default)('parents.children.grandchildren', FORM_DATA);
       expect(data).toEqual(null);
     });
   });
-  it('should get data for top-level collections correctly', function () {
-    var FORM_DATA = {
+  it('should get data for top-level collections correctly', () => {
+    const FORM_DATA = {
       testCollection: [{
         id: '1',
         value: 'Alpha'
       }]
     };
-    var data = (0, _getCollectionPageData.default)('testCollection', FORM_DATA);
+    const data = (0, _getCollectionPageData.default)('testCollection', FORM_DATA);
     expect(Array.isArray(data)).toBeTruthy();
     expect(data.length).toEqual(1);
     expect(data[0]).toMatchObject({
@@ -75,8 +75,8 @@ describe('utils.CollectionPage.getCollectionPageData', function () {
       value: 'Alpha'
     });
   });
-  it('should get data for nested collections correctly', function () {
-    var FORM_DATA = {
+  it('should get data for nested collections correctly', () => {
+    const FORM_DATA = {
       parentsActiveId: '1',
       childrenActiveId: '1',
       grandchildrenActiveId: '1',
@@ -91,7 +91,7 @@ describe('utils.CollectionPage.getCollectionPageData', function () {
         }]
       }]
     };
-    var data = (0, _getCollectionPageData.default)('parents.children.grandchildren', FORM_DATA);
+    const data = (0, _getCollectionPageData.default)('parents.children.grandchildren', FORM_DATA);
     expect(Array.isArray(data)).toBeTruthy();
     expect(data.length).toEqual(1);
     expect(data[0]).toMatchObject({

package/dist/utils/CollectionPage/getErrorsForCollection.js

@@ -5,50 +5,49 @@ Object.defineProperty(exports, "__esModule", {
 });
 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] : {};
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const getErrorsForCollection = function (config, masterPage, formData, hooks) {
+  let 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 = [];
+  const collectionData = _.default.CollectionPage.getData(masterPage.collection.name, masterPage.formData) || [];
+  let allErrors = [];
 
   // Loop over each entry in the collection data
-  collectionData.forEach(function (entry) {
-    var _masterPage$childPage;
+  collectionData.forEach(entry => {
     // eslint-disable-next-line no-param-reassign
-    activeIds = _objectSpread(_objectSpread({}, activeIds), {}, _defineProperty({}, "".concat(masterPage.collection.name.split('.').pop(), "ActiveId"), entry.id));
+    activeIds = {
+      ...activeIds,
+      [`${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)
-      });
+    const allPagesErrors = masterPage.childPages?.flatMap(page => {
+      const pageWithIds = {
+        ...page,
+        formData: {
+          ...formData,
+          ...activeIds
+        }
+      };
 
       // Handle nested collections
       if (page.childPages) {
         return getErrorsForCollection(config, pageWithIds, formData, hooks, activeIds);
       }
-      var pageErrors = _.default.Validate.page(pageWithIds);
+      const 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
-      });
-    }));
+    allErrors = allErrors.concat(allPagesErrors.map(e => ({
+      ...e,
+      entryId: entry.id,
+      showFor: config.id,
+      raisedBy: config.id
+    })));
   });
   return allErrors;
 };

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

@@ -2,17 +2,15 @@
 
 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;
-    }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('Utils.CollectionPage.getErrorsForCollection', () => {
+  const HOOKS = {
+    onValidate: (_, errors) => errors
   };
-  var CONFIG = {
+  const CONFIG = {
     id: 'testId'
   };
-  var FORM_DATA = {
+  const FORM_DATA = {
     collection: [{
       id: 22,
       item1: 'blue',
@@ -22,7 +20,7 @@ describe('Utils.CollectionPage.getErrorsForCollection', function () {
       }]
     }]
   };
-  var FORM_DATA_MISSING_TOP = {
+  const FORM_DATA_MISSING_TOP = {
     collection: [{
       id: 22,
       item2: 'blue',
@@ -32,7 +30,7 @@ describe('Utils.CollectionPage.getErrorsForCollection', function () {
       }]
     }]
   };
-  var FORM_DATA_MISSING_NESTED = {
+  const FORM_DATA_MISSING_NESTED = {
     collection: [{
       id: 22,
       item1: 'blue',
@@ -42,7 +40,7 @@ describe('Utils.CollectionPage.getErrorsForCollection', function () {
       }]
     }]
   };
-  var FORM_DATA_MISSING_BOTH = {
+  const FORM_DATA_MISSING_BOTH = {
     collection: [{
       id: 22,
       item9: 'blue',
@@ -52,7 +50,7 @@ describe('Utils.CollectionPage.getErrorsForCollection', function () {
       }]
     }]
   };
-  var MASTER_PAGE = {
+  const MASTER_PAGE = {
     id: 'masterPage',
     collection: {
       name: 'collection',
@@ -79,7 +77,7 @@ describe('Utils.CollectionPage.getErrorsForCollection', function () {
       }]
     }]
   };
-  var MASTER_PAGE_WITH_NESTED = {
+  const MASTER_PAGE_WITH_NESTED = {
     id: 'masterPage',
     collection: {
       name: 'collection',
@@ -132,24 +130,24 @@ describe('Utils.CollectionPage.getErrorsForCollection', function () {
       }]
     }]
   };
-  it('should return nothing for a master page without errors', function () {
-    var errors = (0, _getErrorsForCollection.default)(CONFIG, MASTER_PAGE, FORM_DATA, HOOKS);
+  it('should return nothing for a master page without errors', () => {
+    const 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);
+  it('should return erorrs for a master page with errors', () => {
+    const 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);
+  it('should return nothing for a master page with a nested master page without errors', () => {
+    const 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);
+  it('should return errors for a master page with a nested master page without errors', () => {
+    const 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);
+  it('should return errors for a master page with errors with a nested master page with errors', () => {
+    const 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,16 +6,7 @@ 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; }
-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); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Generates a new page to be used in a SumaryCard's quick edit section.
  * The page is a standard form page that has all the components that are
@@ -54,39 +45,46 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @param {object} entryData The data for the current collection entry.
  * @returns Page suitble for rendering in a QuickEdit
  */
-var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData) {
-  var _masterPage$collectio;
+const getQuickEditPage = (masterPage, formData, entryData) => {
   if (!masterPage) {
     return null;
   }
-  var fullComponents = [];
-  masterPage.childPages.forEach(function (page) {
-    if (!page.summaryQuickEdit || !(0, _showFormPage.default)(page, _objectSpread(_objectSpread({}, formData), entryData))) {
+  const fullComponents = [];
+  masterPage.childPages.forEach(page => {
+    if (!page.summaryQuickEdit || !(0, _showFormPage.default)(page, {
+      ...formData,
+      ...entryData
+    })) {
       return;
     }
-    page.summaryQuickEdit.forEach(function (quickEditComponent) {
+    page.summaryQuickEdit.forEach(quickEditComponent => {
       if (typeof quickEditComponent === 'string') {
-        fullComponents.push(_objectSpread({}, page.components.find(function (c) {
-          return c.id === quickEditComponent;
-        })));
+        fullComponents.push({
+          ...page.components.find(c => c.id === quickEditComponent)
+        });
         return;
       }
-      var originalComponent = page.components.find(function (c) {
-        return c.id === quickEditComponent.use;
-      });
+      const originalComponent = page.components.find(c => c.id === quickEditComponent.use);
       if (!originalComponent) {
         return;
       }
-      var mergedComponent = _objectSpread(_objectSpread({}, originalComponent), quickEditComponent);
+      const mergedComponent = {
+        ...originalComponent,
+        ...quickEditComponent
+      };
 
       // If there's a show_when in the quick edit config, then we treat
       // 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({}, formData), entryData))) {
-          fullComponents.push(_objectSpread(_objectSpread({}, mergedComponent), {}, {
+        if ((0, _meetsAllConditions.default)(quickEditComponent.show_when, {
+          ...formData,
+          ...entryData
+        })) {
+          fullComponents.push({
+            ...mergedComponent,
             show_when: originalComponent.show_when || []
-          }));
+          });
         }
         return;
       }
@@ -95,9 +93,10 @@ var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData
   });
 
   // Put components and actions onto page object
-  var pageToReturn = _objectSpread(_objectSpread({}, masterPage.childPages[0]), {}, {
-    formData: formData
-  });
+  const pageToReturn = {
+    ...masterPage.childPages[0],
+    formData
+  };
   pageToReturn.components = fullComponents;
   pageToReturn.actions = [{
     type: 'save',
@@ -112,9 +111,15 @@ var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData
 
   // Need to have the collection data at the top level
   // Remove ID to stop overwriting top-level form ID.
-  var id = entryData.id,
-    entryWithNoId = _objectWithoutProperties(entryData, _excluded);
-  pageToReturn.formData = _objectSpread(_objectSpread(_objectSpread({}, pageToReturn.formData), entryWithNoId), {}, _defineProperty({}, "".concat((_masterPage$collectio = masterPage.collection) === null || _masterPage$collectio === void 0 || (_masterPage$collectio = _masterPage$collectio.name) === null || _masterPage$collectio === void 0 ? void 0 : _masterPage$collectio.split('.').pop(), "ActiveId"), entryData.id));
+  const {
+    id,
+    ...entryWithNoId
+  } = entryData;
+  pageToReturn.formData = {
+    ...pageToReturn.formData,
+    ...entryWithNoId,
+    [`${masterPage.collection?.name?.split('.').pop()}ActiveId`]: entryData.id
+  };
   delete pageToReturn.title;
   delete pageToReturn.collection;
   return pageToReturn;

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

@@ -1,15 +1,9 @@
 "use strict";
 
 var _getQuickEditPage = _interopRequireDefault(require("./getQuickEditPage"));
-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); }
-describe('Utils.CollectionPage.getQuickEditPage', function () {
-  var FORM_DATA = {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('Utils.CollectionPage.getQuickEditPage', () => {
+  const FORM_DATA = {
     items: [{
       id: '123',
       testText1: 'value 1',
@@ -18,7 +12,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
       testText3: 'value 3'
     }]
   };
-  var MASTER_PAGE = {
+  const MASTER_PAGE = {
     collection: {
       name: 'entries'
     },
@@ -77,7 +71,7 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
       summaryQuickEdit: ["testText3"]
     }]
   };
-  var EXPECTED_OUTPUT = {
+  const EXPECTED_OUTPUT = {
     id: 'firstPage',
     name: 'firstPage',
     components: [{
@@ -111,32 +105,34 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
       classModifiers: 'secondary'
     }]
   };
-  var ENTRY_DATA = {
+  const ENTRY_DATA = {
     id: '123',
     testText1: 'value 1',
     testText2: 'value 2',
     conditionText: 'true',
     testText3: 'value 3'
   };
-  it('should return a quick edit page', function () {
-    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, ENTRY_DATA);
+  it('should return a quick edit page', () => {
+    const 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 () {
-    var CUSTOM_OUTPUT = _objectSpread(_objectSpread({}, EXPECTED_OUTPUT), {}, {
+  it('should return a quick edit page without components that fail the quick edit show_when', () => {
+    const CUSTOM_OUTPUT = {
+      ...EXPECTED_OUTPUT,
       components: [EXPECTED_OUTPUT.components[0],
       // The second component should fail the show when
       // and not be included in the quick edit page.
       EXPECTED_OUTPUT.components[2]]
-    });
-    var CUSTOM_ENTRY_DATA = _objectSpread(_objectSpread({}, ENTRY_DATA), {}, {
+    };
+    const CUSTOM_ENTRY_DATA = {
+      ...ENTRY_DATA,
       conditionText: 'false'
-    });
-    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, CUSTOM_ENTRY_DATA);
+    };
+    const createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, CUSTOM_ENTRY_DATA);
     expect(createdPage).toMatchObject(CUSTOM_OUTPUT);
   });
-  it('should return a quick edit page with the activeId for the current collection correctly set', function () {
-    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, ENTRY_DATA);
+  it('should return a quick edit page with the activeId for the current collection correctly set', () => {
+    const createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, ENTRY_DATA);
     expect(createdPage.formData.entriesActiveId).toEqual('123');
     expect(createdPage).toMatchObject(EXPECTED_OUTPUT);
   });

package/dist/utils/CollectionPage/index.js

@@ -14,10 +14,10 @@ var _getErrorsForCollection = _interopRequireDefault(require("./getErrorsForColl
 var _mergeCollectionPages = _interopRequireDefault(require("./mergeCollectionPages"));
 var _removeCollectionPageEntry = _interopRequireDefault(require("./removeCollectionPageEntry"));
 var _setCollectionPageData = _interopRequireDefault(require("./setCollectionPageData"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Local imports
 
-var CollectionPage = {
+const CollectionPage = {
   addEntry: _addCollectionPageEntry.default,
   duplicateActiveEntry: _duplicateCollectionPageActiveEntry.default,
   duplicateEntry: _duplicateCollectionPageEntry.default,