Skip to content

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

Refactor imports in analytics hooks and utils for consistency

Bill Yang0ac5beaeef0d
diff --git a/client/src/api/analytics/hooks/errors/useGetErrorEvents.ts b/client/src/api/analytics/hooks/errors/useGetErrorEvents.ts
index 02c9cc97d..7afaa5487 100644
--- a/client/src/api/analytics/hooks/errors/useGetErrorEvents.ts
+++ b/client/src/api/analytics/hooks/errors/useGetErrorEvents.ts
@@ -1,12 +1,8 @@
import { useStore } from "@/lib/store";
import { useInfiniteQuery } from "@tanstack/react-query";
-import { getStartAndEndDate, timeZone } from "../../../utils";
-import {
- fetchErrorEvents,
- ErrorEvent,
- ErrorEventsPaginatedResponse,
- ErrorEventsStandardResponse,
-} from "../../endpoints";
+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) {
diff --git a/client/src/api/analytics/hooks/errors/useGetErrorNames.ts b/client/src/api/analytics/hooks/errors/useGetErrorNames.ts
index d4568e185..69ee9673f 100644
--- a/client/src/api/analytics/hooks/errors/useGetErrorNames.ts
+++ b/client/src/api/analytics/hooks/errors/useGetErrorNames.ts
@@ -1,12 +1,13 @@
import { useStore } from "@/lib/store";
import { useQuery, UseQueryResult } from "@tanstack/react-query";
-import { getStartAndEndDate, timeZone } from "../../../utils";
+import { getStartAndEndDate } from "../../../utils";
import {
fetchErrorNames,
ErrorNameItem,
ErrorNamesPaginatedResponse,
ErrorNamesStandardResponse,
} from "../../endpoints";
+import { timeZone } from "../../../../lib/dateTimeUtils";
type UseGetErrorNamesOptions = {
limit?: number;
diff --git a/client/src/api/analytics/hooks/events/useGetEventNames.ts b/client/src/api/analytics/hooks/events/useGetEventNames.ts
index 6131d7ed9..bf0d64c38 100644
--- a/client/src/api/analytics/hooks/events/useGetEventNames.ts
+++ b/client/src/api/analytics/hooks/events/useGetEventNames.ts
@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
import { EVENT_FILTERS } from "../../../../lib/filterGroups";
import { getFilteredFilters, useStore } from "../../../../lib/store";
import { buildApiParams } from "../../../utils";
-import { fetchEventNames, EventName } from "../../endpoints";
+import { fetchEventNames } from "../../endpoints";
export function useGetEventNames() {
const { site, time } = useStore();
diff --git a/client/src/api/analytics/hooks/events/useGetEventProperties.ts b/client/src/api/analytics/hooks/events/useGetEventProperties.ts
index 1ee77712c..2ed1dbcf1 100644
--- a/client/src/api/analytics/hooks/events/useGetEventProperties.ts
+++ b/client/src/api/analytics/hooks/events/useGetEventProperties.ts
@@ -1,8 +1,9 @@
import { useQuery } from "@tanstack/react-query";
-import { getFilteredFilters, useStore } from "../../../../lib/store";
+import { timeZone } from "../../../../lib/dateTimeUtils";
import { EVENT_FILTERS } from "../../../../lib/filterGroups";
-import { getStartAndEndDate, timeZone } from "../../../utils";
-import { fetchEventProperties, EventProperty } from "../../endpoints";
+import { getFilteredFilters, useStore } from "../../../../lib/store";
+import { getStartAndEndDate } from "../../../utils";
+import { fetchEventProperties } from "../../endpoints";
export function useGetEventProperties(eventName: string | null) {
const { site, time } = useStore();
diff --git a/client/src/api/analytics/hooks/events/useGetEvents.ts b/client/src/api/analytics/hooks/events/useGetEvents.ts
index 856b925d2..673a908fa 100644
--- a/client/src/api/analytics/hooks/events/useGetEvents.ts
+++ b/client/src/api/analytics/hooks/events/useGetEvents.ts
@@ -1,8 +1,9 @@
import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { Time } from "../../../../components/DateSelector/types";
import { useStore } from "../../../../lib/store";
-import { buildApiParams, timeZone } from "../../../utils";
+import { buildApiParams } from "../../../utils";
import { EventsResponse, fetchEvents } from "../../endpoints";
+import { timeZone } from "../../../../lib/dateTimeUtils";
export interface GetEventsOptions {
time?: Time;
diff --git a/client/src/api/analytics/hooks/useGetUserSessions.ts b/client/src/api/analytics/hooks/useGetUserSessions.ts
index 58e5efdf8..985421769 100644
--- a/client/src/api/analytics/hooks/useGetUserSessions.ts
+++ b/client/src/api/analytics/hooks/useGetUserSessions.ts
@@ -1,7 +1,7 @@
import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { SESSION_PAGE_FILTERS } from "../../../lib/filterGroups";
import { getFilteredFilters, useStore } from "../../../lib/store";
-import { buildApiParams, timeZone } from "../../utils";
+import { buildApiParams } from "../../utils";
import {
fetchSession,
fetchSessions,
@@ -11,6 +11,7 @@ import {
UserSessionCountResponse,
} from "../endpoints";
import { Time } from "../../../components/DateSelector/types";
+import { timeZone } from "../../../lib/dateTimeUtils";
export function useGetSessions({
userId,
diff --git a/client/src/api/utils.ts b/client/src/api/utils.ts
index 754ade780..367434ea1 100644
--- a/client/src/api/utils.ts
+++ b/client/src/api/utils.ts
@@ -59,17 +59,11 @@ export function getQueryParams(time: Time, additionalParams: Record<string, any>
};
}
-// Re-export timeZone for convenience
-export { timeZone };
-
/**
* Build CommonApiParams from a Time object, handling all time modes including past-minutes.
* This centralizes the logic for converting Time to API params across all hooks.
*/
-export function buildApiParams(
- time: Time,
- options: { filters?: Filter[] } = {}
-): CommonApiParams {
+export function buildApiParams(time: Time, options: { filters?: Filter[] } = {}): CommonApiParams {
if (time.mode === "past-minutes") {
return {
startDate: "",
diff --git a/client/src/app/[site]/main/components/ExportButton.tsx b/client/src/app/[site]/main/components/ExportButton.tsx
index ed99b034a..ef47042e8 100644
--- a/client/src/app/[site]/main/components/ExportButton.tsx
+++ b/client/src/app/[site]/main/components/ExportButton.tsx
@@ -10,7 +10,7 @@ import {
fetchOutboundLinks,
fetchOverviewBucketed,
} from "../../../../api/analytics/endpoints";
-import { getStartAndEndDate, timeZone } from "../../../../api/utils";
+import { getStartAndEndDate } from "../../../../api/utils";
import { fetchGSCConnectionStatus } from "../../../../api/gsc/useGSCConnection";
import { fetchGSCData, GSCDimension } from "../../../../api/gsc/useGSCData";
import { Button } from "../../../../components/ui/button";
@@ -18,6 +18,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../components/
import { IS_CLOUD } from "../../../../lib/const";
import { CSVFile, downloadZip, formatDateForFilename } from "../../../../lib/export";
import { useStore } from "../../../../lib/store";
+import { timeZone } from "../../../../lib/dateTimeUtils";
// Metric parameters for each section
const REFERRER_METRICS: { param: FilterParameter; filename: string }[] = [