@ukhomeoffice/cop-react-form-renderer 5.49.1 → 5.49.2

package/dist/utils/Validate/validateDate.js

@@ -31,7 +31,7 @@ var maxMonthDays = exports.maxMonthDays = function maxMonthDays(month, year) {
 };
 /**
  * Checks if a date passed is a valid date.
- * This will validate for 'leap years', missing components, invalid day, monnth or year components.
+ * This will validate for 'leap years', missing components, invalid day, month or year components.
  * EXAMPLE USE : const { message, propsInError } = validateDate('2-11-2020')
  * 
  * Note that an empty string is not considered invalid. You should use
@@ -56,53 +56,47 @@ var validateDate = function validateDate(date) {
     year = _formattedDate$split2[2];
   var intDay = parseInt(day, 10);
   var intMonth = parseInt(month, 10);
+  var badProps = [];
+  var messages = [];
   if (year.length === 0) {
-    return {
-      message: 'Date must include a year',
-      propsInError: {
-        year: true
-      }
-    };
-  }
-  if (year.length !== 4) {
-    return {
-      message: 'Year must be 4 numbers',
-      propsInError: {
-        year: true
-      }
-    };
+    badProps.push('year');
+    messages.push('Date must include a year');
+  } else if (year.length !== 4) {
+    badProps.push('year');
+    messages.push('Year must be 4 numbers');
   }
   if (month.length === 0) {
-    return {
-      message: 'Date must include a month',
-      propsInError: {
-        month: true
-      }
-    };
-  }
-  if (intMonth > 12 || intMonth < 1) {
-    return {
-      message: 'Month must be between 1 and 12',
-      propsInError: {
-        month: true
-      }
-    };
+    badProps.push('month');
+    messages.push('Date must include a month');
+  } else if (intMonth > 12 || intMonth < 1) {
+    badProps.push('month');
+    messages.push('Month must be between 1 and 12');
   }
   if (day.length === 0) {
-    return {
-      message: 'Date must include a day',
-      propsInError: {
-        day: true
-      }
-    };
+    badProps.push('day');
+    messages.push('Date must include a day');
+  } else {
+    var maxDays = maxMonthDays(month, year);
+    if (intDay > maxDays || intDay < 1) {
+      badProps.push('day');
+      messages.push("Day must be between 1 and ".concat(maxDays));
+    }
   }
-  var maxDays = maxMonthDays(month, year);
-  if (intDay > maxDays || intDay < 1) {
+  if (badProps.length > 0) {
+    // return single error or generic error if multiple problem
+    var propsInError = {};
+    if (badProps.includes('day')) {
+      propsInError.day = true;
+    }
+    if (badProps.includes('month')) {
+      propsInError.month = true;
+    }
+    if (badProps.includes('year')) {
+      propsInError.year = true;
+    }
     return {
-      message: "Day must be between 1 and ".concat(maxDays),
-      propsInError: {
-        day: true
-      }
+      message: badProps.length === 1 ? messages[0] : 'Enter a valid date',
+      propsInError: propsInError
     };
   }
   if ((0, _dayjs.default)(formattedDate, _utils.DATE_FORMAT).format(_utils.DATE_FORMAT) !== formattedDate) {

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

@@ -55,7 +55,8 @@ describe('utils', function () {
         });
       });
       test('should return an error if the year contains more than 4 numbers', function () {
-        var output = (0, _validateDate.default)('29-02-20202', 'DD-MM-YYYY');
+        // 20202 is not a leap year,so 29th Feb not valid
+        var output = (0, _validateDate.default)('28-02-20202', 'DD-MM-YYYY');
         expect(output).toEqual({
           message: 'Year must be 4 numbers',
           propsInError: {
@@ -99,6 +100,25 @@ describe('utils', function () {
           }
         });
       });
+      test('should handle multiple errors', function () {
+        var output = (0, _validateDate.default)('45-13-2020', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Enter a valid date',
+          propsInError: {
+            day: true,
+            month: true
+          }
+        });
+        var output2 = (0, _validateDate.default)('45-13-', 'DD-MM-YYYY');
+        expect(output2).toEqual({
+          message: 'Enter a valid date',
+          propsInError: {
+            day: true,
+            month: true,
+            year: true
+          }
+        });
+      });
       test('should correctly identify the maximum numbers of days in a given month and year', function () {
         var max = (0, _validateDate.maxMonthDays)('02', '2024');
         expect(max).toEqual(29);

package/dist/utils/Validate/validateTime.js

@@ -37,36 +37,33 @@ var validateTime = function validateTime(time) {
     minute = _formattedDate$split2[1];
   var intHour = parseInt(hour, 10);
   var intMinute = parseInt(minute, 10);
+  var badProps = [];
+  var messages = [];
   if (hour.length === 0) {
-    return {
-      message: 'Time must include a hour',
-      propsInError: {
-        hour: true
-      }
-    };
-  }
-  if (intHour > 23 || intHour < 0) {
-    return {
-      message: 'Hour must be between 0 and 23',
-      propsInError: {
-        hour: true
-      }
-    };
+    badProps.push('hour');
+    messages.push('Time must include a hour');
+  } else if (intHour > 23 || intHour < 0) {
+    badProps.push('hour');
+    messages.push('Hour must be between 0 and 23');
   }
   if (minute.length === 0) {
-    return {
-      message: 'Time must include a minute',
-      propsInError: {
-        minute: true
-      }
-    };
+    badProps.push('minute');
+    messages.push('Time must include a minute');
+  } else if (intMinute > 59 || intMinute < 0) {
+    badProps.push('minute');
+    messages.push('Minute must be between 0 and 59');
   }
-  if (intMinute > 59 || intMinute < 0) {
+  if (badProps.length > 0) {
+    var propsInError = {};
+    if (badProps.includes('hour')) {
+      propsInError.hour = true;
+    }
+    if (badProps.includes('minute')) {
+      propsInError.minute = true;
+    }
     return {
-      message: 'Minute must be between 0 and 59',
-      propsInError: {
-        minute: true
-      }
+      message: badProps.length > 1 ? 'Enter a valid time' : messages[0],
+      propsInError: propsInError
     };
   }
   return {

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

@@ -54,6 +54,16 @@ describe('utils', function () {
           }
         });
       });
+      test('should report multiple errors', function () {
+        var output = (0, _validateTime.default)('24:75');
+        expect(output).toEqual({
+          message: 'Enter a valid time',
+          propsInError: {
+            hour: true,
+            minute: true
+          }
+        });
+      });
     });
   });
 });

package/package.json

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