Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fixed bug in global date range setting.
Mike Cao7d25fd6876f9
diff --git a/components/settings/ProfileSettings.js b/components/settings/ProfileSettings.jsindex 69bc34e9e..10386318b 100644--- a/components/settings/ProfileSettings.js+++ b/components/settings/ProfileSettings.js@@ -30,7 +30,8 @@ export default function ProfileSettings() {}function handleDateChange(values) {- setItem(`umami.date-range`, values);+ const { value } = values;+ setItem(`umami.date-range`, value === 'custom' ? values : value);dispatch(setDateRange(0, values));}diff --git a/hooks/useDateRange.js b/hooks/useDateRange.jsindex e6ad6808a..9a88a5a18 100644--- a/hooks/useDateRange.js+++ b/hooks/useDateRange.js@@ -5,14 +5,20 @@ import { getItem } from 'lib/web';export default function useDateRange(websiteId, defaultDateRange = '24hour') {const globalDefault = getItem('umami.date-range');+ let globalDateRange;- if (globalDefault) {- globalDefault.startDate = parseISO(globalDefault.startDate);- globalDefault.endDate = parseISO(globalDefault.endDate);+ if (typeof globalDefault === 'string') {+ globalDateRange = getDateRange(globalDefault);+ } else {+ globalDateRange = {+ ...globalDefault,+ startDate: parseISO(globalDefault.startDate),+ endDate: parseISO(globalDefault.endDate),+ };}return useSelector(state =>- state.websites[websiteId]?.dateRange || globalDefault || getDateRange(defaultDateRange),+ state.websites[websiteId]?.dateRange || globalDateRange || getDateRange(defaultDateRange),);}