m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed date filter.

Browse Source
This commit is contained in:
Mike Cao 2023-07-11 18:23:16 -07:00
parent e7ff083a87
commit 7a5b5cc678
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/input/WebsiteDateFilter.js
View File

@ -13,7 +13,9 @@ export default function WebsiteDateFilter({ websiteId }) {
const data = await get(`/websites/${websiteId}`); const data = await get(`/websites/${websiteId}`);
if (data) { if (data) {
setDateRange(`range:${new Date(data.createdAt)}:${Date.now()}`); const start = new Date(data.createdAt).getTime();
const end = Date.now();
setDateRange(`range:${start}:${end}`);
} }
} else if (value !== 'all') { } else if (value !== 'all') {
setDateRange(value); setDateRange(value);
@ -27,6 +29,7 @@ export default function WebsiteDateFilter({ websiteId }) {
startDate={startDate} startDate={startDate}
endDate={endDate} endDate={endDate}
onChange={handleChange} onChange={handleChange}
showAllTime={true}
/> />
); );
} }

1
components/pages/reports/BaseParameters.js
View File

@ -33,7 +33,6 @@ export function BaseParameters() {
startDate={startDate} startDate={startDate}
endDate={endDate} endDate={endDate}
onChange={handleDateChange} onChange={handleDateChange}
showAllTime
/> />
</FormRow> </FormRow>
</> </>

3
components/pages/websites/WebsiteMetricsBar.js
View File

@ -1,7 +1,6 @@
import { useState } from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
import { Row, Column } from 'react-basics'; import { Row, Column } from 'react-basics';
import { formatShortTime, formatNumber, formatLongNumber } from 'lib/format'; import { formatShortTime } from 'lib/format';
import MetricCard from 'components/metrics/MetricCard'; import MetricCard from 'components/metrics/MetricCard';
import RefreshButton from 'components/input/RefreshButton'; import RefreshButton from 'components/input/RefreshButton';
import WebsiteDateFilter from 'components/input/WebsiteDateFilter'; import WebsiteDateFilter from 'components/input/WebsiteDateFilter';