@ukhomeoffice/cop-react-form-renderer 5.19.0 → 5.19.2

package/dist/components/CheckYourAnswers/CheckYourAnswers.js

@@ -137,7 +137,9 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
   }, title), errors && errors.length > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
     errors: errors
   }), type === _models.FormTypes.TASK_CYA && pages.length > 0 && sections && sections.map(function (section) {
-    return section.tasks.map(function (task, taskIndex) {
+    return section.tasks.filter(function (task) {
+      return task.state !== _models.TaskStates.TYPES.SKIPPED;
+    }).map(function (task, taskIndex) {
       var filterPages = pages.filter(function (page) {
         return task.pages.some(function (p) {
           return p === page.name;

package/dist/components/CheckYourAnswers/CheckYourAnswers.test.js

@@ -548,5 +548,57 @@ describe('components', function () {
         }
       }, _callee22);
     })));
+    it('should show task list in CYA style and hide pages from skipped tasks', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+      var sections, taskHeading1, namesPageHeading;
+      return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+        while (1) switch (_context24.prev = _context24.next) {
+          case 0:
+            sections = [{
+              name: 'These are your tasks',
+              tasks: [{
+                name: 'Task 1',
+                state: 'complete',
+                pages: ['names']
+              }, {
+                name: 'Task 2',
+                state: 'skipped',
+                pages: ['grade']
+              }]
+            }];
+            _context24.next = 3;
+            return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+              return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+                while (1) switch (_context23.prev = _context23.next) {
+                  case 0:
+                    (0, _setupTests.renderDomWithValidation)( /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, {
+                      pages: PAGES,
+                      onRowAction: ON_ROW_ACTION,
+                      onAction: ON_ACTION,
+                      hide_title: true,
+                      sections: sections,
+                      type: "task-list-cya"
+                    }), container);
+                  case 1:
+                  case "end":
+                    return _context23.stop();
+                }
+              }, _callee23);
+            })));
+          case 3:
+            taskHeading1 = container.childNodes[0].childNodes[0];
+            expect(taskHeading1.tagName).toEqual('H2');
+            expect(taskHeading1.textContent).toEqual('Task 1');
+            expect(taskHeading1.classList).toContain("govuk-heading-m");
+            namesPageHeading = container.childNodes[0].childNodes[1];
+            expect(namesPageHeading.tagName).toEqual('DIV');
+            expect(namesPageHeading.textContent).toContain('John');
+            expect(namesPageHeading.classList).toContain("group-of-rows");
+            expect(container.childNodes[0].childNodes.length).toEqual(2); // second task skipped so not shown 
+          case 12:
+          case "end":
+            return _context24.stop();
+        }
+      }, _callee24);
+    })));
   });
 });

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

@@ -9,7 +9,6 @@ var _getNextPageId = _interopRequireDefault(require("./getNextPageId"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var getSubmissionStatus = function getSubmissionStatus(formType, pages, currentPageId, action, formData, currentTask, isCompleted, sections) {
   if (formType === _models.FormTypes.TASK || formType === _models.FormTypes.FORM_WITH_TASK) {
-    var _currentTask$pages;
     var formStatus = formData.formStatus || {};
     formStatus.tasks = formStatus.tasks || {};
     formStatus.tasks[currentTask.name] = formStatus.tasks[currentTask.name] || {};
@@ -43,7 +42,7 @@ var getSubmissionStatus = function getSubmissionStatus(formType, pages, currentP
         complete: false,
         currentPage: (0, _getNextPageId.default)(formType, pages, currentPageId, action, formData)
       };
-    } else if ((_currentTask$pages = currentTask.pages) !== null && _currentTask$pages !== void 0 && _currentTask$pages.includes(currentPageId)) {
+    } else {
       formStatus.tasks[currentTask.name] = {
         complete: !!(action !== null && action !== void 0 && action.complete),
         currentPage: currentPageId

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

@@ -275,26 +275,6 @@ describe('components', function () {
               })
             });
           });
-          it('should not update the current task state if the current page does not belong in the task', function () {
-            var CUSTOM_FORM_TYPE = _models.FormTypes.FORM_WITH_TASK;
-            var ACTION = _models.PageAction.DEFAULTS.saveAndContinue;
-            var CURRENT_TASK = {
-              name: 'test-task',
-              pages: ['page-a']
-            };
-            var CURRENT_PAGE_ID = 'page-b';
-            var CUSTOM_FORM_DATA = {
-              formStatus: {
-                tasks: {
-                  'test-task': {
-                    complete: false,
-                    currentPage: 'page-a'
-                  }
-                }
-              }
-            };
-            expect((0, _getSubmissionStatus.default)(CUSTOM_FORM_TYPE, PAGES, CURRENT_PAGE_ID, ACTION, CUSTOM_FORM_DATA, CURRENT_TASK, true, [])).toMatchObject(CUSTOM_FORM_DATA.formStatus);
-          });
         });
       });
     });

package/package.json

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