@ukhomeoffice/cop-react-form-renderer 4.44.0 → 4.47.0

package/dist/components/FormRenderer/FormRenderer.js

@@ -311,7 +311,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     if (action.type === _models.PageAction.TYPES.CANCEL) {
       hooks.onCancel();
       return;
-    } // Re-apply the patch to the page's formData.
+    } // Save a copy of data in case submit errors and we need to revert
+
+
+    var preSubmitData = _objectSpread({}, data); // Re-apply the patch to the page's formData.
     // This should normally have no effect but will prevent issues 
     // with validation if formData happens to have been wiped.
 
@@ -419,6 +422,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
           pageUpdate(sData);
         }, function (errors) {
           _handlers.default.submissionError(errors, addErrors);
+
+          setData(_objectSpread({}, preSubmitData));
         }, changedFieldName, changedFieldValue);
       }
     }

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

@@ -262,12 +262,14 @@ describe('components', function () {
             case 0:
               ON_SUBMIT_CALLS = [];
 
-              ON_SUBMIT = function ON_SUBMIT(type, payload, onSuccess, onError) {
+              ON_SUBMIT = function ON_SUBMIT(type, payload, onSuccess, onError, fieldName, fieldValue) {
                 ON_SUBMIT_CALLS.push({
                   type: type,
                   payload: payload,
                   onSuccess: onSuccess,
-                  onError: onError
+                  onError: onError,
+                  fieldName: fieldName,
+                  fieldValue: fieldValue
                 });
                 onSuccess();
               };
@@ -283,7 +285,8 @@ describe('components', function () {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
                           data: _userProfileData.default,
-                          hooks: HOOKS
+                          hooks: HOOKS,
+                          type: _models.FormTypes.HUB
                         })), container);
 
                       case 1:
@@ -302,9 +305,12 @@ describe('components', function () {
               _hub$childNodes2 = _slicedToArray(hub.childNodes, 3), civilServantList = _hub$childNodes2[2];
               link = getChangeLink(civilServantList);
 
-              _react.fireEvent.click(link, {}); // Should already be answered "Yes", so simply click "Continue".
+              _react.fireEvent.click(link, {}); // Should already be answered "Yes", but select "No, I'm a contractor" option to generate patch
+              // and then click "Continue".
 
 
+              _react.fireEvent.click(_react.screen.getByText("No, I'm a contractor"));
+
               page = form.childNodes[0];
               continueButton = getContinueButton(page);
               expect(ON_SUBMIT_CALLS.length).toEqual(0);
@@ -313,7 +319,9 @@ describe('components', function () {
 
               expect(ON_SUBMIT_CALLS.length).toEqual(1);
               expect(ON_SUBMIT_CALLS[0].type).toEqual(_models.PageAction.TYPES.SUBMIT);
-              expect(ON_SUBMIT_CALLS[0].payload.areYouACivilServant).toEqual('yes'); // And we should be back on the hub.
+              expect(ON_SUBMIT_CALLS[0].payload.areYouACivilServant).toEqual('no-contractor');
+              expect(ON_SUBMIT_CALLS[0].fieldName).toEqual('Are you a civil servant?');
+              expect(ON_SUBMIT_CALLS[0].fieldValue).toEqual("No, I'm a contractor"); // And we should be back on the hub.
 
               expect(form.childNodes.length).toEqual(2); // Title + Hub page (= CYA)
 
@@ -321,7 +329,7 @@ describe('components', function () {
               expect(title.tagName).toEqual('H1');
               expect(title.textContent).toEqual(_userProfile.default.title);
 
-            case 21:
+            case 24:
             case "end":
               return _context8.stop();
           }

package/dist/components/SummaryList/SummaryList.js

@@ -15,6 +15,8 @@ var _GroupAction = _interopRequireDefault(require("./GroupAction"));
 
 var _SummaryListRow = _interopRequireDefault(require("./SummaryListRow"));
 
+var _SummaryListHeadingRow = _interopRequireDefault(require("./SummaryListHeadingRow"));
+
 var _SummaryListTitleRow = _interopRequireDefault(require("./SummaryListTitleRow"));
 
 require("./SummaryList.scss");
@@ -67,6 +69,15 @@ var SummaryList = function SummaryList(_ref) {
       });
     }
 
+    if (row.type === 'heading') {
+      return /*#__PURE__*/_react.default.createElement(_SummaryListHeadingRow.default, {
+        key: key,
+        title: row.key,
+        size: row.size || 's',
+        classes: classes
+      });
+    }
+
     if (row.type === 'action') {
       return /*#__PURE__*/_react.default.createElement("div", {
         key: "".concat(key, "-actions")

package/dist/components/SummaryList/SummaryList.scss

@@ -14,6 +14,25 @@
   }
 }
 
+.govuk-summary-list__heading {
+  width: 100%;
+  white-space: nowrap;
+  .govuk-heading-s {
+    margin-bottom: 10px;
+  }
+  .govuk-heading-m {
+    margin-bottom: 10px;
+  }
+  &:not(:first-child) {
+    .govuk-heading-s {
+      margin-top: 20px;
+    }
+    .govuk-heading-m {
+      margin-top: 30px;
+    }
+  }
+}
+
 .changeRow {
   .govuk-link {
     float: right;

package/dist/components/SummaryList/SummaryListHeadingRow.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Global imports
+var SummaryListHeadingRow = function SummaryListHeadingRow(_ref) {
+  var title = _ref.title,
+      size = _ref.size,
+      classes = _ref.classes;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(classes('heading'))
+  }, size === 's' && /*#__PURE__*/_react.default.createElement(_copReactComponents.SmallHeading, null, title), size === 'm' && /*#__PURE__*/_react.default.createElement(_copReactComponents.MediumHeading, null, title));
+};
+
+SummaryListHeadingRow.propTypes = {
+  title: _propTypes.default.string.isRequired,
+  classes: _propTypes.default.func.isRequired
+};
+var _default = SummaryListHeadingRow;
+exports.default = _default;

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -9,12 +9,16 @@ var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 
 var _models = require("../../models");
 
-var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
+var _addShowWhen = _interopRequireDefault(require("../Component/addShowWhen"));
+
+var _showFormPageCYA = _interopRequireDefault(require("../FormPage/showFormPageCYA"));
 
 var _getCYACollectionDeleteAction = _interopRequireDefault(require("./getCYACollectionDeleteAction"));
 
 var _getCYACollectionChangeAction = _interopRequireDefault(require("./getCYACollectionChangeAction"));
 
+var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -30,7 +34,14 @@ var getContainerForPage = function getContainerForPage(page, item, labelCount, f
     type: _models.ComponentTypes.CONTAINER,
     required: true,
     full_path: full_path,
-    components: page.components
+    components: page.components.map(function (component) {
+      return _objectSpread(_objectSpread({}, component), {}, {
+        label: _copReactComponents.Utils.interpolateString(component.label, _objectSpread(_objectSpread({}, item), {}, {
+          index: labelCount
+        })),
+        full_path: "".concat(full_path, ".").concat(component.fieldId)
+      });
+    })
   };
 };
 
@@ -44,7 +55,23 @@ var getTitleRowForItem = function getTitleRowForItem(page, item, pageId, labelCo
     key: _copReactComponents.Utils.interpolateString(labels.item, _objectSpread(_objectSpread({}, item), {}, {
       index: labelCount
     })),
-    type: 'title'
+    type: 'heading',
+    size: page.collection.titleSize || 's'
+  };
+};
+
+var getHeadingRow = function getHeadingRow(config, pageId, labelCount) {
+  if (config.text === '') {
+    return null;
+  }
+
+  return {
+    pageId: pageId,
+    fieldId: "heading".concat(labelCount),
+    full_path: "heading".concat(labelCount),
+    key: config.text,
+    type: 'heading',
+    size: config.size || 's'
   };
 };
 
@@ -69,16 +96,42 @@ var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onA
   var _page$formData, _page$formData$page$c;
 
   var rows = [];
+
+  if (!page.collection.hideNameFromCYA) {
+    rows.push({
+      pageId: page.id,
+      fieldId: "".concat(page.collection.name, "Title"),
+      full_path: "".concat(page.collection.name, "Title"),
+      key: page.collection.name.charAt(0).toUpperCase() + page.collection.name.slice(1),
+      type: 'heading',
+      size: 'm'
+    });
+  }
+
   (_page$formData = page.formData) === null || _page$formData === void 0 ? void 0 : (_page$formData$page$c = _page$formData[page.collection.name]) === null || _page$formData$page$c === void 0 ? void 0 : _page$formData$page$c.forEach(function (item, index) {
     var labelCount = index + 1;
     var full_path = "".concat(page.collection.name, "[").concat(index, "]");
-    var container = getContainerForPage(page, item, labelCount, full_path);
-    var containerRows = (0, _getCYARowsForContainer.default)(page, container, item, undefined);
     var titleRow = getTitleRowForItem(page, item, page.id, labelCount, full_path);
     var actionRows = getActionRows(page, item, onAction, labelCount);
     rows = rows.concat(titleRow);
     rows = rows.concat(actionRows);
-    rows = rows.concat(containerRows);
+    page.collectionPages.forEach(function (p) {
+      if (p.collection.route) {
+        var pageWithRoute = (0, _addShowWhen.default)(p, p.collection.route);
+        p = pageWithRoute || p;
+      }
+
+      if ((0, _showFormPageCYA.default)(p, _objectSpread(_objectSpread({}, p.formData), item))) {
+        if (p.collection.heading) {
+          var headingRow = getHeadingRow(p.collection.heading, p.id, labelCount);
+          rows = rows.concat(headingRow);
+        }
+
+        var container = getContainerForPage(p, item, labelCount, full_path);
+        var containerRows = (0, _getCYARowsForContainer.default)(p, container, item, undefined);
+        rows = rows.concat(containerRows);
+      }
+    });
   });
   return rows.filter(function (row) {
     return !!row;

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

@@ -17,6 +17,25 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     label: 'Test text',
     type: 'text'
   };
+  var DATE_COMP = {
+    id: 'testDate',
+    fieldId: 'testDate',
+    label: 'Test date',
+    type: 'date'
+  };
+  var PAGES = [{
+    id: 'page1',
+    collection: {
+      name: 'collection'
+    },
+    components: [TEXT_COMP]
+  }, {
+    id: 'page2',
+    collection: {
+      name: 'collection'
+    },
+    components: [DATE_COMP]
+  }];
   var MASTER_PAGE = {
     id: 'page1',
     collection: {
@@ -36,16 +55,29 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
         page: 'confirmDelete'
       }]
     },
-    title: 'Collection',
-    components: [TEXT_COMP]
+    collectionPages: PAGES
   };
-  it('should return an empty array if the collection has no entries', function () {
+  it('should return just a heading for the collection if it has no entries', function () {
     var FORM_DATA = {};
 
     var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
       formData: FORM_DATA
     });
 
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    expect(ROWS.length).toEqual(1);
+    expect(ROWS[0].key).toEqual('Collection');
+  });
+  it('should accept the hideNameFromCYA collection flag', function () {
+    var FORM_DATA = {};
+
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      formData: FORM_DATA,
+      collection: _objectSpread(_objectSpread({}, MASTER_PAGE.collection), {}, {
+        hideNameFromCYA: true
+      })
+    });
+
     var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
     expect(ROWS.length).toEqual(0);
   });
