Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additional Date Ranges for DateRangeParameter #6894

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Additional Date Ranges for DateRangeParameter #6894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2187438
adds additional date ranges for DateRangeParameter
Apr 9, 2024
85227ba
Merge branch 'master' into master
rohithsebastian Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 48 additions & 0 deletions client/app/components/dynamic-parameters/DateRangeParameter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ const DYNAMIC_DATE_OPTIONS = [
.value()[0]
.format("YYYY"),
},
{
name: "Last 2 days",
value: getDynamicDateRangeFromString("d_last_2_days"),
label: () =>
getDynamicDateRangeFromString("d_last_2_days")
.value()[0]
.format("MMM D") + " - Today",
},
{
name: "Last 7 days",
value: getDynamicDateRangeFromString("d_last_7_days"),
Expand Down Expand Up @@ -109,6 +117,46 @@ const DYNAMIC_DATE_OPTIONS = [
];

const DYNAMIC_DATETIME_OPTIONS = [
{
name: "Last 5 minutes",
value: getDynamicDateRangeFromString("d_last_5_minutes"),
label: null
},
{
name: "Last 15 minutes",
value: getDynamicDateRangeFromString("d_last_15_minutes"),
label: null
},
{
name: "Last 30 minutes",
value: getDynamicDateRangeFromString("d_last_30_minutes"),
label: null
},
{
name: "Last hour",
value: getDynamicDateRangeFromString("d_last_hour"),
label: null
},
{
name: "Last 3 hours",
value: getDynamicDateRangeFromString("d_last_3_hours"),
label: null
},
{
name: "Last 6 hours",
value: getDynamicDateRangeFromString("d_last_6_hours"),
label: null
},
{
name: "Last 12 hours",
value: getDynamicDateRangeFromString("d_last_12_hours"),
label: null
},
{
name: "Last 24 hours",
value: getDynamicDateRangeFromString("d_last_24_hours"),
label: null
},
{
name: "Today",
value: getDynamicDateRangeFromString("d_today"),
Expand Down
34 changes: 34 additions & 0 deletions client/app/services/parameters/DateRangeParameter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,52 @@ const DYNAMIC_DATE_RANGES = {
.endOf("year"),
],
},
last_5_minutes: {
name: "Last 5 minutes",
value: untilNow(() => moment().subtract(5, "minutes")),
},
last_15_minutes: {
name: "Last 15 minutes",
value: untilNow(() => moment().subtract(15, "minutes")),
},
last_30_minutes: {
name: "Last 30 minutes",
value: untilNow(() => moment().subtract(30, "minutes")),
},
last_hour: {
name: "Last hour",
value: untilNow(() => moment().subtract(1, "hour")),
},
last_3_hours: {
name: "Last 3 hours",
value: untilNow(() => moment().subtract(3, "hour")),
},
last_6_hours: {
name: "Last 6 hours",
value: untilNow(() => moment().subtract(6, "hour")),
},
last_8_hours: {
name: "Last 8 hours",
value: untilNow(() => moment().subtract(8, "hour")),
},
last_12_hours: {
name: "Last 12 hours",
value: untilNow(() => moment().subtract(12, "hour")),
},
last_24_hours: {
name: "Last 24 hours",
value: untilNow(() => moment().subtract(24, "hour")),
},
last_2_days: {
name: "Last 2 days",
value: untilNow(
() =>
moment()
.subtract(2, "days")
.startOf("day"),
() => moment().endOf("day")
),
},
last_7_days: {
name: "Last 7 days",
value: untilNow(
Expand Down