@ukhomeoffice/cop-react-form-renderer 4.56.1 → 4.59.0

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -92,6 +92,19 @@ var getActionRows = function getActionRows(page, item, onAction, labelCount) {
   return actions;
 };
 
+var getChangeActionForPage = function getChangeActionForPage(page, item, onAction) {
+  return function () {
+    var changeCallback = function changeCallback(data) {
+      data["".concat(page.collection.name, "ActiveId")] = item.id;
+      return data;
+    };
+
+    onAction({
+      pageId: page.id
+    }, changeCallback);
+  };
+};
+
 var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onAction) {
   var _page$formData, _page$formData$page$c;
 
@@ -135,7 +148,8 @@ var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onA
         }
 
         var container = getContainerForPage(p, item, labelCount, full_path);
-        var containerRows = (0, _getCYARowsForContainer.default)(p, container, item, undefined);
+        var rowChangeAction = getChangeActionForPage(p, item, onAction);
+        var containerRows = (0, _getCYARowsForContainer.default)(p, container, item, rowChangeAction);
         rows = rows.concat(containerRows);
       }
     });

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

@@ -21,11 +21,13 @@ var _mustBeLongerThan = _interopRequireDefault(require("./mustBeLongerThan"));
 
 var _mustBeShorterThan = _interopRequireDefault(require("./mustBeShorterThan"));
 
-var _mustEnterAtLeastOne = _interopRequireDefault(require("./mustEnterAtLeastOne"));
+var _mustBeGreaterThan = _interopRequireDefault(require("./mustBeGreaterThan"));
+
+var _mustBeLessThan = _interopRequireDefault(require("./mustBeLessThan"));
 
 var _mustBeNumbersOnly = _interopRequireDefault(require("./mustBeNumbersOnly"));
 
-var _mustBeLessThan = _interopRequireDefault(require("./mustBeLessThan"));
+var _mustEnterAtLeastOne = _interopRequireDefault(require("./mustEnterAtLeastOne"));
 
 var _mustHaveLessThanDecimalPlaces = _interopRequireDefault(require("./mustHaveLessThanDecimalPlaces"));
 
@@ -46,6 +48,7 @@ var functions = {
   mustEnterAtLeastOne: _mustEnterAtLeastOne.default,
   mustBeNumbersOnly: _mustBeNumbersOnly.default,
   mustBeLessThan: _mustBeLessThan.default,
+  mustBeGreaterThan: _mustBeGreaterThan.default,
   mustHaveLessThanDecimalPlaces: _mustHaveLessThanDecimalPlaces.default,
   mustSelectOnlyOne: _mustSelectOnlyOne.default
 };

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

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+/**
+ * @param {*} value - the value to check.
+ * @param {number} config.value - the value must be greater than config.value. 
+ * @returns true if value is greater than config.value, false if not.
+ */
+var mustBeGreaterThan = function mustBeGreaterThan(value, config) {
+  if (!value) {
+    // 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;
+  }
+
+  var finalValue = typeof value === 'string' ? value.replace(/,/g, '') : value;
+  return parseFloat(finalValue) > config.value;
+};
+
+var _default = mustBeGreaterThan;
+exports.default = _default;

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

