@ukhomeoffice/cop-react-form-renderer 4.32.3 → 4.33.3

package/dist/components/CheckYourAnswers/CheckYourAnswers.js

@@ -159,7 +159,7 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
       });
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h3", {
         className: "govuk-heading-m govuk-!-margin-top-8 govuk-!-margin-bottom-0"
-      }, filterPages.length > 0 && task.name), filterPages.map(function (page, pageIndex, array) {
+      }, filterPages.length > 0 && task.name), filterPages.map(function (page, pageIndex) {
         var hideActionButtons;
         isGroup(page.id) ? hideActionButtons = true : hideActionButtons = noChangeAction;
         return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
@@ -203,7 +203,7 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
 CheckYourAnswers.propTypes = {
   title: _propTypes.default.string.isRequired,
   pages: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
-  actions: _propTypes.default.arrayOf(_propTypes.default.object),
+  actions: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string])),
   onAction: _propTypes.default.func.isRequired,
   onRowAction: _propTypes.default.func.isRequired,
   hide_page_titles: _propTypes.default.bool,

package/dist/components/FormRenderer/FormRenderer.js

@@ -258,7 +258,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       setData(submitted.data);
       setSubmitted(undefined);
     }
-  }, [submitted, setData, setSubmitted]); // Update task list pages with form data and update states
+  }, [submitted, setData, setSubmitted]);
+  var theSections = _hub === null || _hub === void 0 ? void 0 : _hub.sections;
+  var nonSequential = _hub === null || _hub === void 0 ? void 0 : _hub.nonSequential; // Update task list pages with form data and update states
 
   (0, _react.useEffect)(function () {
     var pages = currentTask.fullPages;
@@ -268,8 +270,6 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         if (page) {
           page.formData = data;
         }
-
-        ;
       });
       setCurrentTask(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, {
@@ -278,18 +278,20 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       });
     }
 
-    if (hubDetails !== null && hubDetails !== void 0 && hubDetails.sections) {
+    if (theSections) {
       var _data$formStatus2;
 
       var tasks = (data === null || data === void 0 ? void 0 : (_data$formStatus2 = data.formStatus) === null || _data$formStatus2 === void 0 ? void 0 : _data$formStatus2.tasks) || {};
 
-      var updatedSections = _helpers.default.getUpdatedSectionStates(hubDetails.sections, tasks, hubDetails.nonSequential);
+      var updatedSections = _helpers.default.getUpdatedSectionStates(theSections, tasks, nonSequential);
 
       setHubDetails(function (prev) {
-        return _objectSpread(_objectSpread({}, prev), updatedSections);
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          sections: [].concat(updatedSections)
+        });
       });
     }
