Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Enhance timezone handling across analytics hooks and components

Bill Yang045041bded57
diff --git a/client/src/api/analytics/hooks/errors/useGetErrorBucketed.ts b/client/src/api/analytics/hooks/errors/useGetErrorBucketed.ts
index 378e35316..a0a085d13 100644
--- a/client/src/api/analytics/hooks/errors/useGetErrorBucketed.ts
+++ b/client/src/api/analytics/hooks/errors/useGetErrorBucketed.ts
@@ -10,12 +10,12 @@ type UseGetErrorBucketedOptions = {
export function useGetErrorBucketed({
errorMessage,
}: UseGetErrorBucketedOptions): UseQueryResult<GetErrorBucketedResponse> {
- const { time, site, filters, bucket } = useStore();
+ const { time, site, filters, bucket, timezone } = useStore();
const params = buildApiParams(time, { filters });
return useQuery({
- queryKey: ["error-bucketed", time, site, filters, bucket, errorMessage],
+ queryKey: ["error-bucketed", time, site, filters, bucket, errorMessage, timezone],
queryFn: () => {
return fetchErrorBucketed(site, {
...params,
diff --git a/client/src/api/analytics/hooks/errors/useGetErrorEvents.ts b/client/src/api/analytics/hooks/errors/useGetErrorEvents.ts
index 7afaa5487..0d96e48bd 100644
--- a/client/src/api/analytics/hooks/errors/useGetErrorEvents.ts
+++ b/client/src/api/analytics/hooks/errors/useGetErrorEvents.ts
@@ -1,22 +1,21 @@
-import { useStore } from "@/lib/store";
+import { getTimezone, useStore } from "@/lib/store";
import { useInfiniteQuery } from "@tanstack/react-query";
-import { timeZone } from "../../../../lib/dateTimeUtils";
import { getStartAndEndDate } from "../../../utils";
import { ErrorEventsPaginatedResponse, fetchErrorEvents } from "../../endpoints";
// Hook for infinite scrolling
export function useGetErrorEventsInfinite(errorMessage: string, enabled: boolean = true) {
- const { time, site, filters } = useStore();
+ const { time, site, filters, timezone } = useStore();
const { startDate, endDate } = getStartAndEndDate(time);
return useInfiniteQuery({
- queryKey: ["error-events-infinite", time, site, filters, errorMessage],
+ queryKey: ["error-events-infinite", time, site, filters, errorMessage, timezone],
queryFn: async ({ pageParam = 1 }) => {
const data = await fetchErrorEvents(site, {
startDate: startDate ?? "",
endDate: endDate ?? "",
- timeZone,
+ timeZone: getTimezone(),
filters,
errorMessage,
limit: 20,
diff --git a/client/src/api/analytics/hooks/errors/useGetErrorNames.ts b/client/src/api/analytics/hooks/errors/useGetErrorNames.ts
index 69ee9673f..63f604d32 100644
--- a/client/src/api/analytics/hooks/errors/useGetErrorNames.ts
+++ b/client/src/api/analytics/hooks/errors/useGetErrorNames.ts
@@ -1,4 +1,4 @@
-import { useStore } from "@/lib/store";
+import { getTimezone, useStore } from "@/lib/store";
import { useQuery, UseQueryResult } from "@tanstack/react-query";
import { getStartAndEndDate } from "../../../utils";
import {
@@ -7,7 +7,6 @@ import {
ErrorNamesPaginatedResponse,
ErrorNamesStandardResponse,
} from "../../endpoints";
-import { timeZone } from "../../../../lib/dateTimeUtils";
type UseGetErrorNamesOptions = {
limit?: number;
@@ -21,17 +20,17 @@ export function useGetErrorNamesPaginated({
page = 1,
useFilters = true,
}: UseGetErrorNamesOptions): UseQueryResult<{ data: ErrorNamesPaginatedResponse }> {
- const { time, site, filters } = useStore();
+ const { time, site, filters, timezone } = useStore();
const { startDate, endDate } = getStartAndEndDate(time);
return useQuery({
- queryKey: ["error-names", time, site, filters, limit, page, useFilters],
+ queryKey: ["error-names", time, site, filters, limit, page, useFilters, timezone],
queryFn: async () => {
const data = await fetchErrorNames(site, {
startDate: startDate ?? "",
endDate: endDate ?? "",
- timeZone,
+ timeZone: getTimezone(),
filters: useFilters ? filters : undefined,
limit,
page,
@@ -47,17 +46,17 @@ export function useGetErrorNames({
limit = 10,
useFilters = true,
}: Omit<UseGetErrorNamesOptions, "page">): UseQueryResult<{ data: ErrorNamesPaginatedResponse }> {
- const { time, site, filters } = useStore();
+ const { time, site, filters, timezone } = useStore();
const { startDate, endDate } = getStartAndEndDate(time);
return useQuery({
- queryKey: ["error-names", time, site, filters, limit],
+ queryKey: ["error-names", time, site, filters, limit, timezone],
queryFn: async () => {
const data = await fetchErrorNames(site, {
startDate: startDate ?? "",
endDate: endDate ?? "",
- timeZone,
+ timeZone: getTimezone(),
filters: useFilters ? filters : undefined,
limit,
});
diff --git a/client/src/api/analytics/hooks/events/useGetEventNames.ts b/client/src/api/analytics/hooks/events/useGetEventNames.ts
index bf0d64c38..929bd72ec 100644
--- a/client/src/api/analytics/hooks/events/useGetEventNames.ts
+++ b/client/src/api/analytics/hooks/events/useGetEventNames.ts
@@ -5,7 +5,7 @@ import { buildApiParams } from "../../../utils";
import { fetchEventNames } from "../../endpoints";
export function useGetEventNames() {
- const { site, time } = useStore();
+ const { site, time, timezone } = useStore();
const filteredFilters = getFilteredFilters(EVENT_FILTERS);
const params = buildApiParams(time, {
@@ -13,7 +13,7 @@ export function useGetEventNames() {
});
return useQuery({
- queryKey: ["event-names", site, time, filteredFilters],
+ queryKey: ["event-names", site, time, filteredFilters, timezone],
enabled: !!site,
queryFn: () => fetchEventNames(site, params),
});
diff --git a/client/src/api/analytics/hooks/events/useGetEventProperties.ts b/client/src/api/analytics/hooks/events/useGetEventProperties.ts
index 2ed1dbcf1..414c9fac1 100644
--- a/client/src/api/analytics/hooks/events/useGetEventProperties.ts
+++ b/client/src/api/analytics/hooks/events/useGetEventProperties.ts
@@ -1,24 +1,23 @@
import { useQuery } from "@tanstack/react-query";
-import { timeZone } from "../../../../lib/dateTimeUtils";
import { EVENT_FILTERS } from "../../../../lib/filterGroups";
-import { getFilteredFilters, useStore } from "../../../../lib/store";
+import { getFilteredFilters, getTimezone, useStore } from "../../../../lib/store";
import { getStartAndEndDate } from "../../../utils";
import { fetchEventProperties } from "../../endpoints";
export function useGetEventProperties(eventName: string | null) {
- const { site, time } = useStore();
+ const { site, time, timezone } = useStore();
const filteredFilters = getFilteredFilters(EVENT_FILTERS);
const { startDate, endDate } = getStartAndEndDate(time);
return useQuery({
- queryKey: ["event-properties", site, eventName, time, filteredFilters],
+ queryKey: ["event-properties", site, eventName, time, filteredFilters, timezone],
enabled: !!site && !!eventName,
queryFn: () => {
return fetchEventProperties(site, {
startDate: startDate ?? "",
endDate: endDate ?? "",
- timeZone,
+ timeZone: getTimezone(),
filters: filteredFilters.length > 0 ? filteredFilters : undefined,
eventName: eventName!,
});
diff --git a/client/src/api/analytics/hooks/events/useGetEvents.ts b/client/src/api/analytics/hooks/events/useGetEvents.ts
index 673a908fa..88f5a7643 100644
--- a/client/src/api/analytics/hooks/events/useGetEvents.ts
+++ b/client/src/api/analytics/hooks/events/useGetEvents.ts
@@ -1,9 +1,8 @@
import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { Time } from "../../../../components/DateSelector/types";
-import { useStore } from "../../../../lib/store";
+import { getTimezone, useStore } from "../../../../lib/store";
import { buildApiParams } from "../../../utils";
import { EventsResponse, fetchEvents } from "../../endpoints";
-import { timeZone } from "../../../../lib/dateTimeUtils";
export interface GetEventsOptions {
time?: Time;
@@ -14,16 +13,16 @@ export interface GetEventsOptions {
}
export function useGetEvents(count = 10) {
- const { site } = useStore();
+ const { site, timezone } = useStore();
return useQuery({
- queryKey: ["events", site, count],
+ queryKey: ["events", site, count, timezone],
refetchInterval: 5000,
queryFn: () =>
fetchEvents(site, {
startDate: "",
endDate: "",
- timeZone,
+ timeZone: getTimezone(),
limit: count,
}).then(res => res.data),
enabled: !!site,
@@ -32,7 +31,7 @@ export function useGetEvents(count = 10) {
// Hook with pagination and filtering support
export function useGetEventsInfinite(options: GetEventsOptions = {}) {
- const { site, time, filters } = useStore();
+ const { site, time, filters, timezone } = useStore();
const pageSize = options.pageSize || 20;
const params = buildApiParams(time, {
@@ -40,7 +39,7 @@ export function useGetEventsInfinite(options: GetEventsOptions = {}) {
});
return useInfiniteQuery<EventsResponse, Error>({
- queryKey: ["events-infinite", site, time, filters, pageSize, options.isRealtime],
+ queryKey: ["events-infinite", site, time, filters, pageSize, options.isRealtime, timezone],
initialPageParam: 1,
queryFn: async ({ pageParam }) => {
return fetchEvents(site, {
diff --git a/client/src/api/analytics/hooks/events/useGetOutboundLinks.ts b/client/src/api/analytics/hooks/events/useGetOutboundLinks.ts
index cea39edae..3ffa0855a 100644
--- a/client/src/api/analytics/hooks/events/useGetOutboundLinks.ts
+++ b/client/src/api/analytics/hooks/events/useGetOutboundLinks.ts
@@ -5,7 +5,7 @@ import { buildApiParams } from "../../../utils";
import { fetchOutboundLinks } from "../../endpoints";
export function useGetOutboundLinks() {
- const { site, time } = useStore();
+ const { site, time, timezone } = useStore();
const filteredFilters = getFilteredFilters(EVENT_FILTERS);
const params = buildApiParams(time, {
@@ -13,7 +13,7 @@ export function useGetOutboundLinks() {
});
return useQuery({
- queryKey: ["outbound-links", site, time, filteredFilters],
+ queryKey: ["outbound-links", site, time, filteredFilters, timezone],
enabled: !!site,
queryFn: () => fetchOutboundLinks(site, params),
});
diff --git a/client/src/api/analytics/hooks/funnels/useGetFunnel.ts b/client/src/api/analytics/hooks/funnels/useGetFunnel.ts
index 2f9c7991d..bcb203927 100644
--- a/client/src/api/analytics/hooks/funnels/useGetFunnel.ts
+++ b/client/src/api/analytics/hooks/funnels/useGetFunnel.ts
@@ -9,7 +9,7 @@ import { analyzeFunnel, FunnelRequest, FunnelResponse, saveFunnel, SaveFunnelReq
* Hook for analyzing conversion funnels through a series of steps
*/
export function useGetFunnel(config?: FunnelRequest, debounce?: boolean) {
- const { site, time } = useStore();
+ const { site, time, timezone } = useStore();
const debouncedConfig = useDebounce(config, 500);
const filteredFilters = getFilteredFilters(FUNNEL_PAGE_FILTERS);
@@ -18,7 +18,7 @@ export function useGetFunnel(config?: FunnelRequest, debounce?: boolean) {
const configToUse = debounce ? debouncedConfig : config;
return useQuery<FunnelResponse[], Error>({
- queryKey: ["funnel", site, time, filteredFilters, configToUse?.steps],
+ queryKey: ["funnel", site, time, filteredFilters, configToUse?.steps, timezone],
queryFn: async () => {
if (!configToUse) {
throw new Error("Funnel configuration is required");
diff --git a/client/src/api/analytics/hooks/funnels/useGetFunnelStepSessions.ts b/client/src/api/analytics/hooks/funnels/useGetFunnelStepSessions.ts
index 1ca9b2dfe..f5934077e 100644
--- a/client/src/api/analytics/hooks/funnels/useGetFunnelStepSessions.ts
+++ b/client/src/api/analytics/hooks/funnels/useGetFunnelStepSessions.ts
@@ -1,7 +1,7 @@
import { useQuery } from "@tanstack/react-query";
import { Time } from "../../../../components/DateSelector/types";
import { FUNNEL_PAGE_FILTERS } from "../../../../lib/filterGroups";
-import { getFilteredFilters } from "../../../../lib/store";
+import { getFilteredFilters, useStore } from "../../../../lib/store";
import { buildApiParams } from "../../../utils";
import { fetchFunnelStepSessions, FunnelStep } from "../../endpoints";
@@ -24,11 +24,12 @@ export function useGetFunnelStepSessions({
limit?: number;
enabled?: boolean;
}) {
+ const { timezone } = useStore();
const filteredFilters = getFilteredFilters(FUNNEL_PAGE_FILTERS);
const params = buildApiParams(time, { filters: filteredFilters });
return useQuery({
- queryKey: ["funnel-step-sessions", steps, stepNumber, siteId, time, mode, page, limit, filteredFilters],
+ queryKey: ["funnel-step-sessions", steps, stepNumber, siteId, time, mode, page, limit, filteredFilters, timezone],
queryFn: async () => {
return fetchFunnelStepSessions(siteId, {
...params,
diff --git a/client/src/api/analytics/hooks/goals/useGetGoalSessions.ts b/client/src/api/analytics/hooks/goals/useGetGoalSessions.ts
index 9b2a897b9..9fe29399e 100644
--- a/client/src/api/analytics/hooks/goals/useGetGoalSessions.ts
+++ b/client/src/api/analytics/hooks/goals/useGetGoalSessions.ts
@@ -1,5 +1,6 @@
import { useQuery } from "@tanstack/react-query";
import { Time } from "../../../../components/DateSelector/types";
+import { useStore } from "../../../../lib/store";
import { buildApiParams } from "../../../utils";
import { fetchGoalSessions } from "../../endpoints";
@@ -18,10 +19,11 @@ export function useGetGoalSessions({
limit?: number;
enabled?: boolean;
}) {
+ const { timezone } = useStore();
const params = buildApiParams(time);
return useQuery({
- queryKey: ["goal-sessions", goalId, siteId, time, page, limit],
+ queryKey: ["goal-sessions", goalId, siteId, time, page, limit, timezone],
queryFn: async () => {
return fetchGoalSessions(siteId, {
...params,
diff --git a/client/src/api/analytics/hooks/goals/useGetGoals.ts b/client/src/api/analytics/hooks/goals/useGetGoals.ts
index 7b9d4ef6f..afe2b4b56 100644
--- a/client/src/api/analytics/hooks/goals/useGetGoals.ts
+++ b/client/src/api/analytics/hooks/goals/useGetGoals.ts
@@ -15,13 +15,13 @@ export function useGetGoals({
sort?: "goalId" | "name" | "goalType" | "createdAt";
order?: "asc" | "desc";
}) {
- const { site, time } = useStore();
+ const { site, time, timezone } = useStore();
const filteredFilters = getFilteredFilters(GOALS_PAGE_FILTERS);
const params = buildApiParams(time, { filters: filteredFilters });
return useQuery({
- queryKey: ["goals", site, time, filteredFilters, page, pageSize, sort, order],
+ queryKey: ["goals", site, time, filteredFilters, page, pageSize, sort, order, timezone],
queryFn: async () => {
return fetchGoals(site, {
...params,
diff --git a/client/src/api/analytics/hooks/performance/useGetPerformanceByDimension.ts b/client/src/api/analytics/hooks/performance/useGetPerformanceByDimension.ts
index 14cd99034..f44243803 100644
--- a/client/src/api/analytics/hooks/performance/useGetPerformanceByDimension.ts
+++ b/client/src/api/analytics/hooks/performance/useGetPerformanceByDimension.ts
@@ -31,7 +31,7 @@ export function useGetPerformanceByDimension({
sortBy,
sortOrder,
}: UseGetPerformanceByDimensionOptions): UseQueryResult<PaginatedPerformanceResponse> {
- const { time, filters } = useStore();
+ const { time, filters, timezone } = useStore();
const { selectedPercentile } = usePerformanceStore();
const combinedFilters = useFilters ? [...filters, ...additionalFilters] : undefined;
@@ -50,6 +50,7 @@ export function useGetPerformanceByDimension({
additionalFilters,
sortBy,
sortOrder,
+ timezone,
],
queryFn: () => {
return fetchPerformanceByDimension(site, {
diff --git a/client/src/api/analytics/hooks/performance/useGetPerformanceOverview.ts b/client/src/api/analytics/hooks/performance/useGetPerformanceOverview.ts
index e1c5511c3..bb55c6edb 100644
--- a/client/src/api/analytics/hooks/performance/useGetPerformanceOverview.ts
+++ b/client/src/api/analytics/hooks/performance/useGetPerformanceOverview.ts
@@ -7,14 +7,14 @@ import { fetchPerformanceOverview } from "../../endpoints";
type PeriodTime = "current" | "previous";
export function useGetPerformanceOverview({ periodTime, site }: { periodTime?: PeriodTime; site?: number | string }) {
- const { time, previousTime, filters } = useStore();
+ const { time, previousTime, filters, timezone } = useStore();
const { selectedPercentile } = usePerformanceStore();
const timeToUse = periodTime === "previous" ? previousTime : time;
const params = buildApiParams(timeToUse, { filters });
return useQuery({
- queryKey: ["performance-overview", timeToUse, site, filters, selectedPercentile],
+ queryKey: ["performance-overview", timeToUse, site, filters, selectedPercentile, timezone],
queryFn: () => {
return fetchPerformanceOverview(site!, {
...params,
diff --git a/client/src/api/analytics/hooks/performance/useGetPerformanceTimeSeries.ts b/client/src/api/analytics/hooks/performance/useGetPerformanceTimeSeries.ts
index 53fd3e000..157a6fc5c 100644
--- a/client/src/api/analytics/hooks/performance/useGetPerformanceTimeSeries.ts
+++ b/client/src/api/analytics/hooks/performance/useGetPerformanceTimeSeries.ts
@@ -21,7 +21,7 @@ export function useGetPerformanceTimeSeries({
dynamicFilters?: Filter[];
props?: Partial<UseQueryOptions<APIResponse<GetPerformanceTimeSeriesResponse>>>;
}): UseQueryResult<APIResponse<GetPerformanceTimeSeriesResponse>> {
- const { time, previousTime, filters: globalFilters, bucket: storeBucket } = useStore();
+ const { time, previousTime, filters: globalFilters, bucket: storeBucket, timezone } = useStore();
const { selectedPerformanceMetric } = usePerformanceStore();
const timeToUse = periodTime === "previous" ? previousTime : time;
@@ -31,7 +31,7 @@ export function useGetPerformanceTimeSeries({
const params = buildApiParams(timeToUse, { filters: combinedFilters });
return useQuery({
- queryKey: ["performance-time-series", timeToUse, bucketToUse, site, combinedFilters, selectedPerformanceMetric],
+ queryKey: ["performance-time-series", timeToUse, bucketToUse, site, combinedFilters, selectedPerformanceMetric, timezone],
queryFn: () => {
return fetchPerformanceTimeSeries(site, { ...params, bucket: bucketToUse }).then(data => ({ data }));
},
diff --git a/client/src/api/analytics/hooks/sessionReplay/useGetSessionReplays.ts b/client/src/api/analytics/hooks/sessionReplay/useGetSessionReplays.ts
index 8d8e6ee81..1560e2cfe 100644
--- a/client/src/api/analytics/hooks/sessionReplay/useGetSessionReplays.ts
+++ b/client/src/api/analytics/hooks/sessionReplay/useGetSessionReplays.ts
@@ -9,11 +9,11 @@ type UseGetSessionReplaysOptions = {
};
export function useGetSessionReplays({ limit = 20, minDuration = 30 }: UseGetSessionReplaysOptions = {}) {
- const { time, site, filters } = useStore();
+ const { time, site, filters, timezone } = useStore();
const params = buildApiParams(time, { filters });
return useInfiniteQuery({
- queryKey: ["session-replays", site, time, filters, limit, minDuration],
+ queryKey: ["session-replays", site, time, filters, limit, minDuration, timezone],
queryFn: async ({ pageParam = 0 }) => {
return fetchSessionReplays(site, {
...params,
diff --git a/client/src/api/analytics/hooks/useGetJourneys.ts b/client/src/api/analytics/hooks/useGetJourneys.ts
index 2a741be85..f25c113d8 100644
--- a/client/src/api/analytics/hooks/useGetJourneys.ts
+++ b/client/src/api/analytics/hooks/useGetJourneys.ts
@@ -1,7 +1,7 @@
import { useQuery } from "@tanstack/react-query";
import { Time } from "../../../components/DateSelector/types";
import { JOURNEY_PAGE_FILTERS } from "../../../lib/filterGroups";
-import { getFilteredFilters } from "../../../lib/store";
+import { getFilteredFilters, useStore } from "../../../lib/store";
import { buildApiParams } from "../../utils";
import { fetchJourneys, Journey, JourneysResponse } from "../endpoints";
@@ -15,11 +15,12 @@ export interface JourneyParams {
}
export const useJourneys = ({ siteId, steps = 3, time, limit = 100, stepFilters }: JourneyParams) => {
+ const { timezone } = useStore();
const filteredFilters = getFilteredFilters(JOURNEY_PAGE_FILTERS);
const params = buildApiParams(time, { filters: filteredFilters });
return useQuery<JourneysResponse>({
- queryKey: ["journeys", siteId, steps, time, limit, filteredFilters, stepFilters],
+ queryKey: ["journeys", siteId, steps, time, limit, filteredFilters, stepFilters, timezone],
queryFn: () =>
fetchJourneys(siteId!, {
...params,
diff --git a/client/src/api/analytics/hooks/useGetMetric.ts b/client/src/api/analytics/hooks/useGetMetric.ts
index ca349ef07..67d91e634 100644
--- a/client/src/api/analytics/hooks/useGetMetric.ts
+++ b/client/src/api/analytics/hooks/useGetMetric.ts
@@ -25,7 +25,7 @@ export function useMetric({
periodTime?: PeriodTime;
useFilters?: boolean;
}): UseQueryResult<APIResponse<MetricResponse[]>> {
- const { time, previousTime, site, filters } = useStore();
+ const { time, previousTime, site, filters, timezone } = useStore();
const timeToUse = periodTime === "previous" ? previousTime : time;
// For "previous" periods in past-minutes mode, we need to modify the time object
@@ -40,7 +40,7 @@ export function useMetric({
: timeToUse;
const params = buildApiParams(timeForQuery, { filters: useFilters ? filters : undefined });
- const queryKey = [parameter, timeForQuery, site, filters, limit, useFilters];
+ const queryKey = [parameter, timeForQuery, site, filters, limit, useFilters, timezone];
return useQuery({
queryKey,
@@ -90,7 +90,7 @@ export function usePaginatedMetric({
customFilters?: Filter[];
customTime?: Time;
}): UseQueryResult<PaginatedResponse> {
- const { time, site, filters } = useStore();
+ const { time, site, filters, timezone } = useStore();
const timeToUse = customTime ?? time;
const combinedFilters = useFilters
? customFilters.length > 0
@@ -101,7 +101,7 @@ export function usePaginatedMetric({
const params = buildApiParams(timeToUse, { filters: combinedFilters });
return useQuery({
- queryKey: [parameter, customTime, time, site, filters, limit, page, additionalFilters, customFilters],
+ queryKey: [parameter, customTime, time, site, filters, limit, page, additionalFilters, customFilters, timezone],
queryFn: async () => {
return fetchMetric(site, {
...params,
@@ -134,11 +134,11 @@ export function useInfiniteMetric({
limit?: number;
useFilters?: boolean;
}): UseInfiniteQueryResult<InfiniteData<PaginatedResponse>> {
- const { time, site, filters } = useStore();
+ const { time, site, filters, timezone } = useStore();
const params = buildApiParams(time, { filters: useFilters ? filters : undefined });
return useInfiniteQuery({
- queryKey: [parameter, time, site, filters, limit, "infinite-metric"],
+ queryKey: [parameter, time, site, filters, limit, "infinite-metric", timezone],
queryFn: async ({ pageParam = 1 }) => {
return fetchMetric(site, {
...params,
diff --git a/client/src/api/analytics/hooks/useGetOverview.ts b/client/src/api/analytics/hooks/useGetOverview.ts
index b0c0e3108..febdd7be8 100644
--- a/client/src/api/analytics/hooks/useGetOverview.ts
+++ b/client/src/api/analytics/hooks/useGetOverview.ts
@@ -14,14 +14,14 @@ type UseGetOverviewOptions = {
};
export function useGetOverview({ periodTime, site, overrideTime }: UseGetOverviewOptions) {
- const { time, previousTime, filters } = useStore();
+ const { time, previousTime, filters, timezone } = useStore();
// Use overrideTime if provided, otherwise use store time
const baseTime = overrideTime || time;
const timeToUse = periodTime === "previous" ? previousTime : baseTime;
const params = buildApiParams(timeToUse, { filters });
- const queryKey = ["overview", timeToUse, site, filters];
+ const queryKey = ["overview", timeToUse, site, filters, timezone];
return useQuery({
queryKey,
diff --git a/client/src/api/analytics/hooks/useGetOverviewBucketed.ts b/client/src/api/analytics/hooks/useGetOverviewBucketed.ts
index a06d9425b..f2373307a 100644
--- a/client/src/api/analytics/hooks/useGetOverviewBucketed.ts
+++ b/client/src/api/analytics/hooks/useGetOverviewBucketed.ts
@@ -26,7 +26,7 @@ export function useGetOverviewBucketed({
| { mode: "range"; startDate: string; endDate: string };
props?: Partial<UseQueryOptions<APIResponse<GetOverviewBucketedResponse>>>;
}): UseQueryResult<APIResponse<GetOverviewBucketedResponse>> {
- const { time, previousTime, filters: globalFilters } = useStore();
+ const { time, previousTime, filters: globalFilters, timezone } = useStore();
// Use overrideTime if provided, otherwise use store time
const baseTime = overrideTime || time;
@@ -43,8 +43,9 @@ export function useGetOverviewBucketed({
site,
bucket,
combinedFilters,
+ timezone,
]
- : ["overview-bucketed", timeToUse, bucket, site, combinedFilters];
+ : ["overview-bucketed", timeToUse, bucket, site, combinedFilters, timezone];
const params = buildApiParams(timeToUse, { filters: combinedFilters });
diff --git a/client/src/api/analytics/hooks/useGetPageTitles.ts b/client/src/api/analytics/hooks/useGetPageTitles.ts
index ff2121d84..c35bad278 100644
--- a/client/src/api/analytics/hooks/useGetPageTitles.ts
+++ b/client/src/api/analytics/hooks/useGetPageTitles.ts
@@ -15,12 +15,12 @@ export function useGetPageTitlesPaginated({
page = 1,
useFilters = true,
}: UseGetPageTitlesOptions): UseQueryResult<{ data: PageTitlesPaginatedResponse }> {
- const { time, site, filters } = useStore();
+ const { time, site, filters, timezone } = useStore();
const params = buildApiParams(time, { filters: useFilters ? filters : undefined });
return useQuery({
- queryKey: ["page-titles", time, site, filters, limit, page, useFilters],
+ queryKey: ["page-titles", time, site, filters, limit, page, useFilters, timezone],
queryFn: async () => {
const data = await fetchPageTitles(site, {
...params,
diff --git a/client/src/api/analytics/hooks/useGetSessionLocations.ts b/client/src/api/analytics/hooks/useGetSessionLocations.ts
index 70d641958..2c13dac1f 100644
--- a/client/src/api/analytics/hooks/useGetSessionLocations.ts
+++ b/client/src/api/analytics/hooks/useGetSessionLocations.ts
@@ -4,7 +4,7 @@ import { buildApiParams } from "../../utils";
import { fetchSessionLocations, LiveSessionLocation } from "../endpoints";
export function useGetSessionLocations() {
- const { time, site, filters } = useStore();
+ const { time, site, filters, timezone } = useStore();
// Filter out location-related filters to avoid circular dependencies
const locationExcludedFilters = filters.filter(
@@ -19,7 +19,7 @@ export function useGetSessionLocations() {
const params = buildApiParams(time, { filters: locationExcludedFilters });
return useQuery<LiveSessionLocation[]>({
- queryKey: ["session-locations", site, time, locationExcludedFilters],
+ queryKey: ["session-locations", site, time, locationExcludedFilters, timezone],
queryFn: () => {
return fetchSessionLocations(site, params);
},
diff --git a/client/src/api/analytics/hooks/useGetUserSessions.ts b/client/src/api/analytics/hooks/useGetUserSessions.ts
index 985421769..647a78397 100644
--- a/client/src/api/analytics/hooks/useGetUserSessions.ts
+++ b/client/src/api/analytics/hooks/useGetUserSessions.ts
@@ -1,6 +1,6 @@
import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { SESSION_PAGE_FILTERS } from "../../../lib/filterGroups";
-import { getFilteredFilters, useStore } from "../../../lib/store";
+import { getFilteredFilters, getTimezone, useStore } from "../../../lib/store";
import { buildApiParams } from "../../utils";
import {
fetchSession,
@@ -11,7 +11,6 @@ import {
UserSessionCountResponse,
} from "../endpoints";
import { Time } from "../../../components/DateSelector/types";
-import { timeZone } from "../../../lib/dateTimeUtils";
export function useGetSessions({
userId,
@@ -26,18 +25,18 @@ export function useGetSessions({
identifiedOnly?: boolean;
timeOverride?: Time;
}) {
- const { time, site } = useStore();
+ const { time, site, timezone } = useStore();
const filteredFilters = getFilteredFilters(SESSION_PAGE_FILTERS);
// When filtering by userId, we fetch all sessions for that user (no time filter)
// Otherwise use buildApiParams which handles past-minutes mode
const params = userId
- ? { startDate: "", endDate: "", timeZone, filters: filteredFilters }
+ ? { startDate: "", endDate: "", timeZone: getTimezone(), filters: filteredFilters }
: buildApiParams(timeOverride || time, { filters: filteredFilters });
return useQuery<{ data: GetSessionsResponse }>({
- queryKey: ["sessions", timeOverride || time, site, filteredFilters, userId, page, limit, identifiedOnly],
+ queryKey: ["sessions", timeOverride || time, site, filteredFilters, userId, page, limit, identifiedOnly, timezone],
queryFn: () => {
return fetchSessions(site, {
...params,
@@ -62,18 +61,18 @@ export function useGetSessionsInfinite({
limit?: number;
refetchInterval?: number;
}) {
- const { time, site } = useStore();
+ const { time, site, timezone } = useStore();
const filteredFilters = getFilteredFilters(SESSION_PAGE_FILTERS);
// When filtering by userId, we fetch all sessions for that user (no time filter)
// Otherwise use buildApiParams which handles past-minutes mode
const params = userId
- ? { startDate: "", endDate: "", timeZone, filters: filteredFilters }
+ ? { startDate: "", endDate: "", timeZone: getTimezone(), filters: filteredFilters }
: buildApiParams(timeOverride || time, { filters: filteredFilters });
return useInfiniteQuery<{ data: GetSessionsResponse }>({
- queryKey: ["sessions-infinite", timeOverride || time, site, filteredFilters, userId],
+ queryKey: ["sessions-infinite", timeOverride || time, site, filteredFilters, userId, timezone],
queryFn: ({ pageParam = 1 }) => {
return fetchSessions(site, {
...params,
@@ -130,14 +129,14 @@ export function useGetSessionDetailsInfinite(sessionId: string | null) {
}
export function useGetUserSessionCount(userId: string) {
- const { site } = useStore();
+ const { site, timezone } = useStore();
return useQuery<{ data: UserSessionCountResponse[] }>({
- queryKey: ["user-session-count", userId, site],
+ queryKey: ["user-session-count", userId, site, timezone],
queryFn: () => {
return fetchUserSessionCount(site, {
userId,
- timeZone,
+ timeZone: getTimezone(),
});
},
staleTime: Infinity,
diff --git a/client/src/api/analytics/hooks/useGetUsers.ts b/client/src/api/analytics/hooks/useGetUsers.ts
index 316ad8703..05c984ca1 100644
--- a/client/src/api/analytics/hooks/useGetUsers.ts
+++ b/client/src/api/analytics/hooks/useGetUsers.ts
@@ -16,7 +16,7 @@ export interface GetUsersOptions {
}
export function useGetUsers(options: GetUsersOptions) {
- const { time, site } = useStore();
+ const { time, site, timezone } = useStore();
const { page, pageSize, sortBy, sortOrder, identifiedOnly = false } = options;
const filteredFilters = getFilteredFilters(USER_PAGE_FILTERS);
@@ -29,7 +29,7 @@ export function useGetUsers(options: GetUsersOptions) {
pageSize: number;
}
>({
- queryKey: ["users", site, time, page, pageSize, sortBy, sortOrder, filteredFilters, identifiedOnly],
+ queryKey: ["users", site, time, page, pageSize, sortBy, sortOrder, filteredFilters, identifiedOnly, timezone],
queryFn: async () => {
const result = await fetchUsers(site, {
...params,
diff --git a/client/src/api/gsc/useGSCData.ts b/client/src/api/gsc/useGSCData.ts
index 5e330ef7a..e3c6797b1 100644
--- a/client/src/api/gsc/useGSCData.ts
+++ b/client/src/api/gsc/useGSCData.ts
@@ -18,12 +18,12 @@ export type GSCData = {
* Hook to fetch data from Google Search Console for a specific dimension
*/
export function useGSCData(dimension: GSCDimension) {
- const { site, time } = useStore();
+ const { site, time, timezone } = useStore();
const timeParams = toQueryParams(buildApiParams(time));
return useQuery({
- queryKey: ["gsc-data", dimension, site, timeParams],
+ queryKey: ["gsc-data", dimension, site, timeParams, timezone],
enabled: !!site,
queryFn: () => {
return authedFetch<{ data: GSCData[] }>(`/gsc/data/${site}`, {
diff --git a/client/src/api/utils.ts b/client/src/api/utils.ts
index f75cde577..4230b42d2 100644
--- a/client/src/api/utils.ts
+++ b/client/src/api/utils.ts
@@ -3,8 +3,7 @@ import { DateTime } from "luxon";
import { Time } from "../components/DateSelector/types";
import axios, { AxiosRequestConfig } from "axios";
import { BACKEND_URL } from "../lib/const";
-import { timeZone } from "../lib/dateTimeUtils";
-import { useStore } from "../lib/store";
+import { getTimezone, useStore } from "../lib/store";
import { CommonApiParams } from "./analytics/endpoints/types";
export function getStartAndEndDate(time: Time): { startDate: string | null; endDate: string | null } {
@@ -40,6 +39,8 @@ export function getStartAndEndDate(time: Time): { startDate: string | null; endD
* This centralizes the logic for converting Time to API params across all hooks.
*/
export function buildApiParams(time: Time, options: { filters?: Filter[] } = {}): CommonApiParams {
+ const timeZone = getTimezone();
+
if (time.mode === "past-minutes") {
return {
startDate: "",
diff --git a/client/src/app/[site]/api-playground/hooks/usePlaygroundStore.ts b/client/src/app/[site]/api-playground/hooks/usePlaygroundStore.ts
index b1cea51dd..54907b0b8 100644
--- a/client/src/app/[site]/api-playground/hooks/usePlaygroundStore.ts
+++ b/client/src/app/[site]/api-playground/hooks/usePlaygroundStore.ts
@@ -212,24 +212,5 @@ export const filterOperators = [
{ value: "regex", label: "Regex" },
];
-// Common timezones for the dropdown
-export const commonTimezones = [
- { value: "UTC", label: "UTC" },
- { value: "America/New_York", label: "Eastern Time (US)" },
- { value: "America/Chicago", label: "Central Time (US)" },
- { value: "America/Denver", label: "Mountain Time (US)" },
- { value: "America/Los_Angeles", label: "Pacific Time (US)" },
- { value: "America/Anchorage", label: "Alaska Time" },
- { value: "Pacific/Honolulu", label: "Hawaii Time" },
- { value: "Europe/London", label: "London" },
- { value: "Europe/Paris", label: "Paris" },
- { value: "Europe/Berlin", label: "Berlin" },
- { value: "Europe/Moscow", label: "Moscow" },
- { value: "Asia/Dubai", label: "Dubai" },
- { value: "Asia/Kolkata", label: "India (IST)" },
- { value: "Asia/Singapore", label: "Singapore" },
- { value: "Asia/Tokyo", label: "Tokyo" },
- { value: "Asia/Shanghai", label: "Shanghai" },
- { value: "Australia/Sydney", label: "Sydney" },
- { value: "Pacific/Auckland", label: "Auckland" },
-];
+// Re-export timezones from shared location for backwards compatibility
+export { timezones as commonTimezones } from "@/lib/dateTimeUtils";
diff --git a/client/src/components/DateSelector/DateSelector.tsx b/client/src/components/DateSelector/DateSelector.tsx
index a358686d2..765c9c8bb 100644
--- a/client/src/components/DateSelector/DateSelector.tsx
+++ b/client/src/components/DateSelector/DateSelector.tsx
@@ -5,9 +5,14 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
+ DropdownMenuSub,
+ DropdownMenuSubContent,
+ DropdownMenuSubTrigger,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
-import { Calendar, Check } from "lucide-react";
+import { getTimezoneLabel, timezones } from "@/lib/dateTimeUtils";
+import { useStore } from "@/lib/store";
+import { Calendar, Check, Globe } from "lucide-react";
import { DateTime } from "luxon";
import { CustomDateRangePicker } from "./CustomDateRangePicker";
import { Time } from "./types";
@@ -102,6 +107,8 @@ export function DateSelector({
setTime: (time: Time) => void;
pastMinutesEnabled?: boolean;
}) {
+ const { timezone, setTimezone } = useStore();
+
return (
<DropdownMenu>
<DropdownMenuTrigger size={"sm"}>
@@ -117,10 +124,9 @@ export function DateSelector({
wellKnown: "today",
})
}
+ className="w-48"
>
- <div className="w-4">
- {time.wellKnown === "today" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "today" && <Check className="w-4 h-4" />}</div>
Today
</DropdownMenuItem>
<DropdownMenuItem
@@ -133,9 +139,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-3-days" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-3-days" && <Check className="w-4 h-4" />}</div>
Last 3 Days
</DropdownMenuItem>
<DropdownMenuItem
@@ -148,9 +152,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-7-days" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-7-days" && <Check className="w-4 h-4" />}</div>
Last 7 Days
</DropdownMenuItem>
<DropdownMenuItem
@@ -163,9 +165,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-14-days" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-14-days" && <Check className="w-4 h-4" />}</div>
Last 14 Days
</DropdownMenuItem>
<DropdownMenuItem
@@ -178,9 +178,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-30-days" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-30-days" && <Check className="w-4 h-4" />}</div>
Last 30 Days
</DropdownMenuItem>
<DropdownMenuItem
@@ -193,9 +191,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-60-days" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-60-days" && <Check className="w-4 h-4" />}</div>
Last 60 Days
</DropdownMenuItem>
{pastMinutesEnabled && (
@@ -211,9 +207,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-30-minutes" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-30-minutes" && <Check className="w-4 h-4" />}</div>
Last 30 Minutes
</DropdownMenuItem>
<DropdownMenuItem
@@ -226,9 +220,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-1-hour" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-1-hour" && <Check className="w-4 h-4" />}</div>
Last 1 Hour
</DropdownMenuItem>
<DropdownMenuItem
@@ -241,9 +233,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-6-hours" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-6-hours" && <Check className="w-4 h-4" />}</div>
Last 6 Hours
</DropdownMenuItem>
<DropdownMenuItem
@@ -256,9 +246,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "last-24-hours" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "last-24-hours" && <Check className="w-4 h-4" />}</div>
Last 24 Hours
</DropdownMenuItem>
</>
@@ -273,9 +261,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "this-week" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "this-week" && <Check className="w-4 h-4" />}</div>
This Week
</DropdownMenuItem>
<DropdownMenuItem
@@ -287,9 +273,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "this-month" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "this-month" && <Check className="w-4 h-4" />}</div>
This Month
</DropdownMenuItem>
<DropdownMenuItem
@@ -301,9 +285,7 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "this-year" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "this-year" && <Check className="w-4 h-4" />}</div>
This Year
</DropdownMenuItem>
<DropdownMenuItem
@@ -314,13 +296,28 @@ export function DateSelector({
})
}
>
- <div className="w-4">
- {time.wellKnown === "all-time" && <Check className="w-4 h-4" />}
- </div>
+ <div className="w-4">{time.wellKnown === "all-time" && <Check className="w-4 h-4" />}</div>
All Time
</DropdownMenuItem>
<DropdownMenuSeparator />
<CustomDateRangePicker setTime={setTime} time={time} />
+ <DropdownMenuSeparator />
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger>
+ <div className="w-4">
+ <Globe className="w-4 h-4" />
+ </div>
+ {getTimezoneLabel(timezone)}
+ </DropdownMenuSubTrigger>
+ <DropdownMenuSubContent>
+ {timezones.map(tz => (
+ <DropdownMenuItem key={tz.value} onClick={() => setTimezone(tz.value)}>
+ <div className="w-4">{timezone === tz.value && <Check className="w-4 h-4" />}</div>
+ {tz.label}
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
</DropdownMenuContent>
</DropdownMenu>
);
diff --git a/client/src/lib/dateTimeUtils.ts b/client/src/lib/dateTimeUtils.ts
index b9db368a1..b60009e28 100644
--- a/client/src/lib/dateTimeUtils.ts
+++ b/client/src/lib/dateTimeUtils.ts
@@ -185,3 +185,43 @@ export const formatChartDateTime = (dt: DateTime, bucket: TimeBucket) => {
export const parseUtcTimestamp = (timestamp: string): DateTime => {
return DateTime.fromSQL(timestamp, { zone: "utc" }).toLocal();
};
+
+// Timezones with GMT offset and city name
+export const timezones = [
+ { value: "system", label: "System" },
+ { value: "Pacific/Honolulu", label: "GMT-10 Pacific/Honolulu" },
+ { value: "America/Anchorage", label: "GMT-9 America/Anchorage" },
+ { value: "America/Los_Angeles", label: "GMT-8 America/Los_Angeles" },
+ { value: "America/Denver", label: "GMT-7 America/Denver" },
+ { value: "America/Chicago", label: "GMT-6 America/Chicago" },
+ { value: "America/New_York", label: "GMT-5 America/New_York" },
+ { value: "America/Halifax", label: "GMT-4 America/Halifax" },
+ { value: "America/Sao_Paulo", label: "GMT-3 America/Sao_Paulo" },
+ { value: "Atlantic/South_Georgia", label: "GMT-2 Atlantic/South_Georgia" },
+ { value: "Atlantic/Azores", label: "GMT-1 Atlantic/Azores" },
+ { value: "UTC", label: "GMT+0 UTC" },
+ { value: "Europe/London", label: "GMT+0 Europe/London" },
+ { value: "Europe/Paris", label: "GMT+1 Europe/Paris" },
+ { value: "Europe/Berlin", label: "GMT+1 Europe/Berlin" },
+ { value: "Europe/Helsinki", label: "GMT+2 Europe/Helsinki" },
+ { value: "Europe/Moscow", label: "GMT+3 Europe/Moscow" },
+ { value: "Asia/Dubai", label: "GMT+4 Asia/Dubai" },
+ { value: "Asia/Karachi", label: "GMT+5 Asia/Karachi" },
+ { value: "Asia/Kolkata", label: "GMT+5:30 Asia/Kolkata" },
+ { value: "Asia/Dhaka", label: "GMT+6 Asia/Dhaka" },
+ { value: "Asia/Bangkok", label: "GMT+7 Asia/Bangkok" },
+ { value: "Asia/Singapore", label: "GMT+8 Asia/Singapore" },
+ { value: "Asia/Shanghai", label: "GMT+8 Asia/Shanghai" },
+ { value: "Asia/Tokyo", label: "GMT+9 Asia/Tokyo" },
+ { value: "Australia/Sydney", label: "GMT+10 Australia/Sydney" },
+ { value: "Pacific/Auckland", label: "GMT+12 Pacific/Auckland" },
+];
+
+// Get timezone label for display
+export const getTimezoneLabel = (value: string): string => {
+ if (value === "system") {
+ return `System (${timeZone})`;
+ }
+ const tz = timezones.find((t) => t.value === value);
+ return tz?.label ?? value;
+};
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
index 74e2f94fe..ac7d46bb7 100644
--- a/client/src/lib/store.ts
+++ b/client/src/lib/store.ts
@@ -1,8 +1,15 @@
import { Filter, FilterParameter, TimeBucket } from "@rybbit/shared";
import { DateTime } from "luxon";
import { create } from "zustand";
+import { persist } from "zustand/middleware";
import { Time } from "../components/DateSelector/types";
+// Get system timezone
+const getSystemTimezone = () =>
+ typeof window !== "undefined"
+ ? Intl.DateTimeFormat().resolvedOptions().timeZone
+ : "UTC";
+
export type StatType = "pageviews" | "sessions" | "users" | "pages_per_session" | "bounce_rate" | "session_duration";
type Store = {
@@ -19,11 +26,15 @@ type Store = {
setSelectedStat: (stat: StatType) => void;
filters: Filter[];
setFilters: (filters: Filter[]) => void;
+ timezone: string;
+ setTimezone: (timezone: string) => void;
};
-export const useStore = create<Store>(set => ({
+export const useStore = create<Store>()(
+ persist(
+ (set) => ({
site: "",
- setSite: site => {
+ setSite: (site) => {
// Get current URL search params to check for stored state
let urlParams: URLSearchParams | null = null;
if (typeof window !== "undefined") {
@@ -140,12 +151,26 @@ export const useStore = create<Store>(set => ({
}
},
bucket: "hour",
- setBucket: bucket => set({ bucket }),
+ setBucket: (bucket) => set({ bucket }),
selectedStat: "users",
- setSelectedStat: stat => set({ selectedStat: stat }),
+ setSelectedStat: (stat) => set({ selectedStat: stat }),
filters: [],
- setFilters: filters => set({ filters }),
-}));
+ setFilters: (filters) => set({ filters }),
+ timezone: "system",
+ setTimezone: (timezone) => set({ timezone }),
+}),
+ {
+ name: "rybbit-store",
+ partialize: (state) => ({ timezone: state.timezone }),
+ }
+ )
+);
+
+// Helper to get actual timezone value (resolves "system" to actual timezone)
+export const getTimezone = () => {
+ const { timezone } = useStore.getState();
+ return timezone === "system" ? getSystemTimezone() : timezone;
+};
export const resetStore = () => {
const { setSite, setTime, setBucket, setSelectedStat, setFilters } = useStore.getState();