@@ -0,0 +1,58 @@
+"use strict";
+
+var _mustBeGreaterThan = _interopRequireDefault(require("./mustBeGreaterThan"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+describe('utils', function () {
+  describe('Validate', function () {
+    describe('additional', function () {
+      describe('mustBeGreaterThan', function () {
+        test('should return true given a number greater than 10', function () {
+          var result = (0, _mustBeGreaterThan.default)('11', {
+            value: 10
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return false if provided value less than or equal to 10', function () {
+          var result1 = (0, _mustBeGreaterThan.default)('9', {
+            value: 10
+          });
+          expect(result1).toBeFalsy();
+          var result2 = (0, _mustBeGreaterThan.default)('10', {
+            value: 10
+          });
+          expect(result2).toBeFalsy();
+        });
+        test('should correctly handle numbers with commas in', function () {
+          var result1 = (0, _mustBeGreaterThan.default)('999,999,999.99', {
+            value: 1000000000
+          });
+          expect(result1).toEqual(false);
+          var result2 = (0, _mustBeGreaterThan.default)('1,000,000,123', {
+            value: 1000000000
+          });
+          expect(result2).toEqual(true);
+        });
+        test('should return true when string is undefined', function () {
+          var result = (0, _mustBeGreaterThan.default)(undefined, {
+            value: 10
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return true when string is empty', function () {
+          var result = (0, _mustBeGreaterThan.default)('', {
+            value: 10
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return true when string is null', function () {
+          var result = (0, _mustBeGreaterThan.default)(null, {
+            value: 10
+          });
+          expect(result).toEqual(true);
+        });
+      });
+    });
+  });
+});

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

@@ -6,18 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 
 /**
- * @param {string} string - the string to check value.
- * @param {number} config.value - the string.value must be equal or less than config.value. 
- * @returns true if sting value is equal to or less then config.value, false if not.
+ * @param {*} value - the value to check.
+ * @param {number} config.value - the value must be equal or less than config.value. 
+ * @returns true if value is equal to or less then config.value, false if not.
  */
-var mustBeLessThan = function mustBeLessThan(string, config) {
-  if (!string) {
+var mustBeLessThan = function mustBeLessThan(value, config) {
+  if (!value) {
     // 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 parseFloat(string) < config.value;
+  var finalValue = typeof value === 'string' ? value.replace(/,/g, '') : value;
+  return parseFloat(finalValue) < config.value;
 };
 
 var _default = mustBeLessThan;

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

@@ -7,7 +7,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 describe('utils', function () {
   describe('Validate', function () {
     describe('additional', function () {
-      describe('mustBeShorterThan', function () {
+      describe('mustBeLessThan', function () {
         test('should return true given a number equal to or less than 1000000000', function () {
           var result = (0, _mustBeLessThan.default)(999999999.999, {
             value: 1000000000
@@ -20,6 +20,16 @@ describe('utils', function () {
           });
           expect(result).toBeFalsy();
         });
+        test('should correctly handle numbers with commas in', function () {
+          var result1 = (0, _mustBeLessThan.default)('999,999,999.99', {
+            value: 1000000000
+          });
+          expect(result1).toEqual(true);
+          var result2 = (0, _mustBeLessThan.default)('1,000,000,123', {
+            value: 1000000000
+          });
+          expect(result2).toEqual(false);
+        });
         test('should return true when string is undefined', function () {
           var result = (0, _mustBeLessThan.default)(undefined, {
             value: 3

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

@@ -6,18 +6,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 
 /**
- * @returns true if number pass the regex, false if not.
+ * Checks if a string contains only numberical characters.
+ * An optional flag in config can be used to allow commas.
+ * @param {*} value The value to check for only numerical characters.
+ * @param {object} config The config of the validation check.
+ * @returns true if value passes the regex, false if not.
  */
-var mustBeNumbersOnly = function mustBeNumbersOnly(number) {
-  var numbersOnlyRegex = /^[0-9]*\.?[0-9]*$/;
-
-  if (!number) {
+var mustBeNumbersOnly = function mustBeNumbersOnly(value, config) {
+  if (!value) {
     // null, undefined and empty numbers should be picked up by the required flag
     // and not considered here as they would be valid for optional fields.
     return true;
   }
 
-  return numbersOnlyRegex.test(number);
+  var regex = config !== null && config !== void 0 && config.allowCommas ? /^[0-9,]*\.?[0-9]*$/ : /^[0-9]*\.?[0-9]*$/;
+  return regex.test(value);
 };
 
 var _default = mustBeNumbersOnly;

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

@@ -16,10 +16,18 @@ describe('utils', function () {
           var result = (0, _mustBeNumbersOnly.default)('123456.123');
           expect(result).toEqual(true);
         });
-        test('should return false if given number contains letters', function () {
-          var result = (0, _mustBeNumbersOnly.default)('123124Hello');
+        test('should return false if given number contains commas and config does not allow them', function () {
+          var CONFIG = {};
+          var result = (0, _mustBeNumbersOnly.default)('1,234', CONFIG);
           expect(result).toEqual(false);
         });
+        test('should return true if given number contains commas and config allows them', function () {
+          var CONFIG = {
+            allowCommas: true
+          };
+          var result = (0, _mustBeNumbersOnly.default)('1,234', CONFIG);
+          expect(result).toEqual(true);
+        });
         test('should return true when string is undefined', function () {
           var result = (0, _mustBeNumbersOnly.default)(undefined);
           expect(result).toEqual(true);

package/package.json

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