The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
improve admin commissions page
Steven Tey91c8f7fe6327
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/commissions-nav.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/commissions-nav.tsxnew file mode 100644index 0000000000..5542c99d95--- /dev/null+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/commissions-nav.tsx@@ -0,0 +1,32 @@+"use client";++import { PageNavTabs } from "@/ui/layout/page-nav-tabs";+import { GridIcon, Users } from "@dub/ui";++export function CommissionsNav() {+ return (+ <PageNavTabs+ basePath="/commissions"+ tabs={[+ {+ id: "programs",+ label: "Programs",+ icon: GridIcon,+ href: "/commissions",+ },+ {+ id: "partners",+ label: "Partners",+ icon: Users,+ },+ ]}+ preservedQueryParams={[+ "interval",+ "start",+ "end",+ "programId",+ "partnerId",+ ]}+ />+ );+}diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/layout.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/layout.tsxnew file mode 100644index 0000000000..199119530b--- /dev/null+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/layout.tsx@@ -0,0 +1,22 @@+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";+import { Suspense } from "react";+import { CommissionsNav } from "./commissions-nav";++export default function AdminCommissionsLayout({+ children,+}: {+ children: React.ReactNode;+}) {+ return (+ <PageWidthWrapper className="pb-12 pt-4">+ <div className="border-border-subtle overflow-hidden rounded-xl border bg-neutral-100">+ <Suspense>+ <CommissionsNav />+ <div className="border-border-subtle -mx-px -mb-px space-y-4 rounded-xl border bg-white p-4">+ {children}+ </div>+ </Suspense>+ </div>+ </PageWidthWrapper>+ );+}diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsxindex e59618b380..83e79a5d19 100644--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx@@ -3,9 +3,12 @@import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";import { adminCommissionsDataSchema } from "@/lib/zod/schemas/admin";import { AnalyticsLoadingSpinner } from "@/ui/analytics/analytics-loading-spinner";+import { PartnerAvatar } from "@/ui/partners/partner-avatar";+import { CountryFlag } from "@/ui/shared/country-flag";import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";import {+ CopyText,CrownSmall,Filter,Table,@@ -15,9 +18,10 @@ import {useTable,} from "@dub/ui";import { Areas, TimeSeriesChart, XAxis, YAxis } from "@dub/ui/charts";-import { GridIcon, Shop } from "@dub/ui/icons";+import { Globe, GridIcon, Shop, Users } from "@dub/ui/icons";import {cn,+ COUNTRIES,currencyFormatter,DUB_FOUNDING_DATE,fetcher,@@ -25,6 +29,7 @@ import {OG_AVATAR_URL,} from "@dub/utils";import NumberFlow from "@number-flow/react";+import { ColumnDef } from "@tanstack/react-table";import { Fragment, Suspense, useCallback, useMemo } from "react";import useSWR from "swr";import * as z from "zod/v4";@@ -38,15 +43,202 @@ export default function CommissionsPage() {}type AdminCommissionsData = z.infer<typeof adminCommissionsDataSchema>;+type ProgramCommission = NonNullable<AdminCommissionsData["programs"]>[number];+type PartnerCommission = NonNullable<AdminCommissionsData["partners"]>[number];++function positionColumn<T>(): ColumnDef<T, any> {+ return {+ id: "position",+ header: "Position",+ size: 12,+ minSize: 12,+ maxSize: 12,+ cell: ({ row }) => {+ return (+ <div className="flex w-28 items-center justify-start gap-2 tabular-nums">+ {row.index + 1}+ {row.index <= 2 && (+ <CrownSmall+ className={cn("size-4", {+ "text-amber-400": row.index === 0,+ "text-neutral-400": row.index === 1,+ "text-yellow-900": row.index === 2,+ })}+ />+ )}+ </div>+ );+ },+ };+}++const programColumns: ColumnDef<ProgramCommission, any>[] = [+ positionColumn<ProgramCommission>(),+ {+ id: "program",+ header: "Program",+ cell: ({ row }) => (+ <div className="flex items-center gap-1.5 text-sm font-medium">+ <img+ src={row.original.logo}+ alt={row.original.name}+ width={20}+ height={20}+ className="size-4 rounded-full"+ />+ <span className="text-sm font-medium">{row.original.name}</span>•+ <a+ className="text-sm font-medium text-neutral-500 transition-colors hover:text-neutral-800"+ href={row.original.url}+ target="_blank"+ rel="noopener noreferrer"+ >+ {getDomainWithoutWWW(row.original.url)}+ </a>+ {row.original.addedToMarketplaceAt && (+ <Tooltip+ content={+ <div className="max-w-[220px] px-3 py-2.5 text-center">+ <p className="text-sm font-medium text-neutral-900">+ Dub Marketplace+ </p>+ <p className="mt-1 text-xs leading-snug text-neutral-500">+ Listed since{" "}+ {new Intl.DateTimeFormat("en-US", {+ month: "short",+ day: "numeric",+ year: "numeric",+ }).format(new Date(row.original.addedToMarketplaceAt))}+ </p>+ <p className="mt-2 text-xs font-medium text-teal-700">+ Click to open listing ↗+ </p>+ </div>+ }+ >+ <a+ href={`https://partners.dub.co/marketplace/${row.original.slug}`}+ target="_blank"+ rel="noopener noreferrer"+ className={cn(+ "ml-1 inline-flex size-6 shrink-0 items-center justify-center rounded-md",+ "border border-teal-200/90 bg-gradient-to-br from-white to-teal-50/90",+ "text-teal-700 shadow-sm ring-1 ring-inset ring-white",+ "transition-[box-shadow,transform] duration-150 hover:shadow-md active:scale-[0.97]",+ "outline-none focus-visible:ring-2 focus-visible:ring-teal-400/35 focus-visible:ring-offset-2 focus-visible:ring-offset-white",+ )}+ aria-label={`View ${row.original.name} on Dub Marketplace (opens in new tab)`}+ >+ <Shop className="size-3.5 shrink-0" aria-hidden />+ </a>+ </Tooltip>+ )}+ </div>+ ),+ meta: {+ filterParams: ({ row }) => ({+ programId: row.original.id,+ }),+ },+ },+ {+ id: "commissions",+ header: "Commissions",+ accessorKey: "commissions",+ cell: ({ row }) => currencyFormatter(row.original.commissions),+ },+ {+ id: "fees",+ header: "Fees",+ accessorKey: "fees",+ cell: ({ row }) => currencyFormatter(row.original.fees),+ },+];++const partnerColumns: ColumnDef<PartnerCommission, any>[] = [+ positionColumn<PartnerCommission>(),+ {+ id: "partner",+ header: "Partner",+ cell: ({ row }) => (+ <div className="flex items-center gap-1.5 text-sm font-medium">+ <PartnerAvatar partner={row.original} className="size-4" />+ <span className="text-sm font-medium">{row.original.name}</span>+ {row.original.email && (+ <>+ •+ <CopyText+ value={row.original.email}+ successMessage="Copied email to clipboard!"+ className="text-sm font-medium text-neutral-500"+ >+ {row.original.email}+ </CopyText>+ </>+ )}+ </div>+ ),+ meta: {+ filterParams: ({ row }) => ({+ partnerId: row.original.id,+ }),+ },+ },+ {+ id: "country",+ header: "Country",+ minSize: 160,+ cell: ({ row }) => {+ const country = row.original.country;++ if (!country) {+ return (+ <div className="flex items-center gap-3">+ <Globe className="size-4 shrink-0" />+ <span className="text-sm text-neutral-900">Unknown</span>+ </div>+ );+ }++ return (+ <div+ className="flex items-center gap-3"+ title={COUNTRIES[country] ?? country}+ >+ <CountryFlag countryCode={country} />+ <span className="truncate text-sm text-neutral-900">+ {COUNTRIES[country] ?? country}+ </span>+ </div>+ );+ },+ },+ {+ id: "commissions",+ header: "Commissions",+ accessorKey: "commissions",+ cell: ({ row }) => currencyFormatter(row.original.commissions),+ },+ {+ id: "fees",+ header: "Fees",+ accessorKey: "fees",+ cell: ({ row }) => currencyFormatter(row.original.fees),+ },+];function CommissionsPageClient() {- const { queryParams, getQueryString, searchParamsObj } = useRouterStuff();- const { interval, start, end, programId } = searchParamsObj;+ const { queryParams, getQueryString, searchParamsObj, pathname } =+ useRouterStuff();+ const { interval, start, end, programId, partnerId } = searchParamsObj;+ const groupBy = pathname.endsWith("/partners") ? "partnerId" : "programId";+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;- const { data: { programs: allPrograms } = {} } = useSWR<AdminCommissionsData>(+ const { data: { programs: allPrograms } = {}, } = useSWR<AdminCommissionsData>(`/api/admin/commissions${getQueryString({- timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,+ timezone,+ groupBy: "programId",},{ exclude: ["programId"] },)}`,@@ -56,16 +248,35 @@ function CommissionsPageClient() {},);- const { data: { programs, timeseries } = {}, isLoading } =- useSWR<AdminCommissionsData>(- `/api/admin/commissions${getQueryString({- timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,- })}`,- fetcher,+ const { data: { partners: allPartners } = {} } = useSWR<AdminCommissionsData>(+ `/api/admin/commissions${getQueryString({- keepPreviousData: true,+ timezone,+ groupBy: "partnerId",},- );+ { exclude: ["partnerId"] },+ )}`,+ fetcher,+ {+ keepPreviousData: true,+ },+ );++ const {+ data: { programs, partners, timeseries } = {},+ isLoading,+ } = useSWR<AdminCommissionsData>(+ `/api/admin/commissions${getQueryString({+ timezone,+ groupBy,+ })}`,+ fetcher,+ {+ keepPreviousData: true,+ },+ );++ const ranking = groupBy === "partnerId" ? partners : programs;// Filter configurationconst filters = useMemo(@@ -88,13 +299,36 @@ function CommissionsPageClient() {right: currencyFormatter(program.commissions),})) ?? null,},+ {+ key: "partnerId",+ icon: Users,+ label: "Partner",+ options:+ allPartners?.map((partner) => ({+ value: partner.id,+ label: partner.email+ ? `${partner.name} · ${partner.email}`+ : partner.name,+ icon: (+ <img+ src={partner.image || `${OG_AVATAR_URL}${partner.name}`}+ alt={`${partner.name} image`}+ className="size-4 rounded-full"+ />+ ),+ right: currencyFormatter(partner.commissions),+ })) ?? null,+ },],- [programs],+ [allPrograms, allPartners],);const activeFilters = useMemo(() => {- return [...(programId ? [{ key: "programId", value: programId }] : [])];- }, [programId]);+ return [+ ...(programId ? [{ key: "programId", value: programId }] : []),+ ...(partnerId ? [{ key: "partnerId", value: partnerId }] : []),+ ];+ }, [programId, partnerId]);const onSelect = useCallback((key: string, value: any) =>@@ -118,7 +352,7 @@ function CommissionsPageClient() {const onRemoveAll = useCallback(() =>queryParams({- del: ["programId"],+ del: ["programId", "partnerId"],}),[queryParams],);@@ -160,140 +394,12 @@ function CommissionsPageClient() {(acc, { commissions }) => acc + (commissions || 0),0,) ?? 0,- fees: programs?.reduce((acc, { fees }) => acc + (fees || 0), 0) ?? 0,+ fees: ranking?.reduce((acc, { fees }) => acc + (fees || 0), 0) ?? 0,};- }, [timeseries, programs]);-- const { pagination, setPagination } = usePagination();-- const { table, ...tableProps } = useTable({- data: programs ?? [],- columns: [- {- id: "position",- header: "Position",- size: 12,- minSize: 12,- maxSize: 12,- cell: ({ row }) => {- return (- <div className="flex w-28 items-center justify-start gap-2 tabular-nums">- {row.index + 1}- {row.index <= 2 && (- <CrownSmall- className={cn("size-4", {- "text-amber-400": row.index === 0,- "text-neutral-400": row.index === 1,- "text-yellow-900": row.index === 2,- })}- />- )}- </div>- );- },- },- {- id: "program",- header: "Program",- cell: ({ row }) => (- <div className="flex items-center gap-1.5 text-sm font-medium">- <img- src={row.original.logo}- alt={row.original.name}- width={20}- height={20}- className="size-4 rounded-full"- />- <span className="text-sm font-medium">{row.original.name}</span>•- <a- className="text-sm font-medium text-neutral-500 transition-colors hover:text-neutral-800"- href={row.original.url}- target="_blank"- rel="noopener noreferrer"- >- {getDomainWithoutWWW(row.original.url)}- </a>- {row.original.addedToMarketplaceAt && (- <Tooltip- content={- <div className="max-w-[220px] px-3 py-2.5 text-center">- <p className="text-sm font-medium text-neutral-900">- Dub Marketplace- </p>- <p className="mt-1 text-xs leading-snug text-neutral-500">- Listed since{" "}- {new Intl.DateTimeFormat("en-US", {- month: "short",- day: "numeric",- year: "numeric",- }).format(new Date(row.original.addedToMarketplaceAt))}- </p>- <p className="mt-2 text-xs font-medium text-teal-700">- Click to open listing ↗- </p>- </div>- }- >- <a- href={`https://partners.dub.co/marketplace/${row.original.slug}`}- target="_blank"- rel="noopener noreferrer"- className={cn(- "ml-1 inline-flex size-6 shrink-0 items-center justify-center rounded-md",- "border border-teal-200/90 bg-gradient-to-br from-white to-teal-50/90",- "text-teal-700 shadow-sm ring-1 ring-inset ring-white",- "transition-[box-shadow,transform] duration-150 hover:shadow-md active:scale-[0.97]",- "outline-none focus-visible:ring-2 focus-visible:ring-teal-400/35 focus-visible:ring-offset-2 focus-visible:ring-offset-white",- )}- aria-label={`View ${row.original.name} on Dub Marketplace (opens in new tab)`}- >- <Shop className="size-3.5 shrink-0" aria-hidden />- </a>- </Tooltip>- )}- </div>- ),- meta: {- filterParams: ({ row }) => ({- programId: row.original.id,- }),- },- },- {- id: "commissions",- header: "Commissions",- accessorKey: "commissions",- cell: ({ row }) => currencyFormatter(row.original.commissions),- },- {- id: "fees",- header: "Fees",- accessorKey: "fees",- cell: ({ row }) => currencyFormatter(row.original.fees),- },- ],- pagination,- onPaginationChange: setPagination,- resourceName: (plural) => `program${plural ? "s" : ""}`,- rowCount: programs?.length ?? 0,- loading: isLoading,- cellRight: (cell) => {- const meta = cell.column.columnDef.meta as- | {- filterParams?: any;- }- | undefined;-- return (- meta?.filterParams && (- <FilterButtonTableRow set={meta.filterParams(cell)} />- )- );- },- });+ }, [timeseries, ranking]);return (- <div className="mx-auto grid w-full min-w-0 max-w-screen-xl gap-3 overflow-x-hidden p-3 lg:px-10">+ <div className="grid w-full min-w-0 gap-3 overflow-x-hidden"><div className="flex min-w-0 flex-col gap-3 md:flex-row md:items-center"><Filter.SelectclassName="w-full md:w-fit"@@ -329,7 +435,7 @@ function CommissionsPageClient() {});}}className={cn(- "border-box relative block h-full min-w-0 w-full flex-none overflow-hidden px-4 py-3 sm:px-8 sm:py-6",+ "border-box relative block h-full w-full min-w-0 flex-none overflow-hidden px-4 py-3 sm:px-8 sm:py-6","ring-inset ring-neutral-500 focus-visible:ring-1 sm:first:rounded-tl-xl",disabled? "cursor-not-allowed"@@ -374,7 +480,7 @@ function CommissionsPageClient() {</div><div className="min-w-0 overflow-hidden p-5 sm:p-10"><div className="flex h-96 w-full min-w-0 items-center justify-center">- {chartData ? (+ {chartData && !isLoading ? (chartData.length > 0 ? (<TimeSeriesChartdata={chartData}@@ -450,9 +556,64 @@ function CommissionsPageClient() {</div></div></div>- <div className="w-full min-w-0 overflow-x-auto">- <Table {...tableProps} table={table} />- </div>+ {groupBy === "partnerId" ? (+ <CommissionsRankingsTable+ data={partners ?? []}+ columns={partnerColumns}+ loading={isLoading}+ resourceName={(plural) => `partner${plural ? "s" : ""}`}+ />+ ) : (+ <CommissionsRankingsTable+ data={programs ?? []}+ columns={programColumns}+ loading={isLoading}+ resourceName={(plural) => `program${plural ? "s" : ""}`}+ />+ )}+ </div>+ );+}++function CommissionsRankingsTable<T>({+ data,+ columns,+ loading,+ resourceName,+}: {+ data: T[];+ columns: ColumnDef<T, any>[];+ loading: boolean;+ resourceName: (plural: boolean) => string;+}) {+ const { pagination, setPagination } = usePagination();++ const { table, ...tableProps } = useTable({+ data,+ columns,+ pagination,+ onPaginationChange: setPagination,+ resourceName,+ rowCount: data.length,+ loading,+ cellRight: (cell) => {+ const meta = cell.column.columnDef.meta as+ | {+ filterParams?: any;+ }+ | undefined;++ return (+ meta?.filterParams && (+ <FilterButtonTableRow set={meta.filterParams(cell)} />+ )+ );+ },+ });++ return (+ <div className="w-full min-w-0 overflow-x-auto">+ <Table {...tableProps} table={table} /></div>);}diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/partners/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/partners/page.tsxnew file mode 100644index 0000000000..bee8ff3025--- /dev/null+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/partners/page.tsx@@ -0,0 +1 @@+export { default } from "../page";diff --git a/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts b/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.tsindex 9e1678f257..638b6fa3e8 100644--- a/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts+++ b/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts@@ -11,12 +11,14 @@ interface Commission {export async function getCommissionsTimeseries({programId,+ partnerId,startDate,endDate,granularity,timezone,}: {programId?: string;+ partnerId?: string;startDate: Date;endDate: Date;granularity: string;@@ -38,6 +40,7 @@ export async function getCommissionsTimeseries({SELECT id FROM Program WHERE environment = ${WorkspaceEnvironment.production})${programId ? Prisma.sql`AND programId = ${programId}` : Prisma.sql``}+ ${partnerId ? Prisma.sql`AND partnerId = ${partnerId}` : Prisma.sql``}GROUP BY startORDER BY start ASC;`;diff --git a/apps/web/app/(ee)/api/admin/commissions/get-top-partners-by-commissions.ts b/apps/web/app/(ee)/api/admin/commissions/get-top-partners-by-commissions.tsnew file mode 100644index 0000000000..3fe48cc6ce--- /dev/null+++ b/apps/web/app/(ee)/api/admin/commissions/get-top-partners-by-commissions.ts@@ -0,0 +1,79 @@+import { prisma } from "@/lib/prisma";++/** Average payout fee used when program-level fee rates aren't available. */+const AVERAGE_PARTNER_PAYOUT_FEE = 0.03;++export async function getTopPartnersByCommissions({+ programId,+ partnerId,+ startDate,+ endDate,+}: {+ programId?: string;+ partnerId?: string;+ startDate: Date;+ endDate: Date;+}) {+ const partnerCommissions = await prisma.commission.groupBy({+ by: ["partnerId"],+ _sum: {+ earnings: true,+ },+ where: {+ createdAt: {+ gte: startDate,+ lte: endDate,+ },+ status: {+ in: ["pending", "processed", "paid"],+ },+ program: {+ environment: "production",+ },+ ...(programId ? { programId } : {}),+ ...(partnerId ? { partnerId } : {}),+ },+ orderBy: {+ _sum: {+ earnings: "desc",+ },+ },+ take: 150,+ });++ const partners = await prisma.partner.findMany({+ where: {+ id: {+ in: partnerCommissions.map(({ partnerId }) => partnerId),+ },+ },+ select: {+ id: true,+ name: true,+ email: true,+ image: true,+ country: true,+ },+ });++ const partnerById = Object.fromEntries(+ partners.map((partner) => [partner.id, partner]),+ );++ return partnerCommissions+ .flatMap(({ partnerId, _sum }) => {+ const partner = partnerById[partnerId];+ if (!partner) return [];++ const commissions = _sum.earnings || 0;++ return [+ {+ ...partner,+ commissions,+ fees: Math.round(commissions * AVERAGE_PARTNER_PAYOUT_FEE),+ },+ ];+ })+ .slice(0, 100);+}diff --git a/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts b/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.tsindex 9df283950c..45b18ca315 100644--- a/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts+++ b/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts@@ -2,10 +2,12 @@ import { prisma } from "@/lib/prisma";export async function getTopProgramsByCommissions({programId,+ partnerId,startDate,endDate,}: {programId?: string;+ partnerId?: string;startDate: Date;endDate: Date;}) {@@ -26,6 +28,7 @@ export async function getTopProgramsByCommissions({environment: "production",},...(programId ? { programId } : {}),+ ...(partnerId ? { partnerId } : {}),},orderBy: {_sum: {diff --git a/apps/web/app/(ee)/api/admin/commissions/route.ts b/apps/web/app/(ee)/api/admin/commissions/route.tsindex df5fea83c1..2dea25b56f 100644--- a/apps/web/app/(ee)/api/admin/commissions/route.ts+++ b/apps/web/app/(ee)/api/admin/commissions/route.ts@@ -7,11 +7,14 @@ import { endOfDay, startOfDay } from "date-fns";import { NextResponse } from "next/server";import * as z from "zod/v4";import { getCommissionsTimeseries } from "./get-commissions-timeseries";+import { getTopPartnersByCommissions } from "./get-top-partners-by-commissions";import { getTopProgramsByCommissions } from "./get-top-program-by-commissions";const adminCommissionsQuerySchema = z.object({programId: z.string().optional(),+ partnerId: z.string().optional(),+ groupBy: z.enum(["programId", "partnerId"]).optional().default("programId"),timezone: z.string().optional().default("UTC"),}).extend(@@ -21,6 +24,8 @@ const adminCommissionsQuerySchema = zexport const GET = withAdmin(async ({ searchParams }) => {const {programId,+ partnerId,+ groupBy,interval = "mtd",start,end,@@ -35,12 +40,30 @@ export const GET = withAdmin(async ({ searchParams }) => {timezone,});+ const filters = { programId, partnerId, startDate, endDate };++ if (groupBy === "partnerId") {+ const [partners, timeseries] = await Promise.all([+ getTopPartnersByCommissions(filters),+ getCommissionsTimeseries({+ ...filters,+ granularity,+ timezone,+ }),+ ]);++ return NextResponse.json(+ adminCommissionsDataSchema.parse({+ partners,+ timeseries,+ }),+ );+ }+const [programs, timeseries] = await Promise.all([- getTopProgramsByCommissions({ programId, startDate, endDate }),+ getTopProgramsByCommissions(filters),getCommissionsTimeseries({- programId,- startDate,- endDate,+ ...filters,granularity,timezone,}),diff --git a/apps/web/lib/zod/schemas/admin.ts b/apps/web/lib/zod/schemas/admin.tsindex f71c3e6dd1..cb6594e633 100644--- a/apps/web/lib/zod/schemas/admin.ts+++ b/apps/web/lib/zod/schemas/admin.ts@@ -15,25 +15,42 @@ import { ProgramSchema } from "./programs";import { UserSchema } from "./users";import { centsSchema, parseDateSchema } from "./utils";+const adminCommissionsTimeseriesSchema = z.array(+ z.object({+ start: parseDateSchema,+ commissions: z.number(),+ }),+);+export const adminCommissionsDataSchema = z.object({- programs: z.array(- z.object({- id: z.string(),- slug: z.string(),- name: z.string(),- url: z.string(),- logo: z.string(),- addedToMarketplaceAt: z.date().nullable(),- commissions: z.number(),- fees: z.number(),- }),- ),- timeseries: z.array(- z.object({- start: parseDateSchema,- commissions: z.number(),- }),- ),+ programs: z+ .array(+ z.object({+ id: z.string(),+ slug: z.string(),+ name: z.string(),+ url: z.string(),+ logo: z.string(),+ addedToMarketplaceAt: z.date().nullable(),+ commissions: z.number(),+ fees: z.number(),+ }),+ )+ .optional(),+ partners: z+ .array(+ z.object({+ id: z.string(),+ name: z.string(),+ email: z.string().nullable(),+ image: z.string().nullable(),+ country: z.string().nullable(),+ commissions: z.number(),+ fees: z.number(),+ }),+ )+ .optional(),+ timeseries: adminCommissionsTimeseriesSchema,});export const adminNetworkPartnerSchema = EnrolledPartnerSchemaExtended.pick({diff --git a/apps/web/scripts/partners/export-partners.ts b/apps/web/scripts/partners/export-partners.tsindex eab66b8696..fe88e0ad4d 100644--- a/apps/web/scripts/partners/export-partners.ts+++ b/apps/web/scripts/partners/export-partners.ts@@ -1,5 +1,6 @@import { prisma } from "@/lib/prisma";import { PlatformType } from "@prisma/client";+import { subDays } from "date-fns";import "dotenv-flow/config";import * as fs from "fs";import * as Papa from "papaparse";@@ -34,6 +35,72 @@ async function main() {},});+ const partnerIds = partners.map((partner) => partner.id);++ if (partnerIds.length === 0) {+ console.log("Exporting 0 partners");+ fs.writeFileSync("dub_network_partners.csv", Papa.unparse([]));+ return;+ }++ const [l90dCommissions, enrollments] = await Promise.all([+ prisma.commission.groupBy({+ by: ["partnerId"],+ where: {+ partnerId: {+ in: partnerIds,+ },+ status: {+ in: ["pending", "processed", "paid"],+ },+ createdAt: {+ gte: subDays(new Date(), 90),+ },+ },+ _sum: {+ earnings: true,+ },+ }),+ prisma.programEnrollment.findMany({+ where: {+ partnerId: {+ in: partnerIds,+ },+ status: "approved",+ },+ select: {+ partnerId: true,+ program: {+ select: {+ categories: {+ select: {+ category: true,+ },+ },+ },+ },+ },+ }),+ ]);++ const l90dCommissionsByPartnerId = new Map(+ l90dCommissions.map(({ partnerId, _sum }) => [+ partnerId,+ _sum.earnings ?? 0,+ ]),+ );++ const categoriesByPartnerId = enrollments.reduce((map, enrollment) => {+ const categories = map.get(enrollment.partnerId) ?? new Set<string>();++ for (const { category } of enrollment.program.categories) {+ categories.add(category);+ }++ map.set(enrollment.partnerId, categories);+ return map;+ }, new Map<string, Set<string>>());+const rows = partners.map(({id,@@ -57,6 +124,10 @@ async function main() {companyName,profileType,networkStatus,+ l90dCommissions: l90dCommissionsByPartnerId.get(id) ?? 0,+ categories: [...(categoriesByPartnerId.get(id) ?? [])]+ .sort()+ .join(","),...Object.fromEntries(platformTypes.flatMap((type) => {const platform = platformsByType[type];