@ukhomeoffice/cop-react-form-renderer 6.0.6-peter → 6.7.0-alpha

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 }; }
+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
+  const collectionData = _.default.CollectionPage.getData(masterPage.collection.name, masterPage.formData) || [];
+  let allErrors = [];
+
+  // Loop over each entry in the collection data
+  collectionData.forEach(entry => {
+    var _masterPage$childPage;
+    // eslint-disable-next-line no-param-reassign
+    activeIds = {
+      ...activeIds,
+      ["".concat(masterPage.collection.name.split('.').pop(), "ActiveId")]: entry.id
+    };
+
+    // Loop over child pages and validate each one
+    const allPagesErrors = (_masterPage$childPage = masterPage.childPages) === null || _masterPage$childPage === void 0 ? void 0 : _masterPage$childPage.flatMap(page => {
+      const pageWithIds = {
+        ...page,
+        formData: {
+          ...formData,
+          ...activeIds
+        }
+      };
+
+      // Handle nested collections
+      if (page.childPages) {
+        return getErrorsForCollection(config, pageWithIds, formData, hooks, activeIds);
+      }
+      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(e => ({
+      ...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,153 @@
+"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', () => {
+  const HOOKS = {
+    onValidate: (_, errors) => errors
+  };
+  const CONFIG = {
+    id: 'testId'
+  };
+  const FORM_DATA = {
+    collection: [{
+      id: 22,
+      item1: 'blue',
+      child: [{
+        id: 11,
+        item4: 'red'
+      }]
+    }]
+  };
+  const FORM_DATA_MISSING_TOP = {
+    collection: [{
+      id: 22,
+      item2: 'blue',
+      child: [{
+        id: 11,
+        item4: 'red'
+      }]
+    }]
+  };
+  const FORM_DATA_MISSING_NESTED = {
+    collection: [{
+      id: 22,
+      item1: 'blue',
+      child: [{
+        id: 11,
+        item9: 'red'
+      }]
+    }]
+  };
+  const FORM_DATA_MISSING_BOTH = {
+    collection: [{
+      id: 22,
+      item9: 'blue',
+      child: [{
+        id: 11,
+        item9: 'red'
+      }]
+    }]
+  };
+  const 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
+      }]
+    }]
+  };
+  const 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', () => {
+    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', () => {
+    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', () => {
+    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', () => {
+    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', () => {
+    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

@@ -7,12 +7,6 @@ exports.default = void 0;
 var _meetsAllConditions = _interopRequireDefault(require("../Condition/meetsAllConditions"));
 var _showFormPage = _interopRequireDefault(require("../FormPage/showFormPage"));
 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); }
 /**
  * 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
@@ -47,41 +41,50 @@ 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) {
+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({}, page.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({}, page.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;
       }
@@ -90,7 +93,10 @@ var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
   });
 
   // Put components and actions onto page object
-  var pageToReturn = _objectSpread({}, masterPage.childPages[0]);
+  const pageToReturn = {
+    ...masterPage.childPages[0],
+    formData
+  };
   pageToReturn.components = fullComponents;
   pageToReturn.actions = [{
     type: 'save',
@@ -104,7 +110,15 @@ 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.
+  const {
+    id,
+    ...entryWithNoId
+  } = entryData;
+  pageToReturn.formData = {
+    ...pageToReturn.formData,
+    ...entryWithNoId
+  };
   delete pageToReturn.title;
   delete pageToReturn.collection;
   return pageToReturn;

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

@@ -2,14 +2,17 @@
 
 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 MASTER_PAGE = {
+describe('Utils.CollectionPage.getQuickEditPage', () => {
+  const FORM_DATA = {
+    items: [{
+      id: '123',
+      testText1: 'value 1',
+      testText2: 'value 2',
+      conditionText: 'true',
+      testText3: 'value 3'
+    }]
+  };
+  const MASTER_PAGE = {
     childPages: [{
       id: 'firstPage',
       name: 'firstPage',
@@ -44,15 +47,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,19 +64,11 @@ 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"]
     }]
   };
-  var EXPECTED_OUTPUT = {
+  const EXPECTED_OUTPUT = {
     id: 'firstPage',
     name: 'firstPage',
     components: [{
@@ -103,15 +90,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',
@@ -123,28 +102,30 @@ 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, 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, CUSTOM_ENTRY_DATA);
+    };
+    const createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, CUSTOM_ENTRY_DATA);
     expect(createdPage).toMatchObject(CUSTOM_OUTPUT);
   });
 });

package/dist/utils/CollectionPage/index.js

@@ -10,19 +10,21 @@ 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"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-var CollectionPage = {
+const CollectionPage = {
   addEntry: _addCollectionPageEntry.default,
   duplicateActiveEntry: _duplicateCollectionPageActiveEntry.default,
   duplicateEntry: _duplicateCollectionPageEntry.default,
   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

@@ -4,12 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-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); }
 /* eslint-disable no-param-reassign */
 
 /*
@@ -28,21 +22,27 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 * - The master page for a child collection, with its own array of child pages.
 */
 
