forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-14 19:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensured end dates are set at the end of the date when filtering visits

Browse Source
This commit is contained in:
Alejandro Celaya
2021-09-12 10:16:05 +02:00
parent 0e47f9b502
commit 178f15b7d3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils/dates/types/index.ts
View File

@@ -55,6 +55,7 @@ export const rangeOrIntervalToString = (range?: DateRange | DateInterval): strin
}; };
const startOfDaysAgo = (daysAgo: number) => startOfDay(subDays(new Date(), daysAgo)); const startOfDaysAgo = (daysAgo: number) => startOfDay(subDays(new Date(), daysAgo));
const endingToday = (startDate: Date): DateRange => ({ startDate, endDate: endOfDay(new Date()) });
export const intervalToDateRange = (dateInterval?: DateInterval): DateRange => { export const intervalToDateRange = (dateInterval?: DateInterval): DateRange => {
if (!dateInterval) { if (!dateInterval) {
@@ -63,19 +64,19 @@ export const intervalToDateRange = (dateInterval?: DateInterval): DateRange => {
switch (dateInterval) { switch (dateInterval) {
case 'today': case 'today':
return { startDate: startOfDay(new Date()), endDate: new Date() }; return endingToday(startOfDay(new Date()));
case 'yesterday': case 'yesterday':
return { startDate: startOfDaysAgo(1), endDate: endOfDay(subDays(new Date(), 1)) }; return { startDate: startOfDaysAgo(1), endDate: endOfDay(subDays(new Date(), 1)) };
case 'last7Days': case 'last7Days':
return { startDate: startOfDaysAgo(7), endDate: new Date() }; return endingToday(startOfDaysAgo(7));
case 'last30Days': case 'last30Days':
return { startDate: startOfDaysAgo(30), endDate: new Date() }; return endingToday(startOfDaysAgo(30));
case 'last90Days': case 'last90Days':
return { startDate: startOfDaysAgo(90), endDate: new Date() }; return endingToday(startOfDaysAgo(90));
case 'last180days': case 'last180days':
return { startDate: startOfDaysAgo(180), endDate: new Date() }; return endingToday(startOfDaysAgo(180));
case 'last365Days': case 'last365Days':
return { startDate: startOfDaysAgo(365), endDate: new Date() }; return endingToday(startOfDaysAgo(365));
} }
return {}; return {};