-  }, [currentTask.fullPages, data, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.sections, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.nonSequential]);
+  }, [currentTask.fullPages, data, theSections, nonSequential]);
 
   var onPageChange = function onPageChange(newPageId) {
     var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -509,7 +511,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
 
     if (action.type === _models.PageAction.TYPES.SAVE_AND_CONTINUE && hub === _models.HubFormats.TASK) {
-      if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
+      var shouldValidate = !(action.hasOwnProperty('validate') && !action.validate);
+      var canSubmit = shouldValidate ? _helpers.default.canCYASubmit(currentTask.fullPages, validate.pages) : true;
+
+      if (canSubmit) {
         var _submissionData = _utils.default.Format.form({
           pages: pages,
           components: components
@@ -547,10 +552,11 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
 
     if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
-      var shouldValidate = !(action.hasOwnProperty('validate') && !action.validate);
-      var canSubmit = shouldValidate ? _helpers.default.canCYASubmit(currentTask.fullPages, validate.pages) : true;
+      var _shouldValidate = !(action.hasOwnProperty('validate') && !action.validate);
 
-      if (canSubmit) {
+      var _canSubmit = _shouldValidate ? _helpers.default.canCYASubmit(currentTask.fullPages, validate.pages) : true;
+
+      if (_canSubmit) {
         var _submissionData3 = _utils.default.Format.form({
           pages: pages,
           components: components

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

@@ -7,9 +7,23 @@ exports.default = void 0;
 
 var _models = require("../../../models");
 
-var getCurrentTaskState = function getCurrentTaskState(_ref, defaultState) {
+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; }
+
+/**
+ *
+ * @param {boolean} complete - true if task complete
+ * @param {boolean} currentPage - true if current page
+ * @param {TaskStates.TYPES|string} defaultState - default state to set task
+ * @returns {TaskStates.TYPES|string} current task state
+ */
+var getCurrentTaskState = function getCurrentTaskState(_ref) {
   var complete = _ref.complete,
       currentPage = _ref.currentPage;
+  var defaultState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _models.TaskStates.TYPES.NOT_STARTED;
 
   if (complete) {
     return _models.TaskStates.TYPES.COMPLETE;
@@ -21,6 +35,13 @@ var getCurrentTaskState = function getCurrentTaskState(_ref, defaultState) {
 
   return defaultState;
 };
+/**
+ * check if dependent tasks have been completed
+ * @param tasks - list of tasks
+ * @param mustBeComplete - tasks which are depended on
+ * @returns {boolean} true if dependent tasks complete
+ */
+
 
 var allDependentTasksComplete = function allDependentTasksComplete(tasks, mustBeComplete) {
   return mustBeComplete.reduce(function (allComplete, taskName) {
@@ -30,66 +51,73 @@ var allDependentTasksComplete = function allDependentTasksComplete(tasks, mustBe
   }, true);
 };
 /**
- * Updates the given task list sections with the latest states
- * @param {object} sections The JSON defining the sections in the task list
- * @param {object} tasks object with entry for each task containing currentPage and complete boolean flag 
- * {
-     "TaskName": {
-       "complete": true,
-       "currentPage": "pageId"
-     }
-   }
- * @returns An JSON representation of the task list sections with up to date states
+ * return updated task state
+ * @param {object} task - current task object
+ * @param {number} taskIndex - order number of task in list
+ * @param {object[]} taskList - list of tasks (associated with section)
+ * @param tasks - list of task state
+ * @param {boolean} nonSequential - set if tasks can be performed out of order
+ * @param {boolean} allowFirst true if first task in list can be accepted
+ * @returns {TYPES|string} new state
  */
 
 
-var getUpdatedSequentialStates = function getUpdatedSequentialStates(sections, tasks) {
-  return sections.map(function (section, sectionIndex, sectionArray) {
-    return section.tasks.map(function (task, taskIndex, taskArray) {
-      if (tasks[task.name]) {
-        task.state = getCurrentTaskState(tasks[task.name], task.state);
-      } else {
-        var _taskArray, _sectionArray, _sectionArray$tasks$s;
-
-        if (taskIndex === 0 && sectionIndex === 0 || //First task in tasklist
-        ((_taskArray = taskArray[taskIndex - 1]) === null || _taskArray === void 0 ? void 0 : _taskArray.state) === _models.TaskStates.TYPES.COMPLETE || //any task after a complete task in same section
-        taskIndex === 0 && ((_sectionArray = sectionArray[sectionIndex - 1]) === null || _sectionArray === void 0 ? void 0 : (_sectionArray$tasks$s = _sectionArray.tasks.slice(-1)[0]) === null || _sectionArray$tasks$s === void 0 ? void 0 : _sectionArray$tasks$s.state) === _models.TaskStates.TYPES.COMPLETE //any task after a complete task in the preceeding section
-        ) {
-          task.state = _models.TaskStates.TYPES.NOT_STARTED;
-        } else {
-          task.state = _models.TaskStates.TYPES.CANNOT_START_YET;
-        }
-      }
-
-      return task;
-    });
-  });
+var updateTaskState = function updateTaskState(task, taskIndex, taskList, tasks) {
+  var _taskList;
+
+  var nonSequential = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var allowFirst = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
+
+  if (tasks[task.name]) {
+    return getCurrentTaskState(tasks[task.name], task.state);
+  }
+
+  return nonSequential ? task.depends_on && !allDependentTasksComplete(tasks, task.depends_on) ? _models.TaskStates.TYPES.CANNOT_START_YET : _models.TaskStates.TYPES.NOT_STARTED : ( // First task in taskList
+  taskIndex ? // any task after a complete task in same section
+  ((_taskList = taskList[taskIndex - 1]) === null || _taskList === void 0 ? void 0 : _taskList.state) === _models.TaskStates.TYPES.COMPLETE : allowFirst) ? _models.TaskStates.TYPES.NOT_STARTED : _models.TaskStates.TYPES.CANNOT_START_YET;
 };
+/**
+ * update all tasks in section with new state.
+ * note use of clone and forEach as some tasks depend on previous update
+ * @param {object} section - section to be processed
+ * @param {number} sectionIndex - index number of current section
+ * @param tasks - task updates
+ * @param nonSequential - true if non-sequential task performance allowed
+ * @param allowFirst - true if first task can be started
+ * @returns {object} - updated section
+ */
 
-var getUpdatedNonSequentialStates = function getUpdatedNonSequentialStates(sections, tasks) {
-  return sections.map(function (section) {
-    return section.tasks.map(function (task) {
-      if (tasks[task.name]) {
-        task.state = getCurrentTaskState(tasks[task.name], task.state);
-      } else if (task.depends_on && !allDependentTasksComplete(tasks, task.depends_on)) {
-        task.state = _models.TaskStates.TYPES.CANNOT_START_YET;
-      } else {
-        task.state = _models.TaskStates.TYPES.NOT_STARTED;
-      }
-
-      return task;
-    });
+
+var updateTasks = function updateTasks(section, sectionIndex, tasks, nonSequential, allowFirst) {
+  var clone = section.tasks.map(function (a) {
+    return _objectSpread({}, a);
+  });
+  clone.forEach(function (task, taskIndex, taskList) {
+    task.state = updateTaskState(task, taskIndex, taskList, tasks, nonSequential, allowFirst);
   });
+  return clone;
 };
+/**
+ * update task states in sections
+ * @param {object[]} sections - array of sections
+ * @param {object} tasks - update task states
+ * @param {boolean} nonSequential - true if tasks can be performed non-sequentially
+ * @returns {object[]} - updated sections - note this is a clone
+ */
+
 
 var getUpdatedSectionStates = function getUpdatedSectionStates(sections, tasks) {
   var nonSequential = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var clone = sections.map(function (a) {
+    return _objectSpread({}, a);
+  });
+  clone.forEach(function (section, sectionIndex, sectionList) {
+    var _sectionList, _sectionList$tasks$sl;
 
-  if (nonSequential === true) {
-    return getUpdatedNonSequentialStates(sections, tasks);
-  }
-
-  return getUpdatedSequentialStates(sections, tasks);
+    var allowFirst = sectionIndex === 0 || ((_sectionList = sectionList[sectionIndex - 1]) === null || _sectionList === void 0 ? void 0 : (_sectionList$tasks$sl = _sectionList.tasks.slice(-1)[0]) === null || _sectionList$tasks$sl === void 0 ? void 0 : _sectionList$tasks$sl.state) === _models.TaskStates.TYPES.COMPLETE;
+    section.tasks = updateTasks(section, sectionIndex, tasks, nonSequential, allowFirst);
+  });
+  return clone;
 };
 
 var _default = getUpdatedSectionStates;

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

@@ -33,11 +33,11 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', function ()
         }]
       }];
       var updatedSections = (0, _getUpdatedSectionStates.default)(SECTIONS, {});
-      expect(updatedSections[0][0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED);
-      expect(updatedSections[0][1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
-      expect(updatedSections[1][0].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
-      expect(updatedSections[1][1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
-      expect(updatedSections[1][2].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
+      expect(updatedSections[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED);
+      expect(updatedSections[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
+      expect(updatedSections[1].tasks[0].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
+      expect(updatedSections[1].tasks[1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
+      expect(updatedSections[1].tasks[2].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
     });
     it("should set tasks after any '".concat(_models.TaskStates.TYPES.COMPLETE, "' ones to '").concat(_models.TaskStates.TYPES.NOT_STARTED, "'"), function () {
       var SECTIONS = [{
@@ -56,8 +56,8 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', function ()
         }
       };
       var updatedSections = (0, _getUpdatedSectionStates.default)(SECTIONS, TASKS);
-      expect(updatedSections[0][0].state).toEqual(_models.TaskStates.TYPES.COMPLETE);
-      expect(updatedSections[0][1].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED);
+      expect(updatedSections[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.COMPLETE);
+      expect(updatedSections[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED);
     });
     it("should set tasks after any '".concat(_models.TaskStates.TYPES.COMPLETE, "' ones to '").concat(_models.TaskStates.TYPES.NOT_STARTED, " across different sections'"), function () {
       var SECTIONS = [{
@@ -88,10 +88,10 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', function ()
         }
       };
       var updatedSections = (0, _getUpdatedSectionStates.default)(SECTIONS, TASKS);
-      expect(updatedSections[0][0].state).toEqual(_models.TaskStates.TYPES.COMPLETE);
-      expect(updatedSections[0][1].state).toEqual(_models.TaskStates.TYPES.COMPLETE);
-      expect(updatedSections[1][0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED);
-      expect(updatedSections[1][1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
+      expect(updatedSections[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.COMPLETE);
+      expect(updatedSections[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.COMPLETE);
+      expect(updatedSections[1].tasks[0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED);
+      expect(updatedSections[1].tasks[1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
     });
     it("should set tasks to '".concat(_models.TaskStates.TYPES.IN_PROGRESS, "' if they have a current page but are not complete"), function () {
       var SECTIONS = [{
@@ -111,8 +111,8 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', function ()
         }
       };
       var updatedSections = (0, _getUpdatedSectionStates.default)(SECTIONS, TASKS);
-      expect(updatedSections[0][0].state).toEqual(_models.TaskStates.TYPES.IN_PROGRESS);
-      expect(updatedSections[0][1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
+      expect(updatedSections[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.IN_PROGRESS);
+      expect(updatedSections[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET);
     });
   });
   describe('non-sequential tasks', function () {
@@ -138,13 +138,13 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', function ()
     }];
     it("should set all states to '".concat(_models.TaskStates.TYPES.NOT_STARTED, "', except any that depend on others"), function () {
       var RESULT = (0, _getUpdatedSectionStates.default)(SECTIONS, {}, NON_SEQUENTIAL);
-      expect(RESULT[0][0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Alpha
+      expect(RESULT[0].tasks[0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Alpha
 
-      expect(RESULT[0][1].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Bravo
+      expect(RESULT[0].tasks[1].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Bravo
 
-      expect(RESULT[1][0].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET); // Charlie
+      expect(RESULT[1].tasks[0].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET); // Charlie
 
-      expect(RESULT[2][0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Delta
+      expect(RESULT[2].tasks[0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Delta
     });
     it('should keep dependent state unable to start if any dependencies are not complete', function () {
       var ALPHA_COMPLETE = (0, _getUpdatedSectionStates.default)(SECTIONS, {
@@ -152,14 +152,14 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', function ()
           complete: true
         }
       }, NON_SEQUENTIAL);
-      expect(ALPHA_COMPLETE[1][0].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET); // Charlie
+      expect(ALPHA_COMPLETE[1].tasks[0].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET); // Charlie
 
       var BRAVO_COMPLETE = (0, _getUpdatedSectionStates.default)(SECTIONS, {
         Bravo: {
           complete: true
         }
       }, NON_SEQUENTIAL);
-      expect(BRAVO_COMPLETE[1][0].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET); // Charlie
+      expect(BRAVO_COMPLETE[1].tasks[0].state).toEqual(_models.TaskStates.TYPES.CANNOT_START_YET); // Charlie
     });
     it('should allow dependent state to start if all dependencies are complete', function () {
       var TASKS = {
@@ -172,9 +172,9 @@ describe('components.FormRenderer.helpers.getUpdatedSectionStates', function ()
         'Delta': {}
       };
       var RESULT = (0, _getUpdatedSectionStates.default)(SECTIONS, TASKS, NON_SEQUENTIAL);
-      expect(RESULT[1][0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Charlie
+      expect(RESULT[1].tasks[0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Charlie
 
-      expect(RESULT[2][0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Delta
+      expect(RESULT[2].tasks[0].state).toEqual(_models.TaskStates.TYPES.NOT_STARTED); // Delta
     });
   });
 });

package/dist/components/TaskList/TaskList.js

@@ -31,6 +31,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 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; }
@@ -55,14 +67,16 @@ var TaskList = function TaskList(_ref) {
   var classes = _copReactComponents.Utils.classBuilder(classBlock, classModifiers, className); //TODO state will be retrieved from a document in S3 rather than given in the component definition, covered under COP-9885
 
 
-  var numberOfCompleteSections = sections.reduce(function (totalComplete, currentSection) {
-    return totalComplete + currentSection.tasks.filter(function (t) {
+  var _sections$reduce = sections.reduce(function (acc, current) {
+    var _current$tasks$filter, _current$tasks, _current$tasks$length, _current$tasks2;
+
+    return [acc[0] + ((_current$tasks$filter = (_current$tasks = current.tasks) === null || _current$tasks === void 0 ? void 0 : _current$tasks.filter(function (t) {
       return t.state === _models.TaskStates.TYPES.COMPLETE;
-    }).length;
-  }, 0);
-  var numberOfSections = sections.reduce(function (totalSections, current) {
-    return totalSections + current.tasks.length;
-  }, 0);
+    }).length) !== null && _current$tasks$filter !== void 0 ? _current$tasks$filter : 0), acc[1] + ((_current$tasks$length = (_current$tasks2 = current.tasks) === null || _current$tasks2 === void 0 ? void 0 : _current$tasks2.length) !== null && _current$tasks$length !== void 0 ? _current$tasks$length : 0)];
+  }, [0, 0]),
+      _sections$reduce2 = _slicedToArray(_sections$reduce, 2),
+      completeSections = _sections$reduce2[0],
+      totalSections = _sections$reduce2[1];
 
   var onClick = function onClick(task) {
     if (typeof onTaskAction === 'function') {
@@ -78,13 +92,13 @@ var TaskList = function TaskList(_ref) {
     className: "tasklist-summary"
   }, "".concat(refTitle))), /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-font-weight-regular"
-  }, "".concat(refNumber))), numberOfSections !== numberOfCompleteSections && /*#__PURE__*/_react.default.createElement("p", {
+  }, "".concat(refNumber))), totalSections !== completeSections && /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-0"
   }, /*#__PURE__*/_react.default.createElement("strong", {
     className: "tasklist-summary"
   }, incompleteTitle)), /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-7"
-  }, "You have completed ".concat(numberOfCompleteSections, " of ").concat(numberOfSections, " sections")), sections.map(function (section, index) {
+  }, "You have completed ".concat(completeSections, " of ").concat(totalSections, " sections")), sections.map(function (section, index) {
     return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
       key: "".concat(section.name)
     }, /*#__PURE__*/_react.default.createElement("h2", {

package/dist/components/TaskList/TaskList.test.js

@@ -14,8 +14,18 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// Global imports
-// Local imports
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 describe('components', function () {
   describe('TaskList', function () {
     it('should render a TaskList', function () {
@@ -62,33 +72,49 @@ describe('components', function () {
       })),
           container = _render.container;
 
-      expect(container.childNodes.length).toEqual(1);
-      var referenceHeading = container.childNodes[0].childNodes[0];
-      expect(referenceHeading.tagName).toEqual('P');
-      expect(referenceHeading.textContent).toEqual('COP reference number');
-      var referenceNumber = container.childNodes[0].childNodes[1];
-      expect(referenceNumber.tagName).toEqual('P');
-      expect(referenceNumber.textContent).toEqual('123');
-      var incompleteForm = container.childNodes[0].childNodes[2];
-      expect(incompleteForm.tagName).toEqual('P');
-      expect(incompleteForm.textContent).toEqual(_TaskList.DEFAULT_INCOMPLETE_TITLE);
-      var numComplete = container.childNodes[0].childNodes[3];
-      expect(numComplete.tagName).toEqual('P');
-      expect(numComplete.textContent).toEqual('You have completed 2 of 6 sections');
-      expect(container.childNodes[0].childNodes.length).toEqual(8);
-      var subSectionOneHeading = container.childNodes[0].childNodes[4];
-      expect(subSectionOneHeading.tagName).toEqual('H2');
-      expect(subSectionOneHeading.textContent).toEqual('1. These are your tasks');
-      var subSectionOneList = container.childNodes[0].childNodes[5];
+      var childNodes = container.childNodes;
+      expect(childNodes.length).toEqual(1);
+      expect(childNodes[0].childNodes.length).toEqual(8);
+
+      var _childNodes$0$childNo = _slicedToArray(childNodes[0].childNodes, 8),
+          referenceHeading = _childNodes$0$childNo[0],
+          referenceNumber = _childNodes$0$childNo[1],
+          incompleteForm = _childNodes$0$childNo[2],
+          numComplete = _childNodes$0$childNo[3],
+          subSectionOneHeading = _childNodes$0$childNo[4],
+          subSectionOneList = _childNodes$0$childNo[5],
+          subSectionTwoHeading = _childNodes$0$childNo[6],
+          subSectionTwoList = _childNodes$0$childNo[7];
+
+      expect(referenceHeading).toMatchObject({
+        tagName: 'P',
+        textContent: 'COP reference number'
+      });
+      expect(referenceNumber).toMatchObject({
+        tagName: 'P',
+        textContent: '123'
+      });
+      expect(incompleteForm).toMatchObject({
+        tagName: 'P',
+        textContent: _TaskList.DEFAULT_INCOMPLETE_TITLE
+      });
+      expect(numComplete).toMatchObject({
+        tagName: 'P',
+        textContent: 'You have completed 2 of 6 sections'
+      });
+      expect(subSectionOneHeading).toMatchObject({
+        tagName: 'H2',
+        textContent: '1. These are your tasks'
+      });
       expect(subSectionOneList.childNodes.length).toEqual(4);
-      var subSectionTwoHeading = container.childNodes[0].childNodes[6];
-      expect(subSectionTwoHeading.tagName).toEqual('H2');
-      expect(subSectionTwoHeading.textContent).toEqual('2. These are your extra bonus tasks');
-      var subSectionTwoList = container.childNodes[0].childNodes[7];
+      expect(subSectionTwoHeading).toMatchObject({
+        tagName: 'H2',
+        textContent: '2. These are your extra bonus tasks'
+      });
       expect(subSectionTwoList.childNodes.length).toEqual(4);
-      var subSectionOneLabel = container.childNodes[0].childNodes[5].firstChild;
+      var subSectionOneLabel = childNodes[0].childNodes[5].firstChild;
       expect(subSectionOneLabel.textContent).toEqual('This is the label for your first tasks');
-      var subSectionTwoLabel = container.childNodes[0].childNodes[7].firstChild;
+      var subSectionTwoLabel = childNodes[0].childNodes[7].firstChild;
       expect(subSectionTwoLabel.textContent).toEqual('This is the label for your extra tasks');
     });
     it('should not show incomplete title if form is complete', function () {
@@ -133,16 +159,26 @@ describe('components', function () {
       })),
           container = _render2.container;
 
-      expect(container.childNodes[0].childNodes.length).toEqual(7);
-      var referenceHeading = container.childNodes[0].childNodes[0];
-      expect(referenceHeading.tagName).toEqual('P');
-      expect(referenceHeading.textContent).toEqual('COP reference number');
-      var referenceNumber = container.childNodes[0].childNodes[1];
-      expect(referenceNumber.tagName).toEqual('P');
-      expect(referenceNumber.textContent).toEqual('123');
-      var numComplete = container.childNodes[0].childNodes[2];
-      expect(numComplete.tagName).toEqual('P');
-      expect(numComplete.textContent).toEqual('You have completed 6 of 6 sections');
+      var childNodes = container.childNodes;
+      expect(childNodes[0].childNodes.length).toEqual(7);
+
+      var _childNodes$0$childNo2 = _slicedToArray(childNodes[0].childNodes, 3),
+          referenceHeading = _childNodes$0$childNo2[0],
+          referenceNumber = _childNodes$0$childNo2[1],
+          numComplete = _childNodes$0$childNo2[2];
+
+      expect(referenceHeading).toMatchObject({
+        tagName: 'P',
+        textContent: 'COP reference number'
+      });
+      expect(referenceNumber).toMatchObject({
+        tagName: 'P',
+        textContent: '123'
+      });
+      expect(numComplete).toMatchObject({
+        tagName: 'P',
+        textContent: 'You have completed 6 of 6 sections'
+      });
     });
     it('should not show numbers on section headings if there is only one section', function () {
       var COP_REF = '123';
@@ -171,7 +207,8 @@ describe('components', function () {
       })),
           container = _render3.container;
 
-      var subSectionOne = container.childNodes[0].childNodes[4];
+      var childNodes = container.childNodes;
+      var subSectionOne = childNodes[0].childNodes[4];
       expect(subSectionOne.childNodes[0].textContent).toEqual('');
       expect(subSectionOne.childNodes[1].textContent).toEqual('These are your tasks');
     });
@@ -215,12 +252,15 @@ describe('components', function () {
       })),
           container = _render4.container;
 
-      expect(container.childNodes.length).toEqual(1);
-      expect(container.childNodes[0].childNodes.length).toEqual(6); // The first child is now the incomplete text.
+      var childNodes = container.childNodes;
+      expect(childNodes.length).toEqual(1);
+      expect(childNodes[0].childNodes.length).toEqual(6); // The first child is now the incomplete text.
 
-      var incompleteForm = container.childNodes[0].childNodes[0];
-      expect(incompleteForm.tagName).toEqual('P');
-      expect(incompleteForm.textContent).toEqual(_TaskList.DEFAULT_INCOMPLETE_TITLE);
+      var incompleteForm = childNodes[0].childNodes[0];
+      expect(incompleteForm).toMatchObject({
+        tagName: 'P',
+        textContent: _TaskList.DEFAULT_INCOMPLETE_TITLE
+      });
     });
     it('should show the correct incomplete title', function () {
       var INCOMPLETE_TITLE = 'Alpha Bravo';
@@ -262,10 +302,11 @@ describe('components', function () {
         sections: sections,
         incompleteTitle: INCOMPLETE_TITLE
       })),
-          container = _render5.container; // The first child is now the incomplete text.
+          container = _render5.container;
 
+      var childNodes = container.childNodes; // The first child is now the incomplete text.
 
-      var incompleteForm = container.childNodes[0].childNodes[0];
+      var incompleteForm = childNodes[0].childNodes[0];
       expect(incompleteForm.textContent).toEqual(INCOMPLETE_TITLE);
     });
   });
@@ -303,9 +344,10 @@ describe('components', function () {
     })),
         container = _render6.container;
 
-    var firstTask = container.childNodes[0].childNodes[5].childNodes[1].childNodes[0].childNodes[0];
-    var secondTask = container.childNodes[0].childNodes[5].childNodes[2].childNodes[0].childNodes[0];
-    var thirdTask = container.childNodes[0].childNodes[5].childNodes[3].childNodes[0].childNodes[0];
+    var taskList = container.childNodes[0].childNodes[5].childNodes;
+    var firstTask = taskList[1].childNodes[0].childNodes[0];
+    var secondTask = taskList[2].childNodes[0].childNodes[0];
+    var thirdTask = taskList[3].childNodes[0].childNodes[0];
 
     _react.fireEvent.click(firstTask.childNodes[0]);
 

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

@@ -11,6 +11,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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; }
 
 describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
+  var OUTER_ID = 'a';
+  var INNER_ID = 'b';
   it('should get an appropriate row for a container with a single readonly text component', function () {
     var FORM_DATA = {
       container: {
@@ -252,9 +254,6 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     });
   });
   it('should get an appropriate row for a collection with a single text component inside a container', function () {
-    var OUTER_ID = 'a';
-    var INNER_ID = 'b';
-
     var FORM_DATA = _defineProperty({}, OUTER_ID, [_defineProperty({}, INNER_ID, 'Bravo'), _defineProperty({}, INNER_ID, 'Charlie')]);
 
     var PAGE = {
@@ -321,8 +320,6 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     checkValueRow(1, ROWS[3], 'Charlie');
   });
   it('should conditionally show an appropriate row for a single text component inside a container belonging to a partial-collection', function () {
-    var OUTER_ID = 'a';
-    var INNER_ID = 'b';
     var FORM_DATA = {
       collectionName: [{
         container: _defineProperty({}, INNER_ID, 'Bravo'),

package/dist/utils/Component/addShowWhen.js

@@ -34,7 +34,11 @@ var addShowWhen = function addShowWhen(component, condition) {
   var result = _objectSpread({}, component);
 
   if (result.show_when) {
-    result.show_when = Array.isArray(result.show_when) ? [].concat(result.show_when, [_objectSpread({}, condition)]) : [result.show_when, _objectSpread({}, condition)];
+    if (Array.isArray(condition)) {
+      result.show_when = Array.isArray(result.show_when) ? [].concat(condition, result.show_when) : [].concat(condition, [result.show_when]);
+    } else {
+      result.show_when = Array.isArray(result.show_when) ? [].concat(result.show_when, [condition]) : [result.show_when, condition];
+    }
   } else {
     result.show_when = condition;
   }

package/dist/utils/Component/addShowWhen.test.js

@@ -61,7 +61,6 @@ describe('utils.Component.addShowWhen', function () {
       alpha: 'bravo'
     };
     var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
-    console.log(result);
     expect(result).toEqual({
       alpha: 'bravo',
       show_when: NEW_ARRAY_SHOW_WHEN
@@ -135,4 +134,84 @@ describe('utils.Component.addShowWhen', function () {
       show_when: SHOW_WHEN_OR
     });
   });
+  it('should add an array of show_whens to a component with an array of show_whens', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
+      field: 'hij',
+      op: '=',
+      value: 'klm'
+    }, {
+      field: 'nop',
+      op: '=',
+      value: 'qrs'
+    }];
+    var COMPONENT = {
+      alpha: 'bravo',
+      show_when: [{
+        field: 'abc',
+        op: '=',
+        value: 'bcd'
+      }, {
+        field: 'cde',
+        op: '=',
+        value: 'efg'
+      }]
+    };
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    expect(result).toEqual({
+      alpha: 'bravo',
+      show_when: [{
+        field: 'hij',
+        op: '=',
+        value: 'klm'
+      }, {
+        field: 'nop',
+        op: '=',
+        value: 'qrs'
+      }, {
+        field: 'abc',
+        op: '=',
+        value: 'bcd'
+      }, {
+        field: 'cde',
+        op: '=',
+        value: 'efg'
+      }]
+    });
+  });
+  it('should add an array of show_whens to a component with a single show_when', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
+      field: 'hij',
+      op: '=',
+      value: 'klm'
+    }, {
+      field: 'nop',
+      op: '=',
+      value: 'qrs'
+    }];
+    var COMPONENT = {
+      alpha: 'bravo',
+      show_when: {
+        field: 'abc',
+        op: '=',
+        value: 'bcd'
+      }
+    };
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    expect(result).toEqual({
+      alpha: 'bravo',
+      show_when: [{
+        field: 'hij',
+        op: '=',
+        value: 'klm'
+      }, {
+        field: 'nop',
+        op: '=',
+        value: 'qrs'
+      }, {
+        field: 'abc',
+        op: '=',
+        value: 'bcd'
+      }]
+    });
+  });
 });

package/dist/utils/FormPage/getPageActions.js

@@ -52,7 +52,7 @@ var getPageActions = function getPageActions(page) {
       if (a && _typeof(a) === 'object') {
         var _PageAction$DEFAULTS$;
 
-        if ((_PageAction$DEFAULTS$ = _models.PageAction.DEFAULTS[a.type]) !== null && _PageAction$DEFAULTS$ !== void 0 && _PageAction$DEFAULTS$.validate) {
+        if ((_PageAction$DEFAULTS$ = _models.PageAction.DEFAULTS[a.type]) !== null && _PageAction$DEFAULTS$ !== void 0 && _PageAction$DEFAULTS$.validate && !a.hasOwnProperty('validate')) {
           a.validate = true;
         }
 

package/dist/utils/FormPage/getPageActions.test.js

@@ -84,6 +84,33 @@ describe('utils', function () {
           actions: actions
         })).toEqual(actions);
       });
+      it('should add a default validation prop if none are present', function () {
+        var actions = [{
+          type: 'saveAndContinue',
+          label: 'Charlie'
+        }];
+        expect((0, _getPageActions.default)({
+          actions: actions
+        })).toEqual([{
+          type: 'saveAndContinue',
+          label: 'Charlie',
+          validate: true
+        }]);
+      });
+      it('should not overwrite a validation prop when one exists', function () {
+        var actions = [{
+          type: 'submit',
+          label: 'Charlie',
+          validate: false
+        }];
+        expect((0, _getPageActions.default)({
+          actions: actions
+        })).toEqual([{
+          type: 'submit',
+          label: 'Charlie',
+          validate: false
+        }]);
+      });
     });
   });
 });

package/package.json

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