🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance useGetOverview hook to support overrideTime parameter for flexible time range queries
Bill Yangcd1bfd8572e1
diff --git a/client/src/api/analytics/useGetOverview.ts b/client/src/api/analytics/useGetOverview.tsindex 10c332d14..60c8e6d39 100644--- a/client/src/api/analytics/useGetOverview.ts+++ b/client/src/api/analytics/useGetOverview.ts@@ -16,11 +16,21 @@ type PeriodTime = "current" | "previous";type UseGetOverviewOptions = {periodTime?: PeriodTime;site?: number | string;+ overrideTime?:+ | { mode: "past-minutes"; pastMinutesStart: number; pastMinutesEnd: number }+ | { mode: "range"; startDate: string; endDate: string };};-export function useGetOverview({ periodTime, site }: UseGetOverviewOptions) {+export function useGetOverview({+ periodTime,+ site,+ overrideTime,+}: UseGetOverviewOptions) {const { time, previousTime, filters } = useStore();- const timeToUse = periodTime === "previous" ? previousTime : time;++ // Use overrideTime if provided, otherwise use store time+ const baseTime = overrideTime || time;+ const timeToUse = periodTime === "previous" ? previousTime : baseTime;const queryParams = getQueryParams(timeToUse, { filters });diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsxindex b2ceae604..ded5a63d1 100644--- a/client/src/components/SiteCard.tsx+++ b/client/src/components/SiteCard.tsx@@ -29,6 +29,11 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {const { data, isLoading, isSuccess } = useGetOverviewBucketed({site: siteId,bucket: "hour",+ overrideTime: {+ mode: "past-minutes",+ pastMinutesStart: 1440,+ pastMinutesEnd: 0,+ },props: {enabled: isInView,},@@ -40,6 +45,11 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {isSuccess: isOverviewSuccess,} = useGetOverview({site: siteId,+ overrideTime: {+ mode: "past-minutes",+ pastMinutesStart: 1440,+ pastMinutesEnd: 0,+ },});// Update the hasLoadedData ref when data loads successfully