Cap date range at 7 days

questdb · Jan 15, 2025 · 8cbec45 · 8cbec45
1 parent b806a45
commit 8cbec45
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/packages/web-console/src/scenes/Editor/Metrics/date-time-picker.tsx b/packages/web-console/src/scenes/Editor/Metrics/date-time-picker.tsx
@@ -5,6 +5,7 @@ import {
   durationToHumanReadable,
   durationTokenToDate,
   isDateToken,
+  MAX_DATE_RANGE,
 } from "./utils"
 import { DateRange } from "./types"
 import { Box, Button, Popover } from "@questdb/react-components"
@@ -197,6 +198,7 @@ export const DateTimePicker = ({
     "string.fromIsAfterTo": "From date must be before To date",
     "string.sameValues": "From and To dates cannot be the same",
     "any.custom": "One of the values is invalid",
+    "string.maxDateRange": "Date range cannot exceed 7 days",
   }
 
   const schema = Joi.object({
@@ -207,19 +209,19 @@ export const DateTimePicker = ({
         const timeValue = new Date(dateValue).getTime()
         const timeNow = new Date().getTime()
         try {
+          const timeTo = new Date(
+            durationTokenToDate(helpers.state.ancestors[0].dateTo),
+          ).getTime()
           if (dateValue === "Invalid date") {
             return helpers.error("string.invalidDate")
-          } else if (
-            timeValue >=
-            new Date(
-              durationTokenToDate(helpers.state.ancestors[0].dateTo),
-            ).getTime()
-          ) {
+          } else if (timeValue >= timeTo) {
             return helpers.error("string.fromIsAfterTo")
           } else if (timeValue > timeNow) {
             return helpers.error("string.dateInFuture")
           } else if (timeValue === timeNow) {
             return helpers.error("string.sameValues")
+          } else if (timeTo - timeValue > MAX_DATE_RANGE * 1000) {
+            return helpers.error("string.maxDateRange")
           }
           return value
         } catch (e) {
@@ -233,19 +235,19 @@ export const DateTimePicker = ({
         const dateValue = durationTokenToDate(value)
         const timeValue = new Date(dateValue).getTime()
         const timeNow = new Date().getTime()
+        const timeFrom = new Date(
+          durationTokenToDate(helpers.state.ancestors[0].dateFrom),
+        ).getTime()
         if (dateValue === "Invalid date") {
           return helpers.error("string.invalidDate")
-        } else if (
-          timeValue <=
-          new Date(
-            durationTokenToDate(helpers.state.ancestors[0].dateFrom),
-          ).getTime()
-        ) {
+        } else if (timeValue <= timeFrom) {
           return helpers.error("string.toIsBeforeFrom")
         } else if (timeValue > timeNow) {
           return helpers.error("string.dateInFuture")
         } else if (timeValue === timeNow) {
           return helpers.error("string.sameValues")
+        } else if (timeValue - timeFrom > MAX_DATE_RANGE * 1000) {
+          return helpers.error("string.maxDateRange")
         }
         return value
       })

diff --git a/packages/web-console/src/scenes/Editor/Metrics/utils.ts b/packages/web-console/src/scenes/Editor/Metrics/utils.ts
@@ -6,6 +6,8 @@ import type { Duration } from "./types"
 
 export const DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss"
 
+export const MAX_DATE_RANGE = 7 * 24 * 60 * 60
+
 export enum MetricType {
   COMMIT_RATE = "Commit rate",
   WRITE_THROUGHPUT = "Write throughput",