The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
avoid duplicate fetch
Steven Teycbbce60ac398
diff --git a/apps/web/ui/analytics/events/events-table.tsx b/apps/web/ui/analytics/events/events-table.tsxindex 35125e7c1a..a1492c4ebc 100644--- a/apps/web/ui/analytics/events/events-table.tsx+++ b/apps/web/ui/analytics/events/events-table.tsx@@ -16,6 +16,7 @@ import {TimestampTooltip,Tooltip,useColumnVisibility,+ useCurrentProduct,usePagination,useRouterStuff,useTable,@@ -728,8 +729,12 @@ export default function EventsTable({[setExportQueryString, queryString, columnVisibility, tab],);+ const { product } = useCurrentProduct();+const { data, isLoading, error } = useSWR<EventDatum[]>(- !requiresUpgrade && `${eventsApiPath || "/api/events"}?${queryString}`,+ !requiresUpgrade &&+ product &&+ `${eventsApiPath || "/api/events"}?${queryString}`,fetcher,{keepPreviousData: true,diff --git a/apps/web/ui/analytics/events/events-tabs.tsx b/apps/web/ui/analytics/events/events-tabs.tsxindex 5c34b82813..6e5f08e5f4 100644--- a/apps/web/ui/analytics/events/events-tabs.tsx+++ b/apps/web/ui/analytics/events/events-tabs.tsx@@ -1,5 +1,10 @@import { editQueryString } from "@/lib/analytics/utils";-import { MiniAreaChart, useMediaQuery, useRouterStuff } from "@dub/ui";+import {+ MiniAreaChart,+ useCurrentProduct,+ useMediaQuery,+ useRouterStuff,+} from "@dub/ui";import { capitalize, cn, fetcher } from "@dub/utils";import NumberFlow from "@number-flow/react";import { useCallback, useContext, useEffect } from "react";@@ -17,6 +22,7 @@ type TimeseriesData = {export default function EventsTabs() {const { searchParams, queryParams } = useRouterStuff();const { isMobile } = useMediaQuery();+ const { product } = useCurrentProduct();const tab = searchParams.get("event") || "clicks";@@ -31,10 +37,11 @@ export default function EventsTabs() {const { data: timeseriesData, isLoading: isLoadingTimeseries } =useSWRImmutable<TimeseriesData>(- `${baseApiPath}?${editQueryString(queryString, {- groupBy: "timeseries",- event: fetchCompositeStats ? "composite" : "clicks",- })}`,+ product &&+ `${baseApiPath}?${editQueryString(queryString, {+ groupBy: "timeseries",+ event: fetchCompositeStats ? "composite" : "clicks",+ })}`,fetcher,{shouldRetryOnError: !requiresUpgrade,