@ukhomeoffice/cop-react-form-renderer 4.58.0 → 4.60.0

package/dist/components/FormRenderer/FormRenderer.js

@@ -254,8 +254,11 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   }, [pages, hub, pageId, setFormState, type, goingBack, data, formState.page]); // Call the onFormLoad hook just when this component first renders.
 
   (0, _react.useEffect)(function () {
-    setPagePoint(undefined);
-    hooks.onFormLoad();
+    setPagePoint(undefined); // In case of refresh the current task needs to be reset
+
+    hooks.onFormLoad(function (currentTask) {
+      return setCurrentTask(currentTask);
+    });
   }, [hooks]);
   (0, _react.useEffect)(function () {
     setHubDetails(_hub);
@@ -357,9 +360,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
             break;
 
           case _models.PageAction.TYPES.SAVE_AND_NAVIGATE:
-            var state = {
-              'fullPages': currentTask.fullPages
-            };
+            var state = _objectSpread({}, currentTask);
 
             pageUpdate = function pageUpdate() {
               return _handlers.default.navigate(action, pageId, onPageChange, state);
@@ -490,6 +491,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       });
       setCurrentTask(currentTask);
 
+      var state = _objectSpread({}, currentTask);
+
       if (currentTask.state === _models.TaskStates.TYPES.COMPLETE) {
         if (hubDetails !== null && hubDetails !== void 0 && hubDetails.noTaskCYAs) {
           var currentPage = data.formStatus.tasks[currentTask.name].currentPage;
@@ -497,19 +500,16 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         } else if (currentTask.customCYA) {
           onPageChange(currentTask.customCYA);
         } else {
-          onPageChange(_models.FormPages.CYA);
+          onPageChange(_models.FormPages.CYA, state);
         }
       } else if (currentTask.state === _models.TaskStates.TYPES.IN_PROGRESS) {
         var _currentPage = data.formStatus.tasks[currentTask.name].currentPage;
-        var state = {
-          'fullPages': currentTask.fullPages
-        };
         onPageChange(_currentPage || currentTask.pages[0], state);
       } else if (currentTask.firstPage) {
         var _currentPage2 = currentTask.firstPage;
-        onPageChange(_currentPage2 || currentTask.pages[0]);
+        onPageChange(_currentPage2 || currentTask.pages[0], state);
       } else {
-        onPageChange(currentTask.pages[0]);
+        onPageChange(currentTask.pages[0], state);
       }
     }
   }; // Handle actions from "Check your answers".

package/dist/context/HooksContext/HooksContext.js

@@ -32,11 +32,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var DEFAULT_HOOKS = {
-  onChange: function onChange(data) {
-    return data;
-  },
+  onChange: function onChange(data) {},
   onFormComplete: function onFormComplete() {},
-  onFormLoad: function onFormLoad() {},
+  onFormLoad: function onFormLoad(setCurrentTask) {},
   onGetComponent: function onGetComponent(config, wrap) {
     return null;
   },

package/dist/utils/Validate/additional/mustBeGreaterThan.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 greater than config.value. 
- * @returns true if string value is greater than config.value, false if not.
+ * @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(string, config) {
-  if (!string) {
+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;
   }
 
-  return parseFloat(string) > config.value;
+  var finalValue = typeof value === 'string' ? value.replace(/,/g, '') : value;
+  return parseFloat(finalValue) > config.value;
 };
 
 var _default = mustBeGreaterThan;

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

@@ -24,6 +24,16 @@ describe('utils', function () {
           });
           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

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.58.0",
+  "version": "4.60.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",