The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Partner tags improvements (#3855)
Pedro Ladeirae14eb63f921c
diff --git a/apps/web/app/(ee)/api/commissions/analytics/route.ts b/apps/web/app/(ee)/api/commissions/analytics/route.tsindex 8b977a3b7f..f3bd98a037 100644--- a/apps/web/app/(ee)/api/commissions/analytics/route.ts+++ b/apps/web/app/(ee)/api/commissions/analytics/route.ts@@ -27,6 +27,12 @@ type CommissionGroupIdQueryRow = {count: bigint;};+type CommissionPartnerTagQueryRow = {+ partnerTagId: string;+ earnings: bigint;+ count: bigint;+};+const excludedStatuses = [CommissionStatus.duplicate,CommissionStatus.fraud,@@ -41,6 +47,7 @@ function commissionSqlConditions({partnerFilter,typeFilter,groupIdParam,+ partnerTagIdParam,}: {programId: string;startDate: Date;@@ -49,6 +56,7 @@ function commissionSqlConditions({partnerFilter: ReturnType<typeof parseFilterValue>;typeFilter: ReturnType<typeof parseFilterValue> | null;groupIdParam: string | undefined;+ partnerTagIdParam: string | undefined;}): Prisma.Sql[] {const conditions: Prisma.Sql[] = [Prisma.sql`c.programId = ${programId}`,@@ -94,6 +102,30 @@ function commissionSqlConditions({}}+ if (partnerTagIdParam) {+ const partnerTagFilter = parseFilterValue(partnerTagIdParam);+ if (partnerTagFilter) {+ const list = Prisma.join(+ partnerTagFilter.values.map((v) => Prisma.sql`${v}`),+ );+ if (partnerTagFilter.sqlOperator === "NOT IN") {+ conditions.push(Prisma.sql`NOT EXISTS (+ SELECT 1 FROM ProgramPartnerTag ppt+ WHERE ppt.programId = c.programId+ AND ppt.partnerId = c.partnerId+ AND ppt.partnerTagId IN (${list})+ )`);+ } else {+ conditions.push(Prisma.sql`EXISTS (+ SELECT 1 FROM ProgramPartnerTag ppt+ WHERE ppt.programId = c.programId+ AND ppt.partnerId = c.partnerId+ AND ppt.partnerTagId IN (${list})+ )`);+ }+ }+ }+return conditions;}@@ -123,6 +155,10 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {return byGroupId({ programId, parsed, startDate, endDate });}+ if (groupBy === "partnerTagId") {+ return byPartnerTagIdId({ programId, parsed, startDate, endDate });+ }+if (groupBy === "partnerId") {return byPartnerId({ programId, parsed, startDate, endDate });}@@ -141,9 +177,10 @@ async function byType({startDate: Date;endDate: Date;}) {- const { status, partnerId, groupId, type } = parsed;+ const { status, partnerId, groupId, partnerTagId, type } = parsed;const partnerFilter = parseFilterValue(partnerId);const groupFilter = parseFilterValue(groupId);+ const partnerTagFilter = parseFilterValue(partnerTagId);const rawTypeFilter = parseFilterValue(type);const validCommissionTypes = new Set(Object.values(CommissionType));@@ -167,6 +204,21 @@ async function byType({? { ...rawTypeFilter, values: validTypeValues }: null;+ const programEnrollmentFilter = {+ ...(groupFilter && {+ groupId:+ groupFilter.sqlOperator === "NOT IN"+ ? { notIn: groupFilter.values }+ : { in: groupFilter.values },+ }),+ ...(partnerTagFilter && {+ programPartnerTags:+ partnerTagFilter.sqlOperator === "NOT IN"+ ? { none: { partnerTagId: { in: partnerTagFilter.values } } }+ : { some: { partnerTagId: { in: partnerTagFilter.values } } },+ }),+ };+const baseWhere: Prisma.CommissionWhereInput = {programId,createdAt: { gte: startDate, lt: endDate },@@ -183,13 +235,8 @@ async function byType({? { notIn: typeFilter.values }: { in: typeFilter.values },}),- ...(groupFilter && {- programEnrollment: {- groupId:- groupFilter.sqlOperator === "NOT IN"- ? { notIn: groupFilter.values }- : { in: groupFilter.values },- },+ ...(Object.keys(programEnrollmentFilter).length > 0 && {+ programEnrollment: programEnrollmentFilter,}),};@@ -224,7 +271,7 @@ async function byGroupId({startDate: Date;endDate: Date;}) {- const { status, partnerId, groupId, type } = parsed;+ const { status, partnerId, groupId, partnerTagId, type } = parsed;const partnerFilter = parseFilterValue(partnerId);const rawTypeFilter = parseFilterValue(type);@@ -257,6 +304,7 @@ async function byGroupId({partnerFilter,typeFilter,groupIdParam: groupId,+ partnerTagIdParam: partnerTagId,});const whereClause = Prisma.join(conditions, " AND ");@@ -308,6 +356,112 @@ async function byGroupId({return NextResponse.json(commissionAnalyticsSchema.groupId.parse(result));}+async function byPartnerTagIdId({+ programId,+ parsed,+ startDate,+ endDate,+}: {+ programId: string;+ parsed: CommissionAnalyticsQuery;+ startDate: Date;+ endDate: Date;+}) {+ const { status, partnerId, groupId, partnerTagId, 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.partnerTagId.parse([]));+ }++ const typeFilter =+ rawTypeFilter && validTypeValues.length > 0+ ? { ...rawTypeFilter, values: validTypeValues }+ : null;++ const partnerTagFilter = parseFilterValue(partnerTagId);++ const conditions = commissionSqlConditions({+ programId,+ startDate,+ endDate,+ status,+ partnerFilter,+ typeFilter,+ groupIdParam: groupId,+ partnerTagIdParam: undefined,+ });++ if (partnerTagFilter) {+ const list = Prisma.join(+ partnerTagFilter.values.map((v) => Prisma.sql`${v}`),+ );+ if (partnerTagFilter.sqlOperator === "IN") {+ conditions.push(Prisma.sql`ppt.partnerTagId IN (${list})`);+ } else {+ conditions.push(Prisma.sql`NOT EXISTS (+ SELECT 1 FROM ProgramPartnerTag ppt_excl+ WHERE ppt_excl.programId = c.programId+ AND ppt_excl.partnerId = c.partnerId+ AND ppt_excl.partnerTagId IN (${list})+ )`);+ }+ }++ const whereClause = Prisma.join(conditions, " AND ");++ const rows = await prisma.$queryRaw<CommissionPartnerTagQueryRow[]>(+ Prisma.sql`+ SELECT+ ppt.partnerTagId AS partnerTagId,+ SUM(c.earnings) AS earnings,+ COUNT(c.id) AS count+ FROM Commission c+ JOIN ProgramPartnerTag ppt+ ON ppt.programId = c.programId+ AND ppt.partnerId = c.partnerId+ WHERE ${whereClause}+ GROUP BY ppt.partnerTagId+ ORDER BY earnings DESC`,+ );++ const partnerTagIds = rows.map((r) => r.partnerTagId);++ const partnerTags =+ partnerTagIds.length > 0+ ? await prisma.partnerTag.findMany({+ where: { id: { in: partnerTagIds } },+ select: { id: true, name: true },+ })+ : [];++ const partnerTagById = new Map(partnerTags.map((t) => [t.id, t]));++ const result = rows.map((row) => ({+ key: row.partnerTagId,+ label: partnerTagById.get(row.partnerTagId)?.name ?? row.partnerTagId,+ earnings: Number(row.earnings),+ count: Number(row.count),+ }));++ return NextResponse.json(+ commissionAnalyticsSchema.partnerTagId.parse(result),+ );+}+async function byPartnerId({programId,parsed,@@ -319,9 +473,10 @@ async function byPartnerId({startDate: Date;endDate: Date;}) {- const { status, partnerId, groupId, type } = parsed;+ const { status, partnerId, groupId, partnerTagId, type } = parsed;const partnerFilter = parseFilterValue(partnerId);const groupFilter = parseFilterValue(groupId);+ const partnerTagFilter = parseFilterValue(partnerTagId);const rawTypeFilter = parseFilterValue(type);const validCommissionTypes = new Set(Object.values(CommissionType));@@ -345,6 +500,21 @@ async function byPartnerId({? { ...rawTypeFilter, values: validTypeValues }: null;+ const programEnrollmentFilter = {+ ...(groupFilter && {+ groupId:+ groupFilter.sqlOperator === "NOT IN"+ ? { notIn: groupFilter.values }+ : { in: groupFilter.values },+ }),+ ...(partnerTagFilter && {+ programPartnerTags:+ partnerTagFilter.sqlOperator === "NOT IN"+ ? { none: { partnerTagId: { in: partnerTagFilter.values } } }+ : { some: { partnerTagId: { in: partnerTagFilter.values } } },+ }),+ };+const grouped = await prisma.commission.groupBy({by: ["partnerId"],where: {@@ -363,13 +533,8 @@ async function byPartnerId({? { notIn: typeFilter.values }: { in: typeFilter.values },}),- ...(groupFilter && {- programEnrollment: {- groupId:- groupFilter.sqlOperator === "NOT IN"- ? { notIn: groupFilter.values }- : { in: groupFilter.values },- },+ ...(Object.keys(programEnrollmentFilter).length > 0 && {+ programEnrollment: programEnrollmentFilter,}),},_sum: { earnings: true },@@ -418,8 +583,17 @@ async function byTimeseries({programId: string;parsed: z.infer<typeof commissionAnalyticsQuerySchema>;}) {- const { start, end, interval, timezone, status, partnerId, groupId, type } =- parsed;+ const {+ start,+ end,+ interval,+ timezone,+ status,+ partnerId,+ groupId,+ partnerTagId,+ type,+ } = parsed;const { startDate, endDate, granularity } = getStartEndDates({interval,@@ -449,6 +623,7 @@ async function byTimeseries({partnerFilter,typeFilter,groupIdParam: groupId,+ partnerTagIdParam: partnerTagId,});const whereClause = Prisma.join(conditions, " AND ");diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/applications/use-applications-analytics-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/applications/use-applications-analytics-filters.tsxindex 129bb200d6..e8770d8829 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/applications/use-applications-analytics-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/applications/use-applications-analytics-filters.tsx@@ -11,6 +11,7 @@ import {nFormatter,parseFilterValue,} from "@dub/utils";+import { useParams } from "next/navigation";import { useCallback, useMemo } from "react";import { ApplicationReferralSourceIcon } from "./application-referral-source-icon";import { useApplicationsAnalytics } from "./use-applications-analytics";@@ -20,6 +21,7 @@ const FILTER_KEYS = ["partnerId", "country", "referralSource"] as const;export function useApplicationAnalyticsFilters() {const { slug } = useWorkspace();+ const { tab } = useParams() as { tab?: string };const { stage } = useApplicationsAnalyticsQuery();const { searchParamsObj, queryParams } = useRouterStuff();@@ -35,16 +37,19 @@ export function useApplicationAnalyticsFilters() {const { data: partners } = useApplicationsAnalytics({groupBy: "partnerId",exclude: ["partnerId"],+ enabled: tab === "applications",});const { data: referralSources } = useApplicationsAnalytics({groupBy: "referralSource",exclude: ["referralSource"],+ enabled: tab === "applications",});const { data: countries } = useApplicationsAnalytics({groupBy: "country",exclude: ["country"],+ enabled: tab === "applications",});const filters = useMemo(diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-cards.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-cards.tsxindex 98a7ff243c..83737ab043 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-cards.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/analytics/commissions-analytics-cards.tsx@@ -7,15 +7,25 @@ import { AnalyticsLoadingSpinner } from "@/ui/analytics/analytics-loading-spinneimport { 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 { Modal, TabSelect, useRouterStuff } from "@dub/ui";import {CircleCheck,CircleDotted,CircleHalfDottedClock,+ Tag,+ Users6,} from "@dub/ui/icons";import { cn } from "@dub/utils";-import { ReactNode, useCallback, useMemo, useState } from "react";+import {+ Dispatch,+ ReactNode,+ SetStateAction,+ useCallback,+ useMemo,+ useState,+} from "react";import { CommissionStatusFilter } from "./commissions-status-selector";+import { useCommissionsAnalyticsQuery } from "./use-commissions-analytics-query";const STATUS_LABELS: Record<string, string> = {pending: "Pending",@@ -31,23 +41,29 @@ const STATUS_ICONS: Record<string, React.ElementType> = {all: CircleDotted,};-type CommissionsBarListTab = "type" | "groupId";+type CommissionsBarListTab = "type" | "groupId" | "partnerTagId";function mapCommissionBarRow(item: CommissionCategoryRow,tab: CommissionsBarListTab,groupColorMap: Map<string, { color: string | null }>,) {- const icon =- tab === "type" ? (+ let icon: ReactNode;+ if (tab === "type") {+ icon = (<CommissionTypeIcontype={item.key as "sale" | "custom" | "lead" | "click"}/>- ) : (+ );+ } else if (tab === "partnerTagId") {+ icon = <Tag className="size-4 shrink-0 text-neutral-500" />;+ } else {+ icon = (<GroupColorCirclegroup={{ color: groupColorMap.get(item.key)?.color ?? null }}/>);+ }return {icon,@@ -103,9 +119,12 @@ function useUrlListFilter(paramKey: string) {};}-function CommissionAnalyticsCardShell({+function CommissionAnalyticsCardShell<T extends string>({status,title,+ tabs,+ selectedTabId,+ onSelectTab,dataLength,expandLimit,isFilterActive,@@ -114,6 +133,9 @@ function CommissionAnalyticsCardShell({}: {status: CommissionStatusFilter;title: string;+ tabs?: { id: T; label: string; icon: React.ElementType }[];+ selectedTabId?: T;+ onSelectTab?: Dispatch<SetStateAction<T>> | ((tabId: T) => void);dataLength?: number;expandLimit: number;isFilterActive?: boolean;@@ -127,6 +149,10 @@ function CommissionAnalyticsCardShell({const showViewAll = (dataLength ?? 0) > expandLimit;const statusKey = status ?? "all";const StatusIcon = STATUS_ICONS[statusKey];+ const activeTitle =+ (tabs && selectedTabId+ ? tabs.find((t) => t.id === selectedTabId)?.label+ : undefined) ?? title;return (<>@@ -136,7 +162,7 @@ function CommissionAnalyticsCardShell({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>+ <h1 className="text-lg font-semibold">{activeTitle}</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>@@ -147,7 +173,15 @@ function CommissionAnalyticsCardShell({<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>+ {tabs && selectedTabId && onSelectTab ? (+ <TabSelect+ options={tabs}+ selected={selectedTabId}+ onSelect={onSelectTab}+ />+ ) : (+ <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>@@ -200,10 +234,13 @@ const BAR_LIST_SHARED = {filterHoverClass: "bg-white border border-neutral-200",};-function CommissionBarPanel({+function CommissionBarPanel<T extends string>({status,title,tab,+ tabs,+ selectedTabId,+ onSelectTab,filter,rawItems,loading,@@ -214,6 +251,9 @@ function CommissionBarPanel({status: CommissionStatusFilter;title: string;tab: CommissionsBarListTab;+ tabs?: { id: T; label: string; icon: React.ElementType }[];+ selectedTabId?: T;+ onSelectTab?: Dispatch<SetStateAction<T>> | ((tabId: T) => void);filter: ReturnType<typeof useUrlListFilter>;rawItems: CommissionCategoryRow[] | undefined;loading: boolean;@@ -234,6 +274,9 @@ function CommissionBarPanel({<CommissionAnalyticsCardShellstatus={status}title={title}+ tabs={tabs}+ selectedTabId={selectedTabId}+ onSelectTab={onSelectTab}dataLength={data.length}expandLimit={EXPAND_LIMIT}isFilterActive={filter.isFilterActive}@@ -272,14 +315,22 @@ function CommissionBarPanel({);}-export function CommissionsAnalyticsCards({- status,- queryString,-}: {- status: CommissionStatusFilter;- queryString: string;-}) {+const LEFT_TABS: {+ id: "groupId" | "partnerTagId";+ label: string;+ icon: React.ElementType;+}[] = [+ { id: "groupId", label: "Partner Group", icon: Users6 },+ { id: "partnerTagId", label: "Partner Tag", icon: Tag },+];++export function CommissionsAnalyticsCards() {+ const { status } = useCommissionsAnalyticsQuery();++ const [leftTab, setLeftTab] = useState<"groupId" | "partnerTagId">("groupId");+const groupFilter = useUrlListFilter("groupId");+ const partnerTagFilter = useUrlListFilter("partnerTagId");const typeFilter = useUrlListFilter("type");const { groups } = useGroups();@@ -290,23 +341,35 @@ export function CommissionsAnalyticsCards({}, [groups]);const { data: groupRows, isLoading: groupLoading } = useCommissionAnalytics({- queryString,groupBy: "groupId",});+ const { data: partnerTagRows, isLoading: partnerTagLoading } =+ useCommissionAnalytics({+ groupBy: "partnerTagId",+ enabled: leftTab === "partnerTagId",+ });const { data: typeRows, isLoading: typeLoading } = useCommissionAnalytics({- queryString,groupBy: "type",});+ const activeLeftFilter =+ leftTab === "groupId" ? groupFilter : partnerTagFilter;+ const activeLeftRows = leftTab === "groupId" ? groupRows : partnerTagRows;+ const activeLeftLoading =+ leftTab === "groupId" ? groupLoading : partnerTagLoading;+return (<div className="grid grid-cols-1 gap-5 md:grid-cols-2"><CommissionBarPanelstatus={status}title="Partner Group"- tab="groupId"- filter={groupFilter}- rawItems={groupRows}- loading={groupLoading}+ tab={leftTab}+ tabs={LEFT_TABS}+ selectedTabId={leftTab}+ onSelectTab={setLeftTab}+ filter={activeLeftFilter}+ rawItems={activeLeftRows}+ loading={activeLeftLoading}groupColorMap={groupColorMap}barBackground="bg-orange-100"hoverBackground="hover:bg-gradient-to-r hover:from-orange-50 hover:to-transparent hover:border-orange-500"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 0427c743a3..4ff81f9060 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@@ -9,7 +9,7 @@ import {XAxis,YAxis,} from "@dub/ui/charts";-import { LoadingSpinner } from "@dub/ui/icons";+import { LoadingSpinner, useRouterStuff } from "@dub/ui";import { currencyFormatter, nFormatter } from "@dub/utils";import { LinearGradient } from "@visx/gradient";import { useId } from "react";@@ -48,19 +48,18 @@ const STATUS_COLORS: Record<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 { searchParams } = useRouterStuff();const color = STATUS_COLORS[status ?? "all"];const {@@ -69,7 +68,6 @@ export function CommissionsAnalyticsChart({error,} = useCommissionAnalytics({groupBy: "timeseries",- queryString,});const chartData = data?.map((d) => ({@@ -95,7 +93,7 @@ export function CommissionsAnalyticsChart({return (<TimeSeriesChart- key={`${status ?? "all"}-${unit}-${queryString}`}+ key={`${status ?? "all"}-${unit}-${searchParams.toString()}`}data={chartData ?? []}series={[{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 9901794e0c..1aa93e7163 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@@ -18,11 +18,7 @@ import { PartnerAnalyticsFilterCell } from "./partner-analytics-filter-cell";const PAGE_SIZE = 10;-export function CommissionsPartnersTable({- queryString,-}: {- queryString: string;-}) {+export function CommissionsPartnersTable() {const { queryParams, searchParams } = useRouterStuff();const { pagination, setPagination } = usePagination(PAGE_SIZE);@@ -77,7 +73,6 @@ export function CommissionsPartnersTable({isLoading,error,} = useCommissionAnalytics({- queryString,groupBy: "partnerId",});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.tsxindex 91be986f07..b41b4065b6 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@@ -59,14 +59,13 @@ function CommissionsTab() {<CommissionsAnalyticsChartstatus={commissionStatus}unit={commissionUnit}- queryString={commissionsQueryString}interval={commissionsInterval}start={commissionsStart}end={commissionsEnd}/></div></div>- <CommissionsPartnersTable queryString={commissionsQueryString} />+ <CommissionsPartnersTable /></>);}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.tsxindex ab1cf72977..d9a32bfb15 100644--- 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@@ -32,6 +32,7 @@ export function ProgramAnalyticsNav() {"end","partnerId","groupId",+ "partnerTagId",]}/>);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 225f2a6951..fd85a3fdc8 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@@ -35,7 +35,6 @@ import {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();@@ -49,11 +48,7 @@ export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {? (tab as ProgramAnalyticsTabId): "performance";- const { queryString: commissionsQueryString, status: commissionStatus } =- useCommissionsAnalyticsQuery();-- const { stage: applicationsStage, view: applicationsView } =- useApplicationsAnalyticsQuery();+ const { stage: applicationsStage } = useApplicationsAnalyticsQuery();const { start, end, interval, selectedTab, saleUnit, view } = useMemo(() => {const { event, ...rest } = searchParamsObj;@@ -121,7 +116,7 @@ export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {onToggleOperator: commOnToggleOperator,onOpenFilter: commOnOpenFilter,setSearch: commSetSearch,- } = useCommissionsAnalyticsFilters(commissionsQueryString);+ } = useCommissionsAnalyticsFilters();const {filters: applicationsFilters,@@ -199,7 +194,7 @@ export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {<Linkhref={pageTab === "commissions"- ? `/${slug}/program/commissions${getQueryString({}, { include: ["interval", "start", "end", "partnerId", "groupId", "type"] })}`+ ? `/${slug}/program/commissions${getQueryString({}, { include: ["interval", "start", "end", "partnerId", "groupId", "partnerTagId", "type"] })}`: pageTab === "applications"? `/${slug}/program/partners/applications`: `/${slug}/events${getQueryString({ folderId: program?.defaultFolderId, event: selectedTab, interval })}`@@ -279,10 +274,7 @@ export function ProgramAnalyticsShell({ children }: { children: ReactNode }) {</div>{pageTab === "commissions" ? (- <CommissionsAnalyticsCards- status={commissionStatus}- queryString={commissionsQueryString}- />+ <CommissionsAnalyticsCards />) : pageTab === "applications" ? (<ApplicationsAnalyticsCards stage={applicationsStage} />) : (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.tsxindex ac5ddca55c..a4d2e21ce0 100644--- 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@@ -1,35 +1,95 @@"use client";+import useCommissionAnalytics from "@/lib/swr/use-commission-analytics";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 { GroupProps } 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 { Sliders, Tag, Users, Users6 } from "@dub/ui/icons";+import {+ currencyFormatter,+ FilterOperator,+ nFormatter,+ parseFilterValue,+} from "@dub/utils";+import { useParams } from "next/navigation";import { useCallback, useMemo, useState } from "react";import { useDebounce } from "use-debounce";-const COMMISSION_FILTER_KEYS = ["partnerId", "groupId", "type"] as const;+const FILTER_KEYS = ["partnerId", "groupId", "partnerTagId", "type"] as const;-export function useCommissionsAnalyticsFilters(- _commissionsQueryString?: string,+type CategoryRow = { earnings: number; count: number };+type PartnerRow = { earnings: number; commissionCount: number };++function metricValue(+ commissionUnit: string | undefined,+ row: CategoryRow | PartnerRow,+) {+ if (commissionUnit === "count") {+ return "commissionCount" in row ? row.commissionCount : row.count;+ }+ return row.earnings;+}++function formatMetricRight(+ commissionUnit: string | undefined,+ row: CategoryRow | PartnerRow,) {+ return commissionUnit === "count"+ ? nFormatter(metricValue(commissionUnit, row), { full: true })+ : currencyFormatter(row.earnings);+}++export function useCommissionsAnalyticsFilters() {const { slug } = useWorkspace();+ const { tab } = useParams() as { tab?: string };const { searchParamsObj, queryParams } = useRouterStuff();+ const commissionUnit = searchParamsObj.commissionUnit;++ const filtersTabEnabled = tab === "commissions";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 { groups: programGroups } = useGroups();++ const groupById = useMemo(() => {+ const map = new Map<string, GroupProps>();+ programGroups?.forEach((g) => map.set(g.id, g));+ return map;+ }, [programGroups]);++ const { data: partners } = useCommissionAnalytics({+ groupBy: "partnerId",+ exclude: ["partnerId"],+ enabled: filtersTabEnabled,+ });++ const { data: groups } = useCommissionAnalytics({+ groupBy: "groupId",+ exclude: ["groupId"],+ enabled: filtersTabEnabled,+ });++ const { data: partnerTags } = useCommissionAnalytics({+ groupBy: "partnerTagId",+ exclude: ["partnerTagId"],+ enabled: filtersTabEnabled,+ });++ const { data: types } = useCommissionAnalytics({+ groupBy: "type",+ exclude: ["type"],+ enabled: filtersTabEnabled,+ });++ const partnerSearch =+ selectedFilter === "partnerId" ? debouncedSearch.trim().toLowerCase() : "";const filters = useMemo(() => [@@ -39,36 +99,89 @@ export function useCommissionsAnalyticsFilters(label: "Partner",shouldFilter: false,options:- partners?.map((partner) => ({- value: partner.id,- label: partner.name,- icon: <PartnerAvatar partner={partner} className="size-4" />,- })) ?? null,+ partners+ ?.filter((row) => metricValue(commissionUnit, row) > 0)+ .filter(+ (row) =>+ !partnerSearch ||+ row.name.toLowerCase().includes(partnerSearch),+ )+ .map((row) => ({+ value: row.partnerId,+ label: row.name,+ icon: (+ <PartnerAvatar+ partner={{+ id: row.partnerId,+ name: row.name,+ image: row.image,+ }}+ className="size-4"+ />+ ),+ right: formatMetricRight(commissionUnit, row),+ })) ?? [],},{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,+ groups+ ?.filter((row) => metricValue(commissionUnit, row) > 0)+ .map((row) => {+ const group = groupById.get(row.key);+ return {+ value: row.key,+ label: row.label,+ icon: (+ <GroupColorCircle group={{ color: group?.color ?? null }} />+ ),+ permalink: group+ ? `/${slug}/program/groups/${group.slug}/rewards`+ : undefined,+ right: formatMetricRight(commissionUnit, row),+ };+ }) ?? [],+ },+ {+ key: "partnerTagId",+ icon: Tag,+ label: "Partner Tag",+ options:+ partnerTags+ ?.filter((row) => metricValue(commissionUnit, row) > 0)+ .map((row) => ({+ value: row.key,+ label: row.label,+ right: formatMetricRight(commissionUnit, row),+ })) ?? [],},{key: "type",icon: Sliders,label: "Type",- options: Object.values(CommissionType).map((type) => ({- value: type,- label: capitalize(type) as string,- icon: <CommissionTypeIcon type={type} />,- })),+ options:+ types+ ?.filter((row) => metricValue(commissionUnit, row) > 0)+ .map((row) => ({+ value: row.key,+ label: row.label,+ icon: <CommissionTypeIcon type={row.key as CommissionType} />,+ right: formatMetricRight(commissionUnit, row),+ })) ?? [],},],- [partners, groups, slug],+ [+ partners,+ groups,+ partnerTags,+ types,+ commissionUnit,+ partnerSearch,+ groupById,+ slug,+ ],);const activeFilters = useMemo(() => {@@ -78,7 +191,7 @@ export function useCommissionsAnalyticsFilters(values: string[];}[] = [];- for (const key of COMMISSION_FILTER_KEYS) {+ for (const key of FILTER_KEYS) {const raw = searchParamsObj[key];if (!raw) continue;const parsed = parseFilterValue(raw);@@ -90,6 +203,7 @@ export function useCommissionsAnalyticsFilters(}, [searchParamsObj.partnerId,searchParamsObj.groupId,+ searchParamsObj.partnerTagId,searchParamsObj.type,]);@@ -146,8 +260,7 @@ export function useCommissionsAnalyticsFilters(const onRemoveAll = useCallback(() =>queryParams({- // Include customerId for backwards compat in case it's still in the URL- del: [...COMMISSION_FILTER_KEYS, "customerId", "page"],+ del: [...FILTER_KEYS, "customerId", "page"],scroll: false,}),[queryParams],@@ -185,29 +298,3 @@ export function useCommissionsAnalyticsFilters(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.tsindex 0c76869350..1af0209a6c 100644--- 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@@ -35,6 +35,7 @@ export function useCommissionsAnalyticsQuery() {end,partnerId,groupId,+ partnerTagId,type,} = searchParamsObj;@@ -54,6 +55,7 @@ export function useCommissionsAnalyticsQuery() {if (partnerId) params.set("partnerId", partnerId);if (groupId) params.set("groupId", groupId);+ if (partnerTagId) params.set("partnerTagId", partnerTagId);if (type) params.set("type", type);return params.toString();diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsxindex ce2cd019f4..333de0ceb2 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx@@ -482,6 +482,7 @@ function CommissionsFilters() {"end","partnerId","groupId",+ "partnerTagId","type",],},diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsxindex 0d8be77424..d35dc5aba8 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx@@ -1,6 +1,7 @@import useCommissionsCount from "@/lib/swr/use-commissions-count";import useCustomers from "@/lib/swr/use-customers";import useGroups from "@/lib/swr/use-groups";+import { usePartnerTags } from "@/lib/swr/use-partner-tags";import usePartners from "@/lib/swr/use-partners";import useWorkspace from "@/lib/swr/use-workspace";import { CustomerProps, EnrolledPartnerProps } from "@/lib/types";@@ -11,7 +12,7 @@ import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { CommissionType } from "@dub/prisma/client";import { CircleDotted, useRouterStuff } from "@dub/ui";-import { Sliders, User, Users, Users6 } from "@dub/ui/icons";+import { Sliders, Tag, User, Users, Users6 } from "@dub/ui/icons";import {capitalize,cn,@@ -41,6 +42,32 @@ export function useCommissionFilters() {const { groups } = useGroups();+ const activePartnerTagIds = useMemo(+ () =>+ searchParamsObj.partnerTagId+ ? searchParamsObj.partnerTagId+ .replace(/^-/, "")+ .split(",")+ .filter(Boolean)+ : undefined,+ [searchParamsObj.partnerTagId],+ );++ const { partnerTags } = usePartnerTags();+ const { partnerTags: selectedPartnerTags } = usePartnerTags({+ query: { ids: activePartnerTagIds },+ enabled: !!activePartnerTagIds?.length,+ });++ const mergedPartnerTags = useMemo(() => {+ if (!partnerTags) return null;+ const baseIds = new Set(partnerTags.map((t) => t.id));+ return [+ ...partnerTags,+ ...(selectedPartnerTags ?? []).filter((t) => !baseIds.has(t.id)),+ ];+ }, [partnerTags, selectedPartnerTags]);+const filters = useMemo(() => [{@@ -85,6 +112,16 @@ export function useCommissionFilters() {};}) ?? null,},+ {+ key: "partnerTagId",+ icon: Tag,+ label: "Partner Tag",+ options:+ mergedPartnerTags?.map((tag) => ({+ value: tag.id,+ label: tag.name,+ })) ?? null,+ },{key: "type",icon: Sliders,@@ -123,7 +160,7 @@ export function useCommissionFilters() {),},],- [commissionsCount, partners, customers, groups],+ [commissionsCount, partners, customers, groups, mergedPartnerTags],);const activeFilters = useMemo(() => {@@ -139,6 +176,7 @@ export function useCommissionFilters() {"type","payoutId","groupId",+ "partnerTagId",] as const;for (const key of keys) {const raw = searchParamsObj[key];@@ -155,6 +193,7 @@ export function useCommissionFilters() {searchParamsObj.type,searchParamsObj.payoutId,searchParamsObj.groupId,+ searchParamsObj.partnerTagId,]);const onSelect = useCallback(@@ -212,6 +251,7 @@ export function useCommissionFilters() {"customerId","payoutId","groupId",+ "partnerTagId","type",],}),diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsxindex da4ed5d7a1..b3a70120b0 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx@@ -22,7 +22,10 @@ import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";import { PartnerRowItem } from "@/ui/partners/partner-row-item";import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";import { PartnerTagsList } from "@/ui/partners/partner-tags-list";-import { useUpdatePartnerTagsModal } from "@/ui/partners/update-partner-tags-modal";+import {+ UpdatePartnerTagsModal,+ useUpdatePartnerTagsModal,+} from "@/ui/partners/update-partner-tags-modal";import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";import { CountryFlag } from "@/ui/shared/country-flag";import { ThreeDots } from "@/ui/shared/icons";@@ -685,10 +688,8 @@ function RowMenuButton({partners: [row.original],});- const { UpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =- useUpdatePartnerTagsModal({- partners: [row.original],- });+ const { showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =+ useUpdatePartnerTagsModal();const { ArchivePartnerModal, setShowArchivePartnerModal } =useArchivePartnerModal({@@ -744,7 +745,11 @@ function RowMenuButton({return (<><ChangeGroupModal />- <UpdatePartnerTagsModal />+ <UpdatePartnerTagsModal+ showUpdatePartnerTagsModal={showUpdatePartnerTagsModal}+ setShowUpdatePartnerTagsModal={setShowUpdatePartnerTagsModal}+ partners={[row.original]}+ /><ArchivePartnerModal /><BanPartnerModal /><UnbanPartnerModal />@@ -933,14 +938,16 @@ const PartnerTagsCell = memo(function PartnerTagsCell({}: {partner: EnrolledPartnerProps;}) {- const { UpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =- useUpdatePartnerTagsModal({- partners: [partner],- });+ const { showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =+ useUpdatePartnerTagsModal();return (<>- <UpdatePartnerTagsModal />+ <UpdatePartnerTagsModal+ showUpdatePartnerTagsModal={showUpdatePartnerTagsModal}+ setShowUpdatePartnerTagsModal={setShowUpdatePartnerTagsModal}+ partners={[partner]}+ /><PartnerTagsListcompacttags={partner.tags}@@ -978,10 +985,8 @@ const PartnersBulkActionsBar = memo(function PartnersBulkActionsBar({const { ChangeGroupModal, setShowChangeGroupModal } = useChangeGroupModal({partners: pendingChangeGroupPartners,});- const { UpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =- useUpdatePartnerTagsModal({- partners: pendingEditTagsPartners,- });+ const { showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =+ useUpdatePartnerTagsModal();const { BulkArchivePartnersModal, setShowBulkArchivePartnersModal } =useBulkArchivePartnersModal({@@ -1008,7 +1013,11 @@ const PartnersBulkActionsBar = memo(function PartnersBulkActionsBar({return (<><ChangeGroupModal />- <UpdatePartnerTagsModal />+ <UpdatePartnerTagsModal+ showUpdatePartnerTagsModal={showUpdatePartnerTagsModal}+ setShowUpdatePartnerTagsModal={setShowUpdatePartnerTagsModal}+ partners={pendingEditTagsPartners}+ /><BulkArchivePartnersModal /><BulkDeactivatePartnersModal /><BulkBanPartnersModal />diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.tsindex d91fd58618..b53ac66d32 100644--- a/apps/web/lib/api/commissions/get-commissions-count.ts+++ b/apps/web/lib/api/commissions/get-commissions-count.ts@@ -25,6 +25,7 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {payoutId,customerId,groupId,+ partnerTagId,fraudEventGroupId,start,end,@@ -71,6 +72,7 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {};const groupFilter = parseFilterValue(groupId);+ const partnerTagFilter = parseFilterValue(partnerTagId);const programEnrollmentFilter = {...(groupFilter && {@@ -79,6 +81,12 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {? { notIn: groupFilter.values }: { in: groupFilter.values },}),+ ...(partnerTagFilter && {+ programPartnerTags:+ partnerTagFilter.sqlOperator === "NOT IN"+ ? { none: { partnerTagId: { in: partnerTagFilter.values } } }+ : { some: { partnerTagId: { in: partnerTagFilter.values } } },+ }),...(isHoldStatus && {fraudEventGroups: {some: {diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.tsindex 993ba64618..454e56f0c2 100644--- a/apps/web/lib/api/commissions/get-commissions.ts+++ b/apps/web/lib/api/commissions/get-commissions.ts@@ -31,6 +31,7 @@ export async function getCommissions(filters: CommissionsFilters) {customerId,payoutId,groupId,+ partnerTagId,fraudEventGroupId,start,end,@@ -93,6 +94,7 @@ export async function getCommissions(filters: CommissionsFilters) {const partnerFilter = parseFilterValue(partnerId);const groupFilter = parseFilterValue(groupId);+ const partnerTagFilter = parseFilterValue(partnerTagId);const validCommissionTypes = new Set(Object.values(CommissionType));const rawTypeFilter = parseFilterValue(type);@@ -138,6 +140,12 @@ export async function getCommissions(filters: CommissionsFilters) {? { notIn: groupFilter.values }: { in: groupFilter.values },}),+ ...(partnerTagFilter && {+ programPartnerTags:+ partnerTagFilter.sqlOperator === "NOT IN"+ ? { none: { partnerTagId: { in: partnerTagFilter.values } } }+ : { some: { partnerTagId: { in: partnerTagFilter.values } } },+ }),...(isHoldStatus && {fraudEventGroups: {some: {diff --git a/apps/web/lib/api/partner-profile/get-partner-for-program.ts b/apps/web/lib/api/partner-profile/get-partner-for-program.tsindex 059286a5c8..ebe15e2677 100644--- a/apps/web/lib/api/partner-profile/get-partner-for-program.ts+++ b/apps/web/lib/api/partner-profile/get-partner-for-program.ts@@ -56,7 +56,9 @@ export async function getPartnerForProgram({toCentsNumber(programEnrollment.totalCommissions ?? 0),id: partner.id,createdAt: new Date(programEnrollment.createdAt),- tags: partner.programPartnerTags.map(({ partnerTag }) => partnerTag),+ tags: partner.programPartnerTags+ .map(({ partnerTag }) => partnerTag)+ .filter((t) => t.programId != null && t.programId === programId),links,lastLeadAt: links.reduce((acc, link) => {return link.lastLeadAt && link.lastLeadAt > (acc ?? new Date(0))diff --git a/apps/web/lib/api/partners/get-partners.ts b/apps/web/lib/api/partners/get-partners.tsindex 03285df35c..64d3ecf8fe 100644--- a/apps/web/lib/api/partners/get-partners.ts+++ b/apps/web/lib/api/partners/get-partners.ts@@ -55,7 +55,9 @@ export async function getPartners(filters: PartnerFilters) {...programEnrollment,id: partner.id,createdAt: new Date(programEnrollment.createdAt),- tags: partner.programPartnerTags.map(({ partnerTag }) => partnerTag),+ tags: partner.programPartnerTags+ .map(({ partnerTag }) => partnerTag)+ .filter((t) => t.programId != null && t.programId === programId),links,netRevenue:toCentsNumber(programEnrollment.totalSaleAmount ?? 0) -diff --git a/apps/web/lib/commissions/schema.ts b/apps/web/lib/commissions/schema.tsindex 79e317a179..c89574d093 100644--- a/apps/web/lib/commissions/schema.ts+++ b/apps/web/lib/commissions/schema.ts@@ -11,6 +11,7 @@ const sharedCommissionAnalyticsFilterSchema = analyticsQuerySchema}).extend({groupId: z.string().optional(),+ partnerTagId: z.string().optional(),partnerId: z.string().optional(),type: z.string().optional(),status: z.enum(CommissionStatus).optional(),@@ -19,7 +20,13 @@ const sharedCommissionAnalyticsFilterSchema = analyticsQuerySchema// Commission program analytics (workspace dashboard)export const commissionAnalyticsQuerySchema =sharedCommissionAnalyticsFilterSchema.extend({- groupBy: z.enum(["timeseries", "partnerId", "groupId", "type"]),+ groupBy: z.enum([+ "timeseries",+ "partnerId",+ "groupId",+ "partnerTagId",+ "type",+ ]),});const commissionTotalsSchema = z.object({@@ -50,6 +57,8 @@ export const commissionAnalyticsSchema = {groupId: z.array(commissionCategoryRowSchema),+ partnerTagId: z.array(commissionCategoryRowSchema),+timeseries: z.array(commissionTimeseriesRowSchema),partnerId: z.array(commissionPartnerIdRowSchema),diff --git a/apps/web/lib/swr/use-commission-analytics.ts b/apps/web/lib/swr/use-commission-analytics.tsindex 124fe27af2..c014e799ad 100644--- a/apps/web/lib/swr/use-commission-analytics.ts+++ b/apps/web/lib/swr/use-commission-analytics.ts@@ -1,60 +1,82 @@-import { DUB_PARTNERS_ANALYTICS_INTERVAL } from "@/lib/analytics/constants";-import { IntervalOptions } from "@/lib/analytics/types";import type {CommissionAnalyticsByGroup,CommissionAnalyticsGroupBy,+ CommissionAnalyticsQuery,} from "@/lib/types";+import { useRouterStuff } from "@dub/ui";import { fetcher } from "@dub/utils";-import { useMemo } from "react";import useSWR from "swr";import useWorkspace from "./use-workspace";-export default function useCommissionAnalytics<+export type CommissionAnalyticsFilterKey = Extract<+ keyof CommissionAnalyticsQuery,+ "partnerId" | "groupId" | "partnerTagId" | "type"+>;++interface UseCommissionAnalyticsProps<G extends CommissionAnalyticsGroupBy,->({- groupBy,- enabled = true,- queryString,- interval,- start,- end,-}: {+> extends Partial<Omit<CommissionAnalyticsQuery, "groupBy">> {groupBy: G;+ exclude?: CommissionAnalyticsFilterKey[];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;+function serializeCommissionAnalyticsFilters(+ filters: Record<string, unknown>,+): Record<string, string> {+ const out: Record<string, string> = {};+ for (const [k, v] of Object.entries(filters)) {+ if (v === undefined || v === null) continue;+ out[k] = v instanceof Date ? v.toISOString() : String(v);+ }+ return out;+}- let qs: string | null = null;+export default function useCommissionAnalytics<+ G extends CommissionAnalyticsGroupBy,+>({+ exclude,+ enabled = true,+ ...filters+}: UseCommissionAnalyticsProps<G>) {+ const { id: workspaceId } = useWorkspace();+ const { getQueryString } = useRouterStuff();- 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();- }+ const serialized = serializeCommissionAnalyticsFilters(+ filters as Record<string, unknown>,+ );- if (!qs) return null;+ const querySuffix = getQueryString(+ {+ ...serialized,+ ...(workspaceId ? { workspaceId } : {}),+ timezone:+ serialized.timezone ??+ Intl.DateTimeFormat().resolvedOptions().timeZone,+ },+ {+ exclude: [+ "pageTab",+ "tab",+ "event",+ "saleUnit",+ "view",+ "commissionUnit",+ "page",+ "pageSize",+ "slug",+ "folderId",+ "customerId",+ "programId",+ ...(exclude ?? []),+ ],+ },+ );- return `/api/commissions/analytics?groupBy=${groupBy}&${qs}`;- }, [enabled, queryString, workspaceId, groupBy, interval, start, end]);+ const url =+ workspaceId && enabled+ ? `/api/commissions/analytics${querySuffix}`+ : null;const { data, error, isLoading } = useSWR<CommissionAnalyticsByGroup[G]>(url,diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.tsindex 5c207ae580..860fc28ffd 100644--- a/apps/web/lib/zod/schemas/commissions.ts+++ b/apps/web/lib/zod/schemas/commissions.ts@@ -127,6 +127,14 @@ export const getCommissionsQuerySchema = z"Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +"Examples: `group_abc`, `group_abc,group_xyz`, `-group_abc`.",),+ partnerTagId: z+ .string()+ .optional()+ .describe(+ "Filter the list of commissions by the associated partner tag. " ++ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " ++ "Examples: `ptag_abc`, `ptag_abc,ptag_xyz`, `-ptag_abc`.",+ ),invoiceId: z.string().optional()diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsxindex e40fe20c18..272c438128 100644--- a/apps/web/ui/partners/partner-info-cards.tsx+++ b/apps/web/ui/partners/partner-info-cards.tsx@@ -48,7 +48,10 @@ import {} from "./payouts/payout-method-config";import { ProgramRewardList } from "./program-reward-list";import { TrustedPartnerBadge } from "./trusted-partner-badge";-import { useUpdatePartnerTagsModal } from "./update-partner-tags-modal";+import {+ UpdatePartnerTagsModal,+ useUpdatePartnerTagsModal,+} from "./update-partner-tags-modal";type PartnerInfoCardsProps = {showFraudIndicator?: boolean;@@ -446,14 +449,16 @@ export function PartnerInfoCards({}function TagsList({ partner }: { partner: EnrolledPartnerExtendedProps }) {- const { UpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =- useUpdatePartnerTagsModal({- partners: [partner],- });+ const { showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =+ useUpdatePartnerTagsModal();return (<div className="border-border-subtle flex flex-col border-t p-4">- <UpdatePartnerTagsModal />+ <UpdatePartnerTagsModal+ showUpdatePartnerTagsModal={showUpdatePartnerTagsModal}+ setShowUpdatePartnerTagsModal={setShowUpdatePartnerTagsModal}+ partners={[partner]}+ /><div className="mb-2 flex justify-between gap-2"><span className="text-content-emphasis block text-xs font-semibold">Tagsdiff --git a/apps/web/ui/partners/partner-tags-list.tsx b/apps/web/ui/partners/partner-tags-list.tsxindex ecc98193cd..5c81999ae5 100644--- a/apps/web/ui/partners/partner-tags-list.tsx+++ b/apps/web/ui/partners/partner-tags-list.tsx@@ -5,7 +5,7 @@ import { cn } from "@dub/utils";import Link from "next/link";const tagPillClassName =- "bg-bg-inverted/5 text-content-default whitespace-nowrap min-w-0 select-none flex h-6 items-center rounded-md px-2 text-xs font-semibold hover:bg-bg-inverted/10";+ "bg-bg-inverted/5 text-content-default whitespace-nowrap min-w-0 select-none inline-flex min-h-6 items-center rounded-md px-2 py-0.5 text-xs font-semibold leading-tight hover:bg-bg-inverted/10";export function PartnerTagsList({tags,@@ -21,28 +21,37 @@ export function PartnerTagsList({mode?: "filter" | "link";}) {return tags?.length ? (- <TruncatedList- className={cn("flex items-center gap-2", wrap && "flex-wrap")}- overflowIndicator={({ visible, hidden }) => (- <Tooltip- content={- <div className="flex max-w-sm flex-wrap gap-1 p-2">- {tags.slice(visible).map((tag) => (- <TagButton key={tag.id} {...tag} mode={mode} />- ))}+ wrap ? (+ <div className="flex flex-wrap gap-2">+ {tags.map((tag) => (+ <TagButton key={tag.id} {...tag} truncate mode={mode} />+ ))}+ </div>+ ) : (+ <TruncatedList+ itemProps={{ className: "shrink-0" }}+ className="flex w-full min-w-0 items-center gap-2"+ overflowIndicator={({ visible, hidden }) => (+ <Tooltip+ content={+ <div className="flex max-w-sm flex-wrap gap-1 p-2">+ {tags.slice(visible).map((tag) => (+ <TagButton key={tag.id} {...tag} mode={mode} />+ ))}+ </div>+ }+ >+ <div className={cn(tagPillClassName, "cursor-default")}>+ +{hidden}</div>- }- >- <div className={cn(tagPillClassName, "cursor-default")}>- +{hidden}- </div>- </Tooltip>- )}- >- {tags.map((tag) => (- <TagButton key={tag.id} {...tag} mode={mode} />- ))}- </TruncatedList>+ </Tooltip>+ )}+ >+ {tags.map((tag) => (+ <TagButton key={tag.id} {...tag} mode={mode} />+ ))}+ </TruncatedList>+ )) : (<buttontype="button"@@ -79,10 +88,17 @@ function TagButton({name,id,mode,-}: PartnerTagProps & { mode?: "filter" | "link" }) {+ truncate: allowTruncate,+}: PartnerTagProps & { mode?: "filter" | "link"; truncate?: boolean }) {const { slug: workspaceSlug } = useWorkspace();const { queryParams } = useRouterStuff();+ const pillClassName = cn(+ tagPillClassName,+ "active:bg-bg-inverted/15",+ allowTruncate && "max-w-full",+ );+return mode === "filter" ? (<buttontype="button"@@ -93,14 +109,14 @@ function TagButton({},});}}- className={cn(tagPillClassName, "active:bg-bg-inverted/15")}+ className={pillClassName}><span className="min-w-0 truncate">{name}</span></button>) : (<Linkhref={`/${workspaceSlug}/program/partners?partnerTagId=${id}`}- className={cn(tagPillClassName, "active:bg-bg-inverted/15")}+ className={pillClassName}><span className="min-w-0 truncate">{name}</span></Link>diff --git a/apps/web/ui/partners/update-partner-tags-modal.tsx b/apps/web/ui/partners/update-partner-tags-modal.tsxindex 4c9cd44b04..10dd06fd75 100644--- a/apps/web/ui/partners/update-partner-tags-modal.tsx+++ b/apps/web/ui/partners/update-partner-tags-modal.tsx@@ -53,11 +53,16 @@ type UpdatePartnerTagsModalProps = {function UpdatePartnerTagsModalContent({setShowUpdatePartnerTagsModal,+ showUpdatePartnerTagsModal,partners,}: UpdatePartnerTagsModalProps) {const { id: workspaceId } = useWorkspace();+ const wasModalOpenRef = useRef(false);const [search, setSearch] = useState("");+ /** Tag definition was deleted this visit (server already updated); enables Save to finish & close. */+ const [hasDeletedPartnerTagThisSession, setHasDeletedPartnerTagThisSession] =+ useState(false);const [debouncedSearch] = useDebounce(search, 500);const { partnerTagsCount } = usePartnerTagsCount();@@ -94,6 +99,19 @@ function UpdatePartnerTagsModalContent({removed: [],});+ useEffect(() => {+ if (showUpdatePartnerTagsModal) {+ if (!wasModalOpenRef.current) {+ setSelectionState({ added: [], removed: [] });+ setHasDeletedPartnerTagThisSession(false);+ setSearch("");+ }+ wasModalOpenRef.current = true;+ } else {+ wasModalOpenRef.current = false;+ }+ }, [showUpdatePartnerTagsModal]);+const tagOptions = useMemo(() => {if (!availableTags) return undefined;@@ -146,6 +164,14 @@ function UpdatePartnerTagsModalContent({});}, [partners, availableTags, selectionState]);+ const clearDeletedTagFromSelection = useCallback((tagId: string) => {+ setSelectionState((s) => ({+ added: s.added.filter((t) => t.id !== tagId),+ removed: s.removed.filter((t) => t.id !== tagId),+ }));+ setHasDeletedPartnerTagThisSession(true);+ }, []);+const { executeAsync: updatePartnerTags, isPending } = useAction(updateProgramPartnerTagsAction,{@@ -164,13 +190,34 @@ function UpdatePartnerTagsModalContent({const handleSave = useCallback(async () => {if (!workspaceId) return;- await updatePartnerTags({- workspaceId,- partnerIds: partners.map(({ id }) => id),- addTagIds: selectionState.added.map(({ id }) => id),- removeTagIds: selectionState.removed.map(({ id }) => id),- });- }, [workspaceId, partners, updatePartnerTags, selectionState]);+ const addTagIds = selectionState.added.map(({ id }) => id);+ const removeTagIds = selectionState.removed.map(({ id }) => id);++ if (addTagIds.length > 0 || removeTagIds.length > 0) {+ await updatePartnerTags({+ workspaceId,+ partnerIds: partners.map(({ id }) => id),+ addTagIds,+ removeTagIds,+ });+ return;+ }++ if (hasDeletedPartnerTagThisSession) {+ setShowUpdatePartnerTagsModal(false);+ setHasDeletedPartnerTagThisSession(false);+ await mutatePrefix("/api/partners");+ await mutatePrefix("/api/partners/tags");+ await mutatePrefix("/api/partners/count");+ }+ }, [+ workspaceId,+ partners,+ updatePartnerTags,+ selectionState,+ hasDeletedPartnerTagThisSession,+ setShowUpdatePartnerTagsModal,+ ]);const { executeAsync: createPartnerTag, isPending: isCreatingPartnerTag } =useAction(createPartnerTagAction, {@@ -238,6 +285,7 @@ function UpdatePartnerTagsModalContent({partnerCounts?.find((pc) => pc.partnerTagId === tag.id)?._count ?? 0}+ onTagDeleted={clearDeletedTagFromSelection}checked={tag.checkedState}onCheckedChange={(checked) => {setSelectionState(({ added, removed }) => ({@@ -356,7 +404,9 @@ function UpdatePartnerTagsModalContent({loading={isPending}text="Save"disabled={- !selectionState.added.length && !selectionState.removed.length+ !selectionState.added.length &&+ !selectionState.removed.length &&+ !hasDeletedPartnerTagThisSession}className="h-8 w-fit px-3"/>@@ -366,7 +416,7 @@ function UpdatePartnerTagsModalContent({);}-function UpdatePartnerTagsModal(props: UpdatePartnerTagsModalProps) {+export function UpdatePartnerTagsModal(props: UpdatePartnerTagsModalProps) {return (<ModalshowModal={props.showUpdatePartnerTagsModal}@@ -383,20 +433,24 @@ function TagOption({partnerCount,checked,onCheckedChange,+ onTagDeleted,}: {tag: PartnerTagProps;partnerCount: number;checked: boolean | "indeterminate";onCheckedChange: (checked: boolean | "indeterminate") => void;+ onTagDeleted?: (tagId: string) => void;}) {const { id: workspaceId } = useWorkspace();const { executeAsync: deletePartnerTag, isPending: isDeletingPartnerTag } =useAction(deletePartnerTagAction, {- onSuccess: () => {+ onSuccess: async () => {toast.success("Partner tag deleted successfully!");- mutatePrefix("/api/partners");- mutatePrefix("/api/partners/tags");+ onTagDeleted?.(tag.id);+ await mutatePrefix("/api/partners");+ await mutatePrefix("/api/partners/tags");+ await mutatePrefix("/api/partners/count");},onError: ({ error }) => {toast.error(parseActionError(error, "Failed to delete partner tag"));@@ -416,6 +470,7 @@ function TagOption({toast.success("Partner tag updated successfully!");mutatePrefix("/api/partners");mutatePrefix("/api/partners/tags");+ mutatePrefix("/api/partners/count");},onError: ({ error }) => {toast.error(parseActionError(error, "Failed to update partner tag"));@@ -553,27 +608,15 @@ function TagOption({);}-export function useUpdatePartnerTagsModal({- partners,-}: Pick<UpdatePartnerTagsModalProps, "partners">) {+export function useUpdatePartnerTagsModal() {const [showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal] =useState(false);- const UpdatePartnerTagsModalCallback = useCallback(() => {- return (- <UpdatePartnerTagsModal- showUpdatePartnerTagsModal={showUpdatePartnerTagsModal}- setShowUpdatePartnerTagsModal={setShowUpdatePartnerTagsModal}- partners={partners}- />- );- }, [showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal, partners]);-return useMemo(() => ({+ showUpdatePartnerTagsModal,setShowUpdatePartnerTagsModal,- UpdatePartnerTagsModal: UpdatePartnerTagsModalCallback,}),- [setShowUpdatePartnerTagsModal, UpdatePartnerTagsModalCallback],+ [showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal],);}diff --git a/packages/ui/src/truncated-list.tsx b/packages/ui/src/truncated-list.tsxindex 0b6a840ac2..c73ca7ff03 100644--- a/packages/ui/src/truncated-list.tsx+++ b/packages/ui/src/truncated-list.tsx@@ -48,57 +48,54 @@ export const TruncatedList = memo(const truncate = useCallback(() => {if (!containerRef.current) return;- const childNodes = Array.from(- containerRef.current.children,- ) as HTMLElement[];-- // Show all items except for the overflow indicator- childNodes.forEach((node) => {- node.hidden = Boolean(node.getAttribute("data-overflow-indicator"));- });-- // No need to truncate if there's only one item- if (childNodes.length <= 2) {- setVisible(childNodes.length - 1);+ const container = containerRef.current;+ const childNodes = Array.from(container.children) as HTMLElement[];+ const tagItems = childNodes.slice(0, -1); // everything except the overflow slot+ const overflowSlot = childNodes[childNodes.length - 1];++ // 1. Show all tags, hide overflow chip+ tagItems.forEach((n) => (n.hidden = false));+ overflowSlot.hidden = true;++ if (tagItems.length === 0) {+ setVisible(0);return;}- // Check if last item already fits- const lastElement = childNodes[childNodes.length - 2];- if (- contains(- containerRef.current.getBoundingClientRect(),- lastElement.getBoundingClientRect(),- )- ) {- setVisible(childNodes.length - 1);+ // Force a synchronous layout reflow before measuring+ void container.offsetWidth;++ const containerRight = container.getBoundingClientRect().right;++ // If the last tag fits, every earlier one does too (left-to-right layout)+ const lastTagRight =+ tagItems[tagItems.length - 1].getBoundingClientRect().right;++ if (lastTagRight <= containerRight + 0.5) {+ setVisible(tagItems.length);return;}- // Last item doesn't fit: show the overflow indicator- childNodes- .filter((node) => node.getAttribute("data-overflow-indicator"))- .forEach((node) => {- node.hidden = false;- });-- // Find all non-overflow-indicator elements that don't fit- const elementsToHide = childNodes.filter(- (node) =>- containerRef.current &&- !node.getAttribute("data-overflow-indicator") &&- !contains(- containerRef.current.getBoundingClientRect(),- node.getBoundingClientRect(),- ),- );-- // Hide the elements that don't fit- elementsToHide.forEach((node) => {- node.hidden = true;- });-- setVisible(childNodes.length - 1 - elementsToHide.length);+ // 2. At least one tag overflows — show the chip, then hide tags from the+ // right one-by-one until the chip itself fits inside the container.+ overflowSlot.hidden = false;++ let visibleCount = tagItems.length;+ while (visibleCount > 0) {+ // Reflow so getBoundingClientRect reflects the latest DOM state+ void container.offsetWidth;++ const chipRight = overflowSlot.getBoundingClientRect().right;+ const currentContainerRight = container.getBoundingClientRect().right;++ if (chipRight <= currentContainerRight + 0.5) break;++ // Hide the rightmost still-visible tag+ tagItems[visibleCount - 1].hidden = true;+ visibleCount--;+ }++ setVisible(visibleCount);}, []);// Set up a resize observer@@ -131,7 +128,7 @@ export const TruncatedList = memo(</ItemAs>))}- <ItemAs hidden data-overflow-indicator>+ <ItemAs className="shrink-0" data-overflow-indicator="">{overflowIndicator({visible,total: childNodes.length,@@ -148,15 +145,6 @@ export const TruncatedList = memo(},);-const contains = (parent: DOMRect, child: DOMRect) => {- return (- child.top >= parent.top &&- child.bottom <= parent.bottom &&- child.left >= parent.left &&- child.right <= parent.right- );-};-// https://github.com/facebook/react/issues/8669#issuecomment-531515508const circular = () => {const seen = new WeakSet();