The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Commissions multi filter (#3829)
Pedro Ladeira772fa34e6c1b
diff --git a/apps/web/app/(ee)/api/commissions/route.ts b/apps/web/app/(ee)/api/commissions/route.tsindex 580fce6584..d999975ce6 100644--- a/apps/web/app/(ee)/api/commissions/route.ts+++ b/apps/web/app/(ee)/api/commissions/route.ts@@ -19,11 +19,14 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {const {status: _status,fraudEventGroupId,+ type: rawType,...restSearchParams} = searchParams;let { partnerId, tenantId, ...filters } = getCommissionsQuerySchema.parse(- isHoldStatus ? restSearchParams : searchParams,+ isHoldStatus+ ? restSearchParams+ : { ...restSearchParams, status: searchParams.status },);if (tenantId && !partnerId) {@@ -51,6 +54,8 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {const commissions = await getCommissions({...filters,+ // Pass raw type string (may be comma-separated) for multi-value handling+ ...(rawType && { type: rawType }),partnerId,programId,isHoldStatus,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 90b2a91b6f..86132c0ba2 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@@ -440,9 +440,11 @@ function CommissionsFilters() {activeFilters,onSelect,onRemove,+ onRemoveFilter,onRemoveAll,+ onToggleOperator,+ onOpenFilter,setSearch,- setSelectedFilter,} = useCommissionFilters();return (@@ -454,8 +456,9 @@ function CommissionsFilters() {activeFilters={activeFilters}onSelect={onSelect}onRemove={onRemove}+ onOpenFilter={onOpenFilter}onSearchChange={setSearch}- onSelectedFilterChange={setSelectedFilter}+ isAdvancedFilter/><SimpleDateRangePickerclassName="w-full sm:min-w-[200px] md:w-fit"@@ -479,7 +482,10 @@ function CommissionsFilters() {activeFilters={activeFilters}onSelect={onSelect}onRemove={onRemove}+ onRemoveFilter={onRemoveFilter}onRemoveAll={onRemoveAll}+ onToggleOperator={onToggleOperator}+ isAdvancedFilter/></div>)}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 c99b8e909a..0d8be77424 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@@ -12,7 +12,13 @@ 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 { capitalize, cn, nFormatter } from "@dub/utils";+import {+ capitalize,+ cn,+ FilterOperator,+ nFormatter,+ parseFilterValue,+} from "@dub/utils";import { useCallback, useMemo, useState } from "react";import { useDebounce } from "use-debounce";@@ -121,17 +127,27 @@ export function useCommissionFilters() {);const activeFilters = useMemo(() => {- const { customerId, partnerId, status, type, payoutId, groupId } =- searchParamsObj;-- return [- ...(customerId ? [{ key: "customerId", value: customerId }] : []),- ...(partnerId ? [{ key: "partnerId", value: partnerId }] : []),- ...(status ? [{ key: "status", value: status }] : []),- ...(type ? [{ key: "type", value: type }] : []),- ...(payoutId ? [{ key: "payoutId", value: payoutId }] : []),- ...(groupId ? [{ key: "groupId", value: groupId }] : []),- ];+ const result: {+ key: string;+ operator: FilterOperator;+ values: string[];+ }[] = [];+ const keys = [+ "customerId",+ "partnerId",+ "status",+ "type",+ "payoutId",+ "groupId",+ ] as const;+ for (const key of keys) {+ const raw = searchParamsObj[key];+ if (!raw) continue;+ const parsed = parseFilterValue(raw);+ if (parsed)+ result.push({ key, operator: parsed.operator, values: parsed.values });+ }+ return result;}, [searchParamsObj.customerId,searchParamsObj.partnerId,@@ -142,38 +158,94 @@ export function useCommissionFilters() {]);const onSelect = useCallback(- (key: string, value: any) =>- queryParams({- set: {- [key]: value,- },- del: "page",- }),- [queryParams],+ (key: string, value: string) => {+ const currentParam = searchParamsObj[key];+ if (!currentParam) {+ queryParams({ set: { [key]: value }, del: "page" });+ return;+ }+ const parsed = parseFilterValue(currentParam);+ if (parsed && !parsed.values.includes(value)) {+ const newValues = [...parsed.values, value];+ const newParam = parsed.operator.includes("NOT")+ ? `-${newValues.join(",")}`+ : newValues.join(",");+ queryParams({ set: { [key]: newParam }, del: "page" });+ }+ },+ [searchParamsObj, queryParams],);const onRemove = useCallback(- (key: string) =>- queryParams({- del: [key, "page"],- }),+ (key: string, value: string) => {+ const currentParam = searchParamsObj[key];+ if (!currentParam) return;+ const parsed = parseFilterValue(currentParam);+ if (!parsed) {+ queryParams({ del: [key, "page"] });+ return;+ }+ const newValues = parsed.values.filter((v) => v !== value);+ if (newValues.length === 0) {+ queryParams({ del: [key, "page"] });+ } else {+ const newParam = parsed.operator.includes("NOT")+ ? `-${newValues.join(",")}`+ : newValues.join(",");+ queryParams({ set: { [key]: newParam }, del: "page" });+ }+ },+ [searchParamsObj, queryParams],+ );++ const onRemoveFilter = useCallback(+ (key: string) => queryParams({ del: [key, "page"] }),[queryParams],);const onRemoveAll = useCallback(() =>queryParams({- del: ["status", "partnerId", "customerId", "payoutId", "groupId"],+ del: [+ "status",+ "partnerId",+ "customerId",+ "payoutId",+ "groupId",+ "type",+ ],}),[queryParams],);+ const onToggleOperator = useCallback(+ (key: string) => {+ const currentParam = searchParamsObj[key];+ if (!currentParam) return;+ const isNegated = currentParam.startsWith("-");+ const cleanValue = isNegated ? currentParam.slice(1) : currentParam;+ queryParams({+ set: { [key]: isNegated ? cleanValue : `-${cleanValue}` },+ del: "page",+ });+ },+ [searchParamsObj, queryParams],+ );++ const onOpenFilter = useCallback(+ (key: string | null) => setSelectedFilter(key),+ [],+ );+return {filters,activeFilters,onSelect,onRemove,+ onRemoveFilter,onRemoveAll,+ onToggleOperator,+ onOpenFilter,setSearch,setSelectedFilter,};@@ -186,20 +258,26 @@ function usePartnerFilterOptions(search: string) {query: { search },});- const { partners: selectedPartners } = usePartners({- query: {- partnerIds: searchParamsObj.partnerId- ? [searchParamsObj.partnerId]+ const activePartnerIds = useMemo(+ () =>+ searchParamsObj.partnerId+ ? searchParamsObj.partnerId.replace(/^-/, "").split(",").filter(Boolean): undefined,- },+ [searchParamsObj.partnerId],+ );++ const { partners: selectedPartners } = usePartners({+ query: { partnerIds: activePartnerIds },});const result = useMemo(() => {return partnersLoading ||- // Consider partners loading if we can't find the currently filtered partner- (searchParamsObj.partnerId &&- ![...(selectedPartners ?? []), ...(partners ?? [])].some(- (p) => p.id === searchParamsObj.partnerId,+ // Consider partners loading if we can't find all currently filtered partners+ (activePartnerIds?.length &&+ !activePartnerIds.every((id) =>+ [...(selectedPartners ?? []), ...(partners ?? [])].some(+ (p) => p.id === id,+ ),))? null: ([diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.tsindex d3cf336049..993ba64618 100644--- a/apps/web/lib/api/commissions/get-commissions.ts+++ b/apps/web/lib/api/commissions/get-commissions.ts@@ -1,12 +1,21 @@import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";import { getCommissionsQuerySchema } from "@/lib/zod/schemas/commissions";import { prisma } from "@dub/prisma";-import { CommissionStatus, FraudEventStatus } from "@dub/prisma/client";+import {+ CommissionStatus,+ CommissionType,+ FraudEventStatus,+} from "@dub/prisma/client";+import { parseFilterValue } from "@dub/utils";import * as z from "zod/v4";import { DubApiError } from "../errors";import { buildPaginationQuery } from "../pagination";-type CommissionsFilters = z.infer<typeof getCommissionsQuerySchema> & {+type CommissionsFilters = Omit<+ z.infer<typeof getCommissionsQuerySchema>,+ "type"+> & {+ type?: string;programId: string;isHoldStatus?: boolean;fraudEventGroupId?: string;@@ -82,11 +91,37 @@ export async function getCommissions(filters: CommissionsFilters) {timezone,});+ const partnerFilter = parseFilterValue(partnerId);+ const groupFilter = parseFilterValue(groupId);++ const validCommissionTypes = new Set(Object.values(CommissionType));+ const rawTypeFilter = parseFilterValue(type);+ if (+ rawTypeFilter?.sqlOperator === "IN" &&+ !rawTypeFilter.values.some((v) =>+ validCommissionTypes.has(v as CommissionType),+ )+ ) {+ return [];+ }+ const typeFilter =+ rawTypeFilter &&+ rawTypeFilter.values.some((v) =>+ validCommissionTypes.has(v as CommissionType),+ )+ ? {+ ...rawTypeFilter,+ values: rawTypeFilter.values.filter((v) =>+ validCommissionTypes.has(v as CommissionType),+ ) as CommissionType[],+ }+ : null;+const statusFilter = isHoldStatus? { in: [CommissionStatus.pending, CommissionStatus.processed] }: status? status- : customerId || partnerId || type+ : customerId || partnerFilter || typeFilter? undefined: {notIn: [@@ -97,7 +132,12 @@ export async function getCommissions(filters: CommissionsFilters) {};const programEnrollmentFilter = {- ...(groupId && { groupId }),+ ...(groupFilter && {+ groupId:+ groupFilter.sqlOperator === "NOT IN"+ ? { notIn: groupFilter.values }+ : { in: groupFilter.values },+ }),...(isHoldStatus && {fraudEventGroups: {some: {@@ -118,9 +158,19 @@ export async function getCommissions(filters: CommissionsFilters) {not: 0,},programId,- partnerId,+ ...(partnerFilter && {+ partnerId:+ partnerFilter.sqlOperator === "NOT IN"+ ? { notIn: partnerFilter.values }+ : { in: partnerFilter.values },+ }),status: statusFilter,- type,+ ...(typeFilter && {+ type:+ typeFilter.sqlOperator === "NOT IN"+ ? { notIn: typeFilter.values }+ : { in: typeFilter.values },+ }),customerId,payoutId,...(eventIds && {diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.tsindex 8a68dfb0f7..5c207ae580 100644--- a/apps/web/lib/zod/schemas/commissions.ts+++ b/apps/web/lib/zod/schemas/commissions.ts@@ -89,7 +89,14 @@ export const COMMISSIONS_MAX_PAGE_SIZE = 100;export const getCommissionsQuerySchema = z.object({- type: z.enum(CommissionType).optional(),+ type: z+ .enum(CommissionType)+ .optional()+ .describe(+ "Filter the list of commissions by type. " ++ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " ++ "Examples: `sale`, `sale,lead`, `-click`.",+ ),customerId: z.string().optional()@@ -102,7 +109,9 @@ export const getCommissionsQuerySchema = z.string().optional().describe(- "Filter the list of commissions by the associated partner. When specified, takes precedence over `tenantId`.",+ "Filter the list of commissions by the associated partner. When specified, takes precedence over `tenantId`. " ++ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " ++ "Examples: `partner_abc`, `partner_abc,partner_xyz`, `-partner_abc`.",),tenantId: z.string()@@ -114,7 +123,9 @@ export const getCommissionsQuerySchema = z.string().optional().describe(- "Filter the list of commissions by the associated partner group.",+ "Filter the list of commissions by the associated partner group. " ++ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " ++ "Examples: `group_abc`, `group_abc,group_xyz`, `-group_abc`.",),invoiceId: z.string()