@@ -62,9 +94,9 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     });
 
     var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
-    expect(ROWS.length).toEqual(5); // Title row + action rows + component row
+    expect(ROWS.length).toEqual(7); // Collection title, item title, action rows & component rows
 
-    expect(ROWS[0].key).toEqual('Collection entry 1');
+    expect(ROWS[1].key).toEqual('Collection entry 1');
   });
   it('should provide default titles if collection.labels.item is not specified', function () {
     var FORM_DATA = {
@@ -82,9 +114,9 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     });
 
     var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
-    expect(ROWS.length).toEqual(5); // Title row + action rows + component row
+    expect(ROWS.length).toEqual(7); // Collection title, item title, action rows & component rows
 
-    expect(ROWS[0].key).toEqual('Item 1');
+    expect(ROWS[1].key).toEqual('Item 1');
   });
   it('should return correctly formatted rows for mutliple entries', function () {
     var FORM_DATA = {
@@ -102,24 +134,42 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     });
 
     var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
-    expect(ROWS.length).toEqual(10); // Title row + component row for each item
-
-    expect(ROWS[0].type).toEqual('title');
-    expect(ROWS[0].key).toEqual('Collection entry 1'); // Formatted according to collection.labels.item
-
-    expect(ROWS[1].action.label).toEqual('Change');
-    expect(ROWS[2].action.label).toEqual('custom remove label');
-    expect(ROWS[3].action.label).toEqual('custom change label');
-    expect(ROWS[4].value).toEqual('value');
-    expect(ROWS[4].key).toEqual('Test text');
-    expect(ROWS[5].type).toEqual('title');
-    expect(ROWS[5].key).toEqual('Collection entry 2'); // Formatted according to collection.labels.item
-
-    expect(ROWS[6].action.label).toEqual('Change');
-    expect(ROWS[7].action.label).toEqual('custom remove label');
-    expect(ROWS[8].action.label).toEqual('custom change label');
-    expect(ROWS[9].value).toEqual('value');
-    expect(ROWS[9].key).toEqual('Test text');
+    expect(ROWS.length).toEqual(13); // Title row + component row for each item
+
+    expect(ROWS[0]).toMatchObject({
+      type: 'heading',
+      key: 'Collection'
+    });
+    expect(ROWS[1]).toMatchObject({
+      type: 'heading',
+      key: 'Collection entry 1'
+    });
+    expect(ROWS[2].action.label).toEqual('Change');
+    expect(ROWS[3].action.label).toEqual('custom remove label');
+    expect(ROWS[4].action.label).toEqual('custom change label');
+    expect(ROWS[5]).toMatchObject({
+      value: 'value',
+      key: 'Test text'
+    });
+    expect(ROWS[6]).toMatchObject({
+      value: '',
+      key: 'Test date'
+    });
+    expect(ROWS[7]).toMatchObject({
+      type: 'heading',
+      key: 'Collection entry 2'
+    });
+    expect(ROWS[8].action.label).toEqual('Change');
+    expect(ROWS[9].action.label).toEqual('custom remove label');
+    expect(ROWS[10].action.label).toEqual('custom change label');
+    expect(ROWS[11]).toMatchObject({
+      value: 'value',
+      key: 'Test text'
+    });
+    expect(ROWS[12]).toMatchObject({
+      value: '',
+      key: 'Test date'
+    });
   });
   it('should exclude components that should not be shown', function () {
     var FD = {
@@ -133,38 +183,152 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
         testText: 'testing'
       }]
     };
