Rearrange date range dropdown logically
parent
83678756c7
commit
4cc75e75d4
|
@ -3,13 +3,12 @@ import { getDateRange } from 'lib/date';
|
||||||
import DropDown from './DropDown';
|
import DropDown from './DropDown';
|
||||||
|
|
||||||
const filterOptions = [
|
const filterOptions = [
|
||||||
{ label: 'Last 24 hours', value: '24hour' },
|
|
||||||
{ label: 'Last 7 days', value: '7day' },
|
|
||||||
{ label: 'Last 30 days', value: '30day' },
|
|
||||||
{ label: 'Last 90 days', value: '90day' },
|
|
||||||
{ label: 'Today', value: '1day' },
|
{ label: 'Today', value: '1day' },
|
||||||
|
{ label: 'Last 7 days', value: '7day' },
|
||||||
{ label: 'This week', value: '1week' },
|
{ label: 'This week', value: '1week' },
|
||||||
|
{ label: 'Last 30 days', value: '30day' },
|
||||||
{ label: 'This month', value: '1month' },
|
{ label: 'This month', value: '1month' },
|
||||||
|
{ label: 'Last 90 days', value: '90day' },
|
||||||
{ label: 'This year', value: '1year' },
|
{ label: 'This year', value: '1year' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -4,14 +4,12 @@ import {
|
||||||
addHours,
|
addHours,
|
||||||
addDays,
|
addDays,
|
||||||
addMonths,
|
addMonths,
|
||||||
subHours,
|
|
||||||
subDays,
|
subDays,
|
||||||
startOfHour,
|
startOfHour,
|
||||||
startOfDay,
|
startOfDay,
|
||||||
startOfWeek,
|
startOfWeek,
|
||||||
startOfMonth,
|
startOfMonth,
|
||||||
startOfYear,
|
startOfYear,
|
||||||
endOfHour,
|
|
||||||
endOfDay,
|
endOfDay,
|
||||||
endOfWeek,
|
endOfWeek,
|
||||||
endOfMonth,
|
endOfMonth,
|
||||||
|
@ -75,13 +73,6 @@ export function getDateRange(value) {
|
||||||
unit,
|
unit,
|
||||||
value,
|
value,
|
||||||
};
|
};
|
||||||
case 'hour':
|
|
||||||
return {
|
|
||||||
startDate: subHours(startOfHour(now), num - 1),
|
|
||||||
endDate: endOfHour(now),
|
|
||||||
unit,
|
|
||||||
value,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue