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

Upgraded next to 13. Fixed date filter for websites.

Browse source
This commit is contained in:
Mike Cao 2023-03-08 20:23:32 -08:00
parent 9b90036401
commit 0607e9f442
19 changed files with 201 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hooks/useDateRange.js
View file

@ -3,27 +3,15 @@ import { parseDateRange } from 'lib/date';
import { setItem } from 'next-basics';
import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';
import useLocale from './useLocale';
import { getWebsiteDateRange, setWebsiteDateRange } from 'store/websites';
import useStore, { setDateRange } from 'store/app';
function parseValue(value, locale) {
if (typeof value === 'string') {
return parseDateRange(value, locale);
} else if (typeof value === 'object') {
return {
...value,
startDate: parseISO(value.startDate),
endDate: parseISO(value.endDate),
};
}
}
import websiteStore, { setWebsiteDateRange } from 'store/websites';
import appStore, { setDateRange } from 'store/app';
export default function useDateRange(websiteId) {
const { locale } = useLocale();
const websiteConfig = getWebsiteDateRange(websiteId);
const websiteConfig = websiteStore(state => state[websiteId]?.dateRange);
const defaultConfig = DEFAULT_DATE_RANGE;
const globalConfig = useStore(state => state.dateRange);
const dateRange = parseValue(websiteConfig || globalConfig || defaultConfig, locale);
const globalConfig = appStore(state => state.dateRange);
const dateRange = parseDateRange(websiteConfig || globalConfig || defaultConfig, locale);
function saveDateRange(value) {
if (websiteId) {