@ukhomeoffice/cop-react-form-renderer 3.5.2-alpha → 3.6.2

package/dist/components/FormPage/FormPage.js

@@ -101,7 +101,7 @@ var FormPage = function FormPage(_ref) {
       component: component,
       onChange: onPageChange,
       value: page.formData[component.fieldId] || patch[component.fieldId],
-      formData: page.formData
+      formData: _objectSpread(_objectSpread({}, page.formData), patch)
     });
   }), /*#__PURE__*/_react.default.createElement(_PageActions.default, {
     actions: page.actions,

package/dist/components/FormRenderer/FormRenderer.js

@@ -73,8 +73,7 @@ var FormRenderer = function FormRenderer(_ref) {
       className = _ref.className,
       hide_title = _ref.hide_title,
       summaryListClassModifiers = _ref.summaryListClassModifiers,
-      noChangeAction = _ref.noChangeAction,
-      newPageId = _ref.newPageId;
+      noChangeAction = _ref.noChangeAction;
   return /*#__PURE__*/_react.default.createElement(_context.HooksContextProvider, {
     overrides: hooks
   }, /*#__PURE__*/_react.default.createElement(_context.ValidationContextProvider, null, /*#__PURE__*/_react.default.createElement(InternalFormRenderer, {
@@ -90,8 +89,7 @@ var FormRenderer = function FormRenderer(_ref) {
     className: className,
     hide_title: hide_title,
     summaryListClassModifiers: summaryListClassModifiers,
-    noChangeAction: noChangeAction,
-    newPageId: newPageId
+    noChangeAction: noChangeAction
   })));
 };
 
@@ -111,8 +109,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       className = _ref2.className,
       hide_title = _ref2.hide_title,
       summaryListClassModifiers = _ref2.summaryListClassModifiers,
-      noChangeAction = _ref2.noChangeAction,
-      newPageId = _ref2.newPageId;
+      noChangeAction = _ref2.noChangeAction;
 
   // Set up the initial states.
   var _useState = (0, _react.useState)({}),
@@ -180,10 +177,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
 
   (0, _react.useEffect)(function () {
     setPages(_utils.default.FormPage.getAll(_pages, components, _objectSpread({}, data)));
-  }, [components, _pages, data, setPages]);
-  (0, _react.useEffect)(function () {
-    if (newPageId !== undefined) onPageChange(newPageId);
-  }, [newPageId]); // Setup initial pageId.
+  }, [components, _pages, data, setPages]); // Setup initial pageId.
 
   (0, _react.useEffect)(function () {
     setPageId(function (prev) {

package/dist/utils/Validate/additional/index.js

@@ -13,6 +13,10 @@ var _mustBeInThePast = _interopRequireDefault(require("./mustBeInThePast"));
 
 var _mustBeInTheFuture = _interopRequireDefault(require("./mustBeInTheFuture"));
 
+var _mustBeLongerThan = _interopRequireDefault(require("./mustBeLongerThan"));
+
+var _mustBeShorterThan = _interopRequireDefault(require("./mustBeShorterThan"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Local imports
@@ -20,7 +24,9 @@ var functions = {
   mustBeAfter: _mustBeAfter.default,
   mustBeBefore: _mustBeBefore.default,
   mustBeInThePast: _mustBeInThePast.default,
-  mustBeInTheFuture: _mustBeInTheFuture.default
+  mustBeInTheFuture: _mustBeInTheFuture.default,
+  mustBeLongerThan: _mustBeLongerThan.default,
+  mustBeShorterThan: _mustBeShorterThan.default
 };
 
 var additionalValidation = function additionalValidation(value, config) {

package/dist/utils/Validate/additional/mustBeLongerThan.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+/**
+ * Function returns true if the string parameter is longer than a given length, false
+ * if it is not.
+ * @param {string} string - the string to check the length of.
+ * @param {number} config.value - the length that string.length must be greater than. 
+ * @returns true if string.length is greater than config.value, false if not.
+ */
+var mustBeLongerThan = function mustBeLongerThan(string, config) {
+  if (!string) {
+    // null, undefined and empty strings should be picked up by the required flag
+    // and not considered here as they would be valid for optional fields.
+    return true;
+  }
+
+  return string.length > config.value;
+};
+
+var _default = mustBeLongerThan;
+exports.default = _default;

package/dist/utils/Validate/additional/mustBeLongerThan.test.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _mustBeLongerThan = _interopRequireDefault(require("./mustBeLongerThan"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+describe('utils', function () {
+  describe('Validate', function () {
+    describe('additional', function () {
+      describe('mustBeLongerThan', function () {
+        test('should return true given a string longer than the given length', function () {
+          var result = (0, _mustBeLongerThan.default)('test', {
+            value: 3
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return false given a string shorter than the given length', function () {
+          var result = (0, _mustBeLongerThan.default)('to', {
+            value: 3
+          });
+          expect(result).toEqual(false);
+        });
+        test('should return false given a string equal to the given length', function () {
+          var result = (0, _mustBeLongerThan.default)('dog', {
+            value: 3
+          });
+          expect(result).toEqual(false);
+        });
+        test('should return true when string is undefined', function () {
+          var result = (0, _mustBeLongerThan.default)(undefined, {
+            value: 3
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return true when string is empty', function () {
+          var result = (0, _mustBeLongerThan.default)('', {
+            value: 3
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return true when string is null', function () {
+          var result = (0, _mustBeLongerThan.default)(null, {
+            value: 3
+          });
+          expect(result).toEqual(true);
+        });
+      });
+    });
+  });
+});

package/dist/utils/Validate/additional/mustBeShorterThan.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+/**
+ * Function returns true if the string parameter is shorter than a given length, false
+ * if it is not.
+ * @param {string} string - the string to check the length of.
+ * @param {number} config.value - the length that string.length must be less than. 
+ * @returns true if string.length is greater than config.value, false if not.
+ */
+var mustBeShorterThan = function mustBeShorterThan(string, config) {
+  if (!string) {
+    // null, undefined and empty strings should be picked up by the required flag
+    // and not considered here as they would be valid for optional fields.
+    return true;
+  }
+
+  return string.length < config.value;
+};
+
+var _default = mustBeShorterThan;
+exports.default = _default;

package/dist/utils/Validate/additional/mustBeShorterThan.test.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _mustBeShorterThan = _interopRequireDefault(require("./mustBeShorterThan"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+describe('utils', function () {
+  describe('Validate', function () {
+    describe('additional', function () {
+      describe('mustBeShorterThan', function () {
+        test('should return true given a string shorter than the given length', function () {
+          var result = (0, _mustBeShorterThan.default)('to', {
+            value: 3
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return false given a string longer than the given length', function () {
+          var result = (0, _mustBeShorterThan.default)('test', {
+            value: 3
+          });
+          expect(result).toEqual(false);
+        });
+        test('should return false given a string equal to the given length', function () {
+          var result = (0, _mustBeShorterThan.default)('dog', {
+            value: 3
+          });
+          expect(result).toEqual(false);
+        });
+        test('should return true when string is undefined', function () {
+          var result = (0, _mustBeShorterThan.default)(undefined, {
+            value: 3
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return true when string is empty', function () {
+          var result = (0, _mustBeShorterThan.default)('', {
+            value: 3
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return true when string is null', function () {
+          var result = (0, _mustBeShorterThan.default)(null, {
+            value: 3
+          });
+          expect(result).toEqual(true);
+        });
+      });
+    });
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "3.5.2-alpha",
+  "version": "3.6.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.9.0",
+    "@ukhomeoffice/cop-react-components": "1.9.5",
     "axios": "^0.21.1",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^3.13.0",