Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Merge the partner profile earnings SWR hooks

Rafie2b2d6fbfa1f
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/earnings-chart.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/earnings-chart.tsx
index 4756dccf50..fab9f753fd 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/earnings-chart.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/earnings-chart.tsx
@@ -2,7 +2,7 @@
import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
import { testIds } from "@/lib/e2e/test-ids";
-import { usePartnerProfileEarningsTimeseries } from "@/lib/swr/use-partner-profile-earnings-timeseries";
+import { usePartnerProfileEarningsTimeseries } from "@/lib/swr/use-partner-profile-earnings";
import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
import { buttonVariants } from "@dub/ui";
import {
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/overview-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/overview-card.tsx
index 1d15569ec3..0cba346882 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/overview-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/overview-card.tsx
@@ -102,7 +102,7 @@ export function OverviewCardList<T>({
);
}
-export function OverviewCardMessage({
+function OverviewCardMessage({
icon,
title,
}: {
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/top-links-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/top-links-card.tsx
index 7d737e69fe..0222ae3672 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/top-links-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/top-links-card.tsx
@@ -1,7 +1,7 @@
"use client";
import { testIds } from "@/lib/e2e/test-ids";
-import { usePartnerProfileTopEarnings } from "@/lib/swr/use-partner-profile-top-earnings";
+import { usePartnerProfileTopEarnings } from "@/lib/swr/use-partner-profile-earnings";
import { Hyperlink } from "@dub/ui/icons";
import { currencyFormatter, getPrettyUrl } from "@dub/utils";
import {
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/use-top-program-earnings.ts b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/use-top-program-earnings.ts
index 9a542b65de..734cf2f26b 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/use-top-program-earnings.ts
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/use-top-program-earnings.ts
@@ -1,4 +1,4 @@
-import { usePartnerProfileTopEarnings } from "@/lib/swr/use-partner-profile-top-earnings";
+import { usePartnerProfileTopEarnings } from "@/lib/swr/use-partner-profile-earnings";
import { useOverviewDateRange } from "./use-overview-date-range";
// shared by the earnings chart tooltip and the Top programs card, so both use one request
diff --git a/apps/web/lib/swr/use-partner-profile-earnings-timeseries.ts b/apps/web/lib/swr/use-partner-profile-earnings-timeseries.ts
deleted file mode 100644
index 44cc19bc6f..0000000000
--- a/apps/web/lib/swr/use-partner-profile-earnings-timeseries.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { fetcher } from "@dub/utils";
-import { useSession } from "next-auth/react";
-import useSWR from "swr";
-import * as z from "zod/v4";
-import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "../analytics/constants";
-import { partnerProfileEarningsTimeseriesQuerySchema } from "../zod/schemas/partner-profile";
-
-export type PartnerProfileEarningsTimeseries = {
- start: string;
- earnings: number;
- groupBy?: string;
- data?: Record<string, number>;
-}[];
-
-export function usePartnerProfileEarningsTimeseries({
- groupBy,
- programIdOrSlug,
- interval,
- start,
- end,
- enabled = true,
-}: Pick<
- z.input<typeof partnerProfileEarningsTimeseriesQuerySchema>,
- "groupBy" | "programIdOrSlug" | "interval"
-> & {
- start?: Date;
- end?: Date;
- enabled?: boolean;
-}) {
- const { data: session } = useSession();
- const partnerId = session?.user?.["defaultPartnerId"];
-
- const { data, error } = useSWR<PartnerProfileEarningsTimeseries>(
- enabled &&
- partnerId &&
- `/api/partner-profile/earnings/timeseries?${new URLSearchParams({
- ...(groupBy && { groupBy }),
- ...(programIdOrSlug && { programIdOrSlug }),
- ...(start && end
- ? { start: start.toISOString(), end: end.toISOString() }
- : { interval: interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL }),
- timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
- })}`,
- fetcher,
- {
- dedupingInterval: 60000,
- keepPreviousData: true,
- },
- );
-
- return {
- data,
- error,
- loading: !data && !error,
- };
-}
diff --git a/apps/web/lib/swr/use-partner-profile-earnings.ts b/apps/web/lib/swr/use-partner-profile-earnings.ts
index 42245207ca..8b7bd55c4d 100644
--- a/apps/web/lib/swr/use-partner-profile-earnings.ts
+++ b/apps/web/lib/swr/use-partner-profile-earnings.ts
@@ -1,32 +1,79 @@
import { fetcher } from "@dub/utils";
import { useSession } from "next-auth/react";
import useSWR from "swr";
-import * as z from "zod/v4";
import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "../analytics/constants";
-import { PartnerProfileEarningsResponse } from "../types";
-import { partnerProfileEarningsQuerySchema } from "../zod/schemas/partner-profile";
+import { IntervalOptions } from "../analytics/types";
+import {
+ PartnerProfileEarningsResponse,
+ PartnerProfileTopLinkEarnings,
+ PartnerProfileTopProgramEarnings,
+} from "../types";
-export function usePartnerProfileEarnings({
- pageSize,
- programIdOrSlug,
- interval,
- start,
- end,
-}: Pick<
- z.input<typeof partnerProfileEarningsQuerySchema>,
- "pageSize" | "programIdOrSlug" | "interval"
-> & {
+type DateRange = {
+ interval?: IntervalOptions;
start?: Date;
end?: Date;
-}) {
+};
+
+type PartnerProfileEarningsTimeseries = {
+ start: string;
+ earnings: number;
+ groupBy?: string;
+ data?: Record<string, number>;
+}[];
+
+type TopEarningsByGroup = {
+ programId: PartnerProfileTopProgramEarnings;
+ linkId: PartnerProfileTopLinkEarnings;
+};
+
+// GET /api/partner-profile/earnings
+export function usePartnerProfileEarnings({
+ pageSize,
+ ...dateRange
+}: DateRange & { pageSize: number }) {
+ return usePartnerProfileEarningsSWR<PartnerProfileEarningsResponse[]>(
+ "",
+ { pageSize: String(pageSize) },
+ dateRange,
+ );
+}
+
+// GET /api/partner-profile/earnings/timeseries
+export function usePartnerProfileEarningsTimeseries({
+ groupBy,
+ ...dateRange
+}: DateRange & { groupBy?: "type" | "linkId" | "programId" }) {
+ return usePartnerProfileEarningsSWR<PartnerProfileEarningsTimeseries>(
+ "/timeseries",
+ { ...(groupBy && { groupBy }) },
+ dateRange,
+ );
+}
+
+// GET /api/partner-profile/earnings/top
+export function usePartnerProfileTopEarnings<
+ T extends keyof TopEarningsByGroup,
+>({ groupBy, limit, ...dateRange }: DateRange & { groupBy: T; limit: number }) {
+ return usePartnerProfileEarningsSWR<TopEarningsByGroup[T][]>(
+ "/top",
+ { groupBy, limit: String(limit) },
+ dateRange,
+ );
+}
+
+function usePartnerProfileEarningsSWR<T>(
+ path: string,
+ params: Record<string, string>,
+ { interval, start, end }: DateRange,
+) {
const { data: session } = useSession();
const partnerId = session?.user?.["defaultPartnerId"];
- const { data, error } = useSWR<PartnerProfileEarningsResponse[]>(
+ const { data, error } = useSWR<T>(
partnerId &&
- `/api/partner-profile/earnings?${new URLSearchParams({
- ...(pageSize !== undefined && { pageSize: String(pageSize) }),
- ...(programIdOrSlug && { programIdOrSlug }),
+ `/api/partner-profile/earnings${path}?${new URLSearchParams({
+ ...params,
...(start && end
? { start: start.toISOString(), end: end.toISOString() }
: { interval: interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL }),
@@ -34,13 +81,10 @@ export function usePartnerProfileEarnings({
})}`,
fetcher,
{
+ dedupingInterval: 60000,
keepPreviousData: true,
},
);
- return {
- data,
- error,
- loading: !data && !error,
- };
+ return { data, error };
}
diff --git a/apps/web/lib/swr/use-partner-profile-top-earnings.ts b/apps/web/lib/swr/use-partner-profile-top-earnings.ts
deleted file mode 100644
index fbea14f6ca..0000000000
--- a/apps/web/lib/swr/use-partner-profile-top-earnings.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { fetcher } from "@dub/utils";
-import { useSession } from "next-auth/react";
-import useSWR from "swr";
-import * as z from "zod/v4";
-import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "../analytics/constants";
-import {
- PartnerProfileTopLinkEarnings,
- PartnerProfileTopProgramEarnings,
-} from "../types";
-import { partnerProfileTopEarningsQuerySchema } from "../zod/schemas/partner-profile";
-
-type TopEarningsByGroup = {
- programId: PartnerProfileTopProgramEarnings;
- linkId: PartnerProfileTopLinkEarnings;
-};
-
-export function usePartnerProfileTopEarnings<
- T extends keyof TopEarningsByGroup,
->({
- groupBy,
- limit,
- programIdOrSlug,
- interval,
- start,
- end,
-}: { groupBy: T } & Pick<
- z.input<typeof partnerProfileTopEarningsQuerySchema>,
- "limit" | "programIdOrSlug" | "interval"
-> & {
- start?: Date;
- end?: Date;
- }) {
- const { data: session } = useSession();
- const partnerId = session?.user?.["defaultPartnerId"];
-
- const { data, error } = useSWR<TopEarningsByGroup[T][]>(
- partnerId &&
- `/api/partner-profile/earnings/top?${new URLSearchParams({
- groupBy,
- ...(limit !== undefined && { limit: String(limit) }),
- ...(programIdOrSlug && { programIdOrSlug }),
- ...(start && end
- ? { start: start.toISOString(), end: end.toISOString() }
- : { interval: interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL }),
- timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
- })}`,
- fetcher,
- {
- dedupingInterval: 60000,
- keepPreviousData: true,
- },
- );
-
- return {
- data,
- error,
- loading: !data && !error,
- };
-}