watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 22:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Updated date range handling.

Browse source
This commit is contained in:
Mike Cao 2023-05-28 22:28:11 -07:00
parent bfb52eb678
commit e9b0d3f796
4 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/input/DateFilter.js
View file

@ -65,7 +65,7 @@ export function DateFilter({
].filter(n => n);
const renderValue = value => {
return value === 'custom' ? (
return value.startsWith('range') ? (
<CustomRange startDate={startDate} endDate={endDate} onClick={() => handleChange('custom')} />
) : (
options.find(e => e.value === value).label

3
components/input/WebsiteDateFilter.js
View file

@ -1,4 +1,3 @@
import { getDateRangeValues } from 'lib/date';
import useApi from 'hooks/useApi';
import useDateRange from 'hooks/useDateRange';
import DateFilter from './DateFilter';
@ -13,7 +12,7 @@ export default function WebsiteDateFilter({ websiteId, value }) {
const data = await get(`/websites/${websiteId}`);
if (data) {
setDateRange({ value, ...getDateRangeValues(new Date(data.createdAt), Date.now()) });
setDateRange(`range:${new Date(data.createdAt)}:${Date.now()}`);
}
} else if (value !== 'all') {
setDateRange(value);