mirror of
https://github.com/umami-software/umami.git
synced 2026-02-07 14:17:13 +01:00
Updated WebsiteSelect behavior. Fixed date select.
This commit is contained in:
parent
f9442001e4
commit
8d5e8b072d
4 changed files with 23 additions and 12 deletions
|
|
@ -10,7 +10,6 @@ import { useNavigation } from './useNavigation';
|
|||
|
||||
export interface UseDateRangeOptions {
|
||||
ignoreOffset?: boolean;
|
||||
useQueryParameter?: boolean;
|
||||
}
|
||||
|
||||
export function useDateRange(websiteId?: string, options: UseDateRangeOptions = {}) {
|
||||
|
|
@ -21,11 +20,7 @@ export function useDateRange(websiteId?: string, options: UseDateRangeOptions =
|
|||
} = useNavigation();
|
||||
const websiteConfig = useWebsites(state => state[websiteId]?.dateRange);
|
||||
const globalConfig = useApp(state => state.dateRangeValue);
|
||||
const dateValue =
|
||||
(options.useQueryParameter ? date : false) ||
|
||||
websiteConfig?.value ||
|
||||
globalConfig ||
|
||||
DEFAULT_DATE_RANGE_VALUE;
|
||||
const dateValue = websiteConfig?.value || date || globalConfig || DEFAULT_DATE_RANGE_VALUE;
|
||||
|
||||
const dateRange = useMemo(() => {
|
||||
const dateRangeObject = parseDateRange(dateValue, locale);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue