Added more date filter options.
This commit is contained in:
@@ -59,7 +59,15 @@ export function DateFilter({
|
|||||||
label: formatMessage(labels.lastDays, { x: 90 }),
|
label: formatMessage(labels.lastDays, { x: 90 }),
|
||||||
value: '90day',
|
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 && {
|
showAllTime && {
|
||||||
label: formatMessage(labels.allTime),
|
label: formatMessage(labels.allTime),
|
||||||
value: 'all',
|
value: 'all',
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ export const labels = defineMessages({
|
|||||||
yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
|
yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
|
||||||
thisWeek: { id: 'label.this-week', defaultMessage: 'This week' },
|
thisWeek: { id: 'label.this-week', defaultMessage: 'This week' },
|
||||||
lastDays: { id: 'label.last-days', defaultMessage: 'Last {x} days' },
|
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' },
|
thisMonth: { id: 'label.this-month', defaultMessage: 'This month' },
|
||||||
thisYear: { id: 'label.this-year', defaultMessage: 'This year' },
|
thisYear: { id: 'label.this-year', defaultMessage: 'This year' },
|
||||||
allTime: { id: 'label.all-time', defaultMessage: 'All time' },
|
allTime: { id: 'label.all-time', defaultMessage: 'All time' },
|
||||||
|
|||||||
@@ -182,8 +182,8 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa
|
|||||||
case 'month':
|
case 'month':
|
||||||
return {
|
return {
|
||||||
startDate: subMonths(startOfMonth(now), num),
|
startDate: subMonths(startOfMonth(now), num),
|
||||||
endDate: subMonths(endOfMonth(now), num),
|
endDate: subMonths(endOfMonth(now), num ? 1 : 0),
|
||||||
unit: 'day',
|
unit: num ? 'month' : 'day',
|
||||||
offset: 0,
|
offset: 0,
|
||||||
num: num || 1,
|
num: num || 1,
|
||||||
value,
|
value,
|
||||||
|
|||||||
Reference in New Issue
Block a user