-    var C = {
-      id: 'testText',
-      fieldId: 'testText',
-      label: 'Test text',
-      type: 'text',
-      show_when: {
-        field: "otherField",
-        op: "!=",
-        value: "no"
-      }
+
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      collection: {
+        name: 'collection'
+      },
+      formData: FD,
+      collectionPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+        components: [{
+          id: 'testText',
+          fieldId: 'testText',
+          label: 'Test text',
+          type: 'text',
+          show_when: {
+            field: "otherField",
+            op: "!=",
+            value: "yes"
+          }
+        }]
+      })]
+    });
+
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    expect(ROWS.length).toEqual(4);
+    expect(ROWS[0]).toMatchObject({
+      type: 'heading',
+      key: 'Collection'
+    });
+    expect(ROWS[1]).toMatchObject({
+      type: 'heading',
+      key: 'Item 1'
+    });
+    expect(ROWS[2]).toMatchObject({
+      type: 'heading',
+      key: 'Item 2'
+    });
+    expect(ROWS[3]).toMatchObject({
+      value: 'testing',
+      key: 'Test text'
+    });
+  });
+  it('should exclude pages that should not be shown', function () {
+    var FD = {
+      collection: [{
+        id: '01',
+        otherField: 'yes',
+        testText: 'testing'
+      }]
     };
-    var P = {
-      id: 'page1',
+
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
       collection: {
         name: 'collection'
       },
-      title: 'Collection',
-      components: [C]
+      formData: FD,
+      collectionPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+        show_when: {
+          field: "otherField",
+          op: "!=",
+          value: "yes"
+        }
+      }), PAGES[1]]
+    });
+
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    expect(ROWS.length).toEqual(3); // Missing the page with the text component on.
+
+    expect(ROWS[0]).toMatchObject({
+      type: 'heading',
+      key: 'Collection'
+    });
+    expect(ROWS[1]).toMatchObject({
+      type: 'heading',
+      key: 'Item 1'
+    });
+    expect(ROWS[2]).toMatchObject({
+      value: '',
+      key: 'Test date'
+    });
+  });
+  it('should include rows for custom headings', function () {
+    var FORM_DATA = {
+      collection: [{
+        id: '01',
+        testText: 'value'
+      }]
     };
 
-    var PAGE = _objectSpread(_objectSpread({}, P), {}, {
-      formData: FD
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      formData: FORM_DATA,
+      collectionPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+        collection: _objectSpread(_objectSpread({}, PAGES[0].collection), {}, {
+          heading: {
+            size: 'm',
+            text: 'Custom page heading'
+          }
+        })
+      })]
     });
 
     var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
-    expect(ROWS.length).toEqual(3); // Title row + single component as other should fail show check
-
-    expect(ROWS[0].type).toEqual('title');
-    expect(ROWS[0].key).toEqual('Item 1');
-    expect(ROWS[1].value).toEqual('testing');
-    expect(ROWS[1].key).toEqual('Test text');
-    expect(ROWS[2].type).toEqual('title');
-    expect(ROWS[2].key).toEqual('Item 2');
+    expect(ROWS.length).toEqual(7);
+    expect(ROWS[0]).toMatchObject({
+      type: 'heading',
+      key: 'Collection'
+    });
+    expect(ROWS[1]).toMatchObject({
+      type: 'heading',
+      key: 'Collection entry 1'
+    });
+    expect(ROWS[2].action.label).toEqual('Change');
+    expect(ROWS[3].action.label).toEqual('custom remove label');
+    expect(ROWS[4].action.label).toEqual('custom change label');
+    expect(ROWS[5]).toMatchObject({
+      type: 'heading',
+      key: 'Custom page heading',
+      size: 'm'
+    });
+    expect(ROWS[6]).toMatchObject({
+      value: 'value',
+      key: 'Test text'
+    });
+  });
+  it('should default to a title size of small if one is not specified', function () {
+    var FORM_DATA = {
+      collection: [{
+        id: '01',
+        testText: 'value'
+      }]
+    };
+
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      formData: FORM_DATA,
+      collectionPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+        collection: _objectSpread(_objectSpread({}, PAGES[0].collection), {}, {
+          heading: {
+            text: 'Custom page heading'
+          }
+        })
+      })]
+    });
+
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    expect(ROWS[5]).toMatchObject({
+      type: 'heading',
+      key: 'Custom page heading',
+      size: 's'
+    });
   });
 });

