🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
refactor(api): enhance infinite query handling for last-24-hours mode
Bill Yang496727efbb52
diff --git a/client/src/api/analytics/useInfiniteSingleCol.ts b/client/src/api/analytics/useInfiniteSingleCol.tsindex 053ffc041..902a0d255 100644--- a/client/src/api/analytics/useInfiniteSingleCol.ts+++ b/client/src/api/analytics/useInfiniteSingleCol.ts@@ -29,17 +29,37 @@ export function useInfiniteSingleCol({> {const { time, site, filters } = useStore();+ const isPast24HoursMode = time.mode === "last-24-hours";+return useInfiniteQuery({- queryKey: [parameter, time, site, filters, limit, "infinite-single-col"],+ queryKey: [+ parameter,+ time,+ site,+ filters,+ limit,+ isPast24HoursMode ? "past-minutes" : "date-range",+ "infinite-single-col",+ ],queryFn: async ({ pageParam = 1 }) => {- const queryParams = {- ...getStartAndEndDate(time),- timeZone: timeZone,- parameter,- limit,- page: pageParam,- filters: useFilters ? filters : undefined,- };+ const queryParams = isPast24HoursMode+ ? {+ timeZone: timeZone,+ pastMinutesStart: 24 * 60, // 24 hours ago+ pastMinutesEnd: 0, // now+ parameter,+ limit,+ page: pageParam,+ filters: useFilters ? filters : undefined,+ }+ : {+ ...getStartAndEndDate(time),+ timeZone: timeZone,+ parameter,+ limit,+ page: pageParam,+ filters: useFilters ? filters : undefined,+ };const response = await authedFetch(`${BACKEND_URL}/single-col/${site}`,diff --git a/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx b/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsxindex 4a28cc917..f5288b6e1 100644--- a/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx+++ b/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx@@ -7,7 +7,7 @@ import { usePaginatedSingleCol } from "../../../../../api/analytics/usePaginatedimport { SingleColResponse } from "../../../../../api/analytics/useSingleCol";import { CardLoader } from "../../../../../components/ui/card";import { FilterParameter } from "../../../../../lib/store";-import { BaseStandardSectionDialog } from "./BaseStandardSectionDialog";+import { StandardSectionDialog } from "./StandardSectionDialog";import { Row } from "./Row";import { Skeleton } from "./Skeleton";@@ -115,7 +115,7 @@ export function StandardSection({)}{!isLoading && !error && itemsForDisplay?.length ? (<div className="flex flex-row gap-2 justify-between items-center">- <BaseStandardSectionDialog+ <StandardSectionDialogtitle={title}ratio={ratio}getKey={getKey}diff --git a/client/src/app/[site]/components/shared/StandardSection/BaseStandardSectionDialog.tsx b/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsxsimilarity index 98%rename from client/src/app/[site]/components/shared/StandardSection/BaseStandardSectionDialog.tsxrename to client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsxindex 6f7994789..01aeaf241 100644--- a/client/src/app/[site]/components/shared/StandardSection/BaseStandardSectionDialog.tsx+++ b/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx@@ -27,7 +27,7 @@ import { SingleColResponse } from "../../../../../api/analytics/useSingleCol";import { addFilter, FilterParameter } from "../../../../../lib/store";import { cn, formatSecondsAsMinutesAndSeconds } from "../../../../../lib/utils";-interface BaseStandardSectionDialogProps {+interface StandardSectionDialogProps {title: string;ratio: number;getKey: (item: SingleColResponse) => string;@@ -43,7 +43,7 @@ interface BaseStandardSectionDialogProps {const columnHelper = createColumnHelper<SingleColResponse>();-export function BaseStandardSectionDialog({+export function StandardSectionDialog({title,ratio,getKey,@@ -55,7 +55,7 @@ export function BaseStandardSectionDialog({filterParameter,expanded,close,-}: BaseStandardSectionDialogProps) {+}: StandardSectionDialogProps) {const {data,isLoading,diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsxindex 6d47371c5..edb6ec773 100644--- a/client/src/app/[site]/layout.tsx+++ b/client/src/app/[site]/layout.tsx@@ -17,7 +17,7 @@ export default function SiteLayout({}) {const pathname = usePathname();const { setSite, site } = useStore();- const { data: siteHasData, isLoading } = useSiteHasData(site);+ const { isLoading } = useSiteHasData(site);const { data: siteMetadata, isLoading: isLoadingSiteMetadata } =useGetSite(site);