@ukhomeoffice/cop-react-form-renderer 4.48.0 → 4.49.0

package/dist/components/FormRenderer/FormRenderer.js

@@ -616,7 +616,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     type: type
   })), hub === _models.HubFormats.TASK && formState.pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_TaskList.default, _extends({}, hubDetails, {
     refNumber: data.businessKey,
-    onTaskAction: onTaskAction
+    onTaskAction: onTaskAction,
+    formData: data
   })), formState.page && !formState.cya && !formState.page.collection && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: formState.page,
     onAction: onPageAction

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

@@ -591,8 +591,8 @@ describe('components', function () {
         }
       }, _callee18);
     })));
-    it('should handle navigating between task list pages', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
-      var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, taskList, firstTaskStatus, secondTaskStatus, firstTask, newPage, continueButton, seaButton, cyaPageChange, modeChangeLink, changePage, airButton, cyaPage, finalSubmit;
+    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;
       return regeneratorRuntime.wrap(function _callee20$(_context20) {
         while (1) {
           switch (_context20.prev = _context20.next) {
@@ -607,13 +607,18 @@ describe('components', function () {
               HOOKS = {
                 onSubmit: ON_SUBMIT
               };
-              _context20.next = 5;
+              TASK_LIST_WITH_NOTES = JSON.parse(JSON.stringify(_taskList.default));
+              TASK_LIST_WITH_NOTES.hub.notes = {
+                title: "test title",
+                text: "test text"
+              };
+              _context20.next = 7;
               return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
                 return regeneratorRuntime.wrap(function _callee19$(_context19) {
                   while (1) {
                     switch (_context19.prev = _context19.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, {
                           hooks: HOOKS
                         })), container);
 
@@ -625,6 +630,52 @@ describe('components', function () {
                 }, _callee19);
               })));
 
+            case 7:
+              taskList = container.childNodes[0].childNodes[1];
+              notesText = taskList.childNodes[3];
+              expect(notesText.textContent).toEqual("test text");
+
+            case 10:
+            case "end":
+              return _context20.stop();
+          }
+        }
+      }, _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;
+      return regeneratorRuntime.wrap(function _callee22$(_context22) {
+        while (1) {
+          switch (_context22.prev = _context22.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
+              };
+              _context22.next = 5;
+              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, {
+                          hooks: HOOKS
+                        })), container);
+
+                      case 1:
+                      case "end":
+                        return _context21.stop();
+                    }
+                  }
+                }, _callee21);
+              })));
+
             case 5:
               taskList = container.childNodes[0].childNodes[1]; //Check statuses are correct
 
@@ -724,16 +775,16 @@ describe('components', function () {
 
             case 54:
             case "end":
-              return _context20.stop();
+              return _context22.stop();
           }
         }
-      }, _callee20);
+      }, _callee22);
     })));
-    it('should go straight to CYA page if a complete task is selected', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee22() {
+    it('should go straight to CYA page if a complete task is selected', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee24() {
       var ON_SUBMIT, HOOKS, taskList, newPage;
-      return regeneratorRuntime.wrap(function _callee22$(_context22) {
+      return regeneratorRuntime.wrap(function _callee24$(_context24) {
         while (1) {
-          switch (_context22.prev = _context22.next) {
+          switch (_context24.prev = _context24.next) {
             case 0:
               ON_SUBMIT = function ON_SUBMIT(type, payload, onSuccess, onError) {
                 onSuccess();
@@ -742,11 +793,11 @@ describe('components', function () {
               HOOKS = {
                 onSubmit: ON_SUBMIT
               };
-              _context22.next = 4;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee21() {
-                return regeneratorRuntime.wrap(function _callee21$(_context21) {
+              _context24.next = 4;
+              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee23() {
+                return regeneratorRuntime.wrap(function _callee23$(_context23) {
                   while (1) {
-                    switch (_context21.prev = _context21.next) {
+                    switch (_context23.prev = _context23.next) {
                       case 0:
                         (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _taskList.default, {
                           hooks: HOOKS
@@ -754,10 +805,10 @@ describe('components', function () {
 
                       case 1:
                       case "end":
-                        return _context21.stop();
+                        return _context23.stop();
                     }
                   }
-                }, _callee21);
+                }, _callee23);
               })));
 
             case 4:
@@ -809,16 +860,16 @@ describe('components', function () {
 
             case 17:
             case "end":
-              return _context22.stop();
+              return _context24.stop();
           }
         }
-      }, _callee22);
+      }, _callee24);
     })));
-    it('should go to the last page of a complete task if noTaskCYAs specified', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee24() {
+    it('should go to the last page of a complete task if noTaskCYAs specified', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee26() {
       var ON_SUBMIT, HOOKS, TASK_LIST_WITH_NO_TASK_CYAS, 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();
@@ -833,11 +884,11 @@ describe('components', function () {
                 type: 'save',
                 complete: true
               };
-              _context24.next = 7;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee23() {
-                return regeneratorRuntime.wrap(function _callee23$(_context23) {
+              _context26.next = 7;
+              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({}, TASK_LIST_WITH_NO_TASK_CYAS, {
                           hooks: HOOKS
@@ -845,10 +896,10 @@ describe('components', function () {
 
                       case 1:
                       case "end":
-                        return _context23.stop();
+                        return _context25.stop();
                     }
                   }
-                }, _callee23);
+                }, _callee25);
               })));
 
             case 7:
@@ -897,17 +948,17 @@ describe('components', function () {
 
             case 19:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
         }
-      }, _callee24);
+      }, _callee26);
     })));
-    it('should handle cancellation from a page', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee26() {
+    it('should handle cancellation from a page', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee28() {
       var ON_CANCEL_CALLS, ON_CANCEL, HOOKS, form, hub, _hub$childNodes5, civilServantList, link, page, cancel;
 
-      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_CANCEL_CALLS = [];
 
@@ -918,11 +969,11 @@ describe('components', function () {
               HOOKS = {
                 onCancel: ON_CANCEL
               };
-              _context26.next = 5;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee25() {
-                return regeneratorRuntime.wrap(function _callee25$(_context25) {
+              _context28.next = 5;
+              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({}, _userProfile.default, {
                           data: _userProfileData.default,
@@ -931,10 +982,10 @@ describe('components', function () {
 
                       case 1:
                       case "end":
-                        return _context25.stop();
+                        return _context27.stop();
                     }
                   }
-                }, _callee25);
+                }, _callee27);
               })));
 
             case 5:
@@ -958,16 +1009,16 @@ describe('components', function () {
 
             case 15:
             case "end":
-              return _context26.stop();
+              return _context28.stop();
           }
         }
-      }, _callee26);
+      }, _callee28);
     })));
