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.

Program Analytics Commissions (#3803)

Pedro Ladeira534b2d75e070
diff --git a/apps/web/app/(ee)/api/commissions/breakdown/route.ts b/apps/web/app/(ee)/api/commissions/breakdown/route.ts
new file mode 100644
index 0000000000..d84c69c232
--- /dev/null
+++ b/apps/web/app/(ee)/api/commissions/breakdown/route.ts
@@ -0,0 +1,181 @@
+import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
+import { withWorkspace } from "@/lib/auth";
+import type { CommissionsBreakdownItem } from "@/lib/swr/use-commissions-breakdown";
+import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { prisma } from "@dub/prisma";
+import { CommissionStatus, CommissionType } from "@dub/prisma/client";
+import { capitalize, parseFilterValue } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+const querySchema = analyticsQuerySchema
+ .pick({ start: true, end: true, interval: true, timezone: true })
+ .extend({
+ groupBy: z.enum(["type", "groupId"]),
+ status: z.enum(CommissionStatus).optional(),
+ partnerId: z.string().optional(),
+ groupId: z.string().optional(),
+ type: z.string().optional(),
+ });
+
+// GET /api/commissions/breakdown
+export const GET = withWorkspace(async ({ workspace, searchParams }) => {
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ const {
+ start,
+ end,
+ interval,
+ timezone,
+ groupBy,
+ status,
+ partnerId,
+ groupId,
+ type,
+ } = querySchema.parse(searchParams);
+
+ assertValidDateRangeForPlan({
+ plan: workspace.plan,
+ dataAvailableFrom: workspace.createdAt,
+ interval,
+ start,
+ end,
+ });
+
+ const { startDate, endDate } = getStartEndDates({
+ interval,
+ start,
+ end,
+ timezone,
+ });
+
+ const partnerFilter = parseFilterValue(partnerId);
+ const groupFilter = parseFilterValue(groupId);
+
+ const rawTypeFilter = parseFilterValue(type);
+ const validCommissionTypes = new Set(Object.values(CommissionType));
+
+ const validTypeValues = rawTypeFilter
+ ? (rawTypeFilter.values.filter((v) =>
+ validCommissionTypes.has(v as CommissionType),
+ ) as CommissionType[])
+ : [];
+
+ if (
+ rawTypeFilter?.sqlOperator === "IN" &&
+ rawTypeFilter.values.length > 0 &&
+ validTypeValues.length === 0
+ ) {
+ return NextResponse.json([]);
+ }
+
+ const typeFilter =
+ rawTypeFilter && validTypeValues.length > 0
+ ? { ...rawTypeFilter, values: validTypeValues }
+ : null;
+
+ const baseWhere = {
+ programId,
+ createdAt: { gte: startDate, lt: endDate },
+ status: status
+ ? status
+ : {
+ notIn: [
+ CommissionStatus.duplicate,
+ CommissionStatus.fraud,
+ CommissionStatus.canceled,
+ ],
+ },
+ ...(partnerFilter && {
+ partnerId:
+ partnerFilter.sqlOperator === "NOT IN"
+ ? { notIn: partnerFilter.values }
+ : { in: partnerFilter.values },
+ }),
+ ...(typeFilter && {
+ type:
+ typeFilter.sqlOperator === "NOT IN"
+ ? { notIn: typeFilter.values }
+ : { in: typeFilter.values },
+ }),
+ ...(groupFilter && {
+ programEnrollment: {
+ groupId:
+ groupFilter.sqlOperator === "NOT IN"
+ ? { notIn: groupFilter.values }
+ : { in: groupFilter.values },
+ },
+ }),
+ };
+
+ let result: CommissionsBreakdownItem[] = [];
+
+ if (groupBy === "type") {
+ const rows = await prisma.commission.groupBy({
+ by: ["type"],
+ where: baseWhere,
+ _sum: { earnings: true },
+ _count: { _all: true },
+ orderBy: { _sum: { earnings: "desc" } },
+ });
+
+ result = rows
+ .filter((r) => r.type !== null)
+ .map((r) => ({
+ key: r.type!,
+ label: capitalize(r.type!) ?? r.type!,
+ earnings: r._sum.earnings ?? 0,
+ count: r._count._all,
+ }));
+ } else if (groupBy === "groupId") {
+ const partnerEarnings = await prisma.commission.groupBy({
+ by: ["partnerId"],
+ where: baseWhere,
+ _sum: { earnings: true },
+ _count: { _all: true },
+ orderBy: { _sum: { earnings: "desc" } },
+ });
+
+ if (partnerEarnings.length > 0) {
+ const partnerIds = partnerEarnings.map((p) => p.partnerId);
+
+ const enrollments = await prisma.programEnrollment.findMany({
+ where: { programId, partnerId: { in: partnerIds } },
+ select: {
+ partnerId: true,
+ groupId: true,
+ partnerGroup: { select: { name: true } },
+ },
+ });
+
+ const enrollmentMap = new Map(enrollments.map((e) => [e.partnerId, e]));
+
+ const groupMap = new Map<
+ string,
+ { label: string; earnings: number; count: number }
+ >();
+ for (const p of partnerEarnings) {
+ const enrollment = enrollmentMap.get(p.partnerId);
+ const key = enrollment?.groupId ?? "ungrouped";
+ const label = enrollment?.partnerGroup?.name ?? "Ungrouped";
+ const entry = groupMap.get(key) ?? { label, earnings: 0, count: 0 };
+ entry.earnings += p._sum.earnings ?? 0;
+ entry.count += p._count._all;
+ groupMap.set(key, entry);
+ }
+
+ result = Array.from(groupMap.entries())
+ .map(([key, { label, earnings, count }]) => ({
+ key,
+ label,
+ earnings,
+ count,
+ }))
+ .sort((a, b) => b.earnings - a.earnings);
+ }
+ }
+
+ return NextResponse.json(result);
+});
diff --git a/apps/web/app/(ee)/api/commissions/timeseries/route.ts b/apps/web/app/(ee)/api/commissions/timeseries/route.ts
index bdab0470c6..6419f6f841 100644
--- a/apps/web/app/(ee)/api/commissions/timeseries/route.ts
+++ b/apps/web/app/(ee)/api/commissions/timeseries/route.ts
@@ -5,33 +5,39 @@ import { withWorkspace } from "@/lib/auth";
import { sqlGranularityMap } from "@/lib/planetscale/granularity";
import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
import { prisma } from "@dub/prisma";
+import { CommissionStatus, Prisma } from "@dub/prisma/client";
+import { parseFilterValue } from "@dub/utils";
import { format } from "date-fns";
import { NextResponse } from "next/server";
+import * as z from "zod/v4";
-const querySchema = analyticsQuerySchema.pick({
- start: true,
- end: true,
- interval: true,
- timezone: true,
-});
+const querySchema = analyticsQuerySchema
+ .pick({ start: true, end: true, interval: true, timezone: true })
+ .extend({
+ status: z.enum(CommissionStatus).optional(),
+ partnerId: z.string().optional(),
+ groupId: z.string().optional(),
+ type: z.string().optional(),
+ });
-interface Commission {
+interface CommissionTimeseriesRow {
start: string;
- earnings: number;
+ earnings: bigint | number;
+ count: bigint | number;
}
// GET /api/commissions/timeseries - get commissions timeseries for a program
export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const programId = getDefaultProgramIdOrThrow(workspace);
- const { start, end, interval, timezone } = querySchema.parse(searchParams);
+ const { start, end, interval, timezone, status, partnerId, groupId, type } =
+ querySchema.parse(searchParams);
const { startDate, endDate, granularity } = getStartEndDates({
interval,
start,
end,
dataAvailableFrom:
- // ideally we should get the first commission event date for dataAvailableFrom
interval === "all"
? await getProgramOrThrow({
workspaceId: workspace.id,
@@ -44,44 +50,89 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const { dateFormat, dateIncrement, startFunction, formatString } =
sqlGranularityMap[granularity];
+ const partnerFilter = parseFilterValue(partnerId);
+ const typeFilter = parseFilterValue(type);
+
+ const conditions: Prisma.Sql[] = [
+ Prisma.sql`c.programId = ${programId}`,
+ Prisma.sql`c.createdAt >= ${startDate}`,
+ Prisma.sql`c.createdAt < ${endDate}`,
+ status
+ ? Prisma.sql`c.status = ${status}`
+ : Prisma.sql`c.status NOT IN (${Prisma.join([
+ CommissionStatus.duplicate,
+ CommissionStatus.fraud,
+ CommissionStatus.canceled,
+ ])})`,
+ ];
+
+ if (partnerFilter) {
+ const list = Prisma.join(partnerFilter.values.map((v) => Prisma.sql`${v}`));
+ conditions.push(
+ partnerFilter.sqlOperator === "NOT IN"
+ ? Prisma.sql`c.partnerId NOT IN (${list})`
+ : Prisma.sql`c.partnerId IN (${list})`,
+ );
+ }
+
+ if (typeFilter) {
+ const list = Prisma.join(typeFilter.values.map((v) => Prisma.sql`${v}`));
+ conditions.push(
+ typeFilter.sqlOperator === "NOT IN"
+ ? Prisma.sql`c.type NOT IN (${list})`
+ : Prisma.sql`c.type IN (${list})`,
+ );
+ }
+ if (groupId) {
+ const groupFilter = parseFilterValue(groupId);
+ if (groupFilter) {
+ const list = Prisma.join(groupFilter.values.map((v) => Prisma.sql`${v}`));
+ const op =
+ groupFilter.sqlOperator === "NOT IN"
+ ? Prisma.sql`NOT IN`
+ : Prisma.sql`IN`;
+ conditions.push(Prisma.sql`EXISTS (
+ SELECT 1 FROM ProgramEnrollment pe
+ WHERE pe.programId = c.programId
+ AND pe.partnerId = c.partnerId
+ AND pe.groupId ${op} (${list})
+ )`);
+ }
+ }
+
+ const whereClause = Prisma.join(conditions, " AND ");
+
console.time("getCommissionsTimeseries");
- const commissions = await prisma.$queryRaw<Commission[]>`
- SELECT
- DATE_FORMAT(CONVERT_TZ(createdAt, "UTC", ${timezone || "UTC"}), ${dateFormat}) AS start,
- SUM(earnings) AS earnings
- FROM Commission
- WHERE
- programId = ${programId}
- AND createdAt >= ${startDate}
- AND createdAt < ${endDate}
- AND status IN ("pending", "processed", "paid")
+ const rows = await prisma.$queryRaw<CommissionTimeseriesRow[]>(
+ Prisma.sql`
+ SELECT
+ DATE_FORMAT(CONVERT_TZ(c.createdAt, "UTC", ${timezone || "UTC"}), ${dateFormat}) AS start,
+ SUM(c.earnings) AS earnings,
+ COUNT(c.id) AS count
+ FROM Commission c
+ WHERE ${whereClause}
GROUP BY start
- ORDER BY start ASC;`;
+ ORDER BY start ASC`,
+ );
console.timeEnd("getCommissionsTimeseries");
let currentDate = startFunction(startDate);
const earningsLookup = Object.fromEntries(
- commissions.map((item) => [
+ rows.map((item) => [
item.start,
- {
- earnings: Number(item.earnings),
- },
+ { earnings: Number(item.earnings), count: Number(item.count) },
]),
);
- const timeseries: Commission[] = [];
+ const timeseries: { start: string; earnings: number; count: number }[] = [];
while (currentDate < endDate) {
const periodKey = format(currentDate, formatString);
-
timeseries.push({
start: currentDate.toISOString(),
- ...(earningsLookup[periodKey] || {
- earnings: 0,
- }),
+ ...(earningsLookup[periodKey] ?? { earnings: 0, count: 0 }),
});
-
currentDate = dateIncrement(currentDate);
}
diff --git a/apps/web/app/(ee)/api/commissions/top-partners/route.ts b/apps/web/app/(ee)/api/commissions/top-partners/route.ts
new file mode 100644
index 0000000000..3453ebb2c9
--- /dev/null
+++ b/apps/web/app/(ee)/api/commissions/top-partners/route.ts
@@ -0,0 +1,137 @@
+import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
+import { withWorkspace } from "@/lib/auth";
+import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
+import { prisma } from "@dub/prisma";
+import { CommissionStatus, CommissionType } from "@dub/prisma/client";
+import { parseFilterValue } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+const querySchema = analyticsQuerySchema
+ .pick({ start: true, end: true, interval: true, timezone: true })
+ .extend({
+ status: z.enum(CommissionStatus).optional(),
+ partnerId: z.string().optional(),
+ groupId: z.string().optional(),
+ type: z.string().optional(),
+ });
+
+// GET /api/commissions/top-partners
+export const GET = withWorkspace(async ({ workspace, searchParams }) => {
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ const { start, end, interval, timezone, status, partnerId, groupId, type } =
+ querySchema.parse(searchParams);
+
+ assertValidDateRangeForPlan({
+ plan: workspace.plan,
+ dataAvailableFrom: workspace.createdAt,
+ interval,
+ start,
+ end,
+ });
+
+ const { startDate, endDate } = getStartEndDates({
+ interval,
+ start,
+ end,
+ timezone,
+ });
+
+ const partnerFilter = parseFilterValue(partnerId);
+ const groupFilter = parseFilterValue(groupId);
+
+ const rawTypeFilter = parseFilterValue(type);
+ const validCommissionTypes = new Set(Object.values(CommissionType));
+
+ const validTypeValues = rawTypeFilter
+ ? (rawTypeFilter.values.filter((v) =>
+ validCommissionTypes.has(v as CommissionType),
+ ) as CommissionType[])
+ : [];
+
+ if (
+ rawTypeFilter?.sqlOperator === "IN" &&
+ rawTypeFilter.values.length > 0 &&
+ validTypeValues.length === 0
+ ) {
+ return NextResponse.json([]);
+ }
+
+ const typeFilter =
+ rawTypeFilter && validTypeValues.length > 0
+ ? { ...rawTypeFilter, values: validTypeValues }
+ : null;
+
+ const grouped = await prisma.commission.groupBy({
+ by: ["partnerId"],
+ where: {
+ programId,
+ createdAt: { gte: startDate, lt: endDate },
+ status: status
+ ? status
+ : {
+ notIn: [
+ CommissionStatus.duplicate,
+ CommissionStatus.fraud,
+ CommissionStatus.canceled,
+ ],
+ },
+ ...(partnerFilter && {
+ partnerId:
+ partnerFilter.sqlOperator === "NOT IN"
+ ? { notIn: partnerFilter.values }
+ : { in: partnerFilter.values },
+ }),
+ ...(typeFilter && {
+ type:
+ typeFilter.sqlOperator === "NOT IN"
+ ? { notIn: typeFilter.values }
+ : { in: typeFilter.values },
+ }),
+ ...(groupFilter && {
+ programEnrollment: {
+ groupId:
+ groupFilter.sqlOperator === "NOT IN"
+ ? { notIn: groupFilter.values }
+ : { in: groupFilter.values },
+ },
+ }),
+ },
+ _sum: { earnings: true },
+ _count: { _all: true },
+ orderBy: { _sum: { earnings: "desc" } },
+ take: 100,
+ });
+
+ if (grouped.length === 0) return NextResponse.json([]);
+
+ const partnerIds = grouped.map((g) => g.partnerId);
+
+ const partners = await prisma.partner.findMany({
+ where: { id: { in: partnerIds } },
+ select: { id: true, name: true, image: true, country: true },
+ });
+
+ const partnerMap = new Map(partners.map((p) => [p.id, p]));
+
+ const result = grouped.flatMap((g) => {
+ const partner = partnerMap.get(g.partnerId);
+ if (!partner) return [];
+
+ return [
+ {
+ partnerId: g.partnerId,
+ name: partner.name,
+ image: partner.image ?? null,
+ country: partner.country ?? null,
+ earnings: g._sum.earnings ?? 0,
+ commissionCount: g._count._all,
+ },
+ ];
+ });
+
+ return NextResponse.json(result);
+});
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/[tab]/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/[tab]/page.tsx
new file mode 100644
index 0000000000..bee8ff3025
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/[tab]/page.tsx
@@ -0,0 +1 @@
+export { default } from "../page";
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/analytics-timeseries-chart.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/analytics-timeseries-chart.tsx
index a724fa5f87..ec1b4b3896 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/analytics-timeseries-chart.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/analytics-timeseries-chart.tsx
@@ -1,15 +1,14 @@
import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
-import {
- Areas,
- ChartContext,
- TimeSeriesChart,
- XAxis,
- YAxis,
-} from "@dub/ui/charts";
-import { capitalize, currencyFormatter, nFormatter } from "@dub/utils";
-import { LinearGradient } from "@visx/gradient";
-import { useContext, useId } from "react";
+import { Areas, TimeSeriesChart, XAxis, YAxis } from "@dub/ui/charts";
+import { capitalize, cn, currencyFormatter, nFormatter } from "@dub/utils";
+import { useContext } from "react";
+
+const TAB_COLOR: Record<string, string> = {
+ clicks: "text-blue-500",
+ leads: "text-violet-600",
+ sales: "text-teal-400",
+};
export function AnalyticsTimeseriesChart({
data,
@@ -21,11 +20,11 @@ export function AnalyticsTimeseriesChart({
};
}[];
}) {
- const id = useId();
-
const { start, end, interval, selectedTab, saleUnit } =
useContext(AnalyticsContext);
+ const colorClassName = TAB_COLOR[selectedTab] ?? "text-violet-500";
+
return (
<TimeSeriesChart
key={`${start?.toString()}-${end?.toString()}-${interval ?? ""}-${selectedTab}-${saleUnit}`}
@@ -34,7 +33,7 @@ export function AnalyticsTimeseriesChart({
{
id: "amount",
valueAccessor: (d) => d.values.amount,
- colorClassName: "text-violet-500",
+ colorClassName,
isActive: true,
},
]}
@@ -47,7 +46,12 @@ export function AnalyticsTimeseriesChart({
</p>
<div className="grid grid-cols-2 gap-x-6 gap-y-2 px-4 py-3 text-sm">
<div className="flex items-center gap-2">
- <div className="h-2 w-2 rounded-sm bg-violet-500 shadow-[inset_0_0_0_1px_#0003]" />
+ <div
+ className={cn(
+ colorClassName,
+ "h-2 w-2 rounded-sm bg-current opacity-50 shadow-[inset_0_0_0_1px_#0003]",
+ )}
+ />
<p className="capitalize text-neutral-600">
{capitalize(selectedTab)}
</p>
@@ -62,18 +66,7 @@ export function AnalyticsTimeseriesChart({
);
}}
>
- <ChartContext.Consumer>
- {(context) => (
- <LinearGradient
- id={`${id}-color-gradient`}
- from="#7D3AEC"
- to="#DA2778"
- x1={0}
- x2={context?.width ?? 1}
- gradientUnits="userSpaceOnUse"
- />
- )}
- </ChartContext.Consumer>
+ <Areas />
<XAxis
tickFormat={(date) => formatDateTooltip(date, { interval, start, end })}
maxTicks={2}
@@ -86,7 +79,6 @@ export function AnalyticsTimeseriesChart({
: nFormatter
}
/>
- <Areas />
</TimeSeriesChart>
);
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-chart.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-chart.tsx
new file mode 100644
index 0000000000..62ded36b2b
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-chart.tsx
@@ -0,0 +1,149 @@
+"use client";
+
+import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
+import useCommissionsTimeseries from "@/lib/swr/use-commissions-timeseries";
+import {
+ Areas,
+ ChartContext,
+ TimeSeriesChart,
+ XAxis,
+ YAxis,
+} from "@dub/ui/charts";
+import { LoadingSpinner } from "@dub/ui/icons";
+import { currencyFormatter, nFormatter } from "@dub/utils";
+import { LinearGradient } from "@visx/gradient";
+import { useId } from "react";
+import { CommissionStatusFilter } from "./commissions-status-selector";
+
+const STATUS_COLORS: Record<
+ string,
+ { className: string; from: string; to: string; label: string }
+> = {
+ pending: {
+ className: "text-orange-500",
+ from: "#f97316",
+ to: "#fb923c",
+ label: "Pending",
+ },
+ processed: {
+ className: "text-blue-500",
+ from: "#3b82f6",
+ to: "#60a5fa",
+ label: "Processed",
+ },
+ paid: {
+ className: "text-green-500",
+ from: "#22c55e",
+ to: "#4ade80",
+ label: "Paid",
+ },
+ all: {
+ className: "text-neutral-400",
+ from: "#a3a3a3",
+ to: "#d4d4d4",
+ label: "All",
+ },
+};
+
+export function CommissionsAnalyticsChart({
+ status,
+ unit = "earnings",
+ queryString,
+ interval,
+ start,
+ end,
+}: {
+ status: CommissionStatusFilter;
+ unit?: "earnings" | "count";
+ queryString: string;
+ interval?: string;
+ start?: Date;
+ end?: Date;
+}) {
+ const id = useId();
+ const color = STATUS_COLORS[status ?? "all"];
+
+ const { data, loading, error } = useCommissionsTimeseries({
+ enabled: true,
+ queryString,
+ });
+
+ const chartData = data?.map((d) => ({
+ date: new Date(d.start),
+ values: { amount: unit === "count" ? d.count : d.earnings },
+ }));
+
+ if (loading) {
+ return (
+ <div className="flex size-full items-center justify-center">
+ <LoadingSpinner />
+ </div>
+ );
+ }
+
+ if (error) {
+ return (
+ <div className="flex size-full items-center justify-center text-sm text-neutral-500">
+ Failed to load data
+ </div>
+ );
+ }
+
+ return (
+ <TimeSeriesChart
+ key={`${status ?? "all"}-${unit}-${queryString}`}
+ data={chartData ?? []}
+ series={[
+ {
+ id: "amount",
+ valueAccessor: (d) => d.values.amount,
+ colorClassName: color.className,
+ isActive: true,
+ },
+ ]}
+ tooltipClassName="p-0"
+ tooltipContent={(d) => (
+ <>
+ <p className="border-b border-neutral-200 px-4 py-3 text-sm text-neutral-900">
+ {formatDateTooltip(d.date, { interval, start, end })}
+ </p>
+ <div className="grid grid-cols-2 gap-x-6 gap-y-2 px-4 py-3 text-sm">
+ <div className="flex items-center gap-2">
+ <div
+ className={`h-2 w-2 rounded-sm bg-current shadow-[inset_0_0_0_1px_#0003] ${color.className}`}
+ />
+ <p className="text-neutral-600">{color.label}</p>
+ </div>
+ <p className="text-right font-medium text-neutral-900">
+ {unit === "count"
+ ? nFormatter(d.values.amount, { full: true })
+ : currencyFormatter(d.values.amount)}
+ </p>
+ </div>
+ </>
+ )}
+ >
+ <ChartContext.Consumer>
+ {(ctx) => (
+ <LinearGradient
+ id={`${id}-color-gradient`}
+ from={color.from}
+ to={color.to}
+ x1={0}
+ x2={ctx?.width ?? 1}
+ gradientUnits="userSpaceOnUse"
+ />
+ )}
+ </ChartContext.Consumer>
+ <XAxis
+ tickFormat={(date) => formatDateTooltip(date, { interval, start, end })}
+ maxTicks={2}
+ />
+ <YAxis
+ showGridLines
+ tickFormat={unit === "count" ? nFormatter : currencyFormatter}
+ />
+ <Areas />
+ </TimeSeriesChart>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-breakdown-cards.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-breakdown-cards.tsx
new file mode 100644
index 0000000000..1257ab7ee3
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-breakdown-cards.tsx
@@ -0,0 +1,324 @@
+"use client";
+
+import useCommissionsBreakdown, {
+ CommissionsBreakdownItem,
+} from "@/lib/swr/use-commissions-breakdown";
+import useGroups from "@/lib/swr/use-groups";
+import { AnalyticsLoadingSpinner } from "@/ui/analytics/analytics-loading-spinner";
+import { BarList } from "@/ui/analytics/bar-list";
+import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
+import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
+import { Modal, useRouterStuff } from "@dub/ui";
+import { CircleCheck, CircleDotted, CircleHalfDottedClock } from "@dub/ui/icons";
+import { cn } from "@dub/utils";
+import { ReactNode, useCallback, useMemo, useState } from "react";
+import { CommissionStatusFilter } from "./commissions-status-selector";
+
+const STATUS_LABELS: Record<string, string> = {
+ pending: "Pending",
+ processed: "Processed",
+ paid: "Paid",
+ all: "All",
+};
+
+const STATUS_ICONS: Record<string, React.ElementType> = {
+ pending: CircleHalfDottedClock,
+ processed: CircleHalfDottedClock,
+ paid: CircleCheck,
+ all: CircleDotted,
+};
+
+type BreakdownGroupBy = "type" | "groupId";
+
+function mapBreakdownItem(
+ item: CommissionsBreakdownItem,
+ groupBy: BreakdownGroupBy,
+ groupColorMap: Map<string, { color: string | null }>,
+) {
+ const icon =
+ groupBy === "type" ? (
+ <CommissionTypeIcon
+ type={item.key as "sale" | "custom" | "lead" | "click"}
+ />
+ ) : (
+ <GroupColorCircle
+ group={{ color: groupColorMap.get(item.key)?.color ?? null }}
+ />
+ );
+
+ return {
+ icon,
+ title: item.label,
+ filterValue: item.key,
+ value: item.earnings,
+ };
+}
+
+function useUrlListFilter(paramKey: string) {
+ const { queryParams, searchParams } = useRouterStuff();
+ const [selected, setSelected] = useState<string[]>([]);
+
+ const activeFilterValues = useMemo(
+ () => searchParams.get(paramKey)?.split(",").filter(Boolean) ?? [],
+ [paramKey, searchParams],
+ );
+ const isFilterActive = searchParams.has(paramKey);
+
+ const applyFilterValues = useCallback(
+ (values: string[]) => {
+ if (values.length === 0) {
+ queryParams({ del: paramKey, scroll: false });
+ } else {
+ queryParams({ set: { [paramKey]: values.join(",") }, scroll: false });
+ }
+ setSelected([]);
+ },
+ [paramKey, queryParams],
+ );
+
+ const clearFilter = useCallback(() => {
+ setSelected([]);
+ if (searchParams.has(paramKey)) {
+ queryParams({ del: paramKey, scroll: false });
+ }
+ }, [paramKey, queryParams, searchParams]);
+
+ const toggleFilter = useCallback((val: string) => {
+ setSelected((prev) =>
+ prev.includes(val) ? prev.filter((v) => v !== val) : [...prev, val],
+ );
+ }, []);
+
+ return {
+ selected,
+ activeFilterValues,
+ isFilterActive,
+ applyFilterValues,
+ clearFilter,
+ toggleFilter,
+ clearSelection: () => setSelected([]),
+ };
+}
+
+function BreakdownCardShell({
+ status,
+ title,
+ dataLength,
+ expandLimit,
+ isFilterActive,
+ onClearFilter,
+ children,
+}: {
+ status: CommissionStatusFilter;
+ title: string;
+ dataLength?: number;
+ expandLimit: number;
+ isFilterActive?: boolean;
+ onClearFilter?: () => void;
+ children: (props: {
+ limit?: number;
+ setShowModal: (show: boolean) => void;
+ }) => ReactNode;
+}) {
+ const [showModal, setShowModal] = useState(false);
+ const showViewAll = (dataLength ?? 0) > expandLimit;
+ const statusKey = status ?? "all";
+ const StatusIcon = STATUS_ICONS[statusKey];
+
+ return (
+ <>
+ <Modal
+ showModal={showModal}
+ setShowModal={setShowModal}
+ className="max-w-lg px-0"
+ >
+ <div className="flex items-center justify-between border-b border-neutral-200 px-6 py-4">
+ <h1 className="text-lg font-semibold">{title}</h1>
+ <div className="flex items-center gap-1 text-neutral-500">
+ <StatusIcon className="h-4 w-4" />
+ <p className="text-xs uppercase">{STATUS_LABELS[statusKey]}</p>
+ </div>
+ </div>
+ {children({ setShowModal })}
+ </Modal>
+
+ <div className="group relative z-0 h-[400px] overflow-hidden rounded-lg border border-neutral-200 bg-white sm:rounded-xl">
+ <div className="flex items-center justify-between border-b border-neutral-200 px-4">
+ <p className="py-3 text-sm font-medium text-neutral-900">{title}</p>
+ <div className="flex items-center gap-1 pr-2 text-neutral-500">
+ <StatusIcon className="hidden h-4 w-4 sm:block" />
+ <p className="text-xs uppercase">{STATUS_LABELS[statusKey]}</p>
+ </div>
+ </div>
+
+ <div className="py-4">
+ {children({ limit: expandLimit, setShowModal })}
+ </div>
+
+ {(showViewAll || isFilterActive) && (
+ <div className="absolute bottom-0 left-0 z-10 flex w-full items-end">
+ <div className="pointer-events-none absolute bottom-0 left-0 h-48 w-full bg-gradient-to-t from-white" />
+ <div className="relative flex w-full items-center justify-center gap-2 py-4">
+ <button
+ type="button"
+ onClick={() => setShowModal(true)}
+ className={cn(
+ "h-8 w-fit rounded-lg px-3 text-sm transition-colors",
+ isFilterActive
+ ? "border-black bg-black text-white hover:bg-neutral-800"
+ : "border border-neutral-200 bg-white text-neutral-950 hover:bg-neutral-100 active:border-neutral-300",
+ )}
+ >
+ View All
+ </button>
+ {isFilterActive && onClearFilter && (
+ <button
+ type="button"
+ onClick={onClearFilter}
+ className="h-8 w-fit rounded-lg border border-neutral-200 bg-white px-3 text-sm text-neutral-600 transition-colors hover:bg-neutral-50 active:border-neutral-300"
+ >
+ Clear
+ </button>
+ )}
+ </div>
+ </div>
+ )}
+ </div>
+ </>
+ );
+}
+
+const EXPAND_LIMIT = 8;
+
+const BAR_LIST_SHARED = {
+ unit: "sales" as const,
+ filterSelectedBackground: "bg-neutral-900",
+ filterSelectedHoverBackground: "hover:bg-neutral-700",
+ filterHoverClass: "bg-white border border-neutral-200",
+};
+
+function BreakdownBarPanel({
+ status,
+ title,
+ tab,
+ filter,
+ rawItems,
+ loading,
+ groupColorMap,
+ barBackground,
+ hoverBackground,
+}: {
+ status: CommissionStatusFilter;
+ title: string;
+ tab: BreakdownGroupBy;
+ filter: ReturnType<typeof useUrlListFilter>;
+ rawItems: CommissionsBreakdownItem[] | undefined;
+ loading: boolean;
+ groupColorMap: Map<string, { color: string | null }>;
+ barBackground: string;
+ hoverBackground: string;
+}) {
+ const data = useMemo(
+ () =>
+ (rawItems ?? []).map((item) =>
+ mapBreakdownItem(item, tab, groupColorMap),
+ ),
+ [rawItems, tab, groupColorMap],
+ );
+ const maxValue = Math.max(0, ...data.map((d) => d.value));
+
+ return (
+ <BreakdownCardShell
+ status={status}
+ title={title}
+ dataLength={data.length}
+ expandLimit={EXPAND_LIMIT}
+ isFilterActive={filter.isFilterActive}
+ onClearFilter={filter.clearFilter}
+ >
+ {({ limit, setShowModal }) =>
+ loading ? (
+ <div className="absolute inset-0 flex h-[300px] w-full items-center justify-center bg-white/50">
+ <AnalyticsLoadingSpinner />
+ </div>
+ ) : data.length === 0 ? (
+ <div className="flex h-[300px] items-center justify-center">
+ <p className="text-sm text-neutral-600">No data available</p>
+ </div>
+ ) : (
+ <BarList
+ tab={tab}
+ {...BAR_LIST_SHARED}
+ data={data}
+ maxValue={maxValue}
+ barBackground={barBackground}
+ hoverBackground={hoverBackground}
+ setShowModal={setShowModal}
+ limit={limit}
+ selectedFilterValues={filter.selected}
+ activeFilterValues={filter.activeFilterValues}
+ onToggleFilter={filter.toggleFilter}
+ onClearFilter={filter.clearFilter}
+ onClearSelection={filter.clearSelection}
+ onApplyFilterValues={filter.applyFilterValues}
+ onRowFilterItem={(val) => filter.applyFilterValues([val])}
+ />
+ )
+ }
+ </BreakdownCardShell>
+ );
+}
+
+export function CommissionsBreakdownCards({
+ status,
+ queryString,
+}: {
+ status: CommissionStatusFilter;
+ queryString: string;
+}) {
+ const groupFilter = useUrlListFilter("groupId");
+ const typeFilter = useUrlListFilter("type");
+
+ const { groups } = useGroups();
+ const groupColorMap = useMemo(() => {
+ const map = new Map<string, { color: string | null }>();
+ groups?.forEach((g) => map.set(g.id, { color: g.color ?? null }));
+ return map;
+ }, [groups]);
+
+ const { data: groupRows, isLoading: groupLoading } = useCommissionsBreakdown({
+ queryString,
+ groupBy: "groupId",
+ });
+ const { data: typeRows, isLoading: typeLoading } = useCommissionsBreakdown({
+ queryString,
+ groupBy: "type",
+ });
+
+ return (
+ <div className="grid grid-cols-1 gap-5 md:grid-cols-2">
+ <BreakdownBarPanel
+ status={status}
+ title="Partner Group"
+ tab="groupId"
+ filter={groupFilter}
+ rawItems={groupRows}
+ loading={groupLoading}
+ groupColorMap={groupColorMap}
+ barBackground="bg-orange-100"
+ hoverBackground="hover:bg-gradient-to-r hover:from-orange-50 hover:to-transparent hover:border-orange-500"
+ />
+ <BreakdownBarPanel
+ status={status}
+ title="Type"
+ tab="type"
+ filter={typeFilter}
+ rawItems={typeRows}
+ loading={typeLoading}
+ groupColorMap={groupColorMap}
+ barBackground="bg-neutral-100"
+ hoverBackground="hover:bg-gradient-to-r hover:from-neutral-50 hover:to-transparent hover:border-neutral-300"
+ />
+ </div>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-partners-table.tsx
new file mode 100644
index 0000000000..0d0168eab0
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-partners-table.tsx
@@ -0,0 +1,200 @@
+"use client";
+
+import useCommissionsTopPartners, {
+ CommissionsTopPartner,
+} from "@/lib/swr/use-commissions-top-partners";
+import {
+ Button,
+ Table,
+ useKeyboardShortcut,
+ usePagination,
+ useRouterStuff,
+ useTable,
+} from "@dub/ui";
+import { cn, COUNTRIES, currencyFormatter } from "@dub/utils";
+import { AnimatePresence, motion } from "motion/react";
+import { useCallback, useMemo, useState } from "react";
+import { PartnerAnalyticsFilterCell } from "./partner-analytics-filter-cell";
+
+const PAGE_SIZE = 10;
+
+export function CommissionsPartnersTable({
+ queryString,
+}: {
+ queryString: string;
+}) {
+ const { queryParams, searchParams } = useRouterStuff();
+ const { pagination, setPagination } = usePagination(PAGE_SIZE);
+
+ const [stagedPartnerIds, setStagedPartnerIds] = useState<string[] | null>(
+ null,
+ );
+
+ const activePartnerIdsFromUrl = useMemo(
+ () => searchParams.get("partnerId")?.split(",").filter(Boolean) ?? [],
+ [searchParams],
+ );
+
+ const isFilterActive = searchParams.has("partnerId");
+
+ const toggleStagePartner = useCallback(
+ (partnerId: string) => {
+ setStagedPartnerIds((prev) => {
+ const base = prev ?? activePartnerIdsFromUrl;
+ const next = base.includes(partnerId)
+ ? base.filter((id) => id !== partnerId)
+ : [...base, partnerId];
+ return next.length === 0 ? null : next;
+ });
+ },
+ [activePartnerIdsFromUrl],
+ );
+
+ const applyFilter = useCallback(() => {
+ if (!stagedPartnerIds || stagedPartnerIds.length === 0) return;
+ queryParams({
+ set: { partnerId: stagedPartnerIds.join(",") },
+ del: "page",
+ scroll: false,
+ });
+ setStagedPartnerIds(null);
+ }, [queryParams, stagedPartnerIds]);
+
+ const clearFilter = useCallback(() => {
+ setStagedPartnerIds(null);
+ if (searchParams.has("partnerId")) {
+ queryParams({ del: ["partnerId", "page"], scroll: false });
+ }
+ }, [queryParams, searchParams]);
+
+ useKeyboardShortcut("Escape", () => setStagedPartnerIds(null), {
+ enabled: stagedPartnerIds !== null,
+ priority: 2,
+ });
+
+ const {
+ partners: allPartners,
+ isLoading,
+ error,
+ } = useCommissionsTopPartners({
+ queryString,
+ });
+
+ const pageData = useMemo(
+ () =>
+ allPartners?.slice(
+ (pagination.pageIndex - 1) * PAGE_SIZE,
+ pagination.pageIndex * PAGE_SIZE,
+ ),
+ [allPartners, pagination.pageIndex],
+ );
+
+ const { table, ...tableProps } = useTable<CommissionsTopPartner>({
+ data: pageData ?? [],
+ columns: [
+ {
+ id: "partner",
+ header: "Partner",
+ enableHiding: false,
+ minSize: 220,
+ cell: ({ row }) => {
+ const { partnerId, name, image } = row.original;
+ return (
+ <PartnerAnalyticsFilterCell
+ partner={{ id: partnerId, name, image }}
+ partnerId={partnerId}
+ isStaged={stagedPartnerIds?.includes(partnerId) ?? false}
+ isApplied={activePartnerIdsFromUrl.includes(partnerId)}
+ onToggle={() => toggleStagePartner(partnerId)}
+ onApplyImmediate={() => {
+ queryParams({
+ set: { partnerId },
+ del: "page",
+ scroll: false,
+ });
+ setStagedPartnerIds(null);
+ }}
+ />
+ );
+ },
+ },
+ {
+ id: "location",
+ header: "Location",
+ minSize: 140,
+ cell: ({ row }) => {
+ const { country } = row.original;
+ if (!country) return <span className="text-neutral-400">—</span>;
+ return (
+ <div className="flex items-center gap-2">
+ <img
+ alt={`${country} flag`}
+ src={`https://hatscripts.github.io/circle-flags/flags/${country.toLowerCase()}.svg`}
+ className="size-4 shrink-0"
+ />
+ <span className="min-w-0 truncate text-sm text-neutral-700">
+ {COUNTRIES[country] ?? country}
+ </span>
+ </div>
+ );
+ },
+ },
+ {
+ id: "commission",
+ header: "Commission",
+ accessorFn: (d) => currencyFormatter(d.earnings),
+ },
+ ],
+ pagination,
+ onPaginationChange: setPagination,
+ sortBy: "commission",
+ thClassName: "border-l-0",
+ tdClassName: "border-l-0",
+ resourceName: (p) => `partner${p ? "s" : ""}`,
+ rowCount: allPartners?.length ?? 0,
+ loading: isLoading,
+ error: error ? "Failed to load partners" : undefined,
+ });
+
+ const showFloatingBar = stagedPartnerIds !== null || isFilterActive;
+
+ return (
+ <div className={cn("relative", isLoading && "pointer-events-none")}>
+ <Table
+ {...tableProps}
+ table={table}
+ containerClassName="border-none"
+ scrollWrapperClassName="min-h-[200px]"
+ >
+ <AnimatePresence>
+ {showFloatingBar && (
+ <motion.div
+ initial={{ opacity: 0, y: 8 }}
+ animate={{ opacity: 1, y: 0 }}
+ exit={{ opacity: 0, y: 8 }}
+ transition={{ ease: "easeOut", duration: 0.15 }}
+ className="absolute bottom-1 left-0 z-20 flex h-16 w-full items-end bg-gradient-to-t from-white to-white/0"
+ >
+ <div className="flex w-full items-center justify-center gap-2 pb-2.5">
+ {stagedPartnerIds !== null && stagedPartnerIds.length > 0 && (
+ <Button
+ text="Filter"
+ variant="primary"
+ className="h-8 w-fit rounded-lg px-3 py-2"
+ onClick={applyFilter}
+ />
+ )}
+ <Button
+ text="Clear"
+ variant="secondary"
+ className="h-8 w-fit rounded-lg px-3 py-2"
+ onClick={clearFilter}
+ />
+ </div>
+ </motion.div>
+ )}
+ </AnimatePresence>
+ </Table>
+ </div>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-status-selector.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-status-selector.tsx
new file mode 100644
index 0000000000..349238fa50
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-status-selector.tsx
@@ -0,0 +1,168 @@
+"use client";
+
+import { CommissionsCount } from "@/lib/types";
+import { ToggleGroup, useMediaQuery, useRouterStuff } from "@dub/ui";
+import { fetcher } from "@dub/utils";
+import NumberFlow, { NumberFlowGroup } from "@number-flow/react";
+import { ChevronRight } from "lucide-react";
+import useSWR from "swr";
+export type CommissionStatusFilter =
+ | "pending"
+ | "processed"
+ | "paid"
+ | undefined;
+
+const STATUS_TABS: {
+ id: CommissionStatusFilter;
+ label: string;
+ colorClassName: string;
+}[] = [
+ {
+ id: undefined,
+ label: "All",
+ colorClassName: "text-neutral-400/70",
+ },
+ {
+ id: "pending",
+ label: "Pending",
+ colorClassName: "text-orange-400/50",
+ },
+ {
+ id: "processed",
+ label: "Processed",
+ colorClassName: "text-blue-500/50",
+ },
+ {
+ id: "paid",
+ label: "Paid",
+ colorClassName: "text-green-500/50",
+ },
+];
+
+export function CommissionsStatusSelector({
+ status,
+ queryString,
+}: {
+ status: CommissionStatusFilter;
+ queryString: string;
+}) {
+ const { queryParams, searchParamsObj } = useRouterStuff();
+ const unit =
+ searchParamsObj.commissionUnit === "count" ? "count" : "earnings";
+
+ const countQueryString = (() => {
+ if (!queryString) return null;
+ const params = new URLSearchParams(queryString);
+ params.delete("status");
+ return params.toString();
+ })();
+
+ const { data: commissionsCount } = useSWR<CommissionsCount>(
+ countQueryString ? `/api/commissions/count?${countQueryString}` : null,
+ fetcher,
+ { keepPreviousData: true },
+ );
+
+ const { isMobile } = useMediaQuery();
+
+ return (
+ <div className="grid w-full grid-cols-4 divide-x divide-neutral-200 overflow-y-hidden">
+ <NumberFlowGroup>
+ {STATUS_TABS.map(({ id, label, colorClassName }, idx) => {
+ const key = id ?? "all";
+ const earnings = commissionsCount?.[key]?.earnings ?? 0;
+ const count = commissionsCount?.[key]?.count ?? 0;
+ const isActive = id === status;
+ const isLast = idx === STATUS_TABS.length - 1;
+
+ return (
+ <div key={label} className="relative z-0">
+ {idx > 0 && (
+ <div className="absolute left-0 top-1/2 z-10 -translate-x-1/2 -translate-y-1/2 rounded-full border border-neutral-200 bg-white p-1.5">
+ <ChevronRight
+ className="h-3 w-3 text-neutral-400"
+ strokeWidth={2.5}
+ />
+ </div>
+ )}
+ <button
+ className="border-box relative block h-full w-full min-w-[80px] flex-none px-4 py-3 text-left transition-colors hover:bg-neutral-50 focus:outline-none active:bg-neutral-100 sm:min-w-[180px] sm:px-8 sm:py-6"
+ onClick={() =>
+ id === undefined
+ ? queryParams({ del: "status", scroll: false })
+ : queryParams({ set: { status: id }, scroll: false })
+ }
+ >
+ <div
+ className={[
+ "absolute bottom-0 left-0 h-0.5 w-full bg-black transition-transform duration-100",
+ !isActive ? "translate-y-[3px]" : "",
+ ].join(" ")}
+ />
+ <div className="flex items-center gap-2.5 text-sm text-neutral-600">
+ <div
+ className={[
+ "h-2 w-2 rounded-sm bg-current shadow-[inset_0_0_0_1px_#00000019]",
+ colorClassName,
+ ].join(" ")}
+ />
+ <span>{label}</span>
+ </div>
+ <div className="mt-1 flex h-12 items-center">
+ {commissionsCount ? (
+ <NumberFlow
+ value={unit === "earnings" ? earnings / 100 : count}
+ className="text-xl font-medium sm:text-2xl"
+ format={
+ unit === "earnings"
+ ? {
+ ...(isMobile && {
+ notation: "compact",
+ }),
+ style: "currency",
+ currency: "USD",
+ // @ts-ignore – trailingZeroDisplay is valid
+ trailingZeroDisplay: "stripIfInteger",
+ }
+ : {
+ notation:
+ isMobile || count > 999999
+ ? "compact"
+ : "standard",
+ }
+ }
+ />
+ ) : (
+ <div className="h-9 w-24 animate-pulse rounded-md bg-neutral-200" />
+ )}
+ </div>
+ </button>
+
+ {isLast && (
+ <ToggleGroup
+ className="absolute right-3 top-3 hidden w-fit shrink-0 items-center gap-1 border-neutral-100 bg-neutral-100 sm:flex"
+ optionClassName="size-8 p-0 flex items-center justify-center"
+ indicatorClassName="border border-neutral-200 bg-white"
+ options={[
+ {
+ label: <div className="text-base">$</div>,
+ value: "earnings",
+ },
+ {
+ label: <div className="text-[11px]">123</div>,
+ value: "count",
+ },
+ ]}
+ selected={unit}
+ selectAction={(v) =>
+ queryParams({ set: { commissionUnit: v }, scroll: false })
+ }
+ />
+ )}
+ </div>
+ );
+ })}
+ </NumberFlowGroup>
+ </div>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/layout.tsx
new file mode 100644
index 0000000000..b5b9f78fab
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/layout.tsx
@@ -0,0 +1,34 @@
+"use client";
+
+import useWorkspace from "@/lib/swr/use-workspace";
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import WorkspaceExceededEvents from "@/ui/workspaces/workspace-exceeded-events";
+import { ProgramAnalyticsShell } from "./program-analytics-shell";
+
+export default function ProgramAnalyticsLayout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ const { exceededEvents } = useWorkspace();
+
+ if (exceededEvents) {
+ return <WorkspaceExceededEvents />;
+ }
+
+ return (
+ <PageContent
+ title="Analytics"
+ titleInfo={{
+ title:
+ "Learn how to use Dub to track and measure your program's performance.",
+ href: "https://dub.co/help/article/program-analytics",
+ }}
+ >
+ <PageWidthWrapper>
+ <ProgramAnalyticsShell>{children}</ProgramAnalyticsShell>
+ </PageWidthWrapper>
+ </PageContent>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page-client.tsx
deleted file mode 100644
index 735c5dfaa9..0000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page-client.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-"use client";
-
-import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "@/lib/analytics/constants";
-import { AnalyticsResponseOptions } from "@/lib/analytics/types";
-import { editQueryString } from "@/lib/analytics/utils";
-import useProgram from "@/lib/swr/use-program";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
-import { DeviceSection } from "@/ui/analytics/device-section";
-import { LocationSection } from "@/ui/analytics/location-section";
-import { PartnerSection } from "@/ui/analytics/partner-section";
-import { ReferrersUTMs } from "@/ui/analytics/referrers-utms";
-import { useAnalyticsFilters } from "@/ui/analytics/use-analytics-filters";
-import { useAnalyticsQuery } from "@/ui/analytics/use-analytics-query";
-import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";
-import {
- Button,
- Filter,
- SquareLayoutGrid6,
- useMediaQuery,
- useRouterStuff,
-} from "@dub/ui";
-import { cn, fetcher } from "@dub/utils";
-import Link from "next/link";
-import { ContextType, useMemo } from "react";
-import useSWR from "swr";
-import { AnalyticsChart } from "./analytics-chart";
-import { AnalyticsPartnersTable } from "./analytics-partners-table";
-
-export function ProgramAnalyticsPageClient() {
- const { slug, defaultProgramId } = useWorkspace();
- const { program } = useProgram();
- const { searchParamsObj, getQueryString } = useRouterStuff();
- const { isMobile } = useMediaQuery();
-
- const { start, end, interval, selectedTab, saleUnit, view } = useMemo(() => {
- const { event, ...rest } = searchParamsObj;
-
- return {
- interval: DUB_PARTNERS_ANALYTICS_INTERVAL,
- selectedTab:
- event || (program?.primaryRewardEvent === "lead" ? "leads" : "sales"),
- saleUnit: "saleAmount",
- view: "timeseries",
- ...rest,
- } as ContextType<typeof AnalyticsContext>;
- }, [searchParamsObj]);
-
- const queryString = editQueryString(
- useAnalyticsQuery({
- defaultEvent: program?.primaryRewardEvent === "lead" ? "leads" : "sales",
- defaultInterval: DUB_PARTNERS_ANALYTICS_INTERVAL,
- }).queryString,
- {
- programId: defaultProgramId!,
- },
- );
-
- const { data: totalEvents } = useSWR<{
- [key in AnalyticsResponseOptions]: number;
- }>(
- `/api/analytics?${editQueryString(queryString ?? "", {
- event: "composite",
- })}`,
- fetcher,
- {
- keepPreviousData: true,
- },
- );
-
- const {
- filters,
- activeFilters,
- onSelect,
- onRemove,
- onRemoveAll,
- onRemoveFilter,
- onOpenFilter,
- onToggleOperator,
- streaming,
- activeFiltersWithStreaming,
- } = useAnalyticsFilters({
- context: {
- baseApiPath: "/api/analytics",
- queryString,
- selectedTab,
- saleUnit,
- },
- programPage: true,
- });
-
- const filterSelect = (
- <Filter.Select
- className="w-full md:w-fit"
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- onOpenFilter={onOpenFilter}
- isAdvancedFilter
- askAI
- />
- );
-
- const dateRangePicker = (
- <SimpleDateRangePicker align="start" className="w-full md:w-fit" />
- );
-
- return (
- <div className="flex flex-col gap-4 pb-12">
- <div>
- <div className="flex w-full flex-col items-center justify-between gap-2 md:flex-row">
- <div className="flex w-full flex-col items-center gap-2 min-[550px]:flex-row">
- {filterSelect}
- <div className="flex w-full grow items-center gap-2 md:w-auto">
- {dateRangePicker}
- <div className="flex grow justify-end gap-2">
- <Link
- href={`/${slug}/events${getQueryString({ folderId: program?.defaultFolderId, event: selectedTab, interval })}`}
- >
- <Button
- variant="secondary"
- className="w-fit"
- icon={
- <SquareLayoutGrid6 className="h-4 w-4 text-neutral-600" />
- }
- text={isMobile ? undefined : "View Events"}
- />
- </Link>
- </div>
- </div>
- </div>
- </div>
- <div>
- <div
- className={cn(
- "transition-[height] duration-[300ms]",
- streaming || activeFilters.length ? "h-3" : "h-0",
- )}
- />
- <Filter.List
- filters={filters}
- activeFilters={activeFiltersWithStreaming}
- onSelect={onSelect}
- onRemove={onRemove}
- onRemoveFilter={onRemoveFilter}
- onRemoveAll={onRemoveAll}
- onToggleOperator={onToggleOperator}
- isAdvancedFilter
- />
- </div>
- </div>
- <AnalyticsContext.Provider
- value={{
- basePath: "",
- baseApiPath: "/api/analytics",
- selectedTab,
- saleUnit,
- view,
- queryString,
- start: start ? new Date(start) : undefined,
- end: end ? new Date(end) : undefined,
- interval,
- totalEvents,
- }}
- >
- <div className="border-border-subtle divide-border-subtle divide-y overflow-hidden rounded-xl border sm:rounded-2xl">
- <AnalyticsChart />
- <AnalyticsPartnersTable />
- </div>
-
- <div className="grid grid-cols-1 gap-5 md:grid-cols-2">
- <PartnerSection />
- <ReferrersUTMs />
- <LocationSection />
- <DeviceSection />
- </div>
- </AnalyticsContext.Provider>
- </div>
- );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page.tsx
index fa9ebad73d..e857d8d5cd 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/page.tsx
@@ -1,34 +1,65 @@
"use client";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { PageContent } from "@/ui/layout/page-content";
-import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import WorkspaceExceededEvents from "@/ui/workspaces/workspace-exceeded-events";
-import { ProgramAnalyticsPageClient } from "./page-client";
+import { notFound, useParams } from "next/navigation";
+import { AnalyticsChart } from "./analytics-chart";
+import { AnalyticsPartnersTable } from "./analytics-partners-table";
+import { CommissionsAnalyticsChart } from "./commissions-analytics-chart";
+import { CommissionsPartnersTable } from "./commissions-partners-table";
+import { CommissionsStatusSelector } from "./commissions-status-selector";
+import {
+ PROGRAM_ANALYTICS_TABS,
+ ProgramAnalyticsTabId,
+} from "./program-analytics-nav";
+import { useCommissionsAnalyticsQuery } from "./use-commissions-analytics-query";
+
+export default function ProgramAnalyticsTabPage() {
+ const { tab } = useParams() as { tab?: ProgramAnalyticsTabId };
+
+ if (tab && !PROGRAM_ANALYTICS_TABS.some((t) => t.id === tab)) {
+ notFound();
+ }
+
+ if (tab === "commissions") {
+ return <CommissionsTab />;
+ }
-export default function ProgramAnalytics() {
return (
- <PageContent
- title="Analytics"
- titleInfo={{
- title:
- "Learn how to use Dub to track and measure your program's performance.",
- href: "https://dub.co/help/article/program-analytics",
- }}
- >
- <PageWidthWrapper>
- <ProgramAnalyticsPageWrapper />
- </PageWidthWrapper>
- </PageContent>
+ <>
+ <AnalyticsChart />
+ <AnalyticsPartnersTable />
+ </>
);
}
-function ProgramAnalyticsPageWrapper() {
- const { exceededEvents } = useWorkspace();
+function CommissionsTab() {
+ const {
+ queryString: commissionsQueryString,
+ status: commissionStatus,
+ unit: commissionUnit,
+ interval: commissionsInterval,
+ start: commissionsStart,
+ end: commissionsEnd,
+ } = useCommissionsAnalyticsQuery();
- if (exceededEvents) {
- return <WorkspaceExceededEvents />;
- }
-
- return <ProgramAnalyticsPageClient />;
+ return (
+ <>
+ <CommissionsStatusSelector
+ status={commissionStatus}
+ queryString={commissionsQueryString}
+ />
+ <div className="relative h-72 md:h-96">
+ <div className="relative size-full p-6 pt-10">
+ <CommissionsAnalyticsChart
+ status={commissionStatus}
+ unit={commissionUnit}
+ queryString={commissionsQueryString}
+ interval={commissionsInterval}
+ start={commissionsStart}
+ end={commissionsEnd}
+ />
+ </div>
+ </div>
+ <CommissionsPartnersTable queryString={commissionsQueryString} />
+ </>
+ );
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-nav.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-nav.tsx
new file mode 100644
index 0000000000..a99c724a5e
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-nav.tsx
@@ -0,0 +1,34 @@
+"use client";
+
+import useWorkspace from "@/lib/swr/use-workspace";
+import { PageNavTabs } from "@/ui/layout/page-nav-tabs";
+import { InvoiceDollar, LinesY } from "@dub/ui";
+
+export type ProgramAnalyticsTabId = "performance" | "commissions";
+
+export const PROGRAM_ANALYTICS_TABS: {
+ id: ProgramAnalyticsTabId;
+ label: string;
+ icon: typeof LinesY;
+}[] = [
+ { id: "performance", label: "Performance", icon: LinesY },
+ { id: "commissions", label: "Commissions", icon: InvoiceDollar },
+];
+
+export function ProgramAnalyticsNav() {
+ const { slug } = useWorkspace();
+
+ return (
+ <PageNavTabs
+ basePath={`/${slug}/program/analytics`}
+ tabs={PROGRAM_ANALYTICS_TABS}
+ preservedQueryParams={[
+ "interval",
+ "start",
+ "end",
+ "partnerId",
+ "groupId",
+ ]}
+ />
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx
new file mode 100644
index 0000000000..f020889ece
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/program-analytics-shell.tsx
@@ -0,0 +1,260 @@
+"use client";
+
+import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "@/lib/analytics/constants";
+import { AnalyticsResponseOptions } from "@/lib/analytics/types";
+import { editQueryString } from "@/lib/analytics/utils";
+import useProgram from "@/lib/swr/use-program";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
+import { DeviceSection } from "@/ui/analytics/device-section";
+import { LocationSection } from "@/ui/analytics/location-section";
+import { PartnerSection } from "@/ui/analytics/partner-section";
+import { ReferrersUTMs } from "@/ui/analytics/referrers-utms";
+import { useAnalyticsFilters } from "@/ui/analytics/use-analytics-filters";
+import { useAnalyticsQuery } from "@/ui/analytics/use-analytics-query";
+import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";
+import { Button, Filter, SquareLayoutGrid6, useMediaQuery, useRouterStuff } from "@dub/ui";
+import { cn, fetcher } from "@dub/utils";
+import Link from "next/link";
+import { useParams } from "next/navigation";
+import { ContextType, ReactNode, useMemo } from "react";
+import useSWR from "swr";
+import { CommissionsBreakdownCards } from "./commissions-breakdown-cards";
+import {
+ ProgramAnalyticsNav,
+ ProgramAnalyticsTabId,
+} from "./program-analytics-nav";
+import { useCommissionsAnalyticsFilters } from "./use-commissions-analytics-filters";
+import { useCommissionsAnalyticsQuery } from "./use-commissions-analytics-query";
+
+export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {
+ const { isMobile } = useMediaQuery();
+ const { program } = useProgram();
+ const { slug, defaultProgramId } = useWorkspace();
+ const { searchParamsObj, getQueryString } = useRouterStuff();
+ const { tab } = useParams() as { tab?: string };
+
+ const pageTab: ProgramAnalyticsTabId =
+ tab && ["performance", "commissions"].includes(tab)
+ ? (tab as ProgramAnalyticsTabId)
+ : "performance";
+
+ const {
+ queryString: commissionsQueryString,
+ status: commissionStatus,
+ } = useCommissionsAnalyticsQuery();
+
+ const { start, end, interval, selectedTab, saleUnit, view } = useMemo(() => {
+ const { event, ...rest } = searchParamsObj;
+
+ return {
+ interval: DUB_PARTNERS_ANALYTICS_INTERVAL,
+ selectedTab:
+ event || (program?.primaryRewardEvent === "lead" ? "leads" : "sales"),
+ saleUnit: "saleAmount",
+ view: "timeseries",
+ ...rest,
+ } as ContextType<typeof AnalyticsContext>;
+ }, [searchParamsObj]);
+
+ const queryString = editQueryString(
+ useAnalyticsQuery({
+ defaultEvent: program?.primaryRewardEvent === "lead" ? "leads" : "sales",
+ defaultInterval: DUB_PARTNERS_ANALYTICS_INTERVAL,
+ }).queryString,
+ {
+ programId: defaultProgramId!,
+ },
+ );
+
+ const { data: totalEvents } = useSWR<{
+ [key in AnalyticsResponseOptions]: number;
+ }>(
+ `/api/analytics?${editQueryString(queryString ?? "", {
+ event: "composite",
+ })}`,
+ fetcher,
+ {
+ keepPreviousData: true,
+ },
+ );
+
+ const {
+ filters: perfFilters,
+ activeFilters: perfActiveFilters,
+ onSelect: perfOnSelect,
+ onRemove: perfOnRemove,
+ onRemoveAll: perfOnRemoveAll,
+ onRemoveFilter: perfOnRemoveFilter,
+ onOpenFilter: perfOnOpenFilter,
+ onToggleOperator: perfOnToggleOperator,
+ streaming,
+ activeFiltersWithStreaming,
+ } = useAnalyticsFilters({
+ context: {
+ baseApiPath: "/api/analytics",
+ queryString,
+ selectedTab,
+ saleUnit,
+ },
+ programPage: true,
+ });
+
+ const {
+ filters: commFilters,
+ activeFilters: commActiveFilters,
+ onSelect: commOnSelect,
+ onRemove: commOnRemove,
+ onRemoveFilter: commOnRemoveFilter,
+ onRemoveAll: commOnRemoveAll,
+ onToggleOperator: commOnToggleOperator,
+ onOpenFilter: commOnOpenFilter,
+ setSearch: commSetSearch,
+ } = useCommissionsAnalyticsFilters(commissionsQueryString);
+
+ const filterSelect =
+ pageTab === "performance" ? (
+ <Filter.Select
+ className="w-full md:w-fit"
+ filters={perfFilters}
+ activeFilters={perfActiveFilters}
+ onSelect={perfOnSelect}
+ onRemove={perfOnRemove}
+ onOpenFilter={perfOnOpenFilter}
+ isAdvancedFilter
+ askAI
+ />
+ ) : (
+ <Filter.Select
+ className="w-full md:w-fit"
+ filters={commFilters}
+ activeFilters={commActiveFilters}
+ onSelect={commOnSelect}
+ onRemove={commOnRemove}
+ onOpenFilter={commOnOpenFilter}
+ onSearchChange={commSetSearch}
+ isAdvancedFilter
+ />
+ );
+
+ const dateRangePicker = (
+ <SimpleDateRangePicker align="start" className="w-full md:w-fit" />
+ );
+
+ return (
+ <AnalyticsContext.Provider
+ value={{
+ basePath: "",
+ baseApiPath: "/api/analytics",
+ selectedTab,
+ saleUnit,
+ view,
+ queryString,
+ start: start ? new Date(start) : undefined,
+ end: end ? new Date(end) : undefined,
+ interval,
+ totalEvents,
+ }}
+ >
+ <div className="flex flex-col gap-4 pb-12">
+ <div>
+ <div className="flex w-full flex-col items-center justify-between gap-2 md:flex-row">
+ <div className="flex w-full flex-col items-center gap-2 min-[550px]:flex-row">
+ {filterSelect}
+ <div className="flex w-full grow items-center gap-2 md:w-auto">
+ {dateRangePicker}
+ <div className="flex grow justify-end gap-2">
+ {pageTab === "performance" ? (
+ <Link
+ href={`/${slug}/events${getQueryString({ folderId: program?.defaultFolderId, event: selectedTab, interval })}`}
+ >
+ <Button
+ variant="secondary"
+ className="w-fit"
+ icon={
+ <SquareLayoutGrid6 className="h-4 w-4 text-neutral-600" />
+ }
+ text={isMobile ? undefined : "View Events"}
+ />
+ </Link>
+ ) : (
+ <Link
+ href={`/${slug}/program/commissions${getQueryString({}, { exclude: ["pageTab", "commissionUnit", "event", "saleUnit", "view"] })}`}
+ >
+ <Button
+ variant="secondary"
+ className="w-fit"
+ icon={
+ <SquareLayoutGrid6 className="h-4 w-4 text-neutral-600" />
+ }
+ text={isMobile ? undefined : "View Commissions"}
+ />
+ </Link>
+ )}
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div
+ className={cn(
+ "transition-[height] duration-[300ms]",
+ pageTab === "performance"
+ ? streaming || perfActiveFilters.length
+ ? "h-3"
+ : "h-0"
+ : commActiveFilters.length
+ ? "h-3"
+ : "h-0",
+ )}
+ />
+ {pageTab === "performance" ? (
+ <Filter.List
+ filters={perfFilters}
+ activeFilters={activeFiltersWithStreaming}
+ onSelect={perfOnSelect}
+ onRemove={perfOnRemove}
+ onRemoveFilter={perfOnRemoveFilter}
+ onRemoveAll={perfOnRemoveAll}
+ onToggleOperator={perfOnToggleOperator}
+ isAdvancedFilter
+ />
+ ) : (
+ <Filter.List
+ filters={commFilters}
+ activeFilters={commActiveFilters}
+ onSelect={commOnSelect}
+ onRemove={commOnRemove}
+ onRemoveFilter={commOnRemoveFilter}
+ onRemoveAll={commOnRemoveAll}
+ onToggleOperator={commOnToggleOperator}
+ isAdvancedFilter
+ />
+ )}
+ </div>
+ </div>
+
+ <div className="border-border-subtle overflow-hidden rounded-xl border bg-neutral-100 sm:rounded-2xl">
+ <ProgramAnalyticsNav />
+ <div className="border-border-subtle divide-border-subtle -mx-px -mb-px divide-y overflow-hidden rounded-xl border bg-white">
+ {children}
+ </div>
+ </div>
+
+ {pageTab === "performance" ? (
+ <div className="grid grid-cols-1 gap-5 md:grid-cols-2">
+ <PartnerSection />
+ <ReferrersUTMs />
+ <LocationSection />
+ <DeviceSection />
+ </div>
+ ) : (
+ <CommissionsBreakdownCards
+ status={commissionStatus}
+ queryString={commissionsQueryString}
+ />
+ )}
+ </div>
+ </AnalyticsContext.Provider>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/use-commissions-analytics-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/use-commissions-analytics-filters.tsx
new file mode 100644
index 0000000000..ac5ddca55c
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/use-commissions-analytics-filters.tsx
@@ -0,0 +1,213 @@
+"use client";
+
+import useGroups from "@/lib/swr/use-groups";
+import usePartners from "@/lib/swr/use-partners";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { EnrolledPartnerProps } from "@/lib/types";
+import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
+import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
+import { PartnerAvatar } from "@/ui/partners/partner-avatar";
+import { CommissionType } from "@dub/prisma/client";
+import { useRouterStuff } from "@dub/ui";
+import { Sliders, Users, Users6 } from "@dub/ui/icons";
+import { capitalize, FilterOperator, parseFilterValue } from "@dub/utils";
+import { useCallback, useMemo, useState } from "react";
+import { useDebounce } from "use-debounce";
+
+const COMMISSION_FILTER_KEYS = ["partnerId", "groupId", "type"] as const;
+
+export function useCommissionsAnalyticsFilters(
+ _commissionsQueryString?: string,
+) {
+ const { slug } = useWorkspace();
+ const { searchParamsObj, queryParams } = useRouterStuff();
+
+ const [selectedFilter, setSelectedFilter] = useState<string | null>(null);
+ const [search, setSearch] = useState("");
+ const [debouncedSearch] = useDebounce(search, 500);
+
+ const { partners } = usePartnerFilterOptions(
+ selectedFilter === "partnerId" ? debouncedSearch : "",
+ );
+ const { groups } = useGroups();
+
+ const filters = useMemo(
+ () => [
+ {
+ key: "partnerId",
+ icon: Users,
+ label: "Partner",
+ shouldFilter: false,
+ options:
+ partners?.map((partner) => ({
+ value: partner.id,
+ label: partner.name,
+ icon: <PartnerAvatar partner={partner} className="size-4" />,
+ })) ?? null,
+ },
+ {
+ key: "groupId",
+ icon: Users6,
+ label: "Partner Group",
+ options:
+ groups?.map((group) => ({
+ value: group.id,
+ label: group.name,
+ icon: <GroupColorCircle group={group} />,
+ permalink: `/${slug}/program/groups/${group.slug}/rewards`,
+ })) ?? null,
+ },
+ {
+ key: "type",
+ icon: Sliders,
+ label: "Type",
+ options: Object.values(CommissionType).map((type) => ({
+ value: type,
+ label: capitalize(type) as string,
+ icon: <CommissionTypeIcon type={type} />,
+ })),
+ },
+ ],
+ [partners, groups, slug],
+ );
+
+ const activeFilters = useMemo(() => {
+ const result: {
+ key: string;
+ operator: FilterOperator;
+ values: string[];
+ }[] = [];
+
+ for (const key of COMMISSION_FILTER_KEYS) {
+ const raw = searchParamsObj[key];
+ if (!raw) continue;
+ const parsed = parseFilterValue(raw);
+ if (parsed)
+ result.push({ key, operator: parsed.operator, values: parsed.values });
+ }
+
+ return result;
+ }, [
+ searchParamsObj.partnerId,
+ searchParamsObj.groupId,
+ searchParamsObj.type,
+ ]);
+
+ const onSelect = useCallback(
+ (key: string, value: string) => {
+ const currentParam = searchParamsObj[key];
+
+ if (!currentParam) {
+ queryParams({ set: { [key]: value }, del: "page", scroll: false });
+ return;
+ }
+
+ const parsed = parseFilterValue(currentParam);
+ if (parsed && !parsed.values.includes(value)) {
+ const newValues = [...parsed.values, value];
+ const newParam = parsed.operator.includes("NOT")
+ ? `-${newValues.join(",")}`
+ : newValues.join(",");
+ queryParams({ set: { [key]: newParam }, del: "page", scroll: false });
+ }
+ },
+ [searchParamsObj, queryParams],
+ );
+
+ const onRemove = useCallback(
+ (key: string, value: string) => {
+ const currentParam = searchParamsObj[key];
+ if (!currentParam) return;
+
+ const parsed = parseFilterValue(currentParam);
+ if (!parsed) {
+ queryParams({ del: [key, "page"], scroll: false });
+ return;
+ }
+
+ const newValues = parsed.values.filter((v) => v !== value);
+ if (newValues.length === 0) {
+ queryParams({ del: [key, "page"], scroll: false });
+ } else {
+ const newParam = parsed.operator.includes("NOT")
+ ? `-${newValues.join(",")}`
+ : newValues.join(",");
+ queryParams({ set: { [key]: newParam }, del: "page", scroll: false });
+ }
+ },
+ [searchParamsObj, queryParams],
+ );
+
+ const onRemoveFilter = useCallback(
+ (key: string) => queryParams({ del: [key, "page"], scroll: false }),
+ [queryParams],
+ );
+
+ const onRemoveAll = useCallback(
+ () =>
+ queryParams({
+ // Include customerId for backwards compat in case it's still in the URL
+ del: [...COMMISSION_FILTER_KEYS, "customerId", "page"],
+ scroll: false,
+ }),
+ [queryParams],
+ );
+
+ const onToggleOperator = useCallback(
+ (key: string) => {
+ const currentParam = searchParamsObj[key];
+ if (!currentParam) return;
+ const isNegated = currentParam.startsWith("-");
+ const cleanValue = isNegated ? currentParam.slice(1) : currentParam;
+ queryParams({
+ set: { [key]: isNegated ? cleanValue : `-${cleanValue}` },
+ del: "page",
+ scroll: false,
+ });
+ },
+ [searchParamsObj, queryParams],
+ );
+
+ const onOpenFilter = useCallback(
+ (key: string | null) => setSelectedFilter(key),
+ [],
+ );
+
+ return {
+ filters,
+ activeFilters,
+ onSelect,
+ onRemove,
+ onRemoveFilter,
+ onRemoveAll,
+ onToggleOperator,
+ onOpenFilter,
+ setSearch,
+ };
+}
+
+function usePartnerFilterOptions(search: string) {
+ const { searchParamsObj } = useRouterStuff();
+
+ const { partners, loading: partnersLoading } = usePartners({
+ query: { search, sortBy: "totalCommissions", sortOrder: "desc" },
+ });
+ const { partners: selectedPartners } = usePartners({
+ query: {
+ partnerIds: searchParamsObj.partnerId
+ ? searchParamsObj.partnerId.replace(/^-/, "").split(",").filter(Boolean)
+ : undefined,
+ },
+ });
+
+ return {
+ partners: partnersLoading
+ ? null
+ : ([
+ ...(partners ?? []),
+ ...(selectedPartners
+ ?.filter((sp) => !partners?.some((p) => p.id === sp.id))
+ ?.map((sp) => ({ ...sp, hideDuringSearch: true })) ?? []),
+ ] as (EnrolledPartnerProps & { hideDuringSearch?: boolean })[]),
+ };
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/use-commissions-analytics-query.ts b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/use-commissions-analytics-query.ts
new file mode 100644
index 0000000000..0c76869350
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/use-commissions-analytics-query.ts
@@ -0,0 +1,76 @@
+"use client";
+
+import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "@/lib/analytics/constants";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { useRouterStuff } from "@dub/ui";
+import { useMemo } from "react";
+import { CommissionStatusFilter } from "./commissions-status-selector";
+
+export function useCommissionsAnalyticsQuery() {
+ const { id: workspaceId } = useWorkspace();
+ const { searchParamsObj } = useRouterStuff();
+
+ const status = useMemo<CommissionStatusFilter>(() => {
+ const raw = searchParamsObj.status;
+ if (raw === "pending" || raw === "processed" || raw === "paid") return raw;
+ return undefined; // All (default)
+ }, [searchParamsObj.status]);
+
+ const unit = useMemo<"earnings" | "count">(() => {
+ return searchParamsObj.commissionUnit === "count" ? "count" : "earnings";
+ }, [searchParamsObj.commissionUnit]);
+
+ const queryString = useMemo(() => {
+ if (!workspaceId) return "";
+
+ const {
+ status: _status, // excluded — added explicitly below via validated `status` variable
+ commissionUnit: _commissionUnit,
+ pageTab: _pageTab,
+ event: _event,
+ saleUnit: _saleUnit,
+ view: _view,
+ interval,
+ start,
+ end,
+ partnerId,
+ groupId,
+ type,
+ } = searchParamsObj;
+
+ const params = new URLSearchParams({
+ workspaceId,
+ timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+ });
+
+ if (status) params.set("status", status);
+
+ if (start && end) {
+ params.set("start", start);
+ params.set("end", end);
+ } else {
+ params.set("interval", interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL);
+ }
+
+ if (partnerId) params.set("partnerId", partnerId);
+ if (groupId) params.set("groupId", groupId);
+ if (type) params.set("type", type);
+
+ return params.toString();
+ }, [workspaceId, status, unit, searchParamsObj]);
+
+ const { interval, start, end } = searchParamsObj;
+ const resolvedInterval =
+ start && end ? undefined : interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL;
+ const resolvedStart = start ? new Date(start) : undefined;
+ const resolvedEnd = end ? new Date(end) : undefined;
+
+ return {
+ queryString,
+ status,
+ unit,
+ interval: resolvedInterval,
+ start: resolvedStart,
+ end: resolvedEnd,
+ };
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/partner-nav.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/partner-nav.tsx
index 4f44c9bb3b..12525bffd9 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/partner-nav.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/partner-nav.tsx
@@ -11,11 +11,10 @@ import {
Msg,
UserCheck,
} from "@dub/ui";
-import { useParams, usePathname } from "next/navigation";
+import { useParams } from "next/navigation";
import { useMemo } from "react";
export function PartnerNav() {
- const pathname = usePathname();
const { partnerId } = useParams() as { partnerId: string };
const { slug: workspaceSlug } = useWorkspace();
diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.ts
index 9a855fb68d..3dcf73b570 100644
--- a/apps/web/lib/api/commissions/get-commissions-count.ts
+++ b/apps/web/lib/api/commissions/get-commissions-count.ts
@@ -1,7 +1,12 @@
import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
import { getCommissionsCountQuerySchema } from "@/lib/zod/schemas/commissions";
import { prisma } from "@dub/prisma";
-import { CommissionStatus, FraudEventStatus } from "@dub/prisma/client";
+import {
+ CommissionStatus,
+ CommissionType,
+ FraudEventStatus,
+} from "@dub/prisma/client";
+import { parseFilterValue } from "@dub/utils";
import * as z from "zod/v4";
type CommissionsCountFilters = z.infer<
@@ -76,6 +81,10 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
}),
};
+ const partnerFilter = parseFilterValue(partnerId);
+ const customerFilter = parseFilterValue(customerId);
+ const typeFilter = parseFilterValue(type);
+
const commissionsCount = await prisma.commission.groupBy({
by: ["status"],
where: {
@@ -83,11 +92,26 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
not: 0,
},
programId,
- partnerId,
+ ...(partnerFilter && {
+ partnerId:
+ partnerFilter.sqlOperator === "NOT IN"
+ ? { notIn: partnerFilter.values }
+ : { in: partnerFilter.values },
+ }),
status: statusFilter,
- type,
+ ...(typeFilter && {
+ type:
+ typeFilter.sqlOperator === "NOT IN"
+ ? { notIn: typeFilter.values as CommissionType[] }
+ : { in: typeFilter.values as CommissionType[] },
+ }),
payoutId,
- customerId,
+ ...(customerFilter && {
+ customerId:
+ customerFilter.sqlOperator === "NOT IN"
+ ? { notIn: customerFilter.values }
+ : { in: customerFilter.values },
+ }),
...(eventIds && {
eventId: {
in: eventIds,
@@ -95,7 +119,7 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
}),
createdAt: {
gte: startDate,
- lte: endDate,
+ lt: endDate,
},
...(Object.keys(programEnrollmentFilter).length > 0 && {
programEnrollment: programEnrollmentFilter,
diff --git a/apps/web/lib/swr/use-commissions-breakdown.ts b/apps/web/lib/swr/use-commissions-breakdown.ts
new file mode 100644
index 0000000000..de3621ac49
--- /dev/null
+++ b/apps/web/lib/swr/use-commissions-breakdown.ts
@@ -0,0 +1,34 @@
+import { fetcher } from "@dub/utils";
+import useSWR from "swr";
+
+export type CommissionsBreakdownItem = {
+ key: string;
+ label: string;
+ earnings: number;
+ count: number;
+};
+
+export type CommissionsBreakdownGroupBy = "type" | "groupId";
+
+export default function useCommissionsBreakdown({
+ queryString,
+ groupBy,
+ enabled = true,
+}: {
+ queryString: string;
+ groupBy: CommissionsBreakdownGroupBy;
+ enabled?: boolean;
+}) {
+ const url =
+ enabled && queryString
+ ? `/api/commissions/breakdown?groupBy=${groupBy}&${queryString}`
+ : null;
+
+ const { data, error, isLoading } = useSWR<CommissionsBreakdownItem[]>(
+ url,
+ fetcher,
+ { keepPreviousData: true },
+ );
+
+ return { data, isLoading, error };
+}
diff --git a/apps/web/lib/swr/use-commissions-timeseries.ts b/apps/web/lib/swr/use-commissions-timeseries.ts
index e32d13d337..d7c1b9c67c 100644
--- a/apps/web/lib/swr/use-commissions-timeseries.ts
+++ b/apps/web/lib/swr/use-commissions-timeseries.ts
@@ -4,42 +4,50 @@ import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "../analytics/constants";
import { PartnerAnalyticsFilters } from "../analytics/types";
import useWorkspace from "./use-workspace";
-interface Commission {
+export interface CommissionTimeseriesItem {
start: string;
earnings: number;
+ count: number;
}
export default function useCommissionsTimeseries(
- params?: PartnerAnalyticsFilters & { enabled: boolean },
+ params?: PartnerAnalyticsFilters & {
+ enabled: boolean;
+ queryString?: string;
+ },
) {
const { id: workspaceId } = useWorkspace();
- const searchParams = new URLSearchParams({
- event: params?.event ?? "composite",
- ...(params?.start && params?.end
- ? {
- start: params.start.toISOString(),
- end: params.end.toISOString(),
- }
- : { interval: params?.interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL }),
- groupBy: params?.groupBy ?? "count",
- timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
- workspaceId: workspaceId!,
- });
-
- const { data, error } = useSWR<Commission[]>(
- params?.enabled
- ? `/api/commissions/timeseries?${searchParams.toString()}`
- : null,
- fetcher,
- {
- dedupingInterval: 60000,
- },
- );
+ const url = (() => {
+ if (!params?.enabled) return null;
+
+ if (params.queryString !== undefined) {
+ return params.queryString
+ ? `/api/commissions/timeseries?${params.queryString}`
+ : null;
+ }
+
+ if (!workspaceId) return null;
+
+ const searchParams = new URLSearchParams({
+ ...(params.start && params.end
+ ? {
+ start: params.start.toISOString(),
+ end: params.end.toISOString(),
+ }
+ : { interval: params.interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL }),
+ timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+ workspaceId,
+ });
+
+ return `/api/commissions/timeseries?${searchParams.toString()}`;
+ })();
+
+ const { data, error } = useSWR<CommissionTimeseriesItem[]>(url, fetcher);
return {
data,
error,
- loading: !data && !error ? true : false,
+ loading: url !== null && !data && !error,
};
}
diff --git a/apps/web/lib/swr/use-commissions-top-partners.ts b/apps/web/lib/swr/use-commissions-top-partners.ts
new file mode 100644
index 0000000000..82db8e7d53
--- /dev/null
+++ b/apps/web/lib/swr/use-commissions-top-partners.ts
@@ -0,0 +1,31 @@
+import { fetcher } from "@dub/utils";
+import useSWR from "swr";
+
+export interface CommissionsTopPartner {
+ partnerId: string;
+ name: string;
+ image: string | null;
+ country: string | null;
+ groupId: string | null;
+ groupName: string | null;
+ earnings: number;
+ commissionCount: number;
+}
+
+export default function useCommissionsTopPartners({
+ queryString,
+ enabled = true,
+}: {
+ queryString: string;
+ enabled?: boolean;
+}) {
+ const { data, error, isLoading } = useSWR<CommissionsTopPartner[]>(
+ enabled && queryString
+ ? `/api/commissions/top-partners?${queryString}`
+ : null,
+ fetcher,
+ { keepPreviousData: true },
+ );
+
+ return { partners: data, isLoading, error };
+}
diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.ts
index 3c18f5a221..8a68dfb0f7 100644
--- a/apps/web/lib/zod/schemas/commissions.ts
+++ b/apps/web/lib/zod/schemas/commissions.ts
@@ -160,14 +160,19 @@ export const getCommissionsQuerySchema = z
}),
});
-export const getCommissionsCountQuerySchema = getCommissionsQuerySchema.omit({
- page: true,
- pageSize: true,
- sortOrder: true,
- sortBy: true,
- startingAfter: true,
- endingBefore: true,
-});
+export const getCommissionsCountQuerySchema = getCommissionsQuerySchema
+ .omit({
+ page: true,
+ pageSize: true,
+ sortOrder: true,
+ sortBy: true,
+ startingAfter: true,
+ endingBefore: true,
+ })
+ .extend({
+ // Accept raw string to support comma-separated multi-value (e.g. "sale,lead")
+ type: z.string().optional(),
+ });
export const createCommissionSchema = z.object({
workspaceId: z.string(),
diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsx
index e17678cf87..ffb92aef44 100644
--- a/apps/web/ui/analytics/use-analytics-filters.tsx
+++ b/apps/web/ui/analytics/use-analytics-filters.tsx
@@ -437,7 +437,7 @@ export function useAnalyticsFilters({
{
key: "groupId",
icon: Users6,
- label: "Group",
+ label: "Partner Group",
getOptionIcon: (_value, props) => {
const group = props.option?.data?.group;
return group ? <GroupColorCircle group={group} /> : null;
diff --git a/apps/web/ui/layout/page-nav-tabs.tsx b/apps/web/ui/layout/page-nav-tabs.tsx
index d7fcd250ee..156dfb3c16 100644
--- a/apps/web/ui/layout/page-nav-tabs.tsx
+++ b/apps/web/ui/layout/page-nav-tabs.tsx
@@ -1,6 +1,11 @@
"use client";
-import { ArrowUpRight2, Icon, useScrollProgress } from "@dub/ui";
+import {
+ ArrowUpRight2,
+ Icon,
+ useRouterStuff,
+ useScrollProgress,
+} from "@dub/ui";
import { cn } from "@dub/utils";
import { LayoutGroup, motion } from "motion/react";
import Link from "next/link";
@@ -25,10 +30,17 @@ export type PageNavTabsProps = {
basePath: string;
tabs: PageNavTabsTab[];
quickLinks?: PageNavTabsQuicklink[];
+ preservedQueryParams?: string[];
};
-export function PageNavTabs({ basePath, tabs, quickLinks }: PageNavTabsProps) {
+export function PageNavTabs({
+ basePath,
+ tabs,
+ quickLinks,
+ preservedQueryParams,
+}: PageNavTabsProps) {
const pathname = usePathname();
+ const { getQueryString } = useRouterStuff();
const containerRef = useRef<HTMLDivElement>(null);
const layoutGroupId = useId();
@@ -69,12 +81,25 @@ export function PageNavTabs({ basePath, tabs, quickLinks }: PageNavTabsProps) {
layout
className={cn("relative z-0 inline-flex items-center gap-1")}
>
- {tabs.map(({ id, label, icon: Icon, badge }) => {
- const isSelected = pathname.endsWith(`/${id}`);
+ {tabs.map(({ id, label, icon: Icon, badge }, idx) => {
+ // if it's the base path, match the first tab
+ const isSelected =
+ pathname.endsWith(basePath) && idx === 0
+ ? true
+ : pathname.endsWith(`/${id}`);
return (
<Link
key={id}
- href={`${basePath}/${id}`}
+ href={`${basePath}/${id}${
+ preservedQueryParams
+ ? getQueryString(
+ {},
+ {
+ include: preservedQueryParams,
+ },
+ )
+ : ""
+ }`}
data-selected={isSelected}
className={cn(
"text-content-emphasis relative z-10 flex items-center gap-2 px-2.5 py-1 text-sm font-medium",