@ukhomeoffice/cop-react-form-renderer 6.14.3 → 6.14.4

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/utils/Condition/meetsCondition.js

@@ -69,7 +69,7 @@ const meetsCondition = (condition, value, data) => {
           if (!value || !compare) {
             return false;
           }
-          const valFloat = parseFloat(value.replace(',', ''));
+          const valFloat = Array.isArray(value) ? value.length : parseFloat(value.replace(',', ''));
           const compareFloat = parseFloat(compare.replace(',', ''));
           return valFloat < compareFloat;
         }
@@ -78,7 +78,7 @@ const meetsCondition = (condition, value, data) => {
           if (!value || !compare) {
             return false;
           }
-          const valFloat = parseFloat(value.replace(/,/g, ''));
+          const valFloat = Array.isArray(value) ? value.length : parseFloat(value.replace(/,/g, ''));
           const compareFloat = parseFloat(compare.replace(/,/g, ''));
           return valFloat > compareFloat;
         }

package/dist/utils/Validate/validateOnPageLoad.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.doValidateOnPageLoad = void 0;
+var _Condition = _interopRequireDefault(require("../Condition"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const doValidateOnPageLoad = page => {
+  var _validation$runWhen, _validation$runWhen2;
+  if (!(page !== null && page !== void 0 && page.customValidation)) return false;
+
+  // Find the validation with `onLoad` set to true
+  const validation = page === null || page === void 0 ? void 0 : page.customValidation.find(item => {
+    var _item$runWhen;
+    return ((_item$runWhen = item.runWhen) === null || _item$runWhen === void 0 ? void 0 : _item$runWhen.onLoad) === true;
+  });
+  if (!validation) return false;
+
+  // Check if the constraint is met using the condition
+  return (_validation$runWhen = validation.runWhen) !== null && _validation$runWhen !== void 0 && _validation$runWhen.constraint ? _Condition.default.meetsOne((_validation$runWhen2 = validation.runWhen) === null || _validation$runWhen2 === void 0 ? void 0 : _validation$runWhen2.constraint, page.formData) : false;
+};
+exports.doValidateOnPageLoad = doValidateOnPageLoad;

package/dist/utils/Validate/validateOnPageLoad.test.js

@@ -0,0 +1,88 @@
+"use strict";
+
+var _Condition = _interopRequireDefault(require("../Condition"));
+var _validateOnPageLoad = require("./validateOnPageLoad");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('doValidateOnPageLoad', () => {
+  const formData = {
+    people: [{
+      name: 'John Doe'
+    }, {
+      name: 'Jane Doe'
+    }]
+  };
+  it('should return false if page.customValidation is not defined', () => {
+    const page = {
+      formData
+    };
+    const result = (0, _validateOnPageLoad.doValidateOnPageLoad)(page);
+    expect(result).toBe(false);
+  });
+  it('should return false if no validation item has onLoad set to true', () => {
+    const page = {
+      customValidation: [{
+        message: "Validation without onLoad",
+        runWhen: {
+          onLoad: false
+        }
+      }],
+      formData
+    };
+    const result = (0, _validateOnPageLoad.doValidateOnPageLoad)(page);
+    expect(result).toBe(false);
+  });
+  it('should return false if validation constraint is not met', () => {
+    const page = {
+      customValidation: [{
+        message: "Update all people details before continuing",
+        runWhen: {
+          onLoad: true,
+          constraint: [{
+            field: 'people',
+            op: _Condition.default.GREATER_THAN,
+            value: 3 // Condition that will fail
+          }]
+        }
+      }],
+      formData
+    };
+    jest.spyOn(_Condition.default, 'meetsOne').mockImplementation(() => false);
+    const result = (0, _validateOnPageLoad.doValidateOnPageLoad)(page);
+    expect(result).toBe(false);
+    expect(_Condition.default.meetsOne).toHaveBeenCalledWith(page.customValidation[0].runWhen.constraint, formData);
+  });
+  it('should return true if validation constraint is met', () => {
+    const page = {
+      customValidation: [{
+        message: "Update all people details before continuing",
+        runWhen: {
+          onLoad: true,
+          constraint: [{
+            field: 'people',
+            op: _Condition.default.GREATER_THAN,
+            value: 0 // Condition that will pass
+          }]
+        }
+      }],
+      formData
+    };
+    jest.spyOn(_Condition.default, 'meetsOne').mockImplementation(() => true);
+    const result = (0, _validateOnPageLoad.doValidateOnPageLoad)(page);
+    expect(result).toBe(true);
+    expect(_Condition.default.meetsOne).toHaveBeenCalledWith(page.customValidation[0].runWhen.constraint, formData);
+  });
+  it('should return false if no matching validation is found', () => {
+    const page = {
+      customValidation: [{
+        message: "Validation without constraint",
+        runWhen: {
+          onLoad: true,
+          constraint: null
+        }
+      }],
+      formData
+    };
+    const result = (0, _validateOnPageLoad.doValidateOnPageLoad)(page);
+    expect(result).toBe(false);
+  });
+});

package/package.json

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