watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 07:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Refactored useDateRange to always use query string. Fixed all time filter.

Browse source
This commit is contained in:
Mike Cao 2025-10-03 17:55:39 -07:00
parent 4d06b0ca5b
commit 92ee44756c
28 changed files with 106 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/date.ts
View file

@ -131,14 +131,6 @@ export function parseDateRange(value: string, locale = 'en-US'): DateRange {
return null;
}
if (value === 'all') {
return {
startDate: new Date(0),
endDate: new Date(1),
value,
};
}
if (value.startsWith('range')) {
const [, startTime, endTime] = value.split(':');
@ -225,24 +217,28 @@ export function getOffsetDateRange(dateRange: DateRange, offset: number) {
case 'day':
return {
...dateRange,
offset,
startDate: addDays(startDate, change),
endDate: addDays(endDate, change),
};
case 'week':
return {
...dateRange,
offset,
startDate: addWeeks(startDate, change),
endDate: addWeeks(endDate, change),
};
case 'month':
return {
...dateRange,
offset,
startDate: addMonths(startDate, change),
endDate: addMonths(endDate, change),
};
case 'year':
return {
...dateRange,
offset,
startDate: addYears(startDate, change),
endDate: addYears(endDate, change),
};
@ -250,6 +246,7 @@ export function getOffsetDateRange(dateRange: DateRange, offset: number) {
return {
startDate: add(startDate, change),
endDate: add(endDate, change),
offset,
value,
unit,
num,
@ -354,6 +351,10 @@ export function generateTimeSeries(
});
}
export function dateToRangeValue(date: Date) {
return `range:${startOfMonth(date).getTime()}:${endOfMonth(date).getTime()}`;
export function getDateRangeValue(startDate: Date, endDate: Date) {
return `range:${startDate.getTime()}:${endDate.getTime()}`;
}
export function getMonthDateRangeValue(date: Date) {
return getDateRangeValue(startOfMonth(date), endOfMonth(date));
}