Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

remove status multi filter

Pedro Ladeiraaa925a49f984
diff --git a/apps/web/app/(ee)/api/commissions/count/route.ts b/apps/web/app/(ee)/api/commissions/count/route.ts
index f008e3edf3..c86698e83e 100644
--- a/apps/web/app/(ee)/api/commissions/count/route.ts
+++ b/apps/web/app/(ee)/api/commissions/count/route.ts
@@ -10,16 +10,17 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const isHoldStatus = searchParams.status === "hold";
const {
- status: rawStatus,
+ status: _status,
fraudEventGroupId,
...restSearchParams
} = searchParams;
- const parsedParams = getCommissionsCountQuerySchema.parse(restSearchParams);
+ const parsedParams = getCommissionsCountQuerySchema.parse(
+ isHoldStatus ? restSearchParams : searchParams,
+ );
const counts = await getCommissionsCount({
...parsedParams,
- ...(!isHoldStatus && rawStatus && { status: rawStatus }),
programId,
isHoldStatus,
...(fraudEventGroupId && { fraudEventGroupId }),
diff --git a/apps/web/app/(ee)/api/commissions/route.ts b/apps/web/app/(ee)/api/commissions/route.ts
index 07aa8527c7..d999975ce6 100644
--- a/apps/web/app/(ee)/api/commissions/route.ts
+++ b/apps/web/app/(ee)/api/commissions/route.ts
@@ -17,14 +17,17 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const isHoldStatus = searchParams.status === "hold";
const {
- status: rawStatus,
+ status: _status,
fraudEventGroupId,
type: rawType,
...restSearchParams
} = searchParams;
- let { partnerId, tenantId, ...filters } =
- getCommissionsQuerySchema.parse(restSearchParams);
+ let { partnerId, tenantId, ...filters } = getCommissionsQuerySchema.parse(
+ isHoldStatus
+ ? restSearchParams
+ : { ...restSearchParams, status: searchParams.status },
+ );
if (tenantId && !partnerId) {
const partner = await prisma.programEnrollment.findUnique({
@@ -51,9 +54,8 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
const commissions = await getCommissions({
...filters,
- // Pass raw type/status strings (may be comma-separated) for multi-value handling
+ // Pass raw type string (may be comma-separated) for multi-value handling
...(rawType && { type: rawType }),
- ...(!isHoldStatus && rawStatus && { status: rawStatus }),
partnerId,
programId,
isHoldStatus,
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.tsx
index d35dc5aba8..6fe0c28f98 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
@@ -136,6 +136,7 @@ export function useCommissionFilters() {
key: "status",
icon: CircleDotted,
label: "Status",
+ singleSelect: true,
options: Object.entries(CommissionStatusBadges).map(
([value, { label }]) => {
const Icon = CommissionStatusBadges[value].icon;
@@ -199,7 +200,10 @@ export function useCommissionFilters() {
const onSelect = useCallback(
(key: string, value: string) => {
const currentParam = searchParamsObj[key];
- if (!currentParam) {
+ const filterDef = filters.find((f) => f.key === key);
+ const isSingleSelect = filterDef?.singleSelect;
+
+ if (!currentParam || isSingleSelect) {
queryParams({ set: { [key]: value }, del: "page" });
return;
}
@@ -212,7 +216,7 @@ export function useCommissionFilters() {
queryParams({ set: { [key]: newParam }, del: "page" });
}
},
- [searchParamsObj, queryParams],
+ [searchParamsObj, queryParams, filters],
);
const onRemove = useCallback(
diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.ts
index 7e37db6717..b53ac66d32 100644
--- a/apps/web/lib/api/commissions/get-commissions-count.ts
+++ b/apps/web/lib/api/commissions/get-commissions-count.ts
@@ -9,11 +9,9 @@ import {
import { parseFilterValue } from "@dub/utils";
import * as z from "zod/v4";
-type CommissionsCountFilters = Omit<
- z.infer<typeof getCommissionsCountQuerySchema>,
- "status"
+type CommissionsCountFilters = z.infer<
+ typeof getCommissionsCountQuerySchema
> & {
- status?: string;
programId: string;
isHoldStatus?: boolean;
fraudEventGroupId?: string;
@@ -63,40 +61,15 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
timezone,
});
- const validCommissionStatuses = new Set(Object.values(CommissionStatus));
- const rawStatusFilter = parseFilterValue(status);
- const hasValidRequestedStatus =
- rawStatusFilter?.values.some((v) =>
- validCommissionStatuses.has(v as CommissionStatus),
- ) ?? false;
- const isInvalidInStatusFilter =
- rawStatusFilter?.sqlOperator === "IN" && !hasValidRequestedStatus;
-
- const statusValueFilter =
- rawStatusFilter && hasValidRequestedStatus
- ? {
- ...rawStatusFilter,
- values: rawStatusFilter.values.filter((v) =>
- validCommissionStatuses.has(v as CommissionStatus),
- ) as CommissionStatus[],
- }
- : null;
-
const statusFilter = isHoldStatus
? { in: [CommissionStatus.pending, CommissionStatus.processed] }
- : isInvalidInStatusFilter
- ? { in: [] as CommissionStatus[] }
- : statusValueFilter
- ? statusValueFilter.sqlOperator === "NOT IN"
- ? { notIn: statusValueFilter.values }
- : { in: statusValueFilter.values }
- : {
- notIn: [
- CommissionStatus.duplicate,
- CommissionStatus.fraud,
- CommissionStatus.canceled,
- ],
- };
+ : status ?? {
+ notIn: [
+ CommissionStatus.duplicate,
+ CommissionStatus.fraud,
+ CommissionStatus.canceled,
+ ],
+ };
const groupFilter = parseFilterValue(groupId);
const partnerTagFilter = parseFilterValue(partnerTagId);
diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.ts
index afb6a7291e..454e56f0c2 100644
--- a/apps/web/lib/api/commissions/get-commissions.ts
+++ b/apps/web/lib/api/commissions/get-commissions.ts
@@ -13,10 +13,9 @@ import { buildPaginationQuery } from "../pagination";
type CommissionsFilters = Omit<
z.infer<typeof getCommissionsQuerySchema>,
- "type" | "status"
+ "type"
> & {
type?: string;
- status?: string;
programId: string;
isHoldStatus?: boolean;
fraudEventGroupId?: string;
@@ -120,35 +119,10 @@ export async function getCommissions(filters: CommissionsFilters) {
}
: null;
- const validCommissionStatuses = new Set(Object.values(CommissionStatus));
- const rawStatusFilter = parseFilterValue(status);
- if (
- rawStatusFilter?.sqlOperator === "IN" &&
- !rawStatusFilter.values.some((v) =>
- validCommissionStatuses.has(v as CommissionStatus),
- )
- ) {
- return [];
- }
- const statusValueFilter =
- rawStatusFilter &&
- rawStatusFilter.values.some((v) =>
- validCommissionStatuses.has(v as CommissionStatus),
- )
- ? {
- ...rawStatusFilter,
- values: rawStatusFilter.values.filter((v) =>
- validCommissionStatuses.has(v as CommissionStatus),
- ) as CommissionStatus[],
- }
- : null;
-
const statusFilter = isHoldStatus
? { in: [CommissionStatus.pending, CommissionStatus.processed] }
- : statusValueFilter
- ? statusValueFilter.sqlOperator === "NOT IN"
- ? { notIn: statusValueFilter.values }
- : { in: statusValueFilter.values }
+ : status
+ ? status
: customerId || partnerFilter || typeFilter
? undefined
: {
diff --git a/packages/ui/src/filter/filter-list.tsx b/packages/ui/src/filter/filter-list.tsx
index 9ef5f552a1..4342c5bdd8 100644
--- a/packages/ui/src/filter/filter-list.tsx
+++ b/packages/ui/src/filter/filter-list.tsx
@@ -315,7 +315,9 @@ function OperatorFilterPill({
onSelect?.(filterKey, value);
}
- if (!isAdvancedFilter && !filter.multiple) setValueDropdownOpen(false);
+ if (filter.singleSelect || (!isAdvancedFilter && !filter.multiple)) {
+ setValueDropdownOpen(false);
+ }
},
[filterKey, values, onSelect, onRemove, isAdvancedFilter, filter.multiple],
);