Added more date filter options.

This commit is contained in:
Mike Cao 2024-03-22 14:35:41 -07:00
parent b873ea38ea
commit 09a161d04a
3 changed files with 12 additions and 3 deletions

View File

@ -59,7 +59,15 @@ export function DateFilter({
label: formatMessage(labels.lastDays, { x: 90 }),
value: '90day',
},
{ label: formatMessage(labels.thisYear), value: '0year' },
{ label: formatMessage(labels.thisYear), value: '0year', divider: true },
{
label: formatMessage(labels.lastMonths, { x: 6 }),
value: '6month',
},
{
label: formatMessage(labels.lastMonths, { x: 12 }),
value: '12month',
},
showAllTime && {
label: formatMessage(labels.allTime),
value: 'all',

View File

@ -110,6 +110,7 @@ export const labels = defineMessages({
yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
thisWeek: { id: 'label.this-week', defaultMessage: 'This week' },
lastDays: { id: 'label.last-days', defaultMessage: 'Last {x} days' },
lastMonths: { id: 'label.last-months', defaultMessage: 'Last {x} months' },
thisMonth: { id: 'label.this-month', defaultMessage: 'This month' },
thisYear: { id: 'label.this-year', defaultMessage: 'This year' },
allTime: { id: 'label.all-time', defaultMessage: 'All time' },

View File

@ -182,8 +182,8 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa
case 'month':
return {
startDate: subMonths(startOfMonth(now), num),
endDate: subMonths(endOfMonth(now), num),
unit: 'day',
endDate: subMonths(endOfMonth(now), num ? 1 : 0),
unit: num ? 'month' : 'day',
offset: 0,
num: num || 1,
value,