Revert "Move timezone selection to query parameters"

This reverts commit 4d7930060c.
This commit is contained in:
Francis Cao committed 2026-07-27 10:32:28 -07:00
1 parent 4d7930060c
commit 3136e3590a
19 files changed
+147 -129

No files matched your search

@@ -3,6 +3,7 @@ import { useLoginQuery, useMessages } from '@/components/hooks';
import { DateRangeSetting } from './DateRangeSetting';
import { LanguageSetting } from './LanguageSetting';
import { ThemeSetting } from './ThemeSetting';
import { TimezoneSetting } from './TimezoneSetting';
import { VersionSetting } from './VersionSetting';
export function PreferenceSettings() {
@@ -19,6 +20,10 @@ export function PreferenceSettings() {
<Label>{t(labels.defaultDateRange)}</Label>
<DateRangeSetting />
</Column>
<Column>
<Label>{t(labels.timezone)}</Label>
<TimezoneSetting />
</Column>
<Column>
<Label>{t(labels.language)}</Label>
<LanguageSetting />
@@ -0,0 +1,45 @@
import { Button, ListItem, Row, Select } from '@umami/react-zen';
import { useState } from 'react';
import { useMessages, useTimezone } from '@/components/hooks';
import { getTimezone } from '@/lib/date';
const timezones = Intl.supportedValuesOf('timeZone');
export function TimezoneSetting() {
const [search, setSearch] = useState('');
const { t, labels } = useMessages();
const { timezone, saveTimezone } = useTimezone();
const items = search
? timezones.filter(n => n.toLowerCase().includes(search.toLowerCase()))
: timezones;
const handleReset = () => saveTimezone(getTimezone());
const handleOpen = isOpen => {
if (isOpen) {
setSearch('');
}
};
return (
<Row gap>
<Select
value={timezone}
onChange={(value: any) => saveTimezone(value)}
allowSearch={true}
onSearch={setSearch}
onOpenChange={handleOpen}
maxHeight={480}
style={{ minWidth: '250px' }}
>
{items.map((item: any) => (
<ListItem key={item} id={item}>
{item}
</ListItem>
))}
{!items.length && <ListItem></ListItem>}
</Select>
<Button onPress={handleReset}>{t(labels.reset)}</Button>
</Row>
);
}
@@ -1,5 +1,5 @@
import { LoadingPanel } from '@/components/common/LoadingPanel';
import { useDateRange } from '@/components/hooks';
import { useDateRange, useTimezone } from '@/components/hooks';
import { useRevenueChartQuery } from '@/components/hooks/queries/useRevenueChartQuery';
import { RevenueChart } from './RevenueChart';
import { useBoardRevenueCurrency } from './useBoardRevenueCurrency';
@@ -12,9 +12,10 @@ export function BoardRevenueChart({
currency?: string;
}) {
const currency = useBoardRevenueCurrency(selectedCurrency);
const { timezone } = useTimezone();
const {
dateRange: { startDate, endDate, unit },
} = useDateRange();
} = useDateRange({ timezone });
const { data, isLoading, isFetching, error } = useRevenueChartQuery(websiteId, currency);
return (
@@ -1,13 +1,14 @@
'use client';
import { Column } from '@umami/react-zen';
import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';
import { useDateRange } from '@/components/hooks';
import { useDateRange, useTimezone } from '@/components/hooks';
import { Revenue } from './Revenue';
export function RevenuePage({ websiteId }: { websiteId: string }) {
const { timezone } = useTimezone();
const {
dateRange: { startDate, endDate, unit },
} = useDateRange();
} = useDateRange({ timezone });
return (
<Column gap>
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import { useDateRange } from '@/components/hooks';
import { useDateRange, useTimezone } from '@/components/hooks';
import { useWebsitePageviewsQuery } from '@/components/hooks/queries/useWebsitePageviewsQuery';
import { PageviewsChart } from '@/components/metrics/PageviewsChart';
@@ -11,7 +11,8 @@ export function WebsiteChart({
websiteId: string;
compareMode?: boolean;
}) {
const { dateRange, dateCompare } = useDateRange();
const { timezone } = useTimezone();
const { dateRange, dateCompare } = useDateRange({ timezone: timezone });
const { startDate, endDate, unit, value } = dateRange;
const { data, isLoading, isFetching, error } = useWebsitePageviewsQuery({
websiteId,
@@ -1,4 +1,4 @@
import { Row } from '@umami/react-zen';
import { Icon, Row, Text } from '@umami/react-zen';
import { Favicon } from '@/components/common/Favicon';
import { IconLabel } from '@/components/common/IconLabel';
import { LinkButton } from '@/components/common/LinkButton';
@@ -15,7 +15,7 @@ export function WebsiteHeader({
allowLink?: boolean;
}) {
const website = useWebsite();
const { renderUrl, pathname, query } = useNavigation();
const { renderUrl, pathname } = useNavigation();
const isSettings = pathname.endsWith('/settings');
const { t, labels } = useMessages();
@@ -28,14 +28,7 @@ export function WebsiteHeader({
<PageHeader
title={website.name}
icon={<Favicon domain={website.domain} />}
titleHref={
allowLink
? renderUrl(
`/websites/${website.id}`,
query.timezone ? { timezone: query.timezone } : false,
)
: undefined
}
titleHref={allowLink ? renderUrl(`/websites/${website.id}`, false) : undefined}
>
<Row alignItems="center" gap="6" wrap="wrap">
<ActiveUsers websiteId={website.id} allowLink={allowLink} />