@ukhomeoffice/cop-react-form-renderer 6.11.1 → 6.12.1

package/dist/components/CollectionSummary/RenderListView.js

@@ -7,6 +7,7 @@ exports.default = exports.DEFAULT_TITLE = exports.DEFAULT_LIST_CLASS = exports.D
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
+var _BannerStrip = _interopRequireDefault(require("./BannerStrip"));
 var _utils = _interopRequireDefault(require("../../utils"));
 var _getSummaryListRowForDetails = _interopRequireDefault(require("../../utils/CheckYourAnswers/getSummaryListRowForDetails"));
 var _Condition = _interopRequireDefault(require("../../utils/Condition"));
@@ -35,19 +36,26 @@ var RenderListView = function RenderListView(_ref) {
     onFullEdit = _ref.onFullEdit,
     onDelete = _ref.onDelete,
     masterPage = _ref.masterPage,
-    classModifiers = _ref.classModifiers;
-  var classes = _copReactComponents.Utils.classBuilder(DEFAULT_CLASS, classModifiers);
+    classModifiers = _ref.classModifiers,
+    optionalFieldPlaceholder = _ref.optionalFieldPlaceholder;
+  var classes = _copReactComponents.Utils.classBuilder(DEFAULT_CLASS, classModifiers, config.className);
   var listClass = _copReactComponents.Utils.classBuilder(DEFAULT_LIST_CLASS);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: classes(),
     id: id
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: classes('title-wrapper', [], 'dark')
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: classes('title-content')
   }, /*#__PURE__*/_react.default.createElement("h2", {
     className: classes('title')
   }, _copReactComponents.Utils.interpolateString(config.title || DEFAULT_TITLE, _objectSpread(_objectSpread({}, entryData), {}, {
     index: entryData.index + 1
-  }))), /*#__PURE__*/_react.default.createElement("ul", {
+  }))), config.banners && /*#__PURE__*/_react.default.createElement(_BannerStrip.default, {
+    id: "BannerStrip".concat(entryData.id),
+    banners: config.banners,
+    formData: entryData
+  })), /*#__PURE__*/_react.default.createElement("ul", {
     className: classes('actions')
   }, /*#__PURE__*/_react.default.createElement("li", {
     className: classes('action')
@@ -95,7 +103,7 @@ var RenderListView = function RenderListView(_ref) {
           if (!component) {
             return null;
           }
-          return (0, _getSummaryListRowForDetails.default)(childPage, component, listClass, entryData);
+          return (0, _getSummaryListRowForDetails.default)(childPage, component, listClass, entryData, optionalFieldPlaceholder);
         });
       }
       return null;
@@ -109,6 +117,8 @@ RenderListView.propTypes = {
     index: _propTypes.default.number.isRequired
   }).isRequired,
   config: _propTypes.default.shape({
+    className: _propTypes.default.string,
+    banners: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.shape({})])),
     title: _propTypes.default.string,
     changeAction: _propTypes.default.shape({
       label: _propTypes.default.string,
@@ -128,9 +138,11 @@ RenderListView.propTypes = {
       components: _propTypes.default.arrayOf(_propTypes.default.shape())
     })).isRequired
   }).isRequired,
-  classModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)])
+  classModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
+  optionalFieldPlaceholder: _propTypes.default.string
 };
 RenderListView.defaultProps = {
-  classModifiers: null
+  classModifiers: null,
+  optionalFieldPlaceholder: null
 };
 var _default = exports.default = RenderListView;

package/dist/components/CollectionSummary/RenderListView.scss

@@ -183,6 +183,10 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
   &--deleting-summary-card {
     background-color: #FCF0EE;
   }
+
+  &.error {
+    border-left: 7px solid red;
+  }
 }
 
 .govuk-summary-card__title-wrapper {
@@ -213,6 +217,11 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
   }
 }
 
+.govuk-summary-card__title-content {
+  display: flex;
+  flex-direction: column;
+}
+
 .govuk-summary-card__actions {
   @include govuk-typography-responsive($size: 19);
   @include govuk-typography-weight-bold;

package/dist/components/CollectionSummary/RenderListView.test.js

@@ -6,10 +6,13 @@ var _setupTests = require("../../setupTests");
 var _RenderListView = _interopRequireDefault(require("./RenderListView"));
 var _models = require("../../models");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// Global imports.
-
+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); } // Global imports.
 // Local imports.
