🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance analytics hooks with filter options
Bill Yang531751a2d70f
diff --git a/client/src/api/analytics/hooks/useGetOverview.ts b/client/src/api/analytics/hooks/useGetOverview.tsindex febdd7be8..64c88265d 100644--- a/client/src/api/analytics/hooks/useGetOverview.ts+++ b/client/src/api/analytics/hooks/useGetOverview.ts@@ -11,17 +11,18 @@ type UseGetOverviewOptions = {overrideTime?:| { mode: "past-minutes"; pastMinutesStart: number; pastMinutesEnd: number }| { mode: "range"; startDate: string; endDate: string };+ useFilters?: boolean;};-export function useGetOverview({ periodTime, site, overrideTime }: UseGetOverviewOptions) {+export function useGetOverview({ periodTime, site, overrideTime, useFilters = true }: UseGetOverviewOptions) {const { time, previousTime, filters, timezone } = useStore();// Use overrideTime if provided, otherwise use store timeconst baseTime = overrideTime || time;const timeToUse = periodTime === "previous" ? previousTime : baseTime;- const params = buildApiParams(timeToUse, { filters });- const queryKey = ["overview", timeToUse, site, filters, timezone];+ const params = buildApiParams(timeToUse, { filters: useFilters ? filters : undefined });+ const queryKey = ["overview", timeToUse, site, filters, useFilters, timezone];return useQuery({queryKey,diff --git a/client/src/api/analytics/hooks/useGetOverviewBucketed.ts b/client/src/api/analytics/hooks/useGetOverviewBucketed.tsindex f2373307a..11970da71 100644--- a/client/src/api/analytics/hooks/useGetOverviewBucketed.ts+++ b/client/src/api/analytics/hooks/useGetOverviewBucketed.ts@@ -15,6 +15,7 @@ export function useGetOverviewBucketed({refetchInterval,overrideTime,props,+ useFilters = true,}: {periodTime?: PeriodTime;site: number | string;@@ -25,13 +26,14 @@ export function useGetOverviewBucketed({| { mode: "past-minutes"; pastMinutesStart: number; pastMinutesEnd: number }| { mode: "range"; startDate: string; endDate: string };props?: Partial<UseQueryOptions<APIResponse<GetOverviewBucketedResponse>>>;+ useFilters?: boolean;}): UseQueryResult<APIResponse<GetOverviewBucketedResponse>> {const { time, previousTime, filters: globalFilters, timezone } = useStore();// Use overrideTime if provided, otherwise use store timeconst baseTime = overrideTime || time;const timeToUse = periodTime === "previous" ? previousTime : baseTime;- const combinedFilters = [...globalFilters, ...dynamicFilters];+ const combinedFilters = useFilters ? [...globalFilters, ...dynamicFilters] : undefined;// Generate appropriate query key based on whether we're using past minutes or regular timeconst queryKey =@@ -43,9 +45,10 @@ export function useGetOverviewBucketed({site,bucket,combinedFilters,+ useFilters,timezone,]- : ["overview-bucketed", timeToUse, bucket, site, combinedFilters, timezone];+ : ["overview-bucketed", timeToUse, bucket, site, combinedFilters, useFilters, timezone];const params = buildApiParams(timeToUse, { filters: combinedFilters });diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsxindex 939b80924..7699a5e07 100644--- a/client/src/components/SiteCard.tsx+++ b/client/src/components/SiteCard.tsx@@ -41,6 +41,7 @@ export function SiteCard({ siteId, domain, tags = [], allTags = [], onTagsUpdateconst { data, isLoading, isSuccess } = useGetOverviewBucketed({site: siteId,bucket,+ useFilters: false,props: {enabled: isInView,},@@ -52,12 +53,14 @@ export function SiteCard({ siteId, domain, tags = [], allTags = [], onTagsUpdateisSuccess: isOverviewSuccess,} = useGetOverview({site: siteId,+ useFilters: false,});// Previous period - automatically handles both regular time-based and past-minutes queriesconst { data: overviewDataPrevious } = useGetOverview({site: siteId,periodTime: "previous",+ useFilters: false,});// Update the hasLoadedData ref when data loads successfully