-    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 _callee28() {
+    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() {
       var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, TASK_LIST_NON_SEQUENTIAL, taskList, firstTask, newPage;
-      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_SUBMIT_CALLS = [];
 
@@ -981,11 +1032,11 @@ describe('components', function () {
               };
               TASK_LIST_NON_SEQUENTIAL = JSON.parse(JSON.stringify(_taskList.default));
               TASK_LIST_NON_SEQUENTIAL.hub.nonSequential = true;
-              _context28.next = 7;
-              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee27() {
-                return regeneratorRuntime.wrap(function _callee27$(_context27) {
+              _context30.next = 7;
+              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({}, TASK_LIST_NON_SEQUENTIAL, {
                           hooks: HOOKS
@@ -993,10 +1044,10 @@ describe('components', function () {
 
                       case 1:
                       case "end":
-                        return _context27.stop();
+                        return _context29.stop();
                     }
                   }
-                }, _callee27);
+                }, _callee29);
               })));
 
             case 7:
@@ -1013,10 +1064,10 @@ describe('components', function () {
 
             case 13:
             case "end":
-              return _context28.stop();
+              return _context30.stop();
           }
         }
-      }, _callee28);
+      }, _callee30);
     })));
   });
 });

package/dist/components/TaskList/TaskList.js

@@ -21,7 +21,7 @@ var _Task = _interopRequireDefault(require("./Task"));
 
 require("./TaskList.scss");
 
-var _excluded = ["refTitle", "refNumber", "incompleteTitle", "sections", "fieldId", "onTaskAction", "classBlock", "classModifiers", "className"];
+var _excluded = ["refTitle", "refNumber", "notes", "incompleteTitle", "sections", "fieldId", "onTaskAction", "classBlock", "classModifiers", "className"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -55,6 +55,7 @@ exports.DEFAULT_INCOMPLETE_TITLE = DEFAULT_INCOMPLETE_TITLE;
 var TaskList = function TaskList(_ref) {
   var refTitle = _ref.refTitle,
       refNumber = _ref.refNumber,
+      notes = _ref.notes,
       incompleteTitle = _ref.incompleteTitle,
       sections = _ref.sections,
       fieldId = _ref.fieldId,
@@ -78,6 +79,12 @@ var TaskList = function TaskList(_ref) {
       completeSections = _sections$reduce2[0],
       totalSections = _sections$reduce2[1];
 
+  var notesId = "".concat(attrs.id, "Notes");
+
+  var _ref2 = notes ? notes : {},
+      notesTitle = _ref2.title,
+      notesText = _ref2.text;
+
   var onClick = function onClick(task) {
     if (typeof onTaskAction === 'function') {
       onTaskAction(task);
@@ -98,7 +105,16 @@ 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")), sections.map(function (section, index) {
+  }, "You have completed ".concat(completeSections, " of ").concat(totalSections, " sections")), notesTitle && notesText && /*#__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"
+  }, _copReactComponents.Utils.interpolateString(notesTitle, attrs.formData))), /*#__PURE__*/_react.default.createElement(_copReactComponents.TextArea, {
+    id: notesId,
+    fieldId: notesId,
+    readOnly: true,
+    value: _copReactComponents.Utils.interpolateString(notesText, attrs.formData)
+  })), sections.map(function (section, index) {
     return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
       key: "".concat(section.name)
     }, /*#__PURE__*/_react.default.createElement("h2", {
@@ -118,6 +134,10 @@ var TaskList = function TaskList(_ref) {
 TaskList.propTypes = {
   refTitle: _propTypes.default.string,
   refNumber: _propTypes.default.string,
+  notes: _propTypes.default.shape({
+    title: _propTypes.default.string,
+    text: _propTypes.default.string
+  }),
   incompleteTitle: _propTypes.default.string,
   sections: _propTypes.default.arrayOf(_propTypes.default.shape({
     name: _propTypes.default.string.isRequired,

package/package.json

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