@ukhomeoffice/cop-react-form-renderer 5.0.0-alpha → 5.0.0

package/dist/components/FormRenderer/handlers/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handlers = exports.default = void 0;
+exports.default = void 0;
 var _cyaAction = _interopRequireDefault(require("./cyaAction"));
 var _navigate = _interopRequireDefault(require("./navigate"));
 var _submissionError = _interopRequireDefault(require("./submissionError"));
@@ -13,6 +13,5 @@ var handlers = {
   navigate: _navigate.default,
   submissionError: _submissionError.default
 };
-exports.handlers = handlers;
 var _default = handlers;
 exports.default = _default;

package/dist/components/FormRenderer/handlers/navigate.js

@@ -12,11 +12,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {object} action The invoked action.
  * @param {string} currentPageId The current pageId.
  * @param {Function} onNavigate The handler to call if the pageId is different to the currentPageId.
+ * @param {object|undefined} state State to pass to the handler on change
  */
 var navigate = function navigate(action, currentPageId, onNavigate) {
+  var state = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
   var pageId = (0, _getPageId.default)(action, currentPageId);
   if (pageId !== currentPageId) {
-    onNavigate(pageId);
+    onNavigate(pageId, state);
   }
 };
 var _default = navigate;

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

@@ -4,24 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var parentComponents = ['radios'];
-var cleanHiddenNestedData = function cleanHiddenNestedData(patch, page) {
-  page.components.forEach(function (component) {
-    if (!parentComponents.includes(component.type)) {
-      return;
-    }
-    var idsToDelete = getIdsToDelete(component, patch[component.id]);
-    idsToDelete.forEach(function (id) {
-      delete patch[id];
-    });
-  });
-  return patch;
-};
+var _optionIsSelected = _interopRequireDefault(require("../../../utils/Component/optionIsSelected"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var parentComponents = ['radios', 'checkboxes'];
 function getIdsToDelete(component, selectedValue) {
   var _component$data, _component$data$optio;
   var idsToDelete = [];
   component === null || component === void 0 ? void 0 : (_component$data = component.data) === null || _component$data === void 0 ? void 0 : (_component$data$optio = _component$data.options) === null || _component$data$optio === void 0 ? void 0 : _component$data$optio.forEach(function (option) {
-    if (option.value !== selectedValue && option.nested) {
+    if (!(0, _optionIsSelected.default)(selectedValue, option) && option.nested) {
       option.nested.forEach(function (nested) {
         idsToDelete.push(nested.id);
       });
@@ -29,5 +25,30 @@ function getIdsToDelete(component, selectedValue) {
   });
   return idsToDelete;
 }
+;
+var cleanHiddenNestedData = function cleanHiddenNestedData(patch, page) {
+  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;
+    });
+  }
+  ;
+  return patch;
+};
 var _default = cleanHiddenNestedData;
 exports.default = _default;

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

@@ -8,13 +8,13 @@ describe('components', function () {
   describe('FormRenderer', function () {
     describe('helpers', function () {
       describe('cleanHiddenNestedData', function () {
-        it('remove data corresponding to hidden nested components', function () {
-          var patch = {
+        it('should remove data corresponding to hidden nested components in radios', function () {
+          var patchRadios = {
             parent: 'option2',
             nested1: 'should not be included',
             nested2: 'should be included'
           };
-          var page = {
+          var pageRadios = {
             id: 'page',
             name: 'page',
             title: 'Page',
@@ -39,9 +39,92 @@ describe('components', function () {
               }
             }]
           };
+          var updatedPatchRadios = (0, _cleanHiddenNestedData.default)(patchRadios, pageRadios);
+          expect(updatedPatchRadios.nested1).toBeFalsy();
+          expect(updatedPatchRadios.nested2).toBeTruthy();
+        });
+        it('should remove data corresponding to hidden nested components in checkboxes', function () {
+          var patchCheckboxes = {
+            parent: ['option2'],
+            nested1: 'should not be included',
+            nested2: 'should be included'
+          };
+          var pageCheckboxes = {
+            id: 'page',
+            name: 'page',
+            title: 'Page',
+            components: [{
+              id: 'parent',
+              fieldId: 'parent',
+              type: 'checkboxes',
+              data: {
+                options: [{
+                  value: 'option1',
+                  nested: [{
+                    id: 'nested1',
+                    fieldId: 'nested1'
+                  }]
+                }, {
+                  value: 'option2',
+                  nested: [{
+                    id: 'nested2',
+                    fieldId: 'nested2'
+                  }]
+                }]
+              }
+            }]
+          };
+          var updatedPatchCheckboxes = (0, _cleanHiddenNestedData.default)(patchCheckboxes, pageCheckboxes);
+          expect(updatedPatchCheckboxes.nested1).toBeFalsy();
+          expect(updatedPatchCheckboxes.nested2).toBeTruthy();
+        });
+        it('remove data corresponding to hidden nested components within the active collection entry', function () {
+          var patch = {
+            collectionNameActiveId: '456',
+            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: 'collectionName'
+            },
+            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['nested1']).toBeFalsy();
-          expect(updatedPatch['nested2']).toBeTruthy();
+          expect(updatedPatch.collectionName[0].nested1).toBeTruthy();
+          expect(updatedPatch.collectionName[0].nested2).toBeTruthy();
+          expect(updatedPatch.collectionName[1].nested1).toBeFalsy();
+          expect(updatedPatch.collectionName[1].nested2).toBeTruthy();
         });
       });
     });

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _models = require("../../../models");
+var _utils = _interopRequireDefault(require("../../../utils"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
 /**
@@ -18,17 +20,24 @@ var getCYA = function getCYA(pageId, pages, hub) {
     return {
       title: ''
     };
-  } else if (pageId === _models.FormPages.CYA) {
+  }
+  ;
+  if (pageId === _models.FormPages.CYA) {
     return {};
   }
+  ;
   var currentPage = pages === null || pages === void 0 ? void 0 : pages.find(function (p) {
     return p.id === pageId;
   });
   if ((currentPage === null || currentPage === void 0 ? void 0 : currentPage.type) === _models.FormPages.PARTIAL_CYA) {
+    var pageWithConditionals = _utils.default.FormPage.applyConditionalProperties(currentPage);
     return {
-      title: currentPage.title
+      title: pageWithConditionals.title,
+      hideChangeActions: pageWithConditionals.hideChangeActions,
+      hideGroupActions: pageWithConditionals.hideGroupActions
     };
   }
+  ;
   return undefined;
 };
 var _default = getCYA;

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

@@ -18,11 +18,14 @@ var getNextHubPageId = function getNextHubPageId(action, currentPageId, pages, f
       if ((currentPage === null || currentPage === void 0 ? void 0 : currentPage.type) === 'pre-task-list') {
         return currentPage.id;
       }
+      ;
       return _models.FormPages.HUB;
     }
+    ;
     return pages.length > 0 ? pages[0].id : undefined;
   }
-  var nextPage = undefined;
+  ;
+  var nextPage;
   action === null || action === void 0 ? void 0 : (_action$pages = action.pages) === null || _action$pages === void 0 ? void 0 : _action$pages.forEach(function (page) {
     if (_FormPage.default.show({
       show_when: page.show_when
@@ -33,9 +36,6 @@ var getNextHubPageId = function getNextHubPageId(action, currentPageId, pages, f
   });
   return nextPage || (action === null || action === void 0 ? void 0 : action.page) || _models.FormPages.HUB;
 };
-var getNextCYAPageId = function getNextCYAPageId(pages, currentPageId, formData) {
-  return getNextWizardPageId(pages, currentPageId, formData) || _models.FormPages.CYA;
-};
 var getNextWizardPageId = function getNextWizardPageId(pages, currentPageId, formData) {
   var _page;
   var nextIndex = pages.findIndex(function (p) {
@@ -43,14 +43,20 @@ var getNextWizardPageId = function getNextWizardPageId(pages, currentPageId, for
   }) + 1;
   var page = pages[nextIndex];
   while (page && !_FormPage.default.show(page, formData)) {
-    nextIndex++;
+    nextIndex += 1;
     page = pages[nextIndex];
   }
+  ;
   return ((_page = page) === null || _page === void 0 ? void 0 : _page.id) || undefined;
 };
+var getNextCYAPageId = function getNextCYAPageId(pages, currentPageId, formData) {
+  return getNextWizardPageId(pages, currentPageId, formData) || _models.FormPages.CYA;
+};
 var getNextFormPageId = function getNextFormPageId(pages) {
-  // A form has a single page... so always return that id.
-  return pages.length > 0 ? pages[0].id : undefined;
+  return (
+    // A form has a single page... so always return that id.
+    pages.length > 0 ? pages[0].id : undefined
+  );
 };
 var getNextPageId = function getNextPageId(formType, pages, currentPageId, action, formData) {
   if (action) {

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

@@ -7,7 +7,10 @@ exports.default = void 0;
 var _models = require("../../../models");
 var slicePages = function slicePages(pages, currentPageId) {
   return pages.slice(0, pages.findIndex(function (p) {
-    return p.id === currentPageId;
+    if ((p === null || p === void 0 ? void 0 : p.id) === currentPageId) {
+      return true;
+    }
+    return false;
   }));
 };
 var getRelevantPages = function getRelevantPages(formState, pages, currentTaskPages) {
@@ -15,7 +18,12 @@ var getRelevantPages = function getRelevantPages(formState, pages, currentTaskPa
   if (((_formState$page = formState.page) === null || _formState$page === void 0 ? void 0 : _formState$page.type) === _models.FormPages.PARTIAL_CYA) {
     return currentTaskPages ? slicePages(currentTaskPages, formState.pageId) : slicePages(pages, formState.pageId);
   }
-  return currentTaskPages ? currentTaskPages : pages;
+  ;
+  if (currentTaskPages) {
+    return currentTaskPages;
+  }
+  ;
+  return pages;
 };
 var _default = getRelevantPages;
 exports.default = _default;

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

@@ -1,7 +1,7 @@
 "use strict";
 
 var _models = require("../../../models");
-var _getRelevantPages = _interopRequireDefault(require("../helpers/getRelevantPages"));
+var _getRelevantPages = _interopRequireDefault(require("./getRelevantPages"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 

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

@@ -23,12 +23,12 @@ var getSubmissionStatus = function getSubmissionStatus(formType, pages, currentP
         sections.forEach(function (section) {
           section.tasks.forEach(function (task) {
             var lastPage = task.pages[task.pages.length - 1];
-            if ((lastPage === currentPageId || lastPage.id === currentPageId) && isCompleted) {
+            if ((lastPage === currentPageId || lastPage.id === currentPageId) && isCompleted && (task === null || task === void 0 ? void 0 : task.type) === 'pre-task-list') {
               formStatus.tasks[task.name] = {
                 complete: isCompleted,
                 currentPage: currentPageId
               };
-            } else if (task.pages.includes(currentPageId)) {
+            } else if (task.pages.includes(currentPageId) && (task === null || task === void 0 ? void 0 : task.type) === 'pre-task-list') {
               formStatus.tasks[task.name] = {
                 complete: false,
                 currentPage: currentPageId

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

@@ -4,7 +4,10 @@ var _models = require("../../../models");
 var _PageAction = require("../../../models/PageAction");
 var _getSubmissionStatus = _interopRequireDefault(require("./getSubmissionStatus"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 describe('components', function () {
   describe('FormRenderer', function () {
     describe('helpers', function () {
@@ -249,7 +252,7 @@ describe('components', function () {
               })
             });
           });
-          it("should mark the current task as complete if the current task is 'undefined' i.e. it is a pre-task-list task", function () {
+          it("should mark the current task as complete if the current task is a pre-task-list task", function () {
             var CURRENT_PAGE_ID = PAGES[PAGES.length - 1].id;
             var TASK_NAME = undefined;
             var CURRENT_TASK = {
@@ -259,6 +262,7 @@ describe('components', function () {
               complete: true
             };
             var TASKS = [{
+              type: 'pre-task-list',
               pages: PAGES
             }];
             var SECTIONS = [{

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

@@ -5,9 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _models = require("../../../models");
-var getCurrentTaskState = function getCurrentTaskState(_ref, defaultState) {
+var _utils = _interopRequireDefault(require("../../../utils"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(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) { 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); }
+/**
+ * @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;
   }
@@ -16,67 +31,172 @@ var getCurrentTaskState = function getCurrentTaskState(_ref, defaultState) {
   }
   return defaultState;
 };
-var allDependentTasksComplete = function allDependentTasksComplete(tasks, mustBeComplete) {
+
+/**
+ * check if dependent tasks have been completed
+ * @param {object} taskStates - list of tasks
+ * @param {array} mustBeComplete - tasks which are depended on
+ * @param {boolean} ignoreSkipped - skipped tasks don't need to have been completed
+ * @returns {boolean} true if dependent tasks complete
+ */
+var allDependentTasksComplete = function allDependentTasksComplete(taskStates, mustBeComplete) {
+  var ignoreSkipped = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return mustBeComplete.reduce(function (allComplete, taskName) {
-    var _tasks$taskName;
-    return allComplete && ((_tasks$taskName = tasks[taskName]) === null || _tasks$taskName === void 0 ? void 0 : _tasks$taskName.complete);
+    var task = taskStates[taskName];
+    if (ignoreSkipped && (task === null || task === void 0 ? void 0 : task.state) === _models.TaskStates.TYPES.SKIPPED) {
+      return allComplete;
+    }
+    return allComplete && (task === null || task === void 0 ? void 0 : task.complete);
   }, true);
 };
+var isPreviousTaskComplete = function isPreviousTaskComplete(tasks, taskIndex) {
+  var lastTaskState = tasks[taskIndex - 1].state;
+  if (lastTaskState === _models.TaskStates.TYPES.COMPLETE) {
+    return true;
+  }
+  if (lastTaskState === _models.TaskStates.TYPES.SKIPPED) {
+    return taskIndex - 1 === 0 ? true : isPreviousTaskComplete(tasks, taskIndex - 1);
+  }
+  return false;
+};
 
 /**
- * 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 {object} taskStates - map 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, taskStates) {
+  var nonSequential = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var allowFirst = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
+  if (taskStates[task.name]) {
+    return getCurrentTaskState(taskStates[task.name], task.state);
+  }
+  if (nonSequential) {
+    if (task.depends_on && !allDependentTasksComplete(taskStates, task.depends_on, task.ignoreSkipped)) {
+      return _models.TaskStates.TYPES.CANNOT_START_YET;
+    }
+    return _models.TaskStates.TYPES.NOT_STARTED;
+  }
+  var notStarted = allowFirst;
+  if (taskIndex) {
+    notStarted = isPreviousTaskComplete(taskList, taskIndex);
+  }
+  if (notStarted) {
+    return _models.TaskStates.TYPES.NOT_STARTED;
+  }
+  return _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 {object} taskStates - task updates
+ * @param {boolean} nonSequential - true if non-sequential task performance allowed
+ * @param {boolean} allowFirst - true if first task can be started
+ * @returns {object} - updated section
+ */
+var updateTasks = function updateTasks(section, taskStates, nonSequential, allowFirst) {
+  var clone = section.tasks.map(function (a) {
+    return _objectSpread({}, a);
+  });
+  clone.filter(function (t) {
+    return t.state !== _models.TaskStates.TYPES.SKIPPED;
+  }).forEach(function (t, index) {
+    var task = t;
+    task.state = updateTaskState(task, index, clone, taskStates, nonSequential, allowFirst);
   });
+  return clone;
 };
-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;
+
+/**
+ * Checks if the previous section has been completed. If the last section
+ * was skipped then this function will check the section before that until
+ * the state of a non-skipped section can be found.
+ * @param {array} sections - array of sections
+ * @param {number} currentIndex - index of the current section
+ * @returns {boolean} true if the last non-skipped section is complete, false
+ *                    if not.
+ */
+var isPreviousSectionComplete = function isPreviousSectionComplete(sections, currentIndex) {
+  var _sections, _sections$tasks$slice;
+  var lastTaskState = (_sections = sections[currentIndex - 1]) === null || _sections === void 0 ? void 0 : (_sections$tasks$slice = _sections.tasks.slice(-1)[0]) === null || _sections$tasks$slice === void 0 ? void 0 : _sections$tasks$slice.state;
+  if (lastTaskState === _models.TaskStates.TYPES.COMPLETE) {
+    return true;
+  }
+  if (lastTaskState === _models.TaskStates.TYPES.SKIPPED) {
+    return currentIndex - 1 === 0 ? true : isPreviousSectionComplete(sections, currentIndex - 1);
+  }
+  return false;
+};
+
+/**
+ * update task states in sections
+ * @param {object[]} sections - array of sections
+ * @param {object} taskStates - update task states
+ * @param {boolean} nonSequential - true if tasks can be performed non-sequentially
+ * @param {object} data - current form data
+ * @returns {object[]} - updated sections - note this is a clone
+ */
+var getUpdatedSectionStates = function getUpdatedSectionStates(sections, taskStates) {
+  var nonSequential = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var data = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  // Make a clone and handle any hidden sections.
+  var clone = sections.map(function (section) {
+    var showWhen = section.show_when ? [section.show_when].flat() : [];
+    if (data && !_utils.default.Condition.meetsAll(showWhen, data)) {
+      return _objectSpread(_objectSpread({}, section), {}, {
+        skipped: true,
+        tasks: section.tasks.map(function (task) {
+          return _objectSpread(_objectSpread({}, task), {}, {
+            state: _models.TaskStates.TYPES.SKIPPED
+          });
+        })
+      });
+    }
+    ;
+    return _objectSpread({}, section);
+  });
+
+  // Now iterate through the clone and handle any hidden tasks.
+  clone.forEach(function (s) {
+    var section = s;
+    section.tasks = section.tasks.map(function (task) {
+      var showWhen = task.show_when ? [task.show_when].flat() : [];
+      if (data && !_utils.default.Condition.meetsAll(showWhen, data)) {
+        return _objectSpread(_objectSpread({}, task), {}, {
+          state: _models.TaskStates.TYPES.SKIPPED
+        });
       }
-      return task;
+      return _objectSpread({}, task);
     });
   });
-};
-var getUpdatedSectionStates = function getUpdatedSectionStates(sections, tasks) {
-  var nonSequential = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  if (nonSequential === true) {
-    return getUpdatedNonSequentialStates(sections, tasks);
-  }
-  return getUpdatedSequentialStates(sections, tasks);
+
+  // Update the taskStates to account for skipped tasks.
+  var states = _objectSpread({}, taskStates);
+  clone.forEach(function (section) {
+    section.tasks.filter(function (t) {
+      return t.state === _models.TaskStates.TYPES.SKIPPED;
+    }).forEach(function (task) {
+      states[task.name] = _objectSpread(_objectSpread({}, states[task.name]), {}, {
+        state: _models.TaskStates.TYPES.SKIPPED
+      });
+    });
+  });
+
+  // Now figure out all the task states.
+  clone.forEach(function (s, index) {
+    var section = s;
+    var allowFirst = index === 0 || isPreviousSectionComplete(clone, index);
+    section.tasks = updateTasks(section, states, nonSequential, allowFirst);
+  });
+  return clone;
 };
 var _default = getUpdatedSectionStates;
 exports.default = _default;