chore: Enhance date validation logic in DatePickerWidget2 for better …

…granularity checks (#37210)
appsmithorg · Nov 5, 2024 · 0df0d8f · 0df0d8f
1 parent 6dc6194
commit 0df0d8f
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/app/client/src/widgets/DatePickerWidget2/widget/derived.js b/app/client/src/widgets/DatePickerWidget2/widget/derived.js
@@ -10,9 +10,31 @@ export default {
     let dateValid = true;
 
     if (!!props.minDate && !!props.maxDate) {
-      dateValid = !!selectedDate
-        ? selectedDate.isBetween(minDate, maxDate)
-        : !props.isRequired;
+      if (!selectedDate) {
+        dateValid = !props.isRequired;
+      } else {
+        let granularityToCheck = undefined;
+        let inclusivityMarkers = undefined;
+
+        switch (props.timePrecision) {
+          case "None":
+            granularityToCheck = "day";
+            inclusivityMarkers = "[]";
+            break;
+          case "second":
+          case "minute":
+          case "millisecond":
+            granularityToCheck = props.timePrecision;
+            inclusivityMarkers = "[]";
+            break;
+        }
+        dateValid = selectedDate.isBetween(
+          minDate,
+          maxDate,
+          granularityToCheck,
+          inclusivityMarkers,
+        );
+      }
     } else if (!!props.minDate) {
       dateValid = !!selectedDate
         ? selectedDate.isAfter(minDate)