@ukhomeoffice/cop-react-form-renderer 3.16.1-alpha → 3.17.2

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/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/Component/getComponentTests/getComponent.checkboxes.test.js

@@ -102,8 +102,8 @@ describe('utils.Component.get', function () {
     _react.fireEvent.click(checkboxItems[0].childNodes[0]); // alpha
 
 
-    expect(ON_CHANGE_CALLS.length).toEqual(2);
-    expect(ON_CHANGE_CALLS[1]).toMatchObject({
+    expect(ON_CHANGE_CALLS.length).toEqual(1);
+    expect(ON_CHANGE_CALLS[0]).toMatchObject({
       name: FIELD_ID,
       value: [OPTIONS[0].value]
     });
@@ -111,8 +111,8 @@ describe('utils.Component.get', function () {
     _react.fireEvent.click(checkboxItems[1].childNodes[0]); // beta
 
 
-    expect(ON_CHANGE_CALLS.length).toEqual(3);
-    expect(ON_CHANGE_CALLS[2]).toMatchObject({
+    expect(ON_CHANGE_CALLS.length).toEqual(2);
+    expect(ON_CHANGE_CALLS[1]).toMatchObject({
       name: FIELD_ID,
       value: [OPTIONS[0].value, OPTIONS[1].value]
     });
@@ -120,8 +120,8 @@ describe('utils.Component.get', function () {
     _react.fireEvent.click(checkboxItems[0].childNodes[0]); // alpha (unchecked this time)
 
 
-    expect(ON_CHANGE_CALLS.length).toEqual(4);
-    expect(ON_CHANGE_CALLS[3]).toMatchObject({
+    expect(ON_CHANGE_CALLS.length).toEqual(3);
+    expect(ON_CHANGE_CALLS[2]).toMatchObject({
       name: FIELD_ID,
       value: [OPTIONS[1].value]
     });

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.1-alpha",
+  "version": "3.17.2",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "1.12.0",
+    "@ukhomeoffice/cop-react-components": "1.13.1",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^3.13.0",