package/dist/utils/CollectionPage/mergeCollectionPages.js

@@ -5,53 +5,34 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _addShowWhen = _interopRequireDefault(require("../Component/addShowWhen"));
-
-var _applyToComponentTree = _interopRequireDefault(require("../Component/applyToComponentTree"));
-
-var _showFormPageCYA = _interopRequireDefault(require("../FormPage/showFormPageCYA"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var getComponentsWithRouting = function getComponentsWithRouting(page) {
-  if (!page.collection.route) {
-    return page.components;
-  } // Apply show_whens to components on certain conditional pages.
-  // This ensures that those components aren't shown on the CYA
-  // screen if they were never visited by the user.
-
-
-  return page.components.map(function (component) {
-    return (0, _applyToComponentTree.default)(component, function (c) {
-      return (0, _addShowWhen.default)(c, page.collection.route);
-    });
-  });
-};
-
 var createMasterPage = function createMasterPage(page) {
-  return _objectSpread(_objectSpread({}, page), {}, {
-    title: page.collection.name.charAt(0).toUpperCase() + page.collection.name.slice(1),
-    components: getComponentsWithRouting(page)
-  });
+  return {
+    id: page.id,
+    collection: _objectSpread({
+      masterPage: true
+    }, page.collection),
+    formData: _objectSpread({}, page.formData),
+    collectionPages: [page]
+  };
 };
 
 var mergeIntoMasterPage = function mergeIntoMasterPage(page, masterPage) {
   masterPage.collection = _objectSpread(_objectSpread({}, masterPage.collection), page.collection);
-  masterPage.components = [].concat(masterPage.components, getComponentsWithRouting(page));
-  masterPage.formData = _objectSpread({}, page.formData);
+  masterPage.formData = _objectSpread(_objectSpread({}, masterPage.formData), page.formData);
+  masterPage.collectionPages = [].concat(masterPage.collectionPages, [page]);
 };
 /**
  * Loop over an array of pages, merging any CollectionPages into a
  * single master page for that collection. A master page is created
  * for each unique collection.name that exists.
- * These master pages contain all the fields needed to represent an
- * entry in the collection. 
+ * These master pages contain all the pages that are needed to
+ * represent an item in that collection.
  * The master page for each collection is positioned at the index
  * of the first CollectionPage in that collection.
  * @param { array } pages Array of pages in the form.
@@ -64,7 +45,7 @@ var mergeCollectionPages = function mergeCollectionPages(pages) {
   return pages.map(function (page) {
     var _page$collection;
 
-    if (page !== null && page !== void 0 && (_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.name && (0, _showFormPageCYA.default)(page, page.formData)) {
+    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.

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

@@ -40,14 +40,14 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
     }];
     var RESULT = (0, _mergeCollectionPages.default)(PAGES);
     expect(RESULT.length).toEqual(1);
-    expect(RESULT[0]).toEqual({
+    expect(RESULT[0]).toMatchObject({
       id: 'page1',
-      title: 'Collection',
       collection: {
-        name: 'collection'
+        name: 'collection',
+        masterPage: true
       },
-      components: [TEXT_COMP, DATE_COMP],
-      formData: {}
+      formData: {},
+      collectionPages: PAGES
     });
   });
   it('should leave non-collection pages unaffected', function () {
@@ -70,12 +70,12 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
     expect(RESULT.length).toEqual(2);
     expect(RESULT[0]).toEqual({
       id: 'page1',
-      title: 'Collection',
       collection: {
-        name: 'collection'
+        name: 'collection',
+        masterPage: true
       },
-      components: [TEXT_COMP, DATE_COMP],
-      formData: {}
+      formData: {},
+      collectionPages: [PAGES[0], PAGES[1]]
     });
     expect(RESULT[1]).toEqual({
       id: 'page3'
@@ -112,90 +112,20 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
     expect(RESULT[0]).toEqual({
       id: 'page1',
       collection: {
-        name: 'collection1'
+        name: 'collection1',
+        masterPage: true
       },
-      title: 'Collection1',
-      components: [],
-      formData: {}
+      formData: {},
+      collectionPages: [PAGES[0], PAGES[1]]
     });
     expect(RESULT[1]).toEqual({
       id: 'page3',
       collection: {
-        name: 'collection2'
-      },
-      title: 'Collection2',
-      components: [],
-      formData: {}
-    });
-  });
-  it('should add a defined route as a show_when to components on the page', function () {
-    var PAGES = [{
-      id: 'page1',
-      collection: {
-        name: 'collection',
-        route: {
-          field: 'field',
-          op: '=',
-          value: 'value'
-        }
-      },
-      components: [{
-        type: 'text'
-      }]
-    }, {
-      id: 'page2',
-      collection: {
-        name: 'collection',
-        route: {
-          field: 'field',
-          op: '=',
-          value: 'otherValue'
-        }
-      },
-      components: [{
-        type: 'container',
-        components: [{
-          type: 'date'
-        }]
-      }]
-    }];
-    var RESULT = (0, _mergeCollectionPages.default)(PAGES);
-    expect(RESULT.length).toEqual(1);
-    expect(RESULT[0]).toEqual({
-      id: 'page1',
-      title: 'Collection',
-      collection: {
-        name: 'collection',
-        route: {
-          field: 'field',
-          op: '=',
-          value: 'otherValue'
-        }
+        name: 'collection2',
+        masterPage: true
       },
-      components: [{
-        type: 'text',
-        show_when: {
-          field: 'field',
-          op: '=',
-          value: 'value'
-        }
-      }, {
-        type: 'container',
-        components: [{
-          type: 'date',
-          show_when: {
-            field: 'field',
-            op: '=',
-            value: 'otherValue'
-          }
-        }],
-        show_when: {
-          field: 'field',
-          op: '=',
-          value: 'otherValue'
-        }
-      }],
-      formData: {}
+      formData: {},
+      collectionPages: [PAGES[2], PAGES[3]]
     });
   });
 });

package/dist/utils/Validate/validateComponent.js

@@ -41,7 +41,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
  * @returns The first encountered error with the component.
  */
 var validateComponent = function validateComponent(component, outerData, formData) {
-  var _fd$keycloakContext, _component$data$optio;
+  var _component$data$optio;
 
   var fd = formData || outerData;
 
@@ -68,8 +68,7 @@ var validateComponent = function validateComponent(component, outerData, formDat
         return (0, _validateCollection.default)(component, value, fd);
 
       case _models.ComponentTypes.EMAIL:
-        var userEmail = fd === null ? '' : (_fd$keycloakContext = fd.keycloakContext) === null || _fd$keycloakContext === void 0 ? void 0 : _fd$keycloakContext.email;
-        error = (0, _validateEmail.default)(value, component.label, userEmail, component.custom_errors);
+        error = (0, _validateEmail.default)(value, component.label, component.custom_errors);
         break;
 
       case _models.ComponentTypes.DATE:

package/dist/utils/Validate/validateEmail.js

@@ -15,24 +15,18 @@ var HODS_EMAIL_REGEX = /^[a-z0-9._-]+@(digital\.)?homeoffice.gov.uk$/i;
  * validateRequired (Validate.required) for that sort of validation.
  * @param {*} value The value to validate.
  * @param {string} label The label to use in any error message.
- * @param {string} userEmail The user email to use for validation.
+ * @param {array} customErrors The array of custom errors to use for format message.
  * @returns An error if the email address is invalid.
  */
 
 var validateEmail = function validateEmail(value) {
   var label = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  var userEmail = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  var customErrors = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var customErrors = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
 
   if (!!value) {
     var name = label ? label.toLowerCase() : 'email address';
 
     if (typeof value === 'string') {
-      // The following is an interim fix pending a mechanism for validating against specific values
-      if (['Line manager email', 'Delegate email address'].includes(label) && value.toLowerCase() === userEmail) {
-        return "".concat(label, " cannot be your own email");
-      }
-
       if (HODS_EMAIL_REGEX.test(value)) {
         return undefined;
       }

package/dist/utils/Validate/validateEmail.test.js

@@ -58,15 +58,15 @@ describe('utils', function () {
           'message': 'Enter email address in the correct format'
         }];
         var CUSTOM_ERROR = 'Enter email address in the correct format';
-        expect((0, _validateEmail.default)('bob', '', '', customErrors)).toEqual(CUSTOM_ERROR);
+        expect((0, _validateEmail.default)('bob', '', customErrors)).toEqual(CUSTOM_ERROR);
       });
-      it('should return an error when line manager email is same as user email', function () {
-        var USER_EMAIL_ERROR = 'Line manager email cannot be your own email';
-        expect((0, _validateEmail.default)('joe.bloggs@digital.homeoffice.gov.uk', 'Line manager email', 'joe.bloggs@digital.homeoffice.gov.uk')).toEqual(USER_EMAIL_ERROR);
-      });
-      it('should return an error when delegate email is same as user email', function () {
-        var USER_EMAIL_ERROR = 'Delegate email address cannot be your own email';
-        expect((0, _validateEmail.default)('joe.bloggs@digital.homeoffice.gov.uk', 'Delegate email address', 'joe.bloggs@digital.homeoffice.gov.uk')).toEqual(USER_EMAIL_ERROR);
+      it('should use the default format error message when custom errors is not an array', function () {
+        var DEFAULT_ERROR = 'Enter email address in the correct format, like jane.doe@homeoffice.gov.uk';
+        var customErrors = {
+          'type': 'format',
+          'message': 'Enter email address in the correct format'
+        };
+        expect((0, _validateEmail.default)('bob', '', customErrors)).toEqual(DEFAULT_ERROR);
       });
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.44.0",
+  "version": "4.47.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",