The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Refactor useCommissionAnalytics (#3830)
Steven Teyba5d14b29e46
diff --git a/apps/web/app/(ee)/api/commissions/analytics/route.ts b/apps/web/app/(ee)/api/commissions/analytics/route.tsnew file mode 100644index 0000000000..fd7df46dde--- /dev/null+++ b/apps/web/app/(ee)/api/commissions/analytics/route.ts@@ -0,0 +1,503 @@+import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";+import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";+import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";+import { withWorkspace } from "@/lib/auth";+import {+ commissionAnalyticsQuerySchema,+ commissionAnalyticsSchema,+} from "@/lib/commissions/schema";+import { sqlGranularityMap } from "@/lib/planetscale/granularity";+import type { CommissionAnalyticsQuery } from "@/lib/types";+import { prisma } from "@dub/prisma";+import { CommissionStatus, CommissionType, Prisma } from "@dub/prisma/client";+import { capitalize, parseFilterValue } from "@dub/utils";+import { format } from "date-fns/format";+import { NextResponse } from "next/server";+import * as z from "zod/v4";++type CommissionTimeseriesRow = {+ start: string;+ earnings: bigint;+ count: bigint;+};++type CommissionGroupIdQueryRow = {+ groupId: string | null;+ earnings: bigint;+ count: bigint;+};++const excludedStatuses = [+ CommissionStatus.duplicate,+ CommissionStatus.fraud,+ CommissionStatus.canceled,+] as const;++function commissionSqlConditions({+ programId,+ startDate,+ endDate,+ status,+ partnerFilter,+ typeFilter,+ groupIdParam,+}: {+ programId: string;+ startDate: Date;+ endDate: Date;+ status: CommissionStatus | undefined;+ partnerFilter: ReturnType<typeof parseFilterValue>;+ typeFilter: ReturnType<typeof parseFilterValue> | null;+ groupIdParam: string | undefined;+}): Prisma.Sql[] {+ 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([...excludedStatuses])})`,+ ];++ 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 (groupIdParam) {+ const groupFilter = parseFilterValue(groupIdParam);+ 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})+ )`);+ }+ }++ return conditions;+}++// GET /api/commissions/analytics+export const GET = withWorkspace(async ({ workspace, searchParams }) => {+ const programId = getDefaultProgramIdOrThrow(workspace);++ const parsed = commissionAnalyticsQuerySchema.parse(searchParams);+ const { groupBy } = parsed;++ if (groupBy === "timeseries") {+ return byTimeseries({ workspace, programId, parsed });+ }++ assertValidDateRangeForPlan({+ plan: workspace.plan,+ dataAvailableFrom: workspace.createdAt,+ interval: parsed.interval,+ start: parsed.start,+ end: parsed.end,+ });++ const { startDate, endDate } = getStartEndDates({+ interval: parsed.interval,+ start: parsed.start,+ end: parsed.end,+ timezone: parsed.timezone,+ });++ if (groupBy === "type") {+ return byType({ programId, parsed, startDate, endDate });+ }++ if (groupBy === "groupId") {+ return byGroupId({ programId, parsed, startDate, endDate });+ }++ if (groupBy === "partnerId") {+ return byPartnerId({ programId, parsed, startDate, endDate });+ }++ return NextResponse.json(null);+});++async function byType({+ programId,+ parsed,+ startDate,+ endDate,+}: {+ programId: string;+ parsed: CommissionAnalyticsQuery;+ startDate: Date;+ endDate: Date;+}) {+ const { status, partnerId, groupId, type } = parsed;+ 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(commissionAnalyticsSchema.type.parse([]));+ }++ const typeFilter =+ rawTypeFilter && validTypeValues.length > 0+ ? { ...rawTypeFilter, values: validTypeValues }+ : null;++ const baseWhere: Prisma.CommissionWhereInput = {+ programId,+ createdAt: { gte: startDate, lt: endDate },+ status: status ? status : { notIn: [...excludedStatuses] },+ ...(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 },+ },+ }),+ };++ const rows = await prisma.commission.groupBy({+ by: ["type"],+ where: baseWhere,+ _sum: { earnings: true },+ _count: { _all: true },+ orderBy: { _sum: { earnings: "desc" } },+ });++ const 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,+ }));++ return NextResponse.json(commissionAnalyticsSchema.type.parse(result));+}++async function byGroupId({+ programId,+ parsed,+ startDate,+ endDate,+}: {+ programId: string;+ parsed: CommissionAnalyticsQuery;+ startDate: Date;+ endDate: Date;+}) {+ const { status, partnerId, groupId, type } = parsed;+ const partnerFilter = parseFilterValue(partnerId);++ 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(commissionAnalyticsSchema.groupId.parse([]));+ }++ const typeFilter =+ rawTypeFilter && validTypeValues.length > 0+ ? { ...rawTypeFilter, values: validTypeValues }+ : null;++ const conditions = commissionSqlConditions({+ programId,+ startDate,+ endDate,+ status,+ partnerFilter,+ typeFilter,+ groupIdParam: groupId,+ });++ const whereClause = Prisma.join(conditions, " AND ");++ const rows = await prisma.$queryRaw<CommissionGroupIdQueryRow[]>(+ Prisma.sql`+ SELECT+ pe.groupId AS groupId,+ SUM(c.earnings) AS earnings,+ COUNT(c.id) AS count+ FROM Commission c+ JOIN ProgramEnrollment pe+ ON pe.programId = c.programId+ AND pe.partnerId = c.partnerId+ WHERE ${whereClause}+ GROUP BY pe.groupId+ ORDER BY earnings DESC`,+ );++ const groupIds = rows+ .map((r) => r.groupId)+ .filter((id): id is string => id !== null);++ const partnerGroups =+ groupIds.length > 0+ ? await prisma.partnerGroup.findMany({+ where: { id: { in: groupIds } },+ select: { id: true, name: true },+ })+ : [];++ const partnerGroupById = new Map(partnerGroups.map((g) => [g.id, g]));++ const result = rows.map((row) => {+ const key = row.groupId ?? "ungrouped";+ const label =+ row.groupId === null+ ? "Ungrouped"+ : partnerGroupById.get(row.groupId)?.name ?? row.groupId;++ return {+ key,+ label,+ earnings: Number(row.earnings),+ count: Number(row.count),+ };+ });++ return NextResponse.json(commissionAnalyticsSchema.groupId.parse(result));+}++async function byPartnerId({+ programId,+ parsed,+ startDate,+ endDate,+}: {+ programId: string;+ parsed: CommissionAnalyticsQuery;+ startDate: Date;+ endDate: Date;+}) {+ const { status, partnerId, groupId, type } = parsed;+ 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(commissionAnalyticsSchema.partnerId.parse([]));+ }++ 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: [...excludedStatuses] },+ ...(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" } },+ });++ if (grouped.length === 0) {+ return NextResponse.json(commissionAnalyticsSchema.partnerId.parse([]));+ }++ 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(commissionAnalyticsSchema.partnerId.parse(result));+}++async function byTimeseries({+ workspace,+ programId,+ parsed,+}: {+ workspace: { id: string };+ programId: string;+ parsed: z.infer<typeof commissionAnalyticsQuerySchema>;+}) {+ const { start, end, interval, timezone, status, partnerId, groupId, type } =+ parsed;++ const { startDate, endDate, granularity } = getStartEndDates({+ interval,+ start,+ end,+ dataAvailableFrom:+ interval === "all"+ ? await getProgramOrThrow({+ workspaceId: workspace.id,+ programId,+ }).then((program) => program.startedAt ?? program.createdAt)+ : undefined,+ timezone,+ });++ const { dateFormat, dateIncrement, startFunction, formatString } =+ sqlGranularityMap[granularity];++ const partnerFilter = parseFilterValue(partnerId);+ const typeFilter = parseFilterValue(type);++ const conditions = commissionSqlConditions({+ programId,+ startDate,+ endDate,+ status,+ partnerFilter,+ typeFilter,+ groupIdParam: groupId,+ });++ const whereClause = Prisma.join(conditions, " AND ");++ 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`,+ );++ const earningsLookup = Object.fromEntries(+ rows.map((item) => [+ item.start,+ { earnings: Number(item.earnings), count: Number(item.count) },+ ]),+ );++ let currentDate = startFunction(startDate);++ const timeseries: z.infer<(typeof commissionAnalyticsSchema)["timeseries"]> =+ [];++ while (currentDate < endDate) {+ const periodKey = format(currentDate, formatString);++ timeseries.push({+ start: currentDate.toISOString(),+ ...(earningsLookup[periodKey] ?? { earnings: 0, count: 0 }),+ });++ currentDate = dateIncrement(currentDate);+ }++ return NextResponse.json(+ commissionAnalyticsSchema.timeseries.parse(timeseries),+ );+}diff --git a/apps/web/app/(ee)/api/commissions/breakdown/route.ts b/apps/web/app/(ee)/api/commissions/breakdown/route.tsdeleted file mode 100644index d84c69c232..0000000000--- a/apps/web/app/(ee)/api/commissions/breakdown/route.ts+++ /dev/null@@ -1,181 +0,0 @@-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.tsdeleted file mode 100644index 6419f6f841..0000000000--- a/apps/web/app/(ee)/api/commissions/timeseries/route.ts+++ /dev/null@@ -1,140 +0,0 @@-import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";-import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";-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 })- .extend({- status: z.enum(CommissionStatus).optional(),- partnerId: z.string().optional(),- groupId: z.string().optional(),- type: z.string().optional(),- });--interface CommissionTimeseriesRow {- start: string;- 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, status, partnerId, groupId, type } =- querySchema.parse(searchParams);-- const { startDate, endDate, granularity } = getStartEndDates({- interval,- start,- end,- dataAvailableFrom:- interval === "all"- ? await getProgramOrThrow({- workspaceId: workspace.id,- programId,- }).then((program) => program.startedAt ?? program.createdAt)- : undefined,- timezone,- });-- 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 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`,- );- console.timeEnd("getCommissionsTimeseries");-- let currentDate = startFunction(startDate);-- const earningsLookup = Object.fromEntries(- rows.map((item) => [- item.start,- { earnings: Number(item.earnings), count: Number(item.count) },- ]),- );-- 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, count: 0 }),- });- currentDate = dateIncrement(currentDate);- }-- return NextResponse.json(timeseries);-});diff --git a/apps/web/app/(ee)/api/commissions/top-partners/route.ts b/apps/web/app/(ee)/api/commissions/top-partners/route.tsdeleted file mode 100644index 3453ebb2c9..0000000000--- a/apps/web/app/(ee)/api/commissions/top-partners/route.ts+++ /dev/null@@ -1,137 +0,0 @@-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/commissions-breakdown-cards.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-cards.tsxsimilarity index 93%rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-breakdown-cards.tsxrename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-cards.tsxindex 1257ab7ee3..c2058c88e8 100644--- 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-analytics-cards.tsx@@ -1,8 +1,8 @@"use client";-import useCommissionsBreakdown, {- CommissionsBreakdownItem,-} from "@/lib/swr/use-commissions-breakdown";+import useCommissionAnalytics, {+ CommissionCategoryRow,+} from "@/lib/swr/use-commission-analytics";import useGroups from "@/lib/swr/use-groups";import { AnalyticsLoadingSpinner } from "@/ui/analytics/analytics-loading-spinner";import { BarList } from "@/ui/analytics/bar-list";@@ -28,15 +28,15 @@ const STATUS_ICONS: Record<string, React.ElementType> = {all: CircleDotted,};-type BreakdownGroupBy = "type" | "groupId";+type CommissionsBarListTab = "type" | "groupId";-function mapBreakdownItem(- item: CommissionsBreakdownItem,- groupBy: BreakdownGroupBy,+function mapCommissionBarRow(+ item: CommissionCategoryRow,+ tab: CommissionsBarListTab,groupColorMap: Map<string, { color: string | null }>,) {const icon =- groupBy === "type" ? (+ tab === "type" ? (<CommissionTypeIcontype={item.key as "sale" | "custom" | "lead" | "click"}/>@@ -100,7 +100,7 @@ function useUrlListFilter(paramKey: string) {};}-function BreakdownCardShell({+function CommissionAnalyticsCardShell({status,title,dataLength,@@ -197,7 +197,7 @@ const BAR_LIST_SHARED = {filterHoverClass: "bg-white border border-neutral-200",};-function BreakdownBarPanel({+function CommissionBarPanel({status,title,tab,@@ -210,9 +210,9 @@ function BreakdownBarPanel({}: {status: CommissionStatusFilter;title: string;- tab: BreakdownGroupBy;+ tab: CommissionsBarListTab;filter: ReturnType<typeof useUrlListFilter>;- rawItems: CommissionsBreakdownItem[] | undefined;+ rawItems: CommissionCategoryRow[] | undefined;loading: boolean;groupColorMap: Map<string, { color: string | null }>;barBackground: string;@@ -221,14 +221,14 @@ function BreakdownBarPanel({const data = useMemo(() =>(rawItems ?? []).map((item) =>- mapBreakdownItem(item, tab, groupColorMap),+ mapCommissionBarRow(item, tab, groupColorMap),),[rawItems, tab, groupColorMap],);const maxValue = Math.max(0, ...data.map((d) => d.value));return (- <BreakdownCardShell+ <CommissionAnalyticsCardShellstatus={status}title={title}dataLength={data.length}@@ -265,11 +265,11 @@ function BreakdownBarPanel({/>)}- </BreakdownCardShell>+ </CommissionAnalyticsCardShell>);}-export function CommissionsBreakdownCards({+export function CommissionsAnalyticsCards({status,queryString,}: {@@ -286,18 +286,18 @@ export function CommissionsBreakdownCards({return map;}, [groups]);- const { data: groupRows, isLoading: groupLoading } = useCommissionsBreakdown({+ const { data: groupRows, isLoading: groupLoading } = useCommissionAnalytics({queryString,groupBy: "groupId",});- const { data: typeRows, isLoading: typeLoading } = useCommissionsBreakdown({+ const { data: typeRows, isLoading: typeLoading } = useCommissionAnalytics({queryString,groupBy: "type",});return (<div className="grid grid-cols-1 gap-5 md:grid-cols-2">- <BreakdownBarPanel+ <CommissionBarPanelstatus={status}title="Partner Group"tab="groupId"@@ -308,7 +308,7 @@ export function CommissionsBreakdownCards({barBackground="bg-orange-100"hoverBackground="hover:bg-gradient-to-r hover:from-orange-50 hover:to-transparent hover:border-orange-500"/>- <BreakdownBarPanel+ <CommissionBarPanelstatus={status}title="Type"tab="type"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.tsxindex 62ded36b2b..0427c743a3 100644--- 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@@ -1,7 +1,7 @@"use client";import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";-import useCommissionsTimeseries from "@/lib/swr/use-commissions-timeseries";+import useCommissionAnalytics from "@/lib/swr/use-commission-analytics";import {Areas,ChartContext,@@ -63,8 +63,12 @@ export function CommissionsAnalyticsChart({const id = useId();const color = STATUS_COLORS[status ?? "all"];- const { data, loading, error } = useCommissionsTimeseries({- enabled: true,+ const {+ data,+ isLoading: loading,+ error,+ } = useCommissionAnalytics({+ groupBy: "timeseries",queryString,});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.tsxindex 0d0168eab0..1ce554ab3f 100644--- 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@@ -1,8 +1,8 @@"use client";-import useCommissionsTopPartners, {- CommissionsTopPartner,-} from "@/lib/swr/use-commissions-top-partners";+import useCommissionAnalytics, {+ CommissionAnalyticsPartnerRow,+} from "@/lib/swr/use-commission-analytics";import {Button,Table,@@ -73,11 +73,12 @@ export function CommissionsPartnersTable({});const {- partners: allPartners,+ data: allPartners,isLoading,error,- } = useCommissionsTopPartners({+ } = useCommissionAnalytics({queryString,+ groupBy: "partnerId",});const pageData = useMemo(@@ -89,7 +90,7 @@ export function CommissionsPartnersTable({[allPartners, pagination.pageIndex],);- const { table, ...tableProps } = useTable<CommissionsTopPartner>({+ const { table, ...tableProps } = useTable<CommissionAnalyticsPartnerRow>({data: pageData ?? [],columns: [{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.tsxindex f020889ece..ea104373dc 100644--- 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@@ -19,7 +19,7 @@ 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 { CommissionsAnalyticsCards } from "./commissions-analytics-cards";import {ProgramAnalyticsNav,ProgramAnalyticsTabId,@@ -249,7 +249,7 @@ export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {<DeviceSection /></div>) : (- <CommissionsBreakdownCards+ <CommissionsAnalyticsCardsstatus={commissionStatus}queryString={commissionsQueryString}/>diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-chart.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-chart.tsxindex d6255ae3a0..0f46146aa5 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-chart.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/overview-chart.tsx@@ -1,7 +1,7 @@import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";import { IntervalOptions } from "@/lib/analytics/types";import { editQueryString } from "@/lib/analytics/utils";-import useCommissionsTimeseries from "@/lib/swr/use-commissions-timeseries";+import useCommissionAnalytics from "@/lib/swr/use-commission-analytics";import useProgram from "@/lib/swr/use-program";import useWorkspace from "@/lib/swr/use-workspace";import { AnalyticsContext } from "@/ui/analytics/analytics-provider";@@ -59,8 +59,7 @@ export function OverviewChart() {);const { data: commissions, error: commissionsError } =- useCommissionsTimeseries({- event: "sales",+ useCommissionAnalytics({groupBy: "timeseries",interval: interval as IntervalOptions | undefined,start: start ? new Date(start) : undefined,diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/form.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/form.tsxindex e46357c975..ca8693de16 100644--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/form.tsx+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/form.tsx@@ -12,7 +12,7 @@ import { AnimatedSizeContainer, Button, CircleCheckFill } from "@dub/ui";import { capitalize, cn } from "@dub/utils";import { usePlausible } from "next-plausible";import { useAction } from "next-safe-action/hooks";-import { useEffect, useRef, useState } from "react";+import { useEffect, useId, useRef, useState } from "react";import { useFormContext } from "react-hook-form";import { toast } from "sonner";import { useOnboardingProgress } from "../../../use-onboarding-progress";@@ -49,6 +49,7 @@ const PAYOUT_MODELS = [export function Form() {const { continueTo } = useOnboardingProgress();+ const rewardAmountInputId = useId();const [hasSubmitted, setHasSubmitted] = useState(false);const { id: workspaceId, mutate } = useWorkspace();@@ -404,12 +405,15 @@ export function Form() {</div>)}- <label className="space-y-2">+ <div className="space-y-2"><div className="flex items-center justify-between gap-3">- <span className="text-content-emphasis block text-sm font-semibold">+ <label+ htmlFor={rewardAmountInputId}+ className="text-content-emphasis block text-sm font-semibold"+ >{type === "percentage" ? "Percentage" : "Amount"} per{" "}{defaultRewardType}- </span>+ </label><RewardQualityFieldIndicatorevent={defaultRewardType as EventType}type={type}@@ -429,6 +433,7 @@ export function Form() {{type === "flat" && "$"}</span><input+ id={rewardAmountInputId}className={cn("block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",type === "flat" ? "pl-6 pr-12" : "pr-7",@@ -449,7 +454,7 @@ export function Form() {{type === "flat" ? "USD" : "%"}</span></div>- </label>+ </div></div></AnimatedSizeContainer></div>diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.tsindex 3dcf73b570..d91fd58618 100644--- a/apps/web/lib/api/commissions/get-commissions-count.ts+++ b/apps/web/lib/api/commissions/get-commissions-count.ts@@ -70,8 +70,15 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {],};+ const groupFilter = parseFilterValue(groupId);+const programEnrollmentFilter = {- ...(groupId && { groupId }),+ ...(groupFilter && {+ groupId:+ groupFilter.sqlOperator === "NOT IN"+ ? { notIn: groupFilter.values }+ : { in: groupFilter.values },+ }),...(isHoldStatus && {fraudEventGroups: {some: {diff --git a/apps/web/lib/commissions/schema.ts b/apps/web/lib/commissions/schema.tsnew file mode 100644index 0000000000..d8a87d7d41--- /dev/null+++ b/apps/web/lib/commissions/schema.ts@@ -0,0 +1,76 @@+import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";+import { CommissionStatus } from "@dub/prisma/client";+import * as z from "zod/v4";++const sharedCommissionAnalyticsFilterSchema = analyticsQuerySchema+ .pick({+ start: true,+ end: true,+ interval: true,+ timezone: true,+ })+ .extend({+ groupId: z.string().optional(),+ partnerId: z.string().optional(),+ type: z.string().optional(),+ status: z.enum(CommissionStatus).optional(),+ });++// Commission program analytics (workspace dashboard)+export const commissionAnalyticsQuerySchema =+ sharedCommissionAnalyticsFilterSchema.extend({+ groupBy: z.enum(["timeseries", "partnerId", "groupId", "type"]),+ });++const commissionTotalsSchema = z.object({+ earnings: z.number(),+ count: z.number(),+});++const commissionCategoryRowSchema = commissionTotalsSchema.extend({+ key: z.string(),+ label: z.string(),+});++const commissionTimeseriesRowSchema = commissionTotalsSchema.extend({+ start: z.string(),+});++const commissionPartnerIdRowSchema = z.object({+ partnerId: z.string(),+ name: z.string(),+ image: z.string().nullable(),+ country: z.string().nullable(),+ earnings: z.number(),+ commissionCount: z.number(),+});++export const commissionAnalyticsSchema = {+ type: z.array(commissionCategoryRowSchema),++ groupId: z.array(commissionCategoryRowSchema),++ timeseries: z.array(commissionTimeseriesRowSchema),++ partnerId: z.array(commissionPartnerIdRowSchema),+} as const;++export type CommissionAnalyticsQuery = z.infer<+ typeof commissionAnalyticsQuerySchema+>;++export type CommissionAnalyticsGroupBy = CommissionAnalyticsQuery["groupBy"];++export type CommissionAnalyticsByGroup = {+ [K in keyof typeof commissionAnalyticsSchema]: z.infer<+ (typeof commissionAnalyticsSchema)[K]+ >;+};++export type CommissionCategoryRow = CommissionAnalyticsByGroup["type"][number];++export type CommissionTimeseriesItem =+ CommissionAnalyticsByGroup["timeseries"][number];++export type CommissionAnalyticsPartnerRow =+ CommissionAnalyticsByGroup["partnerId"][number];diff --git a/apps/web/lib/swr/use-commission-analytics.ts b/apps/web/lib/swr/use-commission-analytics.tsnew file mode 100644index 0000000000..a9aff01e8c--- /dev/null+++ b/apps/web/lib/swr/use-commission-analytics.ts@@ -0,0 +1,72 @@+import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "@/lib/analytics/constants";+import { IntervalOptions } from "@/lib/analytics/types";+import type {+ CommissionAnalyticsByGroup,+ CommissionAnalyticsGroupBy,+} from "@/lib/commissions/schema";+import { fetcher } from "@dub/utils";+import { useMemo } from "react";+import useSWR from "swr";+import useWorkspace from "./use-workspace";++export type {+ CommissionAnalyticsPartnerRow,+ CommissionCategoryRow,+ CommissionTimeseriesItem,+} from "@/lib/commissions/schema";++export default function useCommissionAnalytics<+ G extends CommissionAnalyticsGroupBy,+>({+ groupBy,+ enabled = true,+ queryString,+ interval,+ start,+ end,+}: {+ groupBy: G;+ enabled?: boolean;+ /** Dashboard filters (workspaceId, dates, status, etc.) */+ queryString?: string;+ /** When `queryString` is omitted, build URL from workspace + interval or start/end */+ interval?: IntervalOptions;+ start?: Date;+ end?: Date;+}) {+ const { id: workspaceId } = useWorkspace();++ const url = useMemo(() => {+ if (!enabled) return null;++ let qs: string | null = null;++ if (queryString !== undefined) {+ qs = queryString || null;+ } else if (workspaceId) {+ const searchParams = new URLSearchParams({+ ...(start && end+ ? {+ start: start.toISOString(),+ end: end.toISOString(),+ }+ : { interval: interval ?? DUB_PARTNERS_ANALYTICS_INTERVAL }),+ timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,+ workspaceId,+ });+ qs = searchParams.toString();+ }++ if (!qs) return null;++ return `/api/commissions/analytics?groupBy=${groupBy}&${qs}`;+ }, [enabled, queryString, workspaceId, groupBy, interval, start, end]);++ const { data, error, isLoading } = useSWR<CommissionAnalyticsByGroup[G]>(+ url,+ fetcher,+ { keepPreviousData: true },+ );++ return { data, isLoading, error };+}diff --git a/apps/web/lib/swr/use-commissions-breakdown.ts b/apps/web/lib/swr/use-commissions-breakdown.tsdeleted file mode 100644index de3621ac49..0000000000--- a/apps/web/lib/swr/use-commissions-breakdown.ts+++ /dev/null@@ -1,34 +0,0 @@-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.tsdeleted file mode 100644index d7c1b9c67c..0000000000--- a/apps/web/lib/swr/use-commissions-timeseries.ts+++ /dev/null@@ -1,53 +0,0 @@-import { fetcher } from "@dub/utils";-import useSWR from "swr";-import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "../analytics/constants";-import { PartnerAnalyticsFilters } from "../analytics/types";-import useWorkspace from "./use-workspace";--export interface CommissionTimeseriesItem {- start: string;- earnings: number;- count: number;-}--export default function useCommissionsTimeseries(- params?: PartnerAnalyticsFilters & {- enabled: boolean;- queryString?: string;- },-) {- const { id: workspaceId } = useWorkspace();-- 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: 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.tsdeleted file mode 100644index 82db8e7d53..0000000000--- a/apps/web/lib/swr/use-commissions-top-partners.ts+++ /dev/null@@ -1,31 +0,0 @@-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/types.ts b/apps/web/lib/types.tsindex 149778109d..81760cf49b 100644--- a/apps/web/lib/types.ts+++ b/apps/web/lib/types.ts@@ -920,3 +920,8 @@ export type ApiLogsCountByRoutePattern = ApiLogsCountRow;export type RequestType = z.infer<typeof requestTypeSchema>;export type ApiLogTB = z.infer<typeof apiLogSchemaTB>;++export type {+ CommissionAnalyticsByGroup,+ CommissionAnalyticsQuery,+} from "./commissions/schema";