@ukhomeoffice/cop-react-form-renderer 3.16.0 → 3.17.1

package/dist/components/FormRenderer/FormRenderer.js

@@ -437,7 +437,7 @@ FormRenderer.propTypes = InternalFormRenderer.propTypes = {
   title: _propTypes.default.string,
 
   /** See <a href="/?path=/docs/f-json--page#formtypes">FormTypes</a>. */
-  type: _propTypes.default.oneOf([_models.FormTypes.CYA, _models.FormTypes.FORM, _models.FormTypes.HUB, _models.FormTypes.TASK, _models.FormTypes.WIZARD, _models.FormTypes.TASKCYA]).isRequired,
+  type: _propTypes.default.oneOf([_models.FormTypes.CYA, _models.FormTypes.FORM, _models.FormTypes.HUB, _models.FormTypes.TASK, _models.FormTypes.WIZARD, _models.FormTypes.TASK_CYA, _models.FormTypes.FORM_WITH_TASK]).isRequired,
   components: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
   pages: _propTypes.default.arrayOf(_propTypes.default.object).isRequired,
   hub: _propTypes.default.object,

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

@@ -12,7 +12,7 @@ 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) {
-  if (formType === _models.FormTypes.TASK) {
+  if (formType === _models.FormTypes.TASK || formType === _models.FormTypes.FORM_WITH_TASK) {
     var formStatus = formData.formStatus || {};
     formStatus.tasks = formStatus.tasks || {};
     formStatus.tasks[currentTask.name] = formStatus.tasks[currentTask.name] || {};

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

@@ -103,7 +103,7 @@ describe('components', function () {
         });
         describe("when the action type is '".concat(_models.PageAction.TYPES.SAVE_AND_RETURN, "'"), function () {
           Object.values(_models.FormTypes).forEach(function (formType) {
-            if (formType !== _models.FormTypes.TASK) {
+            if (formType !== _models.FormTypes.TASK && formType !== _models.FormTypes.FORM_WITH_TASK) {
               it("should return the current page if the form type is '".concat(formType, "'"), function () {
                 var ACTION = _models.PageAction.DEFAULTS.saveAndReturn;
                 expect((0, _getSubmissionStatus.default)(formType, PAGES, PAGES[0].id, ACTION, FORM_DATA)).toMatchObject({

package/dist/components/TaskList/Task.js

@@ -81,7 +81,7 @@ Task.propTypes = {
   task: _propTypes.default.shape({
     name: _propTypes.default.string.isRequired,
     pages: _propTypes.default.array.isRequired,
-    state: _propTypes.default.string.isRequired
+    state: _propTypes.default.string
   }).isRequired,
   onClick: _propTypes.default.func.isRequired
 };

package/dist/components/TaskList/TaskList.js

@@ -100,7 +100,7 @@ TaskList.propTypes = {
     tasks: _propTypes.default.arrayOf(_propTypes.default.shape({
       name: _propTypes.default.string.isRequired,
       pages: _propTypes.default.array.isRequired,
-      state: _propTypes.default.string.isRequired
+      state: _propTypes.default.string
     })).isRequired
   })).isRequired,
   classBlock: _propTypes.default.string,

package/dist/components/TaskList/TaskState.js

@@ -25,18 +25,18 @@ var TaskState = function TaskState(_ref) {
 
   var classes = _copReactComponents.Utils.classBuilder(DEFAULT_CLASS, undefined, undefined);
 
-  if (!_models.TaskStates.DETAILS[state]) {
-    return null;
-  }
-
+  var details = _models.TaskStates.DETAILS[state] || _models.TaskStates.DETAILS.cannotStartYet;
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.Tag, {
-    classModifiers: [_models.TaskStates.DETAILS[state].colour],
+    classModifiers: details.colour,
     className: classes('tag')
-  }, _models.TaskStates.DETAILS[state].label);
+  }, details.label);
 };
 
 TaskState.propTypes = {
-  state: _propTypes.default.string.isRequired
+  state: _propTypes.default.string
+};
+TaskState.defaultProps = {
+  state: _models.TaskStates.TYPES.CANNOT_START_YET
 };
 var _default = TaskState;
 exports.default = _default;

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

@@ -14,6 +14,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Local imports
 describe('components', function () {
   describe('TaskList.TaskState', function () {
+    var checkIsCannotStartYet = function checkIsCannotStartYet(container) {
+      expect(container.childNodes.length).toEqual(1);
+      expect(container.childNodes[0].classList).toContain('hods-tag');
+      expect(container.childNodes[0].classList).toContain("hods-tag--".concat(_models.TaskStates.DETAILS.cannotStartYet.colour));
+      expect(container.childNodes[0].textContent).toEqual(_models.TaskStates.DETAILS.cannotStartYet.label);
+      return true;
+    };
+
     it('should render a complete state icon', function () {
       var STATE = _models.TaskStates.TYPES.COMPLETE;
 
@@ -60,12 +68,9 @@ describe('components', function () {
       })),
           container = _render4.container;
 
-      expect(container.childNodes.length).toEqual(1);
-      expect(container.childNodes[0].classList).toContain('hods-tag');
-      expect(container.childNodes[0].classList).toContain("hods-tag--".concat(_models.TaskStates.DETAILS.cannotStartYet.colour));
-      expect(container.childNodes[0].textContent).toEqual(_models.TaskStates.DETAILS.cannotStartYet.label);
+      expect(checkIsCannotStartYet(container)).toBeTruthy();
     });
-    it('should not render a state if given an unknown value', function () {
+    it('should render the "Cannot start yet" state if given an unknown value', function () {
       var STATE = 'spellingError';
 
       var _render5 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskState.default, {
@@ -73,9 +78,9 @@ describe('components', function () {
       })),
           container = _render5.container;
 
-      expect(container.childNodes.length).toEqual(0);
+      expect(checkIsCannotStartYet(container)).toBeTruthy();
     });
-    it('should not render a state if given null', function () {
+    it('should render the "Cannot start yet" state if given null', function () {
       var STATE = null;
 
       var _render6 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskState.default, {
@@ -83,9 +88,9 @@ describe('components', function () {
       })),
           container = _render6.container;
 
-      expect(container.childNodes.length).toEqual(0);
+      expect(checkIsCannotStartYet(container)).toBeTruthy();
     });
-    it('should not render a state if given undefined', function () {
+    it('should render the "Cannot start yet" state if given undefined', function () {
       var STATE = undefined;
 
       var _render7 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskState.default, {
@@ -93,7 +98,7 @@ describe('components', function () {
       })),
           container = _render7.container;
 
-      expect(container.childNodes.length).toEqual(0);
+      expect(checkIsCannotStartYet(container)).toBeTruthy();
     });
   });
 });

package/dist/models/FormTypes.js

@@ -4,19 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var TYPE_FORM = 'form';
 var TYPE_CHECK_YOUR_ANSWERS = 'cya';
+var TYPE_FORM = 'form';
+var TYPE_FORM_WITH_TASK_LIST = 'form-with-task-list';
 var TYPE_HUB_AND_SPOKE = 'hub-and-spoke';
 var TYPE_TASK_LIST = 'task-list';
-var TYPE_WIZARD = 'wizard';
 var TYPE_TASK_LIST_CYA = 'task-list-cya';
+var TYPE_WIZARD = 'wizard';
 var FormTypes = {
-  FORM: TYPE_FORM,
   CYA: TYPE_CHECK_YOUR_ANSWERS,
+  FORM: TYPE_FORM,
+  FORM_WITH_TASK: TYPE_FORM_WITH_TASK_LIST,
   HUB: TYPE_HUB_AND_SPOKE,
   TASK: TYPE_TASK_LIST,
-  WIZARD: TYPE_WIZARD,
-  TASKCYA: TYPE_TASK_LIST_CYA
+  TASK_CYA: TYPE_TASK_LIST_CYA,
+  WIZARD: TYPE_WIZARD
 };
 var _default = FormTypes;
 exports.default = _default;

package/dist/utils/Hub/getFormHub.js

@@ -37,7 +37,7 @@ var getFormHub = function getFormHub(type, hub, components, formData) {
     }
   }
 
-  if (type === _models.FormTypes.TASK) {
+  if (type === _models.FormTypes.TASK || type === _models.FormTypes.FORM_WITH_TASK) {
     return _models.HubFormats.TASK;
   }
 

package/package.json

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