watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 12:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix custom date range display. Closes #923, #921

Browse source
This commit is contained in:
Mike Cao 2022-01-20 19:54:58 -08:00
parent 2baf4b19fe
commit 547eefae82
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/common/DateFilter.js
View file

@ -10,7 +10,7 @@ import { dateFormat } from 'lib/date';
import Calendar from 'assets/calendar-alt.svg';
import Icon from './Icon';
const filterOptions = [
export const filterOptions = [
{ label: <FormattedMessage id="label.today" defaultMessage="Today" />, value: '1day' },
{
label: (
@ -59,7 +59,7 @@ const filterOptions = [
},
];
function DateFilter({ value, startDate, endDate, onChange, className }) {
function DateFilter({ value, startDate, endDate, onChange, className, options }) {
const [showPicker, setShowPicker] = useState(false);
const displayValue =
value === 'custom' ? (
@ -86,7 +86,7 @@ function DateFilter({ value, startDate, endDate, onChange, className }) {
<DropDown
className={className}
value={displayValue}
options={filterOptions}
options={options || filterOptions}
onChange={handleChange}
/>
{showPicker && (