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
remove timezone from realtime. Closes #3700
Francis Cao30781430c5ef
diff --git a/src/app/api/realtime/[websiteId]/route.ts b/src/app/api/realtime/[websiteId]/route.tsindex 054a12418..eaa0bbd8c 100644--- a/src/app/api/realtime/[websiteId]/route.ts+++ b/src/app/api/realtime/[websiteId]/route.ts@@ -1,21 +1,15 @@import { REALTIME_RANGE } from '@/lib/constants';import { getQueryFilters, parseRequest } from '@/lib/request';import { json, unauthorized } from '@/lib/response';-import { timezoneParam } from '@/lib/schema';import { canViewWebsite } from '@/permissions';import { getRealtimeData } from '@/queries/sql';import { startOfMinute, subMinutes } from 'date-fns';-import z from 'zod';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string }> },) {- const schema = z.object({- timezone: timezoneParam,- });-- const { auth, query, error } = await parseRequest(request, schema);+ const { auth, query, error } = await parseRequest(request);if (error) {return error();diff --git a/src/components/hooks/queries/useRealtimeQuery.ts b/src/components/hooks/queries/useRealtimeQuery.tsindex 582fe9fa3..ed388b032 100644--- a/src/components/hooks/queries/useRealtimeQuery.ts+++ b/src/components/hooks/queries/useRealtimeQuery.ts@@ -1,4 +1,3 @@-import { useTimezone } from '@/components/hooks/useTimezone';import { REALTIME_INTERVAL } from '@/lib/constants';import { useApi } from '../useApi';@@ -24,11 +23,10 @@ export interface RealtimeData {export function useRealtimeQuery(websiteId: string) {const { get, useQuery } = useApi();- const { timezone } = useTimezone();const { data, isLoading, error } = useQuery<RealtimeData>({- queryKey: ['realtime', { websiteId, timezone }],+ queryKey: ['realtime', { websiteId }],queryFn: async () => {- return get(`/realtime/${websiteId}`, { timezone });+ return get(`/realtime/${websiteId}`);},enabled: !!websiteId,refetchInterval: REALTIME_INTERVAL,diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.tsindex 5e6e7133c..4880e122e 100644--- a/src/lib/clickhouse.ts+++ b/src/lib/clickhouse.ts@@ -61,7 +61,7 @@ function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {function getDateSQL(field: string, unit: string, timezone?: string) {if (timezone) {- return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'), '${timezone}')`;+ return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'))`;}return `toDateTime(date_trunc('${unit}', ${field}))`;}diff --git a/src/queries/sql/pageviews/getPageviewStats.ts b/src/queries/sql/pageviews/getPageviewStats.tsindex 7dd9ac93e..a6619e87d 100644--- a/src/queries/sql/pageviews/getPageviewStats.ts+++ b/src/queries/sql/pageviews/getPageviewStats.ts@@ -45,7 +45,7 @@ async function clickhouseQuery(websiteId: string,filters: QueryFilters,): Promise<{ x: string; y: number }[]> {- const { timezone = 'utc', unit = 'day' } = filters;+ const { timezone = 'UTC', unit = 'day' } = filters;const { parseFilters, rawQuery, getDateSQL } = clickhouse;const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,diff --git a/src/queries/sql/sessions/getSessionStats.ts b/src/queries/sql/sessions/getSessionStats.tsindex 07582d395..ea93b2263 100644--- a/src/queries/sql/sessions/getSessionStats.ts+++ b/src/queries/sql/sessions/getSessionStats.ts@@ -45,7 +45,7 @@ async function clickhouseQuery(websiteId: string,filters: QueryFilters,): Promise<{ x: string; y: number }[]> {- const { timezone = 'utc', unit = 'day' } = filters;+ const { timezone = 'UTC', unit = 'day' } = filters;const { parseFilters, rawQuery, getDateSQL } = clickhouse;const { filterQuery, cohortQuery, queryParams } = parseFilters({...filters,