From de4afb8db7ec5e027ce8bef99513a6646ec4ea56 Mon Sep 17 00:00:00 2001 From: "egg.boiled" Date: Fri, 16 May 2025 12:33:54 +0900 Subject: [PATCH 1/2] feat: ADD hour/minute granularity to dynamic date range option --- .../dynamic-parameters/DateRangeParameter.jsx | 20 +++++++++++++++++++ .../services/parameters/DateRangeParameter.js | 8 ++++++++ 2 files changed, 28 insertions(+) diff --git a/client/app/components/dynamic-parameters/DateRangeParameter.jsx b/client/app/components/dynamic-parameters/DateRangeParameter.jsx index ea8bf8b1d3..9f300600b7 100644 --- a/client/app/components/dynamic-parameters/DateRangeParameter.jsx +++ b/client/app/components/dynamic-parameters/DateRangeParameter.jsx @@ -109,6 +109,26 @@ const DYNAMIC_DATE_OPTIONS = [ ]; const DYNAMIC_DATETIME_OPTIONS = [ + { + name: "Last 15 miniutes", + value: getDynamicDateRangeFromString("d_last_15_minutes"), + label: null + }, + { + name: "Last 30 miniutes", + value: getDynamicDateRangeFromString("d_last_30_minutes"), + label: null + }, + { + name: "Last Hour", + value: getDynamicDateRangeFromString("d_last_hour"), + label: null + }, + { + name: "Last 8 Hours", + value: getDynamicDateRangeFromString("d_last_8_hours"), + label: null + }, { name: "Today", value: getDynamicDateRangeFromString("d_today"), diff --git a/client/app/services/parameters/DateRangeParameter.js b/client/app/services/parameters/DateRangeParameter.js index dc284ae29b..e59505737a 100644 --- a/client/app/services/parameters/DateRangeParameter.js +++ b/client/app/services/parameters/DateRangeParameter.js @@ -80,6 +80,14 @@ const DYNAMIC_DATE_RANGES = { .endOf("year"), ], }, + last_30_minutes: { + name: "Last 30 minutes", + value: untilNow(() => moment().subtract(30, "minute")), + }, + last_15_minutes: { + name: "Last 15 minutes", + value: untilNow(() => moment().subtract(15, "minute")), + }, last_hour: { name: "Last hour", value: untilNow(() => moment().subtract(1, "hour")), From 96a4ef8523766b37cec96c2af9d9fcf343e61107 Mon Sep 17 00:00:00 2001 From: "egg.boiled" Date: Fri, 13 Jun 2025 13:24:43 +0900 Subject: [PATCH 2/2] fix: correct typo --- .../app/components/dynamic-parameters/DateRangeParameter.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/app/components/dynamic-parameters/DateRangeParameter.jsx b/client/app/components/dynamic-parameters/DateRangeParameter.jsx index 9f300600b7..daed0262c5 100644 --- a/client/app/components/dynamic-parameters/DateRangeParameter.jsx +++ b/client/app/components/dynamic-parameters/DateRangeParameter.jsx @@ -110,12 +110,12 @@ const DYNAMIC_DATE_OPTIONS = [ const DYNAMIC_DATETIME_OPTIONS = [ { - name: "Last 15 miniutes", + name: "Last 15 minutes", value: getDynamicDateRangeFromString("d_last_15_minutes"), label: null }, { - name: "Last 30 miniutes", + name: "Last 30 minutes", value: getDynamicDateRangeFromString("d_last_30_minutes"), label: null },