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.

Show deactivated program names in the Overview chart tooltip

Rafie3c34a48c692
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 d2ff922f1e..e76562cee7 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
@@ -19,6 +19,7 @@ import { useRouter } from "next/navigation";
import { useId, useMemo } from "react";
import { ProgramLogo } from "./overview-card";
import { useOverviewDateRange } from "./use-overview-date-range";
+import { useTopProgramEarnings } from "./use-top-program-earnings";
const MAX_TOOLTIP_PROGRAMS = 5;
@@ -35,13 +36,19 @@ export function EarningsChart() {
});
const { programEnrollments } = useProgramEnrollments();
+ const { data: topPrograms } = useTopProgramEarnings();
+ // the enrollments list skips deactivated programs, but their earnings are still in the chart
const programs = useMemo(
() =>
- new Map(
- programEnrollments?.map(({ program }) => [program.id, program]) ?? [],
- ),
- [programEnrollments],
+ new Map<string, { name: string; logo: string | null }>([
+ ...(programEnrollments?.map(
+ ({ program }) => [program.id, program] as const,
+ ) ?? []),
+ ...(topPrograms?.map((program) => [program.id, program] as const) ??
+ []),
+ ]),
+ [programEnrollments, topPrograms],
);
const total = useMemo(
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/top-programs-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/top-programs-card.tsx
index 52fc323637..88ef81a53d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/top-programs-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/top-programs-card.tsx
@@ -1,6 +1,5 @@
"use client";
-import { usePartnerProfileTopEarnings } from "@/lib/swr/use-partner-profile-top-earnings";
import { GridIcon } from "@dub/ui/icons";
import { cn, currencyFormatter } from "@dub/utils";
import Link from "next/link";
@@ -10,18 +9,13 @@ import {
OverviewCardList,
ProgramLogo,
} from "./overview-card";
-import { useOverviewDateRange } from "./use-overview-date-range";
+import { useTopProgramEarnings } from "./use-top-program-earnings";
-export function TopProgramsCard() {
- const { start, end, interval } = useOverviewDateRange();
+const ROW_COUNT = 6;
- const { data: programs, error } = usePartnerProfileTopEarnings({
- groupBy: "programId",
- limit: 6,
- interval,
- start,
- end,
- });
+export function TopProgramsCard() {
+ const { data, error } = useTopProgramEarnings();
+ const programs = data?.slice(0, ROW_COUNT);
return (
<OverviewCard
@@ -31,7 +25,7 @@ export function TopProgramsCard() {
>
<OverviewCardList
items={programs}
- rowCount={6}
+ rowCount={ROW_COUNT}
error={error}
getKey={(program) => program.id}
emptyState={{
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
new file mode 100644
index 0000000000..9a542b65de
--- /dev/null
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/overview/use-top-program-earnings.ts
@@ -0,0 +1,15 @@
+import { usePartnerProfileTopEarnings } from "@/lib/swr/use-partner-profile-top-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();
+
+ return usePartnerProfileTopEarnings({
+ groupBy: "programId",
+ limit: 100,
+ interval,
+ start,
+ end,
+ });
+}