@ukhomeoffice/cop-react-form-renderer 6.15.0-alpha → 6.15.0-hotfix

package/dist/components/CollectionSummary/BannerStrip.scss

@@ -39,6 +39,10 @@
   }
 }
 
+.hods-form-banner-strip__tag--fit-content{
+  max-width: fit-content;
+}
+
 @mixin banner-tag-colours($colour) {
   .hods-form-banner-strip__tag--#{$colour} {
     @extend .govuk-tag--#{$colour};

package/dist/components/FormPage/FormPage.js

@@ -12,6 +12,7 @@ var _utils = _interopRequireDefault(require("../../utils"));
 var _FormComponent = _interopRequireDefault(require("../FormComponent"));
 var _PageActions = _interopRequireDefault(require("../PageActions"));
 require("./FormPage.scss");
+var _validateOnPageLoad = require("../../utils/Validate/validateOnPageLoad");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -24,7 +25,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 // Styles
 const DEFAULT_CLASS = exports.DEFAULT_CLASS = 'hods-form__page';
 const FormPage = _ref => {
-  var _page$customValidatio, _formPage$actions, _page$actions;
+  var _formPage$actions, _page$actions;
   let {
     page,
     pages,
@@ -37,8 +38,7 @@ const FormPage = _ref => {
     classModifiers,
     className,
     submitting,
-    pageId,
-    fromTarget
+    pageId
   } = _ref;
   const [patch, setPatch] = (0, _react.useState)({});
   const {
@@ -47,12 +47,12 @@ const FormPage = _ref => {
   } = (0, _hooks.useValidation)();
   const [patchLabel, setPatchLabel] = (0, _react.useState)({});
   const [isPageRendered, setIsPageRendered] = (0, _react.useState)(false);
-  const runOnLoad = Array.isArray(page === null || page === void 0 ? void 0 : page.customValidation) && page.customValidation.length > 0 ? ((_page$customValidatio = page.customValidation[0]) === null || _page$customValidatio === void 0 || (_page$customValidatio = _page$customValidatio.runWhen) === null || _page$customValidatio === void 0 ? void 0 : _page$customValidatio.onLoad) === true : false;
+  const runOnLoad = (0, _react.useMemo)(() => (0, _validateOnPageLoad.doValidateOnPageLoad)(page), [page]);
   (0, _react.useEffect)(() => {
     setIsPageRendered(true);
   }, []);
   (0, _react.useEffect)(() => {
-    if (isPageRendered && fromTarget && runOnLoad) {
+    if (isPageRendered && runOnLoad) {
       validate.page(page);
     }
   }, [pageId, isPageRendered]);
@@ -120,9 +120,9 @@ const FormPage = _ref => {
   }));
   let errorMessages = null;
   if (runOnLoad && (errors === null || errors === void 0 ? void 0 : errors.length) > 0) {
-    var _page$customValidatio2;
+    var _page$customValidatio;
     errorMessages = [{
-      error: page === null || page === void 0 || (_page$customValidatio2 = page.customValidation) === null || _page$customValidatio2 === void 0 || (_page$customValidatio2 = _page$customValidatio2[0]) === null || _page$customValidatio2 === void 0 ? void 0 : _page$customValidatio2.message
+      error: page === null || page === void 0 || (_page$customValidatio = page.customValidation) === null || _page$customValidatio === void 0 || (_page$customValidatio = _page$customValidatio[0]) === null || _page$customValidatio === void 0 ? void 0 : _page$customValidatio.message
     }];
   } else if ((errors === null || errors === void 0 ? void 0 : errors.length) > 0 && !runOnLoad) {
     errorMessages = errors;
@@ -174,7 +174,6 @@ FormPage.propTypes = {
   }).isRequired,
   pages: _propTypes.default.arrayOf(_propTypes.default.shape({})),
   submitting: _propTypes.default.bool,
-  fromTarget: _propTypes.default.bool,
   pageId: _propTypes.default.string.isRequired
 };
 FormPage.defaultProps = {
@@ -186,7 +185,6 @@ FormPage.defaultProps = {
   onTopLevelChange: undefined,
   onWrapperChange: undefined,
   pages: [],
-  submitting: false,
-  fromTarget: false
+  submitting: false
 };
 var _default = exports.default = FormPage;

package/dist/components/FormRenderer/FormRenderer.js

@@ -54,8 +54,7 @@ const FormRenderer = _ref => {
     noChangeAction,
     newPageId,
     viewOnly,
-    hideBlankRows,
-    fromTarget
+    hideBlankRows
   } = _ref;
   return /*#__PURE__*/_react.default.createElement(_context.HooksContextProvider, {
     overrides: hooks
@@ -76,8 +75,7 @@ const FormRenderer = _ref => {
     noChangeAction: noChangeAction,
     newPageId: newPageId,
     viewOnly: viewOnly,
-    hideBlankRows: hideBlankRows,
-    fromTarget: fromTarget
+    hideBlankRows: hideBlankRows
   })));
 };
 const DEFAULT_CLASS = exports.DEFAULT_CLASS = 'hods-form';
@@ -100,8 +98,7 @@ const InternalFormRenderer = _ref2 => {
     noChangeAction,
     newPageId,
     viewOnly,
-    hideBlankRows,
-    fromTarget
+    hideBlankRows
   } = _ref2;
   // Set up the initial states.
   const [data, setData] = (0, _react.useState)({});
@@ -326,8 +323,7 @@ const InternalFormRenderer = _ref2 => {
     classModifiers: formState.page.classModifiers,
     className: formState.page.className,
     submitting: submitting,
-    pageId: pageId,
-    fromTarget: fromTarget
+    pageId: pageId
   }), formState.page && !formState.cya && formState.page.collection && /*#__PURE__*/_react.default.createElement(_CollectionPage.default, {
     page: formState.page,
     pages: pages,
@@ -370,8 +366,7 @@ const propTypes = {
   /** 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.TASK_CYA, _models.FormTypes.FORM_WITH_TASK]).isRequired,
   viewOnly: _propTypes.default.bool,
-  hideBlankRows: _propTypes.default.bool,
-  fromTarget: _propTypes.default.bool.isRequired
+  hideBlankRows: _propTypes.default.bool
 };
 const defaultProps = {
   classBlock: DEFAULT_CLASS,

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/cop-reassign-task-to-rcc.json

@@ -0,0 +1,445 @@
+{
+    "cya": {
+        "actions": [
+            {
+                "type": "submit",
+                "label": "Submit",
+                "validate": true
+            }
+        ],
+        "confirm": [
+            {
+                "title": "Task kept with NCC",
+                "message": [
+                    "<h2 class='govuk-heading-m'>What happens next</h2>",
+                    "<p class='govuk-body'>Review the task by ${reviewTimeP} on ${reviewDateP}.</p>",
+                    "<p class='govuk-body'>To view the task, go to <a href='/tms/open-tasks'>open NCC tasks</a>. You can track updates in the task's timeline.</p>",
+                    "<p class='govuk-body'><a href='/'>Go to homepage</a></p>",
+                    "<p class='govuk-body'><a href='https://lssiprod.service-now.com/ess?id=take_survey&type_id=e0e2125b1bdd1110f8655946464bcbf7'>What do you think of this service?</a></p>"
+                ],
+                "show_when": [
+                    {
+                        "op": "=",
+                        "field": "assignWhere",
+                        "value": "NCC"
+                    }
+                ]
+            },
+            {
+                "title": "Task assigned to RCC",
+                "message": [
+                    "<h2 class='govuk-heading-m'>What happens next</h2>",
+                    "<p>This task will automatically close at 23:59 on ${autoClose} - the day after the event date.</p>",
+                    "<p>To view the task, go to <a href='/tms/open-tasks'>open NCC tasks</a>. You can track updates in the task's timeline.</p>",
+                    "<p>You can only work on the task when it is assigned to NCC.</p>",
+                    "<p><a href='/'>Go to homepage</a></p>",
+                    "<p><a href='https://lssiprod.service-now.com/ess?id=take_survey&type_id=e0e2125b1bdd1110f8655946464bcbf7'>What do you think of this service?</a></p>"
+                ],
+                "show_when": [
+                    {
+                        "type": "and",
+                        "conditions": [
+                            {
+                                "op": "=",
+                                "field": "assignWhere",
+                                "value": "RCC"
+                            },
+                            {
+                                "op": "=",
+                                "field": "responseNeeded",
+                                "value": "No"
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "title": "Task assigned to RCC",
+                "message": [
+                    "<h2 class='govuk-heading-m'>What happens next</h2>",
+                    "<p class='govuk-body'>You set a review date of ${reviewTimeP} on ${reviewDateP}.</p>",
+                    "<p class='govuk-body'>To view the task, go to <a href='/tms/open-tasks'>open NCC tasks</a>. You can track updates in the task's timeline.</p>",
+                    "<p class='govuk-body'>You can only work on the task when it is assigned to NCC.</p>",
+                    "<p class='govuk-body'><a href='/'>Go to homepage</a></p>",
+                    "<p class='govuk-body'><a href='https://lssiprod.service-now.com/ess?id=take_survey&type_id=e0e2125b1bdd1110f8655946464bcbf7'>What do you think of this service?</a></p>"
+                ],
+                "show_when": [
+                    {
+                        "type": "and",
+                        "conditions": [
+                            {
+                                "op": "=",
+                                "field": "assignWhere",
+                                "value": "RCC"
+                            },
+                            {
+                                "op": "=",
+                                "field": "responseNeeded",
+                                "value": "Yes"
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "title": "Task assigned to RCC",
+                "message": [
+                    "<h2 class='govuk-heading-m'>What happens next</h2>",
+                    "<p class='govuk-body'>RCC will review this task.</p>",
+                    "<p class='govuk-body'><a href='/'>Go to homepage</a></p>",
+                    "<p class='govuk-body'><a href='https://lssiprod.service-now.com/ess?id=take_survey&type_id=e0e2125b1bdd1110f8655946464bcbf7'>What do you think of this service?</a></p>"
+                ],
+                "show_when": [
+                    {
+                        "type": "and",
+                        "conditions": [
+                            {
+                                "op": "!includes",
+                                "field": "keycloakContext.groups",
+                                "value": "/BFNCC"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ],
+        "insertDateTime": true
+    },
+    "name": "cop-reassign-task-to-rcc",
+    "type": "cya",
+    "pages": [
+        {
+            "id": "assignTask",
+            "name": "assignTask",
+            "title": "Assign Task",
+            "actions": [
+                {
+                    "page": "assignTaskToRCC",
+                    "type": "next",
+                    "label": "Continue",
+                    "validate": true,
+                    "show_when": {
+                        "type": "or",
+                        "conditions": [
+                            {
+                                "op": "=",
+                                "field": "assignWhere",
+                                "value": "RCC"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "page": "reviewDateAndTime",
+                    "type": "saveAndNavigate",
+                    "label": "Continue",
+                    "validate": true,
+                    "show_when": {
+                        "type": "or",
+                        "conditions": [
+                            {
+                                "op": "!=",
+                                "field": "assignWhere",
+                                "value": "RCC"
+                            }
+                        ]
+                    }
+                }
+            ],
+            "cya_link": {},
+            "show_when": [
+                {
+                    "op": "includes",
+                    "field": "keycloakContext.groups",
+                    "value": "/BFNCC"
+                }
+            ],
+            "components": [
+                {
+                    "use": "assignWhere"
+                }
+            ]
+        },
+        {
+            "id": "assignTaskToRCC",
+            "name": "assignTaskToRCC",
+            "title": "Assign task to RCC",
+            "actions": [
+                {
+                    "type": "next",
+                    "label": "Continue",
+                    "validate": true
+                }
+            ],
+            "cya_link": {},
+            "show_when": {
+                "conditions": [
+                    {
+                        "op": "=",
+                        "field": "assignWhere",
+                        "value": "RCC"
+                    }
+                ]
+            },
+            "components": [
+                {
+                    "use": "regionalCommandCentre",
+                    "show_when": {
+                        "type": "and",
+                        "conditions": [
+                            {
+                                "op": "!=",
+                                "field": "definitionKey",
+                                "value": "cop-variance-breach-v2"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "use": "regionalCommandCentreDisplay",
+                    "show_when": {
+                        "type": "or",
+                        "conditions": [
+                            {
+                                "op": "=",
+                                "field": "definitionKey",
+                                "value": "cop-variance-breach-v2"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "use": "responseNeeded",
+                    "show_when": {
+                        "type": "or",
+                        "conditions": [
+                            {
+                                "op": "includes",
+                                "field": "keycloakContext.groups",
+                                "value": "/BFNCC"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "use": "assignMessage"
+                }
+            ],
+            "operations": [
+                {
+                    "field": "reviewDateTime",
+                    "function": "deleteValueInFormData",
+                    "run_when": {
+                        "field": "responseNeeded",
+                        "condition": "changes"
+                    },
+                    "component": " "
+                }
+            ]
+        },
+        {
+            "id": "reviewDateAndTime",
+            "name": "reviewDateAndTime",
+            "title": "Set a review date and time",
+            "actions": [
+                {
+                    "type": "next",
+                    "label": "Continue",
+                    "validate": true
+                }
+            ],
+            "cya_link": {},
+            "show_when": [
+                {
+                    "type": "or",
+                    "conditions": [
+                        {
+                            "op": "=",
+                            "field": "responseNeeded",
+                            "value": "Yes"
+                        },
+                        {
+                            "op": "=",
+                            "field": "assignWhere",
+                            "value": "NCC"
+                        }
+                    ]
+                }
+            ],
+            "components": [
+                {
+                    "use": "reviewDateTime"
+                },
+                {
+                    "use": "responseNeeded",
+                    "label": "",
+                    "value": "Yes",
+                    "hidden": true,
+                    "required": true,
+                    "show_on_cya": false,
+                    "defaultValue": "Yes"
+                }
+            ]
+        }
+    ],
+    "title": "Assign task to RCC",
+    "components": [
+        {
+            "id": "assignMessage",
+            "type": "textarea",
+            "label": "Message",
+            "fieldId": "assignMessage",
+            "cya_link": {},
+            "required": true,
+            "custom_errors": [
+                {
+                    "type": "required",
+                    "message": "Enter a message"
+                }
+            ]
+        },
+        {
+            "id": "assignWhere",
+            "data": {
+                "options": [
+                    {
+                        "hint": "Set a review date and time.",
+                        "label": "Keep task with NCC",
+                        "value": "NCC"
+                    },
+                    {
+                        "hint": "Either set a review date and time or set the task to automatically close.",
+                        "label": "Assign task to RCC",
+                        "value": "RCC"
+                    }
+                ]
+            },
+            "type": "radios",
+            "label": " ",
+            "fieldId": "assignWhere",
+            "preserveInPayload": true,
+            "required": true,
+            "cya_label": "Assign task",
+            "custom_errors": [
+                {
+                    "type": "required",
+                    "message": "Select where you want to assign this task"
+                }
+            ],
+            "showAllValues": "true"
+        },
+        {
+            "id": "regionalCommandCentre",
+            "data": {
+                "url": "${environmentContext.referenceDataUrl}/v2/entities/branch?mode=dataOnly&filter=directorateid.eq=2&filter=code=in.(BFSEEU,BFHROW,BFSOUTH,BFNORTH,BFCENT)"
+            },
+            "hint": "Type to search",
+            "item": {
+                "label": "name",
+                "value": "id"
+            },
+            "type": "autocomplete",
+            "label": "Regional Command Centre",
+            "fieldId": "regionalCommandCentre",
+            "required": true,
+            "cya_label": "RCC",
+            "custom_errors": [
+                {
+                    "type": "required",
+                    "message": "Select a Regional Command Centre"
+                }
+            ],
+            "showAllValues": true
+        },
+        {
+            "id": "regionalCommandCentreDisplay",
+            "data": {
+                "url": "${environmentContext.referenceDataUrl}/v2/entities/branch?mode=dataOnly&filter=directorateid.eq=2&filter=code=in.(BFSEEU,BFHROW,BFSOUTH,BFNORTH,BFCENT)"
+            },
+            "item": {
+                "label": "name",
+                "value": "id"
+            },
+            "type": "autocomplete",
+            "label": "Regional Command Centre",
+            "fieldId": "regionalCommandCentre",
+            "disabled": true,
+            "required": true,
+            "cya_label": "RCC",
+            "showAllValues": true
+        },
+        {
+            "id": "reviewDateTime",
+            "type": "container",
+            "label": " ",
+            "fieldId": "reviewDateTime",
+            "required": true,
+            "components": [
+                {
+                    "type": "html",
+                    "content": "The review date and time will display on the open NCC tasks screen."
+                },
+                {
+                    "id": "reviewDate",
+                    "hint": "For example, 20 2 2023.",
+                    "type": "date",
+                    "label": "Review date",
+                    "fieldId": "reviewDate",
+                    "cya_link": {},
+                    "required": true,
+                    "custom_errors": [
+                        {
+                            "type": "required",
+                            "message": "Enter a review date"
+                        }
+                    ],
+                    "additionalValidation": [
+                        {
+                            "message": "Review date must be today or in the future",
+                            "function": "mustBeInTheFuture",
+                            "todayAllowed": true
+                        }
+                    ]
+                },
+                {
+                    "id": "reviewTime",
+                    "hint": "Use 24-hour. For example, 19:45.",
+                    "type": "time",
+                    "label": "Review time",
+                    "fieldId": "reviewTime",
+                    "cya_link": {},
+                    "required": true,
+                    "custom_errors": [
+                        {
+                            "type": "required",
+                            "message": "Enter a review time"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "id": "responseNeeded",
+            "data": {
+                "options": [
+                    {
+                        "hint": "Set a review date for the task.",
+                        "label": "Yes",
+                        "value": "Yes"
+                    },
+                    {
+                        "hint": "The task will automatically close at 23:59 on ${autoClose} - the day after the event date.",
+                        "label": "No",
+                        "value": "No"
+                    }
+                ]
+            },
+            "type": "radios",
+            "label": "Do you need a response?",
+            "fieldId": "responseNeeded",
+            "required": true,
+            "showAllValues": "true"
+        }
+    ],
+    "version": "7b941ec0bb281e2b93ba32058b81e1a88f0f0a9a"
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-hidden-component-show-when-in-component-and-page.json

@@ -0,0 +1,62 @@
+{
+  "id": "example-form",
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha",
+      "fieldId": "alpha",
+      "label": "Alpha",
+      "type": "text"
+    },
+    {
+      "id": "bravo",
+      "fieldId": "bravo",
+      "label": "Bravo",
+      "type": "text"
+    },
+    {
+      "id": "charlie",
+      "fieldId": "charlie",
+      "label": "Charlie",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "general",
+      "name": "general",
+      "title": "General information",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo",
+          "show_when": {
+            "op": "=",
+            "field": "alpha",
+            "value": "NOT-alpha-value"
+          }
+        }
+      ],
+      "show_when": {
+        "op": "=",
+        "field": "charlie",
+        "value": "charlie-value"
+      }
+    },
+    {
+      "id": "Charlie-page",
+      "name": "Charlie-page",
+      "title": "Charlie-page",
+      "components": [
+        {
+          "use": "charlie"
+        }
+      ]
+    }
+  ]
+}