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.

Keep the earnings count grouped by program within the selected program

Rafi41d7d8ed5be5
diff --git a/apps/web/lib/api/partner-profile/get-partner-earnings-count.ts b/apps/web/lib/api/partner-profile/get-partner-earnings-count.ts
index cd29dffd7d..8ff08cc6b2 100644
--- a/apps/web/lib/api/partner-profile/get-partner-earnings-count.ts
+++ b/apps/web/lib/api/partner-profile/get-partner-earnings-count.ts
@@ -44,10 +44,7 @@ export async function getPartnerEarningsCount({
earnings: {
not: 0,
},
- // the program filter options list every program, like the other grouped filters
- programId: getEarningsProgramFilter(
- groupBy === "programId" ? undefined : programId,
- ),
+ programId: getEarningsProgramFilter(programId),
partnerId,
...(payoutId && { payoutId }),
createdAt: {
diff --git a/apps/web/playwright/api/partner-profile/earnings.spec.ts b/apps/web/playwright/api/partner-profile/earnings.spec.ts
index a0daeda893..13b220eb13 100644
--- a/apps/web/playwright/api/partner-profile/earnings.spec.ts
+++ b/apps/web/playwright/api/partner-profile/earnings.spec.ts
@@ -233,30 +233,43 @@ test.describe("GET /partner-profile/earnings", () => {
});
});
- test("counts earnings grouped by program, also when one program is selected", async ({
+ test("counts earnings grouped by program, within the selected program", async ({
playwright,
program,
}) => {
await withPartnerApi(playwright, async (partnerApi) => {
- for (const query of ["", `&programIdOrSlug=${programB.slug}`]) {
- const { status, data } = await partnerApi.get<
- { id: string; slug: string; _count: number }[]
- >(`/api/partner-profile/earnings/count?groupBy=programId${query}`);
+ const all = await partnerApi.get<
+ { id: string; slug: string; _count: number }[]
+ >("/api/partner-profile/earnings/count?groupBy=programId");
+
+ expect(all.status).toEqual(200);
+ expect(all.data).toEqual([
+ expect.objectContaining({
+ id: program.id,
+ slug: programSlug,
+ _count: 2,
+ }),
+ expect.objectContaining({
+ id: programB.id,
+ slug: programB.slug,
+ _count: 1,
+ }),
+ ]);
- expect(status).toEqual(200);
- expect(data).toEqual([
- expect.objectContaining({
- id: program.id,
- slug: programSlug,
- _count: 2,
- }),
- expect.objectContaining({
- id: programB.id,
- slug: programB.slug,
- _count: 1,
- }),
- ]);
- }
+ const selected = await partnerApi.get<
+ { id: string; slug: string; _count: number }[]
+ >(
+ `/api/partner-profile/earnings/count?groupBy=programId&programIdOrSlug=${programB.slug}`,
+ );
+
+ expect(selected.status).toEqual(200);
+ expect(selected.data).toEqual([
+ expect.objectContaining({
+ id: programB.id,
+ slug: programB.slug,
+ _count: 1,
+ }),
+ ]);
});
});
diff --git a/apps/web/ui/partners/earnings/earnings-composite-chart.tsx b/apps/web/ui/partners/earnings/earnings-composite-chart.tsx
index 9568c6ba84..06a7d59e68 100644
--- a/apps/web/ui/partners/earnings/earnings-composite-chart.tsx
+++ b/apps/web/ui/partners/earnings/earnings-composite-chart.tsx
@@ -330,6 +330,8 @@ function EarningsTableControls() {
{ id: string; name?: string; logo?: string | null; _count: number }[]
>({
...earningsFilters,
+ // the menu lists every program, also when one program is selected
+ programIdOrSlug: undefined,
groupBy: "programId",
enabled:
!programSlug &&