-var createMasterPage = function createMasterPage(page) {
-  return {
-    id: page.id,
-    name: page.name,
-    deleteCollectionWhenHidden: page.deleteCollectionWhenHidden,
-    collection: _objectSpread({
-      masterPage: true
-    }, page.collection),
-    formData: _objectSpread({}, page.formData),
-    childPages: [page]
+const createMasterPage = page => ({
+  id: page.id,
+  name: page.name,
+  collection: {
+    masterPage: true,
+    ...page.collection
+  },
+  formData: {
+    ...page.formData
+  },
+  childPages: [page]
+});
+const mergeIntoMasterPage = (page, masterPage) => {
+  masterPage.collection = {
+    ...masterPage.collection,
+    ...page.collection
+  };
+  masterPage.formData = {
+    ...masterPage.formData,
+    ...page.formData
   };
-};
-var mergeIntoMasterPage = function mergeIntoMasterPage(page, masterPage) {
-  masterPage.collection = _objectSpread(_objectSpread({}, masterPage.collection), page.collection);
-  masterPage.formData = _objectSpread(_objectSpread({}, masterPage.formData), page.formData);
   masterPage.childPages = [].concat(masterPage.childPages, [page]);
 };
 
@@ -54,14 +54,14 @@ var mergeIntoMasterPage = function mergeIntoMasterPage(page, masterPage) {
  * @returns true if page belonged to a child collection and was successfully
  *   nested. false if it isn't in a child collection or failed to be nested.
  */
-var nestUnderParent = function nestUnderParent(childPage, masterPages) {
-  var names = childPage.collection.name.split('.');
+const nestUnderParent = (childPage, masterPages) => {
+  const names = childPage.collection.name.split('.');
   if (names.length === 1) {
     return false;
   }
   names.pop();
-  var parentName = names.join('.');
-  var parentPage = masterPages[parentName] || null;
+  const parentName = names.join('.');
+  const parentPage = masterPages[parentName] || null;
   if (!parentPage) {
     // Something had gone wrong if we're here - parent collection pages
     // should always be defined before their children, so the parent master 
@@ -83,15 +83,15 @@ var nestUnderParent = function nestUnderParent(childPage, masterPages) {
  * @param { array } pages Array of pages in the form.
  * @returns An array of the same pages, with a master page for each collection.
  */
-var mergeCollectionPages = function mergeCollectionPages(pages) {
-  var masterPages = {};
-  var pagesWithMasters = pages.map(function (page) {
+const mergeCollectionPages = pages => {
+  const masterPages = {};
+  const pagesWithMasters = pages.map(page => {
     var _page$collection;
     if (page !== null && page !== void 0 && (_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.name) {
       if (!masterPages[page.collection.name]) {
         // If no master page exists for this collection.name, then
         // we kick one off using this page as a template.
-        var newMasterPage = createMasterPage(page);
+        const newMasterPage = createMasterPage(page);
         masterPages[page.collection.name] = newMasterPage;
         return newMasterPage;
       }
@@ -102,20 +102,16 @@ var mergeCollectionPages = function mergeCollectionPages(pages) {
       return null;
     }
     return page;
-  }).filter(function (page) {
-    return !!page;
-  });
+  }).filter(page => !!page);
   // We nest any child master pages under their parents here to 
   // ensure that all parent master pages have been created by the
   // above code first.
-  return pagesWithMasters.map(function (page) {
+  return pagesWithMasters.map(page => {
     var _page$collection2;
     if ((_page$collection2 = page.collection) !== null && _page$collection2 !== void 0 && _page$collection2.masterPage) {
       return nestUnderParent(page, masterPages) ? null : page;
     }
     return page;
-  }).filter(function (e) {
-    return !!e;
-  });
+  }).filter(e => !!e);
 };
 var _default = exports.default = mergeCollectionPages;