-
 describe('components.CollectionSummary.RenderListView', function () {
   var ENTRY = {
     id: '001',
@@ -78,6 +81,13 @@ describe('components.CollectionSummary.RenderListView', function () {
       label: 'Delete label'
     }
   };
+  var CONFIG_ERROR = _objectSpread({
+    className: 'error',
+    banners: [{
+      "text": "MORE DETAILS NEEDED",
+      "classModifiers": ["red"]
+    }]
+  }, CONFIG);
   var ID = 'testListView';
   var onChangeArgs = [];
   var onChangeCalls = 0;
@@ -180,6 +190,33 @@ describe('components.CollectionSummary.RenderListView', function () {
     // Check if the index is rendered as expected in the title
     expect(title.textContent).toContain("Title text ".concat(ENTRY.index + 1));
   });
+  it('should render an Error Tag with Error className when passed an error in the Banner and ClassName', function () {
+    var _renderWithValidation3 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_RenderListView.default, {
+        id: ID,
+        entryData: ENTRY,
+        config: CONFIG_ERROR,
+        onFullEdit: ON_CHANGE,
+        onDelete: ON_DELETE,
+        masterPage: MASTER_PAGE,
+        getComponentRow: getComponentRow
+      })),
+      container = _renderWithValidation3.container;
+    var listViewDiv = checkSetup(container);
+
+    // Check className
+    expect(listViewDiv.classList).toContain('error');
+
+    // Check for presence of Banner Strip
+    var bannerStrip = listViewDiv.querySelector('.hods-form-banner-strip');
+    expect(bannerStrip).not.toBeNull();
+    expect(bannerStrip.id).toEqual('BannerStrip001');
+
+    // Check for presence of Error Tag with correct tagName, className, and Text content
+    var errorTag = listViewDiv.querySelector('.hods-form-banner-strip__tag--red');
+    expect(errorTag).not.toBeNull();
+    expect(errorTag.tagName).toBe('STRONG');
+    expect(errorTag.innerHTML).toContain('MORE DETAILS NEEDED');
+  });
   describe('Action buttons in RenderListView', function () {
     beforeEach(function () {
       onChangeArgs = [];
@@ -188,7 +225,7 @@ describe('components.CollectionSummary.RenderListView', function () {
       onDeleteCalls = 0;
     });
     it('should render and handle action buttons correctly', function () {
-      var _renderWithValidation3 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_RenderListView.default, {
+      var _renderWithValidation4 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_RenderListView.default, {
           id: ID,
           entryData: ENTRY,
           config: CONFIG,
@@ -197,7 +234,7 @@ describe('components.CollectionSummary.RenderListView', function () {
           masterPage: MASTER_PAGE,
           getComponentRow: getComponentRow
         })),
-        container = _renderWithValidation3.container;
+        container = _renderWithValidation4.container;
       var listViewDiv = container.querySelector('.govuk-summary-card');
       expect(listViewDiv).not.toBeNull();
 

package/dist/components/CollectionSummary/SummaryCard.js

@@ -47,7 +47,7 @@ var DEFAULT_DUPLICATE_BUTTON_LABEL = exports.DEFAULT_DUPLICATE_BUTTON_LABEL = 'D
 var DEFAULT_DETAILS_TITLE = exports.DEFAULT_DETAILS_TITLE = 'Full details';
 var DEFAULT_CHANGE_BUTTON_CLASS = exports.DEFAULT_CHANGE_BUTTON_CLASS = 'secondary';
 var SummaryCard = function SummaryCard(_ref) {
-  var _config$changeAction2, _config$changeAction3, _config$changeAction4, _config$deleteAction, _config$deleteAction2, _config$duplicateActi, _config$duplicateActi2, _config$fullDetails;
+  var _config$changeAction2, _config$changeAction3, _config$changeAction4, _config$deleteAction, _config$deleteAction2, _config$duplicateActi, _config$duplicateActi2, _config$fullDetails2;
   var id = _ref.id,
     entryData = _ref.entryData,
     config = _ref.config,
@@ -148,6 +148,7 @@ var SummaryCard = function SummaryCard(_ref) {
 
   // To render summary card in list view as per https://design-system.service.gov.uk/components/summary-list
   if (config.listView) {
+    var _config$fullDetails;
     return /*#__PURE__*/_react.default.createElement(_RenderListView.default, {
       id: id,
       entryData: entryData,
@@ -155,7 +156,8 @@ var SummaryCard = function SummaryCard(_ref) {
       onFullEdit: onFullEdit,
       onDelete: onDelete,
       masterPage: masterPage,
-      classModifiers: classModifiers
+      classModifiers: classModifiers,
+      optionalFieldPlaceholder: (_config$fullDetails = config.fullDetails) === null || _config$fullDetails === void 0 ? void 0 : _config$fullDetails.optionalFieldPlaceholder
     });
   }
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -169,7 +171,7 @@ var SummaryCard = function SummaryCard(_ref) {
     id: "BannerStrip".concat(entryData.id),
     banners: config.banners,
     formData: entryData
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }), /*#__PURE__*/_react.default.createElement("h2", {
     id: "".concat(id, ".titleText"),
     className: classes('header-content-title')
   }, _utils.default.FormPage.getTitle(config.title, entryData)), config.details && /*#__PURE__*/_react.default.createElement("div", {
@@ -234,7 +236,7 @@ var SummaryCard = function SummaryCard(_ref) {
     childCollections: childCollections,
     formData: formData,
     entryData: entryData,
-    optionalFieldPlaceholder: ((_config$fullDetails = config.fullDetails) === null || _config$fullDetails === void 0 ? void 0 : _config$fullDetails.optionalFieldPlaceholder) || ''
+    optionalFieldPlaceholder: (_config$fullDetails2 = config.fullDetails) === null || _config$fullDetails2 === void 0 ? void 0 : _config$fullDetails2.optionalFieldPlaceholder
   }))));
 };
 SummaryCard.propTypes = {

package/dist/components/CollectionSummary/SummaryCard.scss

@@ -44,6 +44,12 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
         margin-right: govuk-spacing(2);
       }
 
+      &-title {
+        margin-block-start: 0;
+        margin-block-end: 0;
+        font-size: 1em;
+      }
+
       &-detail {
         font-weight: normal;
       }

package/dist/components/CollectionSummary/SummaryCard.test.js

@@ -81,7 +81,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
     expect(headerBanners.tagName).toEqual('DIV');
     expect(headerBanners.classList).toContain(_BannerStrip.DEFAULT_CLASS);
     var headerTitle = headerContentDiv.children[1];
-    expect(headerTitle.tagName).toEqual('DIV');
+    expect(headerTitle.tagName).toEqual('H2');
     expect(headerTitle.classList).toContain(classes('header-content-title'));
     expect(headerTitle.textContent).toEqual(CONFIG.title);
     var headerDetails = headerContentDiv.children[2];
@@ -113,7 +113,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
     // and the details.
 
     var headerTitle = headerContentDiv.children[0];
-    expect(headerTitle.tagName).toEqual('DIV');
+    expect(headerTitle.tagName).toEqual('H2');
     expect(headerTitle.classList).toContain(classes('header-content-title'));
     expect(headerTitle.textContent).toEqual(CONFIG.title);
     var headerDetails = headerContentDiv.children[1];
@@ -148,7 +148,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
     // the title.
 
     var headerTitle = headerContentDiv.children[1];
-    expect(headerTitle.tagName).toEqual('DIV');
+    expect(headerTitle.tagName).toEqual('H2');
     expect(headerTitle.classList).toContain(classes('header-content-title'));
     expect(headerTitle.textContent).toEqual(CONFIG.title);
   });
@@ -171,7 +171,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
     var _checkSetup4 = checkSetup(container),
       headerContentDiv = _checkSetup4.headerContentDiv;
     var headerTitle = headerContentDiv.children[0];
-    expect(headerTitle.tagName).toEqual('DIV');
+    expect(headerTitle.tagName).toEqual('H2');
     expect(headerTitle.classList).toContain(classes('header-content-title'));
     expect(headerTitle.textContent).toEqual("".concat(ENTRY.titleText, " that is interpolated"));
   });
@@ -211,7 +211,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
     var _checkSetup5 = checkSetup(container),
       headerContentDiv = _checkSetup5.headerContentDiv;
     var headerTitle = headerContentDiv.children[0];
-    expect(headerTitle.tagName).toEqual('DIV');
+    expect(headerTitle.tagName).toEqual('H2');
     expect(headerTitle.classList).toContain(classes('header-content-title'));
     expect(headerTitle.textContent).toEqual("".concat(ENTRY.titleText, " that is interpolated"));
   });

package/dist/components/CollectionSummary/SummaryCardDetails.js

@@ -168,7 +168,8 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
               childMasterPages: [],
               formData: _objectSpread(_objectSpread(_objectSpread({}, formData), entryData), entry),
               entryData: entry,
-              hideChildSectionTitles: true
+              hideChildSectionTitles: true,
+              optionalFieldPlaceholder: optionalFieldPlaceholder
             });
           }));
         }
