watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-06 01:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix default date range setting.

Browse source
This commit is contained in:
Mike Cao 2022-03-01 22:02:31 -08:00
parent 69b81880cb
commit 7a3c1e9faa
4 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hooks/useDateRange.js
View file

@ -7,11 +7,12 @@ import useForceUpdate from './useForceUpdate';
import useLocale from './useLocale';
import useStore, { setDateRange } from 'store/websites';
export default function useDateRange(websiteId, defaultDateRange = DEFAULT_DATE_RANGE) {
export default function useDateRange(websiteId) {
const { locale } = useLocale();
const selector = useCallback(state => state?.[websiteId]?.dateRange, [websiteId]);
const dateRange = useStore(selector);
const websiteDateRange = useStore(selector);
const forceUpdate = useForceUpdate();
const defaultDateRange = getDateRange(DEFAULT_DATE_RANGE, locale);
const globalDefault = getItem(DATE_RANGE_CONFIG);
let globalDateRange;
@ -32,11 +33,10 @@ export default function useDateRange(websiteId, defaultDateRange = DEFAULT_DATE_
if (websiteId) {
setDateRange(websiteId, dateRange);
} else {
const { value } = dateRange;
setItem(DATE_RANGE_CONFIG, value === 'custom' ? dateRange : value);
setItem(DATE_RANGE_CONFIG, dateRange);
forceUpdate();
}
}
return [dateRange || globalDateRange || getDateRange(defaultDateRange, locale), saveDateRange];
return [websiteDateRange || globalDateRange || defaultDateRange, saveDateRange];
}