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

package/dist/components/CollectionSummary/BannerStrip.scss

@@ -39,10 +39,6 @@
   }
 }
 
-.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,7 +12,6 @@ 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; }
@@ -25,7 +24,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 _formPage$actions, _page$actions;
+  var _page$customValidatio, _formPage$actions, _page$actions;
   let {
     page,
     pages,
@@ -38,7 +37,8 @@ const FormPage = _ref => {
     classModifiers,
     className,
     submitting,
-    pageId
+    pageId,
+    fromTarget
   } = _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 = (0, _react.useMemo)(() => (0, _validateOnPageLoad.doValidateOnPageLoad)(page), [page]);
+  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;
   (0, _react.useEffect)(() => {
     setIsPageRendered(true);
   }, []);
   (0, _react.useEffect)(() => {
-    if (isPageRendered && runOnLoad) {
+    if (isPageRendered && fromTarget && 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$customValidatio;
+    var _page$customValidatio2;
     errorMessages = [{
-      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
+      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
     }];
   } else if ((errors === null || errors === void 0 ? void 0 : errors.length) > 0 && !runOnLoad) {
     errorMessages = errors;
@@ -174,6 +174,7 @@ 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 = {
@@ -185,6 +186,7 @@ FormPage.defaultProps = {
   onTopLevelChange: undefined,
   onWrapperChange: undefined,
   pages: [],
-  submitting: false
+  submitting: false,
+  fromTarget: false
 };
 var _default = exports.default = FormPage;

package/dist/components/FormRenderer/FormRenderer.js

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

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-containerised.json

@@ -0,0 +1,119 @@
+{
+  "id": "example-form",
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha-parent",
+      "fieldId": "alpha-parent",
+      "type": "container",
+      "components": [
+        {
+          "id": "alpha",
+          "fieldId": "alpha",
+          "label": "Alpha",
+          "type": "text",
+          "show_when": {
+            "op": "=",
+            "field": "bravo-parent.bravo",
+            "value": "bravo-value"
+          }
+        }
+      ]
+    },
+    {
+      "id": "bravo-parent",
+      "fieldId": "bravo-parent",
+      "type": "container",
+      "components": [
+        {
+          "id": "bravo",
+          "fieldId": "bravo",
+          "label": "Bravo",
+          "type": "text",
+          "show_when": {
+            "op": "=",
+            "field": "gamma-parent.gamma",
+            "value": "gamma-value"
+          }
+        }
+      ]
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true
+              }
+            ]
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma-parent",
+      "fieldId": "gamma-parent",
+      "type": "container",
+      "components": [
+        {
+          "id": "gamma",
+          "fieldId": "gamma",
+          "label": "Gamma",
+          "type": "text",
+          "show_when": {
+            "op": "=",
+            "field": "epsilon",
+            "value": "epsilon-value"
+          }
+        }
+      ]
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha-parent"
+        },
+        {
+          "use": "bravo-parent"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma-parent"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-dependent-component-nested-block.json

@@ -0,0 +1,112 @@
+{
+  "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",
+      "show_when": [
+        {
+          "type": "or",
+          "conditions": [
+            {
+              "op": "=",
+              "field": "gamma",
+              "value": "NOT-gamma-value"
+            },
+            {
+              "op": "=",
+              "field": "epsilon",
+              "value": "NOT-epsilon-value"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true  
+              },
+              {
+                "id": "address",
+                "fieldId": "address",
+                "type": "text",
+                "label": "Address",
+                "required": true  
+              }
+            ],
+            "show_when": {
+              "op": "=",
+              "field": "bravo",
+              "value": "bravo-value"
+            }
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text"
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-dependent-component-nested.json

@@ -0,0 +1,105 @@
+{
+  "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",
+      "show_when": [
+        {
+          "type": "or",
+          "conditions": [
+            {
+              "op": "=",
+              "field": "gamma",
+              "value": "NOT-gamma-value"
+            },
+            {
+              "op": "=",
+              "field": "epsilon",
+              "value": "NOT-epsilon-value"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true,
+                "show_when": {
+                  "op": "=",
+                  "field": "bravo",
+                  "value": "bravo-value"
+                }
+              }
+            ]
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text"
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-refdata.json

@@ -0,0 +1,105 @@
+{
+  "id": "example-form",
+  "version": "0.0.1",
+  "name": "example-form",
+  "title": "Example form",
+  "type": "form",
+  "components": [
+    {
+      "id": "alpha",
+      "fieldId": "alpha",
+      "label": "Alpha",
+      "type": "text",
+      "show_when": {
+        "op": "=",
+        "field": "bravo.id",
+        "value": "bravo-value.id"
+      }
+    },
+    {
+      "id": "bravo",
+      "fieldId": "bravo",
+      "label": "Bravo",
+      "type": "text",
+      "show_when": [
+        {
+          "type": "or",
+          "conditions": [
+            {
+              "op": "=",
+              "field": "gamma",
+              "value": "NOT-gamma-value"
+            },
+            {
+              "op": "=",
+              "field": "epsilon",
+              "value": "NOT-epsilon-value"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true
+              }
+            ]
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text"
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/forms/form-chained-component-show-whens-target-component-nested.json

@@ -0,0 +1,98 @@
+{
+  "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",
+      "show_when": {
+        "op": "=",
+        "field": "telephone",
+        "value": "telephone-value"
+      }
+    },
+    {
+      "id": "personKnown",
+      "fieldId": "personKnown",
+      "type": "radios",
+      "data": {
+        "options": [
+          {
+            "value": "yes",
+            "label": "Yes",
+            "nested": [
+              {
+                "id": "telephone",
+                "fieldId": "telephone",
+                "type": "text",
+                "label": "Telephone",
+                "required": true,
+                "show_when": {
+                  "op": "=",
+                  "field": "epsilon",
+                  "value": "NOT-epsilon-value"
+                }
+              }
+            ]
+          },
+          {
+            "value": "no",
+            "label": "No"
+          }
+        ]
+      }
+    },
+    {
+      "id": "gamma",
+      "fieldId": "gamma",
+      "label": "Gamma",
+      "type": "text",
+      "show_when": {
+        "op": "=",
+        "field": "bravo",
+        "value": "bravo-value"
+      }
+    },
+    {
+      "id": "epsilon",
+      "fieldId": "epsilon",
+      "label": "Epsilon",
+      "type": "text"
+    }
+  ],
+  "pages": [
+    {
+      "id": "visiblePage",
+      "name": "visiblePage",
+      "title": "Visible Page",
+      "components": [
+        {
+          "use": "alpha"
+        },
+        {
+          "use": "bravo"
+        },
+        {
+          "use": "personKnown"
+        },
+        {
+          "use": "gamma"
+        },
+        {
+          "use": "epsilon"
+        }
+      ]
+    }
+  ]
+}