@@ -182,7 +183,7 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
         className: classes('section')
       }, !hideChildSectionTitles && /*#__PURE__*/_react.default.createElement("h3", {
         className: classes('section-title')
-      }, _utils.default.FormPage.getConditionalText(section.title, _objectSpread(_objectSpread({}, childPage.formData), entryData))), /*#__PURE__*/_react.default.createElement("div", {
+      }, _utils.default.FormPage.getConditionalText(section.title, _objectSpread(_objectSpread({}, childPage.formData), entryData))), /*#__PURE__*/_react.default.createElement("dl", {
         className: classes('section-content'),
         style: {
           '--dividers': columns.length - 1

package/dist/components/CollectionSummary/SummaryCardDetails.scss

@@ -141,6 +141,8 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
         grid-column-end: var(--column);
         grid-row-start: var(--row);
         grid-row-end: var(--row);
+        margin-block-start: 0;
+        margin-block-end: 0;
       }
 
       .hods-form-summary-card-details__divider {

package/dist/components/FormComponent/Collection.js

@@ -8,6 +8,7 @@ exports.default = exports.DEFAULT_CLASS = void 0;
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _uuid = require("uuid");
 var _models = require("../../models");
 var _utils = _interopRequireDefault(require("../../utils"));
 var _Container = _interopRequireDefault(require("./Container"));
@@ -78,7 +79,7 @@ var Collection = function Collection(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             reportChange([].concat(value, [{
-              id: Date.now().toString()
+              id: (0, _uuid.v4)()
             }]));
           case 1:
           case "end":

package/dist/components/FormComponent/Collection.scss

@@ -21,4 +21,4 @@
       float: right;
     }
   }
-}
+}

package/dist/components/FormComponent/Container.js

@@ -12,8 +12,10 @@ var _models = require("../../models");
 var _utils = _interopRequireDefault(require("../../utils"));
 var _FormComponent = _interopRequireDefault(require("./FormComponent"));
 var _getSourceData = _interopRequireDefault(require("../../utils/Data/getSourceData"));
+require("./Container.scss");
 var _excluded = ["container", "value", "formData", "onChange", "wrap", "onTopLevelChange"]; // Global imports
 // Local imports
+// Styles
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }

package/dist/components/FormComponent/Container.scss

@@ -0,0 +1,15 @@
+.horizonal {
+  flex-direction: row;
+  display: flex;
+  justify-content: space-between;
+  gap: 2rem;
+  .horizonal{
+    justify-content: space-around;
+  }
+}
+@media screen and (max-width: 640px) {
+  .horizonal {
+    flex-direction: column;
+    gap:0;
+  }
+}

package/dist/components/FormComponent/FormComponent.js

@@ -89,7 +89,7 @@ var FormComponent = function FormComponent(_ref) {
   };
   (0, _react.useEffect)(function () {
     var defaultValue = _utils.default.Component.defaultValue(component, formData);
-    if (!value && defaultValue) {
+    if (!value && !(formData !== null && formData !== void 0 && formData[component.fieldId]) && defaultValue) {
       if (typeof onComponentChange === 'function') {
         onComponentChange({
           target: {

package/dist/components/FormPage/FormPage.js

@@ -62,13 +62,25 @@ var FormPage = function FormPage(_ref) {
   var onPageChange = function onPageChange(_ref2) {
     var target = _ref2.target;
     var formPage = page;
-    formPage.formData[target.name] = target.value;
-    setPatch(function (prev) {
-      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.name, target.value));
-    });
-    setPatchLabel(function (prev) {
-      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.component, target.label));
-    });
+    if (target.value == null) {
+      delete formPage.formData[target.name];
+      setPatch(function (prev) {
+        var data = prev;
+        return delete data[target.name];
+      });
+      setPatchLabel(function (prev) {
+        var data = prev;
+        return delete data[target.component];
+      });
+    } else {
+      formPage.formData[target.name] = target.value;
+      setPatch(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.name, target.value));
+      });
+      setPatchLabel(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.component, target.label));
+      });
+    }
     if (typeof onChange === 'function') {
       onChange(page.formData);
     }

package/dist/components/FormRenderer/helpers/cleanHiddenNestedData.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _optionIsSelected = _interopRequireDefault(require("../../../utils/Component/optionIsSelected"));
+var _getCollectionPageActiveId = _interopRequireDefault(require("../../../utils/CollectionPage/getCollectionPageActiveId"));
+var _getCollectionPageData = _interopRequireDefault(require("../../../utils/CollectionPage/getCollectionPageData"));
+var _setCollectionPageData = _interopRequireDefault(require("../../../utils/CollectionPage/setCollectionPageData"));
 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; }
@@ -13,6 +16,14 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // Local imports
 var parentComponents = ['radios', 'checkboxes'];
+var getActiveIds = function getActiveIds(collectionName, formData) {
+  var nameParts = collectionName.split('.');
+  var result = {};
+  nameParts.forEach(function (part) {
+    result["".concat(part, "ActiveId")] = formData["".concat(part, "ActiveId")];
+  });
+  return result;
+};
 function getIdsToDelete(component, selectedValue) {
   var _component$data;
   var idsToDelete = [];
@@ -25,29 +36,30 @@ function getIdsToDelete(component, selectedValue) {
   });
   return idsToDelete;
 }
-;
 var cleanHiddenNestedData = function cleanHiddenNestedData(patch, page) {
+  var _patch = patch;
   page.components.forEach(function (component) {
     if (!parentComponents.includes(component.type)) {
       return;
     }
-    var _patch = patch;
     var idsToDelete = getIdsToDelete(component, _patch[component.id]);
     idsToDelete.forEach(function (id) {
       delete _patch[id];
     });
   });
-  if (page.collection && patch[page.collection.name]) {
-    var _page$formData;
-    var activeId = patch["".concat(page.collection.name, "ActiveId")] || ((_page$formData = page.formData) === null || _page$formData === void 0 ? void 0 : _page$formData["".concat(page.collection.name, "ActiveId")]);
-    var _patch = patch;
-    _patch[page.collection.name] = _patch[page.collection.name].map(function (entry) {
-      return entry.id === activeId ? cleanHiddenNestedData(entry, _objectSpread(_objectSpread({}, page), {}, {
-        collection: undefined
-      })) : entry;
-    });
+  if (page.collection) {
+    _patch = _objectSpread(_objectSpread({}, getActiveIds(page.collection.name, page.formData)), _patch);
+    var collectionData = (0, _getCollectionPageData.default)(page.collection.name, _patch);
+    if (collectionData) {
+      var activeId = (0, _getCollectionPageActiveId.default)(page.collection.name, _patch);
+      var modifiedCollection = collectionData.map(function (entry) {
+        return entry.id === activeId ? cleanHiddenNestedData(entry, _objectSpread(_objectSpread({}, page), {}, {
+          collection: undefined
+        })) : entry;
+      });
+      (0, _setCollectionPageData.default)(page.collection.name, modifiedCollection, _patch);
+    }
   }
-  ;
-  return patch;
+  return _patch;
 };
 var _default = exports.default = cleanHiddenNestedData;

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

@@ -78,7 +78,7 @@ describe('components', function () {
           expect(updatedPatchCheckboxes.nested1).toBeFalsy();
           expect(updatedPatchCheckboxes.nested2).toBeTruthy();
         });
-        it('remove data corresponding to hidden nested components within the active collection entry', function () {
+        it('should remove data corresponding to hidden nested components within the active collection entry', function () {
           var patch = {
             collectionNameActiveId: '456',
             collectionName: [{
@@ -100,6 +100,9 @@ describe('components', function () {
             collection: {
               name: 'collectionName'
             },
+            formData: {
+              collectionNameActiveId: '456'
+            },
             components: [{
               id: 'parent',
               type: 'radios',
@@ -126,6 +129,61 @@ describe('components', function () {
           expect(updatedPatch.collectionName[1].nested1).toBeFalsy();
           expect(updatedPatch.collectionName[1].nested2).toBeTruthy();
         });
+        it('should remove data corresponding to hidden nested components when collection is nested within an entity', function () {
+          var patch = {
+            collectionNameActiveId: '456',
+            entities: [{
+              id: '777',
+              collectionName: [{
+                id: '123',
+                parent: 'option1',
+                nested1: 'should be included',
+                nested2: 'should be included'
+              }, {
+                id: '456',
+                parent: 'option2',
+                nested1: 'should not be included',
+                nested2: 'should be included'
+              }]
+            }]
+          };
+          var page = {
+            id: 'page',
+            name: 'page',
+            title: 'Page',
+            collection: {
+              name: 'entities.collectionName'
+            },
+            formData: {
+              collectionNameActiveId: '456',
+              entitiesActiveId: '777'
+            },
+            components: [{
+              id: 'parent',
+              type: 'radios',
+              data: {
+                options: [{
+                  value: 'option1',
+                  nested: [{
+                    id: 'nested1',
+                    fieldId: 'nested1'
+                  }]
+                }, {
+                  value: 'option2',
+                  nested: [{
+                    id: 'nested2',
+                    fieldId: 'nested2'
+                  }]
+                }]
+              }
+            }]
+          };
+          var updatedPatch = (0, _cleanHiddenNestedData.default)(patch, page);
+          expect(updatedPatch.entities[0].collectionName[0].nested1).toBeTruthy();
+          expect(updatedPatch.entities[0].collectionName[0].nested2).toBeTruthy();
+          expect(updatedPatch.entities[0].collectionName[1].nested1).toBeFalsy();
+          expect(updatedPatch.entities[0].collectionName[1].nested2).toBeTruthy();
+        });
       });
     });
   });

package/dist/components/FormRenderer/onPageAction.js

@@ -100,7 +100,11 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
           break;
       }
       ;
-      /* eslint-enable no-case-declarations */
+
+      // If a value has been deleted from formData,
+      // also delete it from data before doing object spread,
+      // or else it will reappear in submissionData.
+      _utils.default.Data.deleteValues(data, formState.page.formData);
 
       // Save draft or submit.
       var submissionData = _utils.default.Format.form({

package/dist/json/actions.json

@@ -0,0 +1,17 @@
+[
+    {
+        "type": "submit",
+        "label": "Submit",
+        "validate": true
+    },
+    {
+        "type": "saveAndReturn",
+        "show_when": {
+            "field": "areYouACivilServant",
+            "op": "nin",
+            "values": [
+                "no"
+            ]
+        }
+    }
+]

package/dist/json/actionsNoSave.json

@@ -0,0 +1,17 @@
+[
+    {
+        "type": "submit",
+        "label": "Submit",
+        "validate": true
+    },
+    {
+        "type": "saveAndReturn",
+        "show_when": {
+            "field": "areYouACivilServant",
+            "op": "nin",
+            "values": [
+                "yes"
+            ]
+        }
+    }
+]

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -204,8 +204,9 @@ var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onA
     rows.push(getCollectionNameHeading(page, collectionName, page.collection.collectionHeading, headingChangeAction));
   }
   var itemIndex = 0;
-  var result = Array.isArray(page.collection.onlyShowActiveEntryOnCYA) ? (0, _meetsAllConditions.default)(page.collection.onlyShowActiveEntryOnCYA, data) : page.collection.onlyShowActiveEntryOnCYA;
-  if (result) {
+  var hideItemTitles = Array.isArray(page.collection.hideItemTitles) ? (0, _meetsAllConditions.default)(page.collection.hideItemTitles, data) : page.collection.hideItemTitles;
+  var onlyShowActiveEntry = Array.isArray(page.collection.onlyShowActiveEntryOnCYA) ? (0, _meetsAllConditions.default)(page.collection.onlyShowActiveEntryOnCYA, data) : page.collection.onlyShowActiveEntryOnCYA;
+  if (onlyShowActiveEntry) {
     var activeEntry = collectionData.find(function (entry, index) {
       itemIndex = index;
       return entry.id === activeId;
@@ -222,9 +223,11 @@ var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onA
     var labelCount = itemIndex + 1;
     var actionPosition = ((_page$collection2 = page.collection) === null || _page$collection2 === void 0 ? void 0 : _page$collection2.actionPosition) || 'top';
     var fullPath = "".concat(page.collection.name, "[").concat(itemIndex, "]");
-    var titleRow = getTitleRowForItem(page, item, page.id, labelCount, fullPath);
     var actionRows = getActionRows(page, item, onAction, labelCount, activeIds);
-    rows = rows.concat(titleRow);
+    if (!hideItemTitles) {
+      var titleRow = getTitleRowForItem(page, item, page.id, labelCount, fullPath);
+      rows = rows.concat(titleRow);
+    }
     if (actionPosition === 'top') {
       rows = rows.concat(actionRows);
     }