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
add canonicalizeTimezone conversions
Francis Caoa1d6204373b1
diff --git a/src/components/hooks/useDateParameters.ts b/src/components/hooks/useDateParameters.tsindex 359bbc1fd..16e123142 100644--- a/src/components/hooks/useDateParameters.ts+++ b/src/components/hooks/useDateParameters.ts@@ -5,7 +5,7 @@ export function useDateParameters() {const {dateRange: { startDate, endDate, unit },} = useDateRange();- const { timezone, toUtc } = useTimezone();+ const { timezone, toUtc, canonicalizeTimezone } = useTimezone();return {startAt: +toUtc(startDate),@@ -13,6 +13,6 @@ export function useDateParameters() {startDate: toUtc(startDate).toISOString(),endDate: toUtc(endDate).toISOString(),unit,- timezone,+ timezone: canonicalizeTimezone(timezone),};}diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.tsindex 0e1fe6cd3..3770c26bd 100644--- a/src/components/hooks/useTimezone.ts+++ b/src/components/hooks/useTimezone.ts@@ -1,5 +1,5 @@import { setItem } from '@/lib/storage';-import { TIMEZONE_CONFIG } from '@/lib/constants';+import { TIMEZONE_CONFIG, TIMEZONE_LEGACY } from '@/lib/constants';import { formatInTimeZone, zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz';import { useApp, setTimezone } from '@/store/app';import { useLocale } from './useLocale';@@ -34,5 +34,16 @@ export function useTimezone() {return utcToZonedTime(date, timezone);};- return { timezone, saveTimezone, formatTimezoneDate, toUtc, fromUtc };+ const canonicalizeTimezone = (timezone: string): string => {+ return TIMEZONE_LEGACY[timezone] ?? timezone;+ };++ return {+ timezone,+ saveTimezone,+ formatTimezoneDate,+ toUtc,+ fromUtc,+ canonicalizeTimezone,+ };}diff --git a/src/lib/constants.ts b/src/lib/constants.tsindex 50a25b8d8..195fe1be8 100644--- a/src/lib/constants.ts+++ b/src/lib/constants.ts@@ -658,3 +658,24 @@ export const CURRENCIES = [{ id: 'OMR', name: 'Omani Rial' },{ id: 'GHS', name: 'Ghanaian Cedi' },];++export const TIMEZONE_LEGACY: Record<string, string> = {+ 'Asia/Batavia': 'Asia/Jakarta',+ 'Asia/Calcutta': 'Asia/Kolkata',+ 'Asia/Chongqing': 'Asia/Shanghai',+ 'Asia/Harbin': 'Asia/Shanghai',+ 'Asia/Jayapura': 'Asia/Pontianak',+ 'Asia/Katmandu': 'Asia/Kathmandu',+ 'Asia/Macao': 'Asia/Macau',+ 'Asia/Rangoon': 'Asia/Yangon',+ 'Asia/Saigon': 'Asia/Ho_Chi_Minh',+ 'Europe/Kiev': 'Europe/Kyiv',+ 'Europe/Zaporozhye': 'Europe/Kyiv',+ 'Etc/UTC': 'UTC',+ 'US/Arizona': 'America/Phoenix',+ 'US/Central': 'America/Chicago',+ 'US/Eastern': 'America/New_York',+ 'US/Mountain': 'America/Denver',+ 'US/Pacific': 'America/Los_Angeles',+ 'US/Samoa': 'Pacific/Pago_Pago',+};