@ukhomeoffice/cop-react-form-renderer 4.51.1 → 4.53.0

package/dist/components/FormRenderer/FormRenderer.js

@@ -103,7 +103,7 @@ var DEFAULT_CLASS = 'hods-form';
 exports.DEFAULT_CLASS = DEFAULT_CLASS;
 
 var InternalFormRenderer = function InternalFormRenderer(_ref2) {
-  var _formState$page5;
+  var _formState$page5, _formState$page$actio;
 
   var title = _ref2.title,
       type = _ref2.type,
@@ -605,7 +605,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   }, title && !hide_title && pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, title), formState.cya && /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, _extends({
     pages: _helpers.default.getRelevantPages(formState, pages, currentTask.fullPages)
   }, cya, ((_formState$page5 = formState.page) === null || _formState$page5 === void 0 ? void 0 : _formState$page5.type) === _models.FormPages.PARTIAL_CYA && {
-    actions: formState.page.actions
+    actions: (_formState$page$actio = formState.page.actions) === null || _formState$page$actio === void 0 ? void 0 : _formState$page$actio.filter(function (action) {
+      return _utils.default.Component.show(action, data);
+    })
   }, formState.cya, {
     onAction: onCYAAction,
     onRowAction: onCYARowAction,

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

@@ -592,7 +592,7 @@ describe('components', function () {
       }, _callee18);
     })));
     it('should load tasklist with notes', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
-      var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, TASK_LIST_WITH_NOTES, taskList, notesText;
+      var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, TASK_LIST_WITH_NOTES, taskList;
       return regeneratorRuntime.wrap(function _callee20$(_context20) {
         while (1) {
           switch (_context20.prev = _context20.next) {
@@ -610,7 +610,12 @@ describe('components', function () {
               TASK_LIST_WITH_NOTES = JSON.parse(JSON.stringify(_taskList.default));
               TASK_LIST_WITH_NOTES.hub.notes = {
                 title: "test title",
-                text: "test text"
+                text: "test text",
+                show_when: [{
+                  "op": "=",
+                  "field": "areYouACivilServant",
+                  "value": "yes"
+                }]
               };
               _context20.next = 7;
               return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
@@ -619,6 +624,7 @@ describe('components', function () {
                     switch (_context19.prev = _context19.next) {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, TASK_LIST_WITH_NOTES, {
+                          data: _userProfileData.default,
                           hooks: HOOKS
                         })), container);
 
@@ -632,8 +638,8 @@ describe('components', function () {
 
             case 7:
               taskList = container.childNodes[0].childNodes[1];
-              notesText = taskList.childNodes[3];
-              expect(notesText.textContent).toEqual("test text");
+              expect(taskList.childNodes[5].textContent).toEqual("test text");
+              expect(taskList.childNodes[5].classList).toContain('govuk-textarea');
 
             case 10:
             case "end":
@@ -642,8 +648,8 @@ describe('components', function () {
         }
       }, _callee20);
     })));
-    it('should handle navigating between task list pages', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee22() {
-      var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, taskList, firstTaskStatus, secondTaskStatus, firstTask, newPage, continueButton, seaButton, cyaPageChange, modeChangeLink, changePage, airButton, cyaPage, finalSubmit;
+    it('should not load tasklist with notes', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee22() {
+      var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, TASK_LIST_WITH_NOTES, taskList;
       return regeneratorRuntime.wrap(function _callee22$(_context22) {
         while (1) {
           switch (_context22.prev = _context22.next) {
@@ -658,13 +664,24 @@ describe('components', function () {
               HOOKS = {
                 onSubmit: ON_SUBMIT
               };
-              _context22.next = 5;
+              TASK_LIST_WITH_NOTES = JSON.parse(JSON.stringify(_taskList.default));
+              TASK_LIST_WITH_NOTES.hub.notes = {
+                title: "test title",
+                text: "test text",
+                show_when: [{
+                  "op": "!=",
+                  "field": "changeSummary",
+                  "value": undefined
+                }]
+              };
+              _context22.next = 7;
               return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee21() {
                 return regeneratorRuntime.wrap(function _callee21$(_context21) {
                   while (1) {
                     switch (_context21.prev = _context21.next) {
                       case 0:
-                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _taskList.default, {
+                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, TASK_LIST_WITH_NOTES, {
+                          data: _userProfileData.default,
                           hooks: HOOKS
                         })), container);
 
@@ -676,6 +693,55 @@ describe('components', function () {
                 }, _callee21);
               })));
 
+            case 7:
+              taskList = container.childNodes[0].childNodes[1];
+              taskList.childNodes.forEach(function (child) {
+                console.log("taskList, child = ".concat(JSON.stringify(child.textContent)));
+              });
+              expect(taskList.childNodes[5].textContent).not.toEqual("test text");
+              expect(taskList.childNodes[5].classList).not.toContain('govuk-textarea');
+
+            case 11:
+            case "end":
+              return _context22.stop();
+          }
+        }
+      }, _callee22);
+    })));
+    it('should handle navigating between task list pages', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee24() {
+      var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, taskList, firstTaskStatus, secondTaskStatus, firstTask, newPage, continueButton, seaButton, cyaPageChange, modeChangeLink, changePage, airButton, cyaPage, finalSubmit;
+      return regeneratorRuntime.wrap(function _callee24$(_context24) {
+        while (1) {
+          switch (_context24.prev = _context24.next) {
+            case 0:
+              ON_SUBMIT_CALLS = [];
+
+              ON_SUBMIT = function ON_SUBMIT(type, payload, onSuccess, onError) {
+                ON_SUBMIT_CALLS.push(payload);
+                onSuccess();
+              };
+
+              HOOKS = {
+                onSubmit: ON_SUBMIT
+              };
+              _context24.next = 5;
+              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, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _taskList.default, {
+                          hooks: HOOKS
+                        })), container);
+
+                      case 1:
+                      case "end":
+                        return _context23.stop();
+                    }
+                  }
+                }, _callee23);
+              })));
+
             case 5:
               taskList = container.childNodes[0].childNodes[1]; //Check statuses are correct
 
@@ -775,16 +841,16 @@ describe('components', function () {
 
             case 54:
             case "end":
-              return _context22.stop();
+              return _context24.stop();
           }
         }
-      }, _callee22);
+      }, _callee24);
     })));
-    it('should go straight to CYA page if a complete task is selected', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee24() {
+    it('should go straight to CYA page if a complete task is selected', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee26() {
       var ON_SUBMIT, HOOKS, taskList, newPage;
-      return regeneratorRuntime.wrap(function _callee24$(_context24) {
+      return regeneratorRuntime.wrap(function _callee26$(_context26) {
         while (1) {
-          switch (_context24.prev = _context24.next) {
+          switch (_context26.prev = _context26.next) {
             case 0:
               ON_SUBMIT = function ON_SUBMIT(type, payload, onSuccess, onError) {
                 onSuccess();
@@ -793,11 +859,11 @@ describe('components', function () {
               HOOKS = {
                 onSubmit: ON_SUBMIT
               };
-              _context24.next = 4;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee23() {
-                return regeneratorRuntime.wrap(function _callee23$(_context23) {
+              _context26.next = 4;
+              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee25() {
+                return regeneratorRuntime.wrap(function _callee25$(_context25) {
                   while (1) {
-                    switch (_context23.prev = _context23.next) {
+                    switch (_context25.prev = _context25.next) {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _taskList.default, {
                           hooks: HOOKS
@@ -805,10 +871,10 @@ describe('components', function () {
 
                       case 1:
                       case "end":
-                        return _context23.stop();
+                        return _context25.stop();
                     }
                   }
-                }, _callee23);
+                }, _callee25);
               })));
 
             case 4:
@@ -860,16 +926,16 @@ describe('components', function () {
 
             case 17:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
         }
-      }, _callee24);
+      }, _callee26);
     })));
-    it('should go to the last page of a complete task if noTaskCYAs specified', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee26() {
+    it('should go to the last page of a complete task if noTaskCYAs specified', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee28() {
       var ON_SUBMIT, HOOKS, TASK_LIST_WITH_NO_TASK_CYAS, taskList, newPage;
-      return regeneratorRuntime.wrap(function _callee26$(_context26) {
+      return regeneratorRuntime.wrap(function _callee28$(_context28) {
         while (1) {
-          switch (_context26.prev = _context26.next) {
+          switch (_context28.prev = _context28.next) {
             case 0:
               ON_SUBMIT = function ON_SUBMIT(type, payload, onSuccess, onError) {
                 onSuccess();
@@ -884,11 +950,11 @@ describe('components', function () {
                 type: 'save',
                 complete: true
               };
-              _context26.next = 7;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee25() {
-                return regeneratorRuntime.wrap(function _callee25$(_context25) {
+              _context28.next = 7;
+              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee27() {
+                return regeneratorRuntime.wrap(function _callee27$(_context27) {
                   while (1) {
-                    switch (_context25.prev = _context25.next) {
+                    switch (_context27.prev = _context27.next) {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, TASK_LIST_WITH_NO_TASK_CYAS, {
                           hooks: HOOKS
@@ -896,10 +962,10 @@ describe('components', function () {
 
                       case 1:
                       case "end":
-                        return _context25.stop();
+                        return _context27.stop();
                     }
                   }
-                }, _callee25);
+                }, _callee27);
               })));
 
             case 7:
@@ -948,17 +1014,17 @@ describe('components', function () {
 
             case 19:
             case "end":
-              return _context26.stop();
+              return _context28.stop();
           }
         }
-      }, _callee26);
+      }, _callee28);
     })));
-    it('should handle cancellation from a page', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee28() {
+    it('should handle cancellation from a page', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee30() {
       var ON_CANCEL_CALLS, ON_CANCEL, HOOKS, form, hub, _hub$childNodes5, civilServantList, link, page, cancel;
 
-      return regeneratorRuntime.wrap(function _callee28$(_context28) {
+      return regeneratorRuntime.wrap(function _callee30$(_context30) {
         while (1) {
-          switch (_context28.prev = _context28.next) {
+          switch (_context30.prev = _context30.next) {
             case 0:
               ON_CANCEL_CALLS = [];
 
@@ -969,11 +1035,11 @@ describe('components', function () {
               HOOKS = {
                 onCancel: ON_CANCEL
               };
-              _context28.next = 5;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee27() {
-                return regeneratorRuntime.wrap(function _callee27$(_context27) {
+              _context30.next = 5;
+              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee29() {
+                return regeneratorRuntime.wrap(function _callee29$(_context29) {
                   while (1) {
-                    switch (_context27.prev = _context27.next) {
+                    switch (_context29.prev = _context29.next) {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _userProfile.default, {
                           data: _userProfileData.default,
@@ -982,10 +1048,10 @@ describe('components', function () {
 
                       case 1:
                       case "end":
-                        return _context27.stop();
+                        return _context29.stop();
                     }
                   }
-                }, _callee27);
+                }, _callee29);
               })));
 
             case 5:
@@ -1009,16 +1075,16 @@ describe('components', function () {
 
             case 15:
             case "end":
-              return _context28.stop();
+              return _context30.stop();
           }
         }
-      }, _callee28);
+      }, _callee30);
     })));
-    it('should navigate to a specific page at the beginning of a task if it is set as the firstPage of a task', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee30() {
+    it('should navigate to a specific page at the beginning of a task if it is set as the firstPage of a task', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee32() {
       var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, TASK_LIST_NON_SEQUENTIAL, taskList, firstTask, newPage;
-      return regeneratorRuntime.wrap(function _callee30$(_context30) {
+      return regeneratorRuntime.wrap(function _callee32$(_context32) {
         while (1) {
-          switch (_context30.prev = _context30.next) {
+          switch (_context32.prev = _context32.next) {
             case 0:
               ON_SUBMIT_CALLS = [];
 
@@ -1032,11 +1098,11 @@ describe('components', function () {
               };
               TASK_LIST_NON_SEQUENTIAL = JSON.parse(JSON.stringify(_taskList.default));
               TASK_LIST_NON_SEQUENTIAL.hub.nonSequential = true;
-              _context30.next = 7;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee29() {
-                return regeneratorRuntime.wrap(function _callee29$(_context29) {
+              _context32.next = 7;
+              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee31() {
+                return regeneratorRuntime.wrap(function _callee31$(_context31) {
                   while (1) {
-                    switch (_context29.prev = _context29.next) {
+                    switch (_context31.prev = _context31.next) {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, TASK_LIST_NON_SEQUENTIAL, {
                           hooks: HOOKS
@@ -1044,10 +1110,10 @@ describe('components', function () {
 
                       case 1:
                       case "end":
-                        return _context29.stop();
+                        return _context31.stop();
                     }
                   }
-                }, _callee29);
+                }, _callee31);
               })));
 
             case 7:
@@ -1064,10 +1130,10 @@ describe('components', function () {
 
             case 13:
             case "end":
-              return _context30.stop();
+              return _context32.stop();
           }
         }
-      }, _callee30);
+      }, _callee32);
     })));
   });
 });

package/dist/components/TaskList/TaskList.js

@@ -19,6 +19,8 @@ var _models = require("../../models");
 
 var _Task = _interopRequireDefault(require("./Task"));
 
+var _showComponent = _interopRequireDefault(require("../../utils/Component/showComponent"));
+
 require("./TaskList.scss");
 
 var _excluded = ["refTitle", "refNumber", "notes", "incompleteTitle", "sections", "fieldId", "onTaskAction", "classBlock", "classModifiers", "className"];
@@ -105,7 +107,7 @@ var TaskList = function TaskList(_ref) {
     className: "tasklist-summary"
   }, incompleteTitle)), /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-7"
-  }, "You have completed ".concat(completeSections, " of ").concat(totalSections, " sections")), notesTitle && notesText && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
+  }, "You have completed ".concat(completeSections, " of ").concat(totalSections, " sections")), notesTitle && notesText && (0, _showComponent.default)(notes, attrs.formData) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-0"
   }, /*#__PURE__*/_react.default.createElement("strong", {
     className: "tasklist-summary"

package/package.json

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