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.

Move the program earnings and bounties pages to the shared partner endpoints (#4683)

Rafi948ff22c4ce1
diff --git a/apps/web/app/(ee)/api/partner-profile/bounties/route.ts b/apps/web/app/(ee)/api/partner-profile/bounties/route.ts
index 6add9e5e93..c1692a0beb 100644
--- a/apps/web/app/(ee)/api/partner-profile/bounties/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/bounties/route.ts
@@ -1,40 +1,43 @@
import { getProgramEnrollmentsWhere } from "@/lib/api/partner-profile/get-program-enrollments-where";
+import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
import { withPartnerProfile } from "@/lib/auth/partner";
import { programEnrollmentEligibilityIncludes } from "@/lib/bounty/api/bounty-availability";
import { getBountiesForPartnerEnrollments } from "@/lib/bounty/api/get-bounties-for-partner";
import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
import { getPartnerLinksStatsByProgram } from "@/lib/partners/get-partner-links-stats-by-program";
import { prisma } from "@/lib/prisma";
-import { PartnerProfileBountySchema } from "@/lib/zod/schemas/partner-profile";
+import {
+ partnerProfileBountiesQuerySchema,
+ PartnerProfileBountySchema,
+} from "@/lib/zod/schemas/partner-profile";
import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
+import { Prisma } from "@prisma/client";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
-// GET /api/partner-profile/bounties – get available bounties for all active program enrollments
-export const GET = withPartnerProfile(async ({ partner }) => {
- const [programEnrollments, linksStatsByProgram] = await Promise.all([
- prisma.programEnrollment.findMany({
- where: getProgramEnrollmentsWhere({
- partnerId: partner.id,
- // archived partners can still submit bounties
- status: ACTIVE_ENROLLMENT_STATUSES,
- }),
- include: {
- program: {
- select: {
- id: true,
- name: true,
- slug: true,
- logo: true,
- defaultGroupId: true,
- },
- },
- ...programEnrollmentEligibilityIncludes,
- },
- }),
- // summed in the database, because a partner can have many links in each program
- getPartnerLinksStatsByProgram({ partnerId: partner.id }),
- ]);
+const programEnrollmentInclude = {
+ program: {
+ select: {
+ id: true,
+ name: true,
+ slug: true,
+ logo: true,
+ defaultGroupId: true,
+ },
+ },
+ ...programEnrollmentEligibilityIncludes,
+} satisfies Prisma.ProgramEnrollmentInclude;
+
+// GET /api/partner-profile/bounties – get available bounties for all active program enrollments (or a single program)
+export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
+ const { programIdOrSlug } =
+ partnerProfileBountiesQuerySchema.parse(searchParams);
+
+ const { programEnrollments, linksStatsByProgram } =
+ await getEnrollmentsWithLinksStats({
+ partnerId: partner.id,
+ programIdOrSlug,
+ });
const bounties = await getBountiesForPartnerEnrollments({
partnerId: partner.id,
@@ -59,3 +62,46 @@ export const GET = withPartnerProfile(async ({ partner }) => {
),
);
});
+
+// the enrollments to load bounties for, with the partner's link stats in each program
+async function getEnrollmentsWithLinksStats({
+ partnerId,
+ programIdOrSlug,
+}: {
+ partnerId: string;
+ programIdOrSlug?: string;
+}) {
+ if (programIdOrSlug) {
+ // one program accepts any enrollment status, as its program page does.
+ // The partner sidebar locks the page for unapproved enrollments
+ const programEnrollment = await getProgramEnrollmentOrThrow({
+ partnerId,
+ programId: programIdOrSlug,
+ include: programEnrollmentInclude,
+ });
+
+ return {
+ programEnrollments: [programEnrollment],
+ // only this program's links, on the Link [programId, partnerId] index
+ linksStatsByProgram: await getPartnerLinksStatsByProgram({
+ partnerId,
+ programId: programEnrollment.programId,
+ }),
+ };
+ }
+
+ const [programEnrollments, linksStatsByProgram] = await Promise.all([
+ prisma.programEnrollment.findMany({
+ where: getProgramEnrollmentsWhere({
+ partnerId,
+ // archived partners can still submit bounties
+ status: ACTIVE_ENROLLMENT_STATUSES,
+ }),
+ include: programEnrollmentInclude,
+ }),
+ // summed in the database, because a partner can have many links in each program
+ getPartnerLinksStatsByProgram({ partnerId }),
+ ]);
+
+ return { programEnrollments, linksStatsByProgram };
+}
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/bounties/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/bounties/route.ts
deleted file mode 100644
index a3f3f51b7d..0000000000
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/bounties/route.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
-import { withPartnerProfile } from "@/lib/auth/partner";
-import { programEnrollmentEligibilityIncludes } from "@/lib/bounty/api/bounty-availability";
-import { getBountiesForPartner } from "@/lib/bounty/api/get-bounties-for-partner";
-import { partnerLinkStatsSelect } from "@/lib/partners/aggregate-partner-links-stats";
-import { NextResponse } from "next/server";
-
-// GET /api/partner-profile/programs/[programId]/bounties – get available bounties for an enrolled program
-export const GET = withPartnerProfile(async ({ partner, params }) => {
- const programEnrollment = await getProgramEnrollmentOrThrow({
- partnerId: partner.id,
- programId: params.programId,
- include: {
- program: {
- select: {
- id: true,
- defaultGroupId: true,
- },
- },
- links: {
- select: partnerLinkStatsSelect,
- },
- ...programEnrollmentEligibilityIncludes,
- },
- });
-
- const bounties = await getBountiesForPartner(programEnrollment);
-
- return NextResponse.json(bounties);
-});
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/count/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/count/route.ts
deleted file mode 100644
index 2bfc102550..0000000000
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/count/route.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { getPartnerEarningsCount } from "@/lib/api/partner-profile/get-partner-earnings-count";
-import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
-import { withPartnerProfile } from "@/lib/auth/partner";
-import { getPartnerEarningsCountQuerySchema } from "@/lib/zod/schemas/partner-profile";
-import { NextResponse } from "next/server";
-
-// GET /api/partner-profile/programs/[programId]/earnings/count – get earnings count for a partner in a program enrollment
-export const GET = withPartnerProfile(
- async ({ partner, params, searchParams }) => {
- const { programId } = await getProgramEnrollmentOrThrow({
- partnerId: partner.id,
- programId: params.programId,
- include: {},
- });
-
- const filters = getPartnerEarningsCountQuerySchema.parse(searchParams);
-
- const counts = await getPartnerEarningsCount({
- partnerId: partner.id,
- programId,
- filters,
- });
-
- return NextResponse.json(counts);
- },
-);
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/route.ts
deleted file mode 100644
index ab3943ef2e..0000000000
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/route.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { getEarningsForPartner } from "@/lib/api/partner-profile/get-earnings-for-partner";
-import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
-import { withPartnerProfile } from "@/lib/auth/partner";
-import {
- getPartnerEarningsQuerySchema,
- PartnerEarningsSchema,
-} from "@/lib/zod/schemas/partner-profile";
-import { NextResponse } from "next/server";
-import * as z from "zod/v4";
-
-// GET /api/partner-profile/programs/[programId]/earnings – get earnings for a partner in a program enrollment
-export const GET = withPartnerProfile(
- async ({ partner, params, searchParams }) => {
- const { programId, partnerId } = await getProgramEnrollmentOrThrow({
- partnerId: partner.id,
- programId: params.programId,
- include: {},
- });
-
- const parsedQuery = getPartnerEarningsQuerySchema.parse(searchParams);
-
- const earnings = await getEarningsForPartner({
- ...parsedQuery,
- programId,
- partnerId,
- });
-
- return NextResponse.json(z.array(PartnerEarningsSchema).parse(earnings));
- },
-);
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts
deleted file mode 100644
index 7d8ec5e9ee..0000000000
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/earnings/timeseries/route.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { getPartnerEarningsTimeseries } from "@/lib/api/partner-profile/get-partner-earnings-timeseries";
-import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
-import { withPartnerProfile } from "@/lib/auth/partner";
-import { getPartnerEarningsTimeseriesSchema } from "@/lib/zod/schemas/partner-profile";
-import { NextResponse } from "next/server";
-
-// GET /api/partner-profile/programs/[programId]/earnings/timeseries - get timeseries chart for a partner's earnings
-export const GET = withPartnerProfile(
- async ({ partner, params, searchParams }) => {
- const { programId } = await getProgramEnrollmentOrThrow({
- partnerId: partner.id,
- programId: params.programId,
- include: {},
- });
-
- const filters = getPartnerEarningsTimeseriesSchema.parse(searchParams);
-
- const timeseries = await getPartnerEarningsTimeseries({
- partnerId: partner.id,
- programId,
- filters,
- });
-
- return NextResponse.json(timeseries);
- },
-);
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 58a166575c..f38b48bf6f 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
@@ -1,6 +1,7 @@
"use client";
import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
+import { usePartnerDateRange } from "@/lib/analytics/use-partner-date-range";
import { testIds } from "@/lib/e2e/test-ids";
import { usePartnerProfileEarningsTimeseries } from "@/lib/swr/use-partner-profile-earnings";
import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
@@ -19,7 +20,6 @@ import NumberFlow from "@number-flow/react";
import { LinearGradient } from "@visx/gradient";
import { useRouter } from "next/navigation";
import { useId, useMemo } from "react";
-import { useOverviewDateRange } from "./use-overview-date-range";
import { useTopProgramEarnings } from "./use-top-program-earnings";
const MAX_TOOLTIP_PROGRAMS = 5;
@@ -27,7 +27,7 @@ const MAX_TOOLTIP_PROGRAMS = 5;
export function EarningsChart() {
const id = useId();
const router = useRouter();
- const { start, end, interval } = useOverviewDateRange();
+ const { start, end, interval } = usePartnerDateRange();
// on touch devices, the chart opens /programs at the end of each drag, which
// stops partners from reading the tooltip
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/recent-earnings-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/recent-earnings-card.tsx
index 86410f04fb..de87386a98 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/recent-earnings-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/recent-earnings-card.tsx
@@ -1,5 +1,6 @@
"use client";
+import { usePartnerDateRange } from "@/lib/analytics/use-partner-date-range";
import { testIds } from "@/lib/e2e/test-ids";
import { usePartnerProfileEarnings } from "@/lib/swr/use-partner-profile-earnings";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
@@ -14,10 +15,9 @@ import {
OverviewCard,
OverviewCardList,
} from "./overview-card";
-import { useOverviewDateRange } from "./use-overview-date-range";
export function RecentEarningsCard() {
- const { start, end, interval } = useOverviewDateRange();
+ const { start, end, interval } = usePartnerDateRange();
const { data: earnings, error } = usePartnerProfileEarnings({
pageSize: 6,
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 31fb744cf0..9cbbbfc445 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,5 +1,6 @@
"use client";
+import { usePartnerDateRange } from "@/lib/analytics/use-partner-date-range";
import { testIds } from "@/lib/e2e/test-ids";
import { usePartnerProfileEarningsAnalytics } from "@/lib/swr/use-partner-profile-earnings";
import { ProgramLogo } from "@/ui/partners/program-logo";
@@ -11,10 +12,9 @@ import {
OverviewCard,
OverviewCardList,
} from "./overview-card";
-import { useOverviewDateRange } from "./use-overview-date-range";
export function TopLinksCard({ className }: { className?: string }) {
- const { start, end, interval } = useOverviewDateRange();
+ const { start, end, interval } = usePartnerDateRange();
const { data: links, error } = usePartnerProfileEarningsAnalytics({
groupBy: "linkId",
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 3be7e242c5..44161558ac 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,9 +1,9 @@
+import { usePartnerDateRange } from "@/lib/analytics/use-partner-date-range";
import { usePartnerProfileEarningsAnalytics } 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
export function useTopProgramEarnings() {
- const { start, end, interval } = useOverviewDateRange();
+ const { start, end, interval } = usePartnerDateRange();
return usePartnerProfileEarningsAnalytics({
groupBy: "programId",
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
index ff8116b1d4..62c795956b 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/partner-payout-details-sheet.tsx
@@ -7,8 +7,8 @@ import {
STABLECOIN_PAYOUT_FEE_RATE,
} from "@/lib/constants/payouts";
import { TestPayoutBadge } from "@/lib/sandbox/components/test-payout-badge";
-import usePartnerProfile from "@/lib/swr/use-partner-profile";
-import { PartnerEarningsResponse, PartnerPayoutResponse } from "@/lib/types";
+import { usePartnerProfileEarnings } from "@/lib/swr/use-partner-profile-earnings";
+import { PartnerPayoutResponse } from "@/lib/types";
import { CustomerAvatar } from "@/ui/customers/customer-avatar";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
import { CommissionDescriptionLabel } from "@/ui/partners/commission-description-label";
@@ -34,7 +34,6 @@ import {
import {
cn,
currencyFormatter,
- fetcher,
formatDateTime,
formatDateTimeSmart,
NETWORK_PROGRAM_ID,
@@ -45,7 +44,6 @@ import { PartnerPayoutMethod, PayoutStatus } from "@prisma/client";
import { addBusinessDays, addMinutes } from "date-fns";
import Link from "next/link";
import { Dispatch, Fragment, SetStateAction, useMemo } from "react";
-import useSWR from "swr";
type PayoutDetailsSheetProps = {
payout: PartnerPayoutResponse;
@@ -64,18 +62,18 @@ const failureTooltips: Record<PartnerPayoutMethod, string> = {
};
function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
- const { partner } = usePartnerProfile();
-
const {
data: earnings,
isLoading,
error,
- } = useSWR<PartnerEarningsResponse[]>(
- partner && payout.program.id !== NETWORK_PROGRAM_ID
- ? `/api/partner-profile/programs/${payout.program.id}/earnings?payoutId=${payout.id}&interval=all&pageSize=${PAYOUTS_SHEET_ITEMS_LIMIT}`
- : undefined,
- fetcher,
- );
+ } = usePartnerProfileEarnings({
+ programIdOrSlug: payout.program.id,
+ payoutId: payout.id,
+ interval: "all",
+ pageSize: PAYOUTS_SHEET_ITEMS_LIMIT,
+ enabled: payout.program.id !== NETWORK_PROGRAM_ID,
+ keepPreviousData: false,
+ });
const invoiceData = useMemo(() => {
const statusBadge = PayoutStatusBadges[payout.status];
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/[bountyId]/bounty-performance-section.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/[bountyId]/bounty-performance-section.tsx
index 9bbffb7a10..49793ed8e5 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/[bountyId]/bounty-performance-section.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/[bountyId]/bounty-performance-section.tsx
@@ -5,14 +5,13 @@ import { PartnerAnalyticsFilters } from "@/lib/analytics/types";
import { isCurrencyAttribute } from "@/lib/api/workflows/utils";
import { PERFORMANCE_BOUNTY_SCOPE_ATTRIBUTES } from "@/lib/bounty/api/performance-bounty-scope-attributes";
import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";
-import { usePartnerEarningsTimeseries } from "@/lib/swr/use-partner-earnings-timeseries";
-import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import {
- LeadEvent,
- PartnerBountyProps,
- PartnerEarningsResponse,
- SaleEvent,
-} from "@/lib/types";
+ usePartnerProfileEarnings,
+ usePartnerProfileEarningsCount,
+ usePartnerProfileEarningsTimeseries,
+} from "@/lib/swr/use-partner-profile-earnings";
+import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
+import { LeadEvent, PartnerBountyProps, SaleEvent } from "@/lib/types";
import { CustomerRowItem } from "@/ui/customers/customer-row-item";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
import {
@@ -117,6 +116,7 @@ export function BountyPerformanceSection({
function BountyPerformanceChart({ bounty }: { bounty: PartnerBountyProps }) {
const { programEnrollment } = useProgramEnrollment();
+ const { programSlug } = useParams<{ programSlug: string }>();
const attribute = bounty.performanceCondition?.attribute as
| PerformanceAttribute
| undefined;
@@ -156,28 +156,19 @@ function BountyPerformanceChart({ bounty }: { bounty: PartnerBountyProps }) {
});
const { data: earningsTimeseries, error: earningsError } =
- usePartnerEarningsTimeseries({
- interval: "30d",
- ...(startDate && endDate && { start: startDate, end: endDate }),
+ usePartnerProfileEarningsTimeseries({
+ programIdOrSlug: programSlug,
+ start: startDate,
+ end: endDate,
enabled: isCommissions,
});
const data = useMemo(() => {
if (isCommissions) {
- if (!earningsTimeseries) {
- return undefined;
- }
-
- if (!Array.isArray(earningsTimeseries)) {
- return [];
- }
-
- return earningsTimeseries.map(
- ({ start, earnings }: { start: string; earnings: number }) => ({
- date: new Date(start),
- values: { main: earnings },
- }),
- );
+ return earningsTimeseries?.map(({ start, earnings }) => ({
+ date: new Date(start),
+ values: { main: earnings },
+ }));
}
if (!attribute) {
@@ -559,73 +550,44 @@ function BountyPerformanceCommissionsTable({
const dateRangeStable =
bounty.performanceScope === "new" || programEnrollment != null;
- const { earningsParams, countParams } = useMemo<{
- earningsParams: Record<string, string> | null;
- countParams: Record<string, string> | null;
- }>(() => {
- if (!programSlug || !dateRangeStable) {
- return {
- earningsParams: null,
- countParams: null,
- };
+ const dateRange = useMemo(() => {
+ if (!dateRangeStable) {
+ return null;
}
- const startDate =
- bounty.performanceScope === "new"
- ? new Date(bounty.startsAt)
- : new Date(programEnrollment?.createdAt ?? bounty.startsAt);
-
- const endDate = bounty.endsAt ? new Date(bounty.endsAt) : new Date();
-
- const baseParams: Record<string, string> = {
- ...(startDate && { start: startDate.toISOString() }),
- ...(endDate && { end: endDate.toISOString() }),
- };
-
return {
- earningsParams: {
- ...baseParams,
- pageSize: String(PAGE_SIZE),
- page: String(page),
- },
-
- countParams: {
- ...baseParams,
- },
+ start:
+ bounty.performanceScope === "new"
+ ? new Date(bounty.startsAt)
+ : new Date(programEnrollment?.createdAt ?? bounty.startsAt),
+ end: bounty.endsAt ? new Date(bounty.endsAt) : new Date(),
};
}, [
- programSlug,
dateRangeStable,
- page,
bounty.performanceScope,
bounty.startsAt,
bounty.endsAt,
programEnrollment?.createdAt,
]);
- const earningsUrl = useMemo(() => {
- if (!programSlug || !earningsParams) return null;
- return `/api/partner-profile/programs/${programSlug}/earnings?${new URLSearchParams(earningsParams).toString()}`;
- }, [programSlug, earningsParams]);
-
- const countUrl = useMemo(() => {
- if (!programSlug || !countParams) return null;
- return `/api/partner-profile/programs/${programSlug}/earnings/count?${new URLSearchParams(countParams).toString()}`;
- }, [programSlug, countParams]);
-
const {
data: earnings,
isLoading,
error,
- } = useSWR<PartnerEarningsResponse[]>(earningsUrl, fetcher, {
- keepPreviousData: true,
+ } = usePartnerProfileEarnings({
+ programIdOrSlug: programSlug,
+ ...dateRange,
+ page,
+ pageSize: PAGE_SIZE,
+ enabled: dateRange !== null,
});
- const { data: earningsCount, isLoading: isLoadingCount } = useSWR<{
- count: number;
- }>(countUrl, fetcher, {
- keepPreviousData: true,
- });
+ const { data: earningsCount, isLoading: isLoadingCount } =
+ usePartnerProfileEarningsCount({
+ programIdOrSlug: programSlug,
+ ...dateRange,
+ enabled: dateRange !== null,
+ });
const rows = useMemo<PerformanceRow[]>(
() =>
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/page.tsx
index 3c80dce64e..902adcaa3f 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/bounties/page.tsx
@@ -1,14 +1,16 @@
"use client";
-import { usePartnerProgramBounties } from "@/lib/swr/use-partner-program-bounties";
+import { usePartnerProfileBounties } from "@/lib/swr/use-partner-profile-bounties";
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import { PartnerBountiesView } from "@/ui/partners/bounties/partner-bounties-view";
import { useParams } from "next/navigation";
export default function PartnerProgramBountiesPage() {
- const { programSlug } = useParams();
- const { bounties, bountiesCount, isLoading } = usePartnerProgramBounties();
+ const { programSlug } = useParams<{ programSlug: string }>();
+ const { bounties, bountiesCount, isLoading } = usePartnerProfileBounties({
+ programIdOrSlug: programSlug,
+ });
return (
<PageContent title="Bounties">
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx
index 07ddd912d4..c911a37d48 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx
@@ -2,8 +2,11 @@
import { CUSTOMER_PAGE_EVENTS_LIMIT } from "@/lib/constants/misc";
import usePartnerCustomer from "@/lib/swr/use-partner-customer";
+import {
+ usePartnerProfileEarnings,
+ usePartnerProfileEarningsCount,
+} from "@/lib/swr/use-partner-profile-earnings";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import { PartnerEarningsResponse } from "@/lib/types";
import { CustomerActivityList } from "@/ui/customers/customer-activity-list";
import { CustomerDetailsColumn } from "@/ui/customers/customer-details-column";
import { CustomerSalesTable } from "@/ui/customers/customer-sales-table";
@@ -12,12 +15,11 @@ import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import { ProgramRewardList } from "@/ui/partners/program-reward-list";
import { Callout } from "@/ui/shared/callout";
import { Button, ChevronRight, MoneyBill2, Tooltip, User } from "@dub/ui";
-import { cn, fetcher, formatDate } from "@dub/utils";
+import { cn, formatDate } from "@dub/utils";
import { addMonths, isBefore } from "date-fns";
import Link from "next/link";
import { redirect, useParams } from "next/navigation";
import { memo, useMemo } from "react";
-import useSWR from "swr";
export function ProgramCustomerPageClient() {
const { programEnrollment, showDetailedAnalytics } = useProgramEnrollment();
@@ -161,27 +163,22 @@ export function ProgramCustomerPageClient() {
const EarningsTable = memo(({ customerId }: { customerId: string }) => {
const { programSlug } = useParams();
- const { data: earningsData, isLoading: isEarningsLoading } = useSWR<
- PartnerEarningsResponse[]
- >(
- `/api/partner-profile/programs/${programSlug}/earnings?interval=all&pageSize=${CUSTOMER_PAGE_EVENTS_LIMIT}&customerId=${customerId}`,
- fetcher,
- {
- keepPreviousData: true,
- },
- );
+ const { data: earningsData, isLoading: isEarningsLoading } =
+ usePartnerProfileEarnings({
+ programIdOrSlug: programSlug as string,
+ customerId,
+ interval: "all",
+ pageSize: CUSTOMER_PAGE_EVENTS_LIMIT,
+ });
- const { data: totalEarnings, isLoading: isTotalEarningsLoading } = useSWR<{
- count: number;
- }>(
- // Only fetch total earnings count if the earnings data is equal to the limit
- earningsData?.length === CUSTOMER_PAGE_EVENTS_LIMIT &&
- `/api/partner-profile/programs/${programSlug}/earnings/count?interval=all&customerId=${customerId}`,
- fetcher,
- {
- keepPreviousData: true,
- },
- );
+ const { data: totalEarnings, isLoading: isTotalEarningsLoading } =
+ usePartnerProfileEarningsCount({
+ programIdOrSlug: programSlug as string,
+ customerId,
+ interval: "all",
+ // Only fetch total earnings count if the earnings data is equal to the limit
+ enabled: earningsData?.length === CUSTOMER_PAGE_EVENTS_LIMIT,
+ });
return (
<CustomerSalesTable
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
index 8ff2e7f567..b3eb5c4f96 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
@@ -1,11 +1,11 @@
"use client";
-import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "@/lib/analytics/constants";
import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
-import { IntervalOptions } from "@/lib/analytics/types";
-import usePartnerEarningsCount from "@/lib/swr/use-partner-earnings-count";
-import { usePartnerEarningsTimeseries } from "@/lib/swr/use-partner-earnings-timeseries";
import usePartnerLinks from "@/lib/swr/use-partner-links";
+import {
+ usePartnerProfileEarningsCount,
+ usePartnerProfileEarningsTimeseries,
+} from "@/lib/swr/use-partner-profile-earnings";
import { LinkIcon } from "@/ui/links/link-icon";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
@@ -29,8 +29,8 @@ import {
} from "@dub/utils";
import NumberFlow from "@number-flow/react";
import { CommissionType } from "@prisma/client";
-import { endOfDay, startOfDay } from "date-fns";
import { Fragment, useMemo, useState } from "react";
+import { useProgramEarningsFilters } from "./use-program-earnings-filters";
const LINE_COLORS = [
"text-teal-500",
@@ -54,25 +54,18 @@ const MAX_LINES = LINE_COLORS.length;
export function EarningsCompositeChart() {
const { queryParams, searchParamsObj } = useRouterStuff();
- const {
- start,
- end,
- interval = DUB_PARTNERS_ANALYTICS_INTERVAL,
- groupBy = "type",
- } = searchParamsObj as {
- start?: string;
- end?: string;
- interval?: IntervalOptions;
+ const filters = useProgramEarningsFilters();
+ const { start, end, interval } = filters;
+
+ const { groupBy = "type" } = searchParamsObj as {
groupBy?: "linkId" | "type";
};
const { links } = usePartnerLinks();
- const { data } = usePartnerEarningsTimeseries({
- interval,
+ const { data } = usePartnerProfileEarningsTimeseries({
+ ...filters,
groupBy,
- start: start ? startOfDay(new Date(start)) : undefined,
- end: end ? endOfDay(new Date(end)) : undefined,
});
const total = useMemo(
@@ -258,19 +251,22 @@ export function EarningsCompositeChart() {
function EarningsTableControls() {
const { queryParams, searchParamsObj } = useRouterStuff();
+ const earningsFilters = useProgramEarningsFilters();
const [selectedFilter, setSelectedFilter] = useState<string | null>(null);
- const { earningsCount: links } = usePartnerEarningsCount<
+ const { data: links } = usePartnerProfileEarningsCount<
{ id: string; domain: string; key: string; url: string; _count: number }[]
>({
+ ...earningsFilters,
groupBy: "linkId",
enabled:
selectedFilter === "linkId" || searchParamsObj.linkId ? true : false,
});
- const { earningsCount: customers } = usePartnerEarningsCount<
+ const { data: customers } = usePartnerProfileEarningsCount<
{ id: string; email: string; _count: number }[]
>({
+ ...earningsFilters,
groupBy: "customerId",
enabled:
selectedFilter === "customerId" || searchParamsObj.customerId
@@ -278,9 +274,10 @@ function EarningsTableControls() {
: false,
});
- const { earningsCount: statuses } = usePartnerEarningsCount<
+ const { data: statuses } = usePartnerProfileEarningsCount<
{ status: string; _count: number }[]
>({
+ ...earningsFilters,
groupBy: "status",
enabled:
selectedFilter === "status" || searchParamsObj.status ? true : false,
@@ -330,22 +327,23 @@ function EarningsTableControls() {
key: "status",
icon: CircleDotted,
label: "Status",
- options: statuses?.map(({ status, _count }) => {
- const Icon = CommissionStatusBadges[status].icon;
- return {
- value: status,
- label: CommissionStatusBadges[status].label,
- icon: (
- <Icon
- className={cn(
- CommissionStatusBadges[status].className,
- "size-4 bg-transparent",
- )}
- />
- ),
- right: nFormatter(_count, { full: true }),
- };
- }),
+ options:
+ statuses?.map(({ status, _count }) => {
+ const Icon = CommissionStatusBadges[status].icon;
+ return {
+ value: status,
+ label: CommissionStatusBadges[status].label,
+ icon: (
+ <Icon
+ className={cn(
+ CommissionStatusBadges[status].className,
+ "size-4 bg-transparent",
+ )}
+ />
+ ),
+ right: nFormatter(_count, { full: true }),
+ };
+ }) ?? null,
},
],
[links, customers, statuses],
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
index 950f47eb3c..6f137e7e1d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-table.tsx
@@ -1,10 +1,13 @@
"use client";
import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";
-import usePartnerEarningsCount from "@/lib/swr/use-partner-earnings-count";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
+import {
+ usePartnerProfileEarnings,
+ usePartnerProfileEarningsCount,
+} from "@/lib/swr/use-partner-profile-earnings";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import { PartnerEarningsResponse } from "@/lib/types";
+import { PartnerProfileEarningsResponse } from "@/lib/types";
import { CustomerRowItem } from "@/ui/customers/customer-row-item";
import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";
import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";
@@ -27,7 +30,6 @@ import {
cn,
COUNTRIES,
currencyFormatter,
- fetcher,
formatDateTimeSmart,
getApexDomain,
getPrettyUrl,
@@ -35,11 +37,11 @@ import {
import { CommissionType } from "@prisma/client";
import { Cell } from "@tanstack/react-table";
import { useParams } from "next/navigation";
-import useSWR from "swr";
+import { useProgramEarningsFilters } from "./use-program-earnings-filters";
type ColumnMeta = {
filterParams?: (
- args: Pick<Cell<PartnerEarningsResponse, any>, "getValue">,
+ args: Pick<Cell<PartnerProfileEarningsResponse, any>, "getValue">,
) => Record<string, any>;
};
@@ -47,31 +49,33 @@ export function EarningsTablePartner({ limit }: { limit?: number }) {
const { programSlug } = useParams();
const { partner } = usePartnerProfile();
const { programEnrollment, showDetailedAnalytics } = useProgramEnrollment();
- const { queryParams, searchParamsObj, getQueryString } = useRouterStuff();
+ const { queryParams, searchParamsObj } = useRouterStuff();
+ const filters = useProgramEarningsFilters();
const { sortBy = "createdAt", sortOrder = "desc" } = searchParamsObj as {
- sortBy?: "createdAt";
+ sortBy?: "createdAt" | "amount" | "earnings";
sortOrder?: "asc" | "desc";
};
- const { earningsCount } = usePartnerEarningsCount<{ count: number }>({
- enabled: programEnrollment ? true : false,
+ const { pagination, setPagination } = usePagination(limit);
+
+ // the table only shows the count with pagination, and a limit turns pagination off
+ const { data: earningsCount } = usePartnerProfileEarningsCount({
+ ...filters,
+ enabled: !limit,
});
const {
data: earnings,
isLoading,
error,
- } = useSWR<PartnerEarningsResponse[]>(
- programEnrollment &&
- `/api/partner-profile/programs/${programEnrollment.programId}/earnings${getQueryString(
- limit ? { pageSize: limit } : {},
- )}`,
- fetcher,
- { keepPreviousData: true },
- );
-
- const { pagination, setPagination } = usePagination(limit);
+ } = usePartnerProfileEarnings({
+ ...filters,
+ page: pagination.pageIndex,
+ pageSize: pagination.pageSize,
+ sortBy,
+ sortOrder,
+ });
const { table, ...tableProps } = useTable({
data: earnings || [],
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/use-program-earnings-filters.ts b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/use-program-earnings-filters.ts
new file mode 100644
index 0000000000..011da6fffd
--- /dev/null
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/use-program-earnings-filters.ts
@@ -0,0 +1,28 @@
+import { usePartnerDateRange } from "@/lib/analytics/use-partner-date-range";
+import { PartnerProfileEarningsFilters } from "@/lib/swr/use-partner-profile-earnings";
+import { useRouterStuff } from "@dub/ui";
+import { useParams } from "next/navigation";
+import { useMemo } from "react";
+
+// the program, filters and date range of the program Earnings page, from the URL
+export function useProgramEarningsFilters() {
+ const { programSlug } = useParams<{ programSlug: string }>();
+ const { searchParamsObj } = useRouterStuff();
+ const dateRange = usePartnerDateRange();
+
+ const { type, linkId, customerId, status, payoutId } =
+ searchParamsObj as Omit<PartnerProfileEarningsFilters, "programIdOrSlug">;
+
+ return useMemo(
+ () => ({
+ ...dateRange,
+ programIdOrSlug: programSlug,
+ type,
+ linkId,
+ customerId,
+ status,
+ payoutId,
+ }),
+ [dateRange, programSlug, type, linkId, customerId, status, payoutId],
+ );
+}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
index b1bf941631..62c4b001de 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
@@ -3,6 +3,7 @@
import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "@/lib/analytics/constants";
import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
import { IntervalOptions } from "@/lib/analytics/types";
+import { usePartnerDateRange } from "@/lib/analytics/use-partner-date-range";
import { useSyncedLocalStorage } from "@/lib/hooks/use-synced-local-storage";
import { constructPartnerReferralLink } from "@/lib/partner-referrals/utils";
import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
@@ -10,9 +11,9 @@ import { getRewardAmount } from "@/lib/partners/get-reward-amount";
import { QueryLinkStructureHelpText } from "@/lib/partners/query-link-structure-help-text";
import { getPartnerLinkDisplayRewards } from "@/lib/rewards/resolve-partner-link-rewards";
import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";
-import { usePartnerEarningsTimeseries } from "@/lib/swr/use-partner-earnings-timeseries";
import usePartnerLinks from "@/lib/swr/use-partner-links";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
+import { usePartnerProfileEarningsTimeseries } from "@/lib/swr/use-partner-profile-earnings";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import { GroupProps, PartnerProfileLinkProps } from "@/lib/types";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
@@ -63,7 +64,6 @@ import {
} from "@dub/utils";
import NumberFlow, { NumberFlowGroup } from "@number-flow/react";
import { LinearGradient } from "@visx/gradient";
-import { endOfDay, startOfDay } from "date-fns";
import { ChevronDown } from "lucide-react";
import { AnimatePresence, motion } from "motion/react";
import Link from "next/link";
@@ -91,8 +91,9 @@ const ProgramOverviewContext = createContext<{
});
export function PartnerProgramOverviewPageClient() {
- const { getQueryString, searchParamsObj } = useRouterStuff();
+ const { getQueryString } = useRouterStuff();
const { programSlug } = useParams();
+ const { start, end, interval } = usePartnerDateRange();
const [hideDetails, _setHideDetails] = useSyncedLocalStorage(
`hide-program-details:${programSlug}`,
@@ -101,16 +102,6 @@ export function PartnerProgramOverviewPageClient() {
const { programEnrollment, showDetailedAnalytics } = useProgramEnrollment();
- const {
- start,
- end,
- interval = DUB_PARTNERS_ANALYTICS_INTERVAL,
- } = searchParamsObj as {
- start?: string;
- end?: string;
- interval?: IntervalOptions;
- };
-
const program = programEnrollment?.program;
if (!program) {
@@ -143,8 +134,8 @@ export function PartnerProgramOverviewPageClient() {
)}
<ProgramOverviewContext.Provider
value={{
- start: start ? startOfDay(new Date(start)) : undefined,
- end: end ? endOfDay(new Date(end)) : undefined,
+ start,
+ end,
interval,
color: programEnrollment.group?.brandColor ?? undefined,
}}
@@ -205,7 +196,8 @@ function EarningsChart() {
const { programEnrollment } = useProgramEnrollment();
- const { data: timeseries, error } = usePartnerEarningsTimeseries({
+ const { data: timeseries, error } = usePartnerProfileEarningsTimeseries({
+ programIdOrSlug: programSlug as string,
interval,
start,
end,
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/accept-program-invite-button.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/accept-program-invite-button.tsx
index 2cd54e0b41..3c5857504d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/accept-program-invite-button.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/invite/accept-program-invite-button.tsx
@@ -18,7 +18,11 @@ export function AcceptProgramInviteButton({
const { executeAsync: executeAcceptInvite, isPending: isAcceptingInvite } =
useAction(acceptProgramInviteAction, {
onSuccess: async () => {
- await mutatePrefix("/api/partner-profile/programs");
+ // an accepted invite adds the program's bounties to the All programs list
+ await mutatePrefix([
+ "/api/partner-profile/programs",
+ "/api/partner-profile/bounties",
+ ]);
toast.success("Program invite accepted!");
router.push(`/programs/${program.slug}`);
},
diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.ts
index 04e304b2ce..46d866a45c 100644
--- a/apps/web/lib/analytics/types.ts
+++ b/apps/web/lib/analytics/types.ts
@@ -5,7 +5,6 @@ import {
eventsQuerySchema,
} from "../zod/schemas/analytics";
import { analyticsResponse } from "../zod/schemas/analytics-response";
-import { getPartnerEarningsTimeseriesSchema } from "../zod/schemas/partner-profile";
import {
ANALYTICS_SALE_UNIT,
ANALYTICS_VIEWS,
@@ -91,6 +90,3 @@ const partnerAnalyticsSchema = analyticsQuerySchema
export type PartnerAnalyticsFilters = z.infer<typeof partnerAnalyticsSchema> & {
linkId?: string;
};
-export type PartnerEarningsTimeseriesFilters = z.infer<
- typeof getPartnerEarningsTimeseriesSchema
->;
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/use-overview-date-range.ts b/apps/web/lib/analytics/use-partner-date-range.ts
similarity index 84%
rename from apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/use-overview-date-range.ts
rename to apps/web/lib/analytics/use-partner-date-range.ts
index 1c522dd7b9..90116aaba7 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/use-overview-date-range.ts
+++ b/apps/web/lib/analytics/use-partner-date-range.ts
@@ -4,7 +4,8 @@ import { useRouterStuff } from "@dub/ui";
import { endOfDay, startOfDay } from "date-fns";
import { useMemo } from "react";
-export function useOverviewDateRange() {
+// the date range from the URL, as the partner earnings and analytics hooks need it
+export function usePartnerDateRange() {
const { searchParamsObj } = useRouterStuff();
const {
diff --git a/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts b/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts
index 3a5d7500cb..2d08bb15ed 100644
--- a/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts
+++ b/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts
@@ -1,11 +1,13 @@
import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
+import { DubApiError } from "@/lib/api/errors";
+import { buildPaginationQuery } from "@/lib/api/pagination";
import { generateRandomName } from "@/lib/names";
import { prisma } from "@/lib/prisma";
import {
getPartnerEarningsQuerySchema,
PartnerProfileEarningsSchema,
} from "@/lib/zod/schemas/partner-profile";
-import { CommissionType, Partner } from "@prisma/client";
+import { CommissionType, Partner, Prisma } from "@prisma/client";
import * as z from "zod/v4";
import { getEarningsProgramFilter } from "./get-earnings-program-id";
import { obfuscateCustomerEmail } from "./obfuscate-customer-email";
@@ -20,8 +22,10 @@ export async function getEarningsForPartner(
params: GetEarningsForPartnerParams,
) {
const {
- page = 1,
+ page,
pageSize,
+ startingAfter,
+ endingBefore,
type,
status,
sortBy,
@@ -44,23 +48,59 @@ export async function getEarningsForPartner(
timezone,
});
- const earnings = await prisma.commission.findMany({
- where: {
- earnings: {
- not: 0,
+ // the helper sorts cursor pages by ID only, so the sort below replaces its orderBy
+ const { orderBy: _, ...paginationQuery } = buildPaginationQuery({
+ page,
+ pageSize,
+ startingAfter,
+ endingBefore,
+ sortBy,
+ sortOrder,
+ });
+
+ const where: Prisma.CommissionWhereInput = {
+ earnings: {
+ not: 0,
+ },
+ programId: getEarningsProgramFilter(programId),
+ partnerId,
+ status,
+ type,
+ linkId,
+ customerId,
+ payoutId,
+ createdAt: {
+ gte: startDate,
+ lte: endDate,
+ },
+ };
+
+ // the cursor must match the same filters, because Prisma skips the first row after the cursor position
+ // and would drop a valid earning when the cursor itself is not in the results
+ const cursorId = startingAfter || endingBefore;
+
+ if (cursorId) {
+ const cursor = await prisma.commission.findFirst({
+ where: {
+ ...where,
+ id: cursorId,
},
- programId: getEarningsProgramFilter(programId),
- partnerId,
- status,
- type,
- linkId,
- customerId,
- payoutId,
- createdAt: {
- gte: startDate,
- lte: endDate,
+ select: {
+ id: true,
},
- },
+ });
+
+ if (!cursor) {
+ throw new DubApiError({
+ code: "unprocessable_entity",
+ message:
+ "Invalid cursor: the provided ID does not exist or does not match the filters.",
+ });
+ }
+ }
+
+ const earnings = await prisma.commission.findMany({
+ where,
// the response schema drops these fields, so don't load them
omit: {
metadata: true,
@@ -97,11 +137,9 @@ export async function getEarningsForPartner(
},
},
},
- skip: (page - 1) * pageSize,
- take: pageSize,
- orderBy: {
- [sortBy]: sortOrder,
- },
+ ...paginationQuery,
+ // offset and cursor pages use the same sort, and the commission ID breaks ties, so that no earning repeats or goes missing between pages
+ orderBy: [{ [sortBy]: sortOrder }, { id: sortOrder }],
});
// TODO: Once we migrate to add sourcePartner relation on Commission table, we can simplify this logic
diff --git a/apps/web/lib/partners/get-partner-links-stats-by-program.ts b/apps/web/lib/partners/get-partner-links-stats-by-program.ts
index f84a3752a5..1602cf8592 100644
--- a/apps/web/lib/partners/get-partner-links-stats-by-program.ts
+++ b/apps/web/lib/partners/get-partner-links-stats-by-program.ts
@@ -5,18 +5,20 @@ import {
partnerLinkStatsSelect,
} from "./aggregate-partner-links-stats";
-// the link stats of a partner in each of their programs, summed in the database
-// instead of loading every link. Programs without links are not in the map
+// the link stats of a partner in each of their programs, or in one program, summed in
+// the database instead of loading every link. Programs without links are not in the map
export async function getPartnerLinksStatsByProgram({
partnerId,
+ programId,
}: {
partnerId: string;
+ programId?: string;
}) {
const stats = await prisma.link.groupBy({
by: ["programId"],
where: {
partnerId,
- programId: {
+ programId: programId ?? {
not: null,
},
},
diff --git a/apps/web/lib/swr/use-partner-earnings-count.ts b/apps/web/lib/swr/use-partner-earnings-count.ts
deleted file mode 100644
index 23c1b6f261..0000000000
--- a/apps/web/lib/swr/use-partner-earnings-count.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useRouterStuff } from "@dub/ui";
-import { fetcher } from "@dub/utils";
-import { useSession } from "next-auth/react";
-import { useParams } from "next/navigation";
-import useSWR from "swr";
-
-export default function usePartnerEarningsCount<T>(opts?: {
- groupBy?: string;
- programId?: string;
- enabled?: boolean;
-}) {
- const { data: session } = useSession();
- const partnerId = session?.user?.["defaultPartnerId"];
- const { programSlug } = useParams();
- const programIdToUse = opts?.programId ?? programSlug;
-
- const { getQueryString } = useRouterStuff();
-
- const { data: earningsCount, error } = useSWR(
- programIdToUse &&
- partnerId &&
- opts?.enabled &&
- `/api/partner-profile/programs/${programIdToUse}/earnings/count${getQueryString(
- opts,
- {
- include: [
- "type",
- "linkId",
- "customerId",
- "status",
- "payoutId",
- "interval",
- "start",
- "end",
- ],
- },
- )}`,
- fetcher,
- {
- keepPreviousData: true,
- },
- );
-
- return {
- earningsCount: earningsCount as T,
- error,
- loading: !earningsCount && !error,
- };
-}
diff --git a/apps/web/lib/swr/use-partner-earnings-timeseries.ts b/apps/web/lib/swr/use-partner-earnings-timeseries.ts
deleted file mode 100644
index 721d7cfaf3..0000000000
--- a/apps/web/lib/swr/use-partner-earnings-timeseries.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { useRouterStuff } from "@dub/ui";
-import { fetcher } from "@dub/utils";
-import { useSession } from "next-auth/react";
-import { useParams } from "next/navigation";
-import useSWR from "swr";
-import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "../analytics/constants";
-import { PartnerEarningsTimeseriesFilters } from "../analytics/types";
-
-export function usePartnerEarningsTimeseries(
- params?: PartnerEarningsTimeseriesFilters & {
- programId?: string;
- enabled?: boolean;
- },
-) {
- const { data: session } = useSession();
- const partnerId = session?.user?.["defaultPartnerId"];
- const { programSlug } = useParams();
- const programIdToUse = params?.programId ?? programSlug;
- const enabled = params?.enabled !== false;
-
- const { getQueryString } = useRouterStuff();
-
- const { data, error } = useSWR<any>(
- enabled &&
- partnerId &&
- programIdToUse &&
- `/api/partner-profile/programs/${programIdToUse}/earnings/timeseries${getQueryString(
- {
- ...(params?.groupBy && { groupBy: params.groupBy }),
- ...(params?.start && params?.end
- ? {
- start: params.start.toISOString(),
- end: params.end.toISOString(),
- }
- : {
- interval: params?.interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL,
- }),
- timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
- },
- { include: ["type", "linkId", "customerId", "status", "payoutId"] },
- )}`,
- fetcher,
- {
- dedupingInterval: 60000,
- keepPreviousData: true,
- },
- );
-
- return {
- data,
- error,
- loading: partnerId && programIdToUse && !data && !error ? true : false,
- };
-}
diff --git a/apps/web/lib/swr/use-partner-profile-bounties.ts b/apps/web/lib/swr/use-partner-profile-bounties.ts
index d9d494f4e1..ac6ee3bcfb 100644
--- a/apps/web/lib/swr/use-partner-profile-bounties.ts
+++ b/apps/web/lib/swr/use-partner-profile-bounties.ts
@@ -4,10 +4,12 @@ import useSWR from "swr";
import { countPartnerBountiesByTab } from "../bounty/partner-bounty-tabs";
import { PartnerProfileBountyProps } from "../types";
-// the partner bounties of all active programs
+// the partner bounties of all active programs, or of one program
export function usePartnerProfileBounties({
+ programIdOrSlug,
enabled = true,
}: {
+ programIdOrSlug?: string;
enabled?: boolean;
} = {}) {
const {
@@ -15,7 +17,12 @@ export function usePartnerProfileBounties({
isLoading,
error,
} = useSWR<PartnerProfileBountyProps[]>(
- enabled && "/api/partner-profile/bounties",
+ enabled &&
+ `/api/partner-profile/bounties${
+ programIdOrSlug
+ ? `?${new URLSearchParams({ programIdOrSlug }).toString()}`
+ : ""
+ }`,
fetcher,
{
dedupingInterval: 60000,
diff --git a/apps/web/lib/swr/use-partner-profile-earnings.ts b/apps/web/lib/swr/use-partner-profile-earnings.ts
index 47299a2154..636da56744 100644
--- a/apps/web/lib/swr/use-partner-profile-earnings.ts
+++ b/apps/web/lib/swr/use-partner-profile-earnings.ts
@@ -1,4 +1,5 @@
import { fetcher } from "@dub/utils";
+import { CommissionStatus, CommissionType } from "@prisma/client";
import { useSession } from "next-auth/react";
import { useMemo } from "react";
import useSWR from "swr";
@@ -16,15 +17,67 @@ type DateRange = {
end?: Date;
};
+// the only keys that go into the query string, in this order
+const PARTNER_PROFILE_EARNINGS_FILTER_KEYS = [
+ "programIdOrSlug",
+ "type",
+ "linkId",
+ "customerId",
+ "status",
+ "payoutId",
+] as const;
+
+// without programIdOrSlug, the routes return the earnings of all programs
+export type PartnerProfileEarningsFilters = Partial<
+ Record<(typeof PARTNER_PROFILE_EARNINGS_FILTER_KEYS)[number], string>
+> & {
+ type?: CommissionType;
+ status?: CommissionStatus;
+};
+
+type PartnerProfileEarningsQuery = DateRange &
+ PartnerProfileEarningsFilters & {
+ enabled?: boolean;
+ // turn off when the same component shows the earnings of another payout or customer next
+ keepPreviousData?: boolean;
+ };
+
// GET /api/partner-profile/earnings
export function usePartnerProfileEarnings({
pageSize,
- ...dateRange
-}: DateRange & { pageSize: number }) {
+ page,
+ sortBy,
+ sortOrder,
+ ...query
+}: PartnerProfileEarningsQuery & {
+ pageSize: number;
+ page?: number;
+ sortBy?: "createdAt" | "amount" | "earnings";
+ sortOrder?: "asc" | "desc";
+}) {
return usePartnerProfileEarningsSWR<PartnerProfileEarningsResponse[]>(
"",
- { pageSize: String(pageSize) },
- dateRange,
+ {
+ pageSize: String(pageSize),
+ ...(page !== undefined && { page: String(page) }),
+ ...(sortBy && { sortBy }),
+ ...(sortOrder && { sortOrder }),
+ },
+ query,
+ );
+}
+
+// GET /api/partner-profile/earnings/count
+export function usePartnerProfileEarningsCount<T = { count: number }>({
+ groupBy,
+ ...query
+}: PartnerProfileEarningsQuery & {
+ groupBy?: "linkId" | "customerId" | "status" | "type";
+}) {
+ return usePartnerProfileEarningsSWR<T>(
+ "/count",
+ { ...(groupBy && { groupBy }) },
+ query,
);
}
@@ -38,12 +91,14 @@ type PartnerProfileEarningsTimeseries = {
// GET /api/partner-profile/earnings/timeseries
export function usePartnerProfileEarningsTimeseries({
groupBy,
- ...dateRange
-}: DateRange & { groupBy?: "type" | "linkId" | "programId" }) {
+ ...query
+}: PartnerProfileEarningsQuery & {
+ groupBy?: "type" | "linkId" | "programId";
+}) {
return usePartnerProfileEarningsSWR<PartnerProfileEarningsTimeseries>(
"/timeseries",
{ ...(groupBy && { groupBy }) },
- dateRange,
+ query,
);
}
@@ -73,7 +128,9 @@ export function usePartnerProfileEarningsAnalytics<
limit,
...dateRange
}: DateRange & { groupBy: G; limit?: number }) {
- return usePartnerProfileEarningsSWR<PartnerProfileEarningsAnalyticsByGroup[G]>(
+ return usePartnerProfileEarningsSWR<
+ PartnerProfileEarningsAnalyticsByGroup[G]
+ >(
"/analytics",
{
groupBy,
@@ -86,15 +143,29 @@ export function usePartnerProfileEarningsAnalytics<
function usePartnerProfileEarningsSWR<T>(
path: string,
params: Record<string, string>,
- { interval, start, end }: DateRange,
+ {
+ interval,
+ start,
+ end,
+ enabled = true,
+ keepPreviousData = true,
+ ...filters
+ }: PartnerProfileEarningsQuery,
) {
const { data: session } = useSession();
const partnerId = session?.user?.["defaultPartnerId"];
- const { data, error } = useSWR<T>(
- partnerId &&
+ const { data, error, isLoading } = useSWR<T>(
+ enabled &&
+ partnerId &&
`/api/partner-profile/earnings${path}?${new URLSearchParams({
...params,
+ ...Object.fromEntries(
+ PARTNER_PROFILE_EARNINGS_FILTER_KEYS.map((key) => [
+ key,
+ filters[key],
+ ]).filter(([, value]) => value),
+ ),
...(start && end
? { start: start.toISOString(), end: end.toISOString() }
: { interval: interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL }),
@@ -103,9 +174,9 @@ function usePartnerProfileEarningsSWR<T>(
fetcher,
{
dedupingInterval: 60000,
- keepPreviousData: true,
+ keepPreviousData,
},
);
- return { data, error };
+ return { data, error, isLoading };
}
diff --git a/apps/web/lib/swr/use-partner-program-bounties.ts b/apps/web/lib/swr/use-partner-program-bounties.ts
deleted file mode 100644
index d24c4d2b25..0000000000
--- a/apps/web/lib/swr/use-partner-program-bounties.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { fetcher } from "@dub/utils";
-import { useParams } from "next/navigation";
-import { useMemo } from "react";
-import useSWR from "swr";
-import { countPartnerBountiesByTab } from "../bounty/partner-bounty-tabs";
-import { PartnerBountyProps } from "../types";
-
-export function usePartnerProgramBounties({
- enabled = true,
-}: {
- enabled?: boolean;
-} = {}) {
- const { programSlug } = useParams();
-
- const {
- data: bounties,
- isLoading,
- error,
- } = useSWR<PartnerBountyProps[]>(
- enabled &&
- programSlug &&
- `/api/partner-profile/programs/${programSlug}/bounties`,
- fetcher,
- {
- dedupingInterval: 60000,
- keepPreviousData: true,
- },
- );
-
- const bountiesCount = useMemo(
- () => countPartnerBountiesByTab(bounties),
- [bounties],
- );
-
- return {
- bounties,
- bountiesCount,
- isLoading,
- error,
- };
-}
diff --git a/apps/web/lib/zod/schemas/partner-profile.ts b/apps/web/lib/zod/schemas/partner-profile.ts
index b2f684f652..84063aecce 100644
--- a/apps/web/lib/zod/schemas/partner-profile.ts
+++ b/apps/web/lib/zod/schemas/partner-profile.ts
@@ -319,11 +319,20 @@ export const PartnerBountySchema = BountySchema.omit({
}),
});
-// used in GET /partner-profile/bounties, which lists the bounties of all programs
+// used in GET /partner-profile/bounties, for all programs or for one program
export const PartnerProfileBountySchema = PartnerBountySchema.extend({
program: PartnerProfileEarningsProgramSchema,
});
+export const partnerProfileBountiesQuerySchema = z.object({
+ programIdOrSlug: z
+ .string()
+ .optional()
+ .describe(
+ "The ID or slug of the program to filter bounties by. If not provided, bounties across all active programs are returned.",
+ ),
+});
+
export const invitePartnerUserSchema = z.object({
email: z.email({ error: "Please enter a valid email." }),
role: z.enum(PartnerRole),
diff --git a/apps/web/playwright/api/partner-profile/bounties.spec.ts b/apps/web/playwright/api/partner-profile/bounties.spec.ts
index bc48daad77..c68b6c8d93 100644
--- a/apps/web/playwright/api/partner-profile/bounties.spec.ts
+++ b/apps/web/playwright/api/partner-profile/bounties.spec.ts
@@ -260,7 +260,41 @@ test.describe("GET /partner-profile/bounties", () => {
});
});
- test("sums the partner's link stats like the program bounties route", async ({
+ test("filters by program ID or slug", async ({ playwright }) => {
+ await withPartnerApi(playwright, async (partnerApi) => {
+ for (const programIdOrSlug of [approved.id, approved.slug]) {
+ const { status, data } = await partnerApi.get<PartnerProfileBounty[]>(
+ `/api/partner-profile/bounties?programIdOrSlug=${programIdOrSlug}`,
+ );
+
+ expect(status).toEqual(200);
+ expect(data.every(({ program }) => program.id === approved.id)).toBe(
+ true,
+ );
+ expect(data.map(({ id }) => id).sort()).toEqual(
+ [
+ bounties.approved,
+ bounties.endedWithSubmission,
+ bounties.partnerGroup,
+ ].sort(),
+ );
+ }
+ });
+ });
+
+ test("returns 404 for a program the partner is not in", async ({
+ playwright,
+ }) => {
+ await withPartnerApi(playwright, async (partnerApi) => {
+ const { status } = await partnerApi.get(
+ `/api/partner-profile/bounties?programIdOrSlug=pw-bounties-${suffix}-missing`,
+ );
+
+ expect(status).toEqual(404);
+ });
+ });
+
+ test("sums the partner's link stats for each program", async ({
playwright,
}) => {
await withPartnerApi(playwright, async (partnerApi) => {
@@ -268,7 +302,7 @@ test.describe("GET /partner-profile/bounties", () => {
PartnerProfileBounty[]
>("/api/partner-profile/bounties");
const { data: oneProgram } = await partnerApi.get<PartnerProfileBounty[]>(
- `/api/partner-profile/programs/${approved.id}/bounties`,
+ `/api/partner-profile/bounties?programIdOrSlug=${approved.id}`,
);
const stats = (data: PartnerProfileBounty[]) =>
diff --git a/apps/web/playwright/api/partner-profile/earnings.spec.ts b/apps/web/playwright/api/partner-profile/earnings.spec.ts
index ae411d5fb8..585eb13053 100644
--- a/apps/web/playwright/api/partner-profile/earnings.spec.ts
+++ b/apps/web/playwright/api/partner-profile/earnings.spec.ts
@@ -251,6 +251,148 @@ test.describe("GET /partner-profile/earnings", () => {
});
});
+ test("continues an offset page with startingAfter and endingBefore, and rejects a cursor from another program", async ({
+ playwright,
+ program,
+ }) => {
+ // two extra earnings whose createdAt order is the reverse of their ID order
+ const [olderId, newerId] = [
+ createId({ prefix: "cm_" }),
+ createId({ prefix: "cm_" }),
+ ].sort();
+ const day = 24 * 60 * 60 * 1000;
+
+ await prisma.commission.createMany({
+ data: [
+ { id: olderId, createdAt: new Date(Date.now() - day) },
+ { id: newerId, createdAt: new Date(Date.now() - 2 * day) },
+ ].map(({ id, createdAt }) => ({
+ id,
+ createdAt,
+ programId: program.id,
+ partnerId: partnerId!,
+ type: "custom",
+ status: "pending",
+ amount: 0,
+ quantity: 1,
+ earnings: 100,
+ })),
+ });
+
+ try {
+ await withPartnerApi(playwright, async (partnerApi) => {
+ const list = `/api/partner-profile/earnings?programIdOrSlug=${programSlug}`;
+
+ const { data: all } =
+ await partnerApi.get<PartnerProfileEarning[]>(list);
+ const ids = all.map((e) => e.id);
+ expect(ids).toHaveLength(4);
+ // sorted by createdAt first, so the lower ID comes first here
+ expect(ids.indexOf(olderId)).toBeLessThan(ids.indexOf(newerId));
+
+ const firstPage = await partnerApi.get<PartnerProfileEarning[]>(
+ `${list}&pageSize=2`,
+ );
+ expect(firstPage.data.map((e) => e.id)).toEqual(ids.slice(0, 2));
+
+ const after = await partnerApi.get<PartnerProfileEarning[]>(
+ `${list}&pageSize=2&startingAfter=${ids[1]}`,
+ );
+ expect(after.status).toEqual(200);
+ expect(after.data.map((e) => e.id)).toEqual(ids.slice(2, 4));
+
+ const before = await partnerApi.get<PartnerProfileEarning[]>(
+ `${list}&pageSize=2&endingBefore=${ids[3]}`,
+ );
+ expect(before.status).toEqual(200);
+ expect(before.data.map((e) => e.id)).toEqual(ids.slice(1, 3));
+
+ const { data: allPrograms } = await partnerApi.get<
+ PartnerProfileEarning[]
+ >("/api/partner-profile/earnings");
+ const programBEarningId = allPrograms.find(
+ (e) => e.program.id === programB.id,
+ )!.id;
+
+ // a cursor that does not match the filters (every test earning is pending)
+ expect(
+ await partnerApi.get(`${list}&status=paid&startingAfter=${ids[0]}`),
+ ).toMatchObject({ status: 422 });
+
+ for (const cursor of [programBEarningId, "cm_doesnotexist"]) {
+ expect(
+ await partnerApi.get(`${list}&startingAfter=${cursor}`),
+ ).toMatchObject({ status: 422 });
+ }
+ });
+ } finally {
+ await prisma.commission.deleteMany({
+ where: { id: { in: [olderId, newerId] } },
+ });
+ }
+ });
+
+ test("pages through earnings with the same createdAt without repeating or skipping one", async ({
+ playwright,
+ program,
+ }) => {
+ // two extra earnings with the same createdAt, so that only the ID tie-breaker orders them
+ const tiedIds = [createId({ prefix: "cm_" }), createId({ prefix: "cm_" })];
+ const createdAt = new Date(Date.now() - 3 * 24 * 60 * 60 * 1000);
+
+ await prisma.commission.createMany({
+ data: tiedIds.map((id) => ({
+ id,
+ createdAt,
+ programId: program.id,
+ partnerId: partnerId!,
+ type: "custom",
+ status: "pending",
+ amount: 0,
+ quantity: 1,
+ earnings: 100,
+ })),
+ });
+
+ try {
+ await withPartnerApi(playwright, async (partnerApi) => {
+ const list = `/api/partner-profile/earnings?programIdOrSlug=${programSlug}`;
+
+ const { data: all } =
+ await partnerApi.get<PartnerProfileEarning[]>(list);
+ const ids = all.map((e) => e.id);
+ expect(ids).toHaveLength(4);
+
+ // the tied earnings are next to each other, higher ID first (sortOrder desc)
+ const [higherId, lowerId] = [...tiedIds].sort().reverse();
+ expect(ids.indexOf(lowerId)).toEqual(ids.indexOf(higherId) + 1);
+
+ // one earning per page, with offset pages and with the cursor
+ const offsetIds: string[] = [];
+ const cursorIds: string[] = [];
+ for (let page = 1; page <= ids.length; page++) {
+ const { data } = await partnerApi.get<PartnerProfileEarning[]>(
+ `${list}&pageSize=1&page=${page}`,
+ );
+ offsetIds.push(...data.map((e) => e.id));
+
+ const cursor = cursorIds.at(-1);
+ const { data: cursorPage } = await partnerApi.get<
+ PartnerProfileEarning[]
+ >(`${list}&pageSize=1${cursor ? `&startingAfter=${cursor}` : ""}`);
+ cursorIds.push(...cursorPage.map((e) => e.id));
+ }
+
+ expect(offsetIds).toEqual(ids);
+ expect(cursorIds).toEqual(ids);
+ });
+ } finally {
+ await prisma.commission.deleteMany({
+ where: { id: { in: tiedIds } },
+ });
+ }
+ });
+
test("returns 404 for a program the partner is not enrolled in", async ({
playwright,
}) => {
@@ -334,7 +476,7 @@ test.describe("GET /partner-profile/earnings", () => {
);
const byLink = await partnerApi.get<TimeseriesPoint[]>(
- `/api/partner-profile/programs/${program.id}/earnings/timeseries?groupBy=linkId&timezone=UTC`,
+ `/api/partner-profile/earnings/timeseries?programIdOrSlug=${program.id}&groupBy=linkId&timezone=UTC`,
);
expect(byLink.status).toEqual(200);
expect(byLink.data.reduce((sum, d) => sum + d.earnings, 0)).toEqual(3500);
@@ -492,7 +634,7 @@ test.describe("GET /partner-profile/earnings", () => {
await withPartnerApi(playwright, async (partnerApi) => {
expect(
await partnerApi.get(
- "/api/partner-profile/programs/prog_doesnotexist/earnings/timeseries",
+ "/api/partner-profile/earnings/timeseries?programIdOrSlug=prog_doesnotexist",
),
).toMatchObject({ status: 404 });
diff --git a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
index bb3a39d1ae..fc4e46ad3f 100644
--- a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
@@ -4,7 +4,6 @@ import { useProgramMessagesCount } from "@/lib/messages/hooks/use-program-messag
import { getGroupSubmittedLeadForm } from "@/lib/submitted-leads/get-group-submitted-lead-form";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import { usePartnerProfileBounties } from "@/lib/swr/use-partner-profile-bounties";
-import { usePartnerProgramBounties } from "@/lib/swr/use-partner-program-bounties";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import useProgramEnrollmentsCount from "@/lib/swr/use-program-enrollments-count";
import { MarketplaceSidebarFilters } from "@/ui/program-marketplace/marketplace-sidebar-filters";
@@ -394,7 +393,8 @@ export function PartnersSidebarNav({
[programEnrollment],
);
- const { bountiesCount } = usePartnerProgramBounties({
+ const { bountiesCount } = usePartnerProfileBounties({
+ programIdOrSlug: programSlug,
enabled:
isEnrolledProgramPage && programEnrollment && !isUnapproved
? true
diff --git a/apps/web/ui/partners/bounties/claim-bounty-sheet.tsx b/apps/web/ui/partners/bounties/claim-bounty-sheet.tsx
index 04971051bd..e031eef9ae 100644
--- a/apps/web/ui/partners/bounties/claim-bounty-sheet.tsx
+++ b/apps/web/ui/partners/bounties/claim-bounty-sheet.tsx
@@ -469,9 +469,11 @@ function ClaimBountySheetContent({
toast.success(
isDraftSave ? "Bounty progress saved." : "Bounty submitted.",
);
- await mutatePrefix(
+ // the bounty lists, and this bounty on its program route
+ await mutatePrefix([
+ "/api/partner-profile/bounties",
`/api/partner-profile/programs/${programEnrollment?.program.slug}/bounties`,
- );
+ ]);
setIsDraft(null);
if (!isDraftSave) {
setIsOpen(false);
diff --git a/apps/web/ui/partners/program-invite-actions.tsx b/apps/web/ui/partners/program-invite-actions.tsx
index af2e283484..54706db7f6 100644
--- a/apps/web/ui/partners/program-invite-actions.tsx
+++ b/apps/web/ui/partners/program-invite-actions.tsx
@@ -23,7 +23,11 @@ export function ProgramInviteActions({
const { executeAsync, isPending } = useAction(acceptProgramInviteAction, {
onSuccess: async () => {
- await mutatePrefix("/api/partner-profile/programs");
+ // an accepted invite adds the program's bounties to the All programs list
+ await mutatePrefix([
+ "/api/partner-profile/programs",
+ "/api/partner-profile/bounties",
+ ]);
toast.success("Program invite accepted!");
router.push(`/programs/${program.slug}`);
},