The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
fix reward filtering in program marketplace
Steven Teyc78c8e31adcf
diff --git a/apps/web/app/(ee)/api/network/programs/count/route.ts b/apps/web/app/(ee)/api/network/programs/count/route.tsindex 5568f776dd..4b602bb1f5 100644--- a/apps/web/app/(ee)/api/network/programs/count/route.ts+++ b/apps/web/app/(ee)/api/network/programs/count/route.ts@@ -29,10 +29,7 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {${rewardType && groupBy !== "rewardType"? Prisma.sql`- AND ${Prisma.join(- rewardType.map((type) => rewardTypeMap[type]),- " AND ",- )}`+ AND ${rewardTypeMap[rewardType]}`: Prisma.sql``})diff --git a/apps/web/app/(ee)/api/network/programs/route.ts b/apps/web/app/(ee)/api/network/programs/route.tsindex 48dbf4e88c..fe80d478b8 100644--- a/apps/web/app/(ee)/api/network/programs/route.ts+++ b/apps/web/app/(ee)/api/network/programs/route.ts@@ -53,16 +53,16 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {groups: {some: {slug: DEFAULT_PARTNER_GROUP.slug,- ...(rewardType.includes("sale") && {+ ...(rewardType === "sale" && {saleRewardId: { not: null },}),- ...(rewardType.includes("lead") && {+ ...(rewardType === "lead" && {leadRewardId: { not: null },}),- ...(rewardType.includes("click") && {+ ...(rewardType === "click" && {clickRewardId: { not: null },}),- ...(rewardType.includes("discount") && {+ ...(rewardType === "discount" && {discountId: { not: null },}),},diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsxindex 14bd729f4f..a4229c0a73 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx@@ -72,7 +72,6 @@ export function useProgramNetworkFilters() {() => [{key: "rewardType",- multiple: true,icon: Gift,label: "Reward type",options: Object.entries(REWARD_TYPES).map(@@ -136,74 +135,42 @@ export function useProgramNetworkFilters() {[categoriesCount, rewardTypesCount, statusCount],);- const multiFilters = useMemo(- () => ({- rewardType: searchParamsObj.rewardType?.split(",").filter(Boolean) ?? [],- }),- [searchParamsObj],- ) as Record<string, string[]>;-const activeFilters = useMemo(() => {- const { category, status } = searchParamsObj;+ const { rewardType, category, status } = searchParamsObj;return [- ...Object.entries(multiFilters)- .map(([key, value]) => ({ key, value }))- .filter(({ value }) => value.length > 0),-+ ...(rewardType ? [{ key: "rewardType", value: rewardType }] : []),...(category ? [{ key: "category", value: category }] : []),...(status ? [{ key: "status", value: status }] : []),];- }, [searchParamsObj, multiFilters]);+ }, [searchParamsObj]);const onSelect = useCallback((key: string, value: any) =>queryParams({- set: Object.keys(multiFilters).includes(key)- ? {- [key]: multiFilters[key].concat(value).join(","),- }- : {- [key]: value,- },+ set: {+ [key]: value,+ },del: "page",}),- [queryParams, multiFilters],+ [queryParams],);const onRemove = useCallback(- (key: string, value: any) => {- if (- Object.keys(multiFilters).includes(key) &&- !(multiFilters[key].length === 1 && multiFilters[key][0] === value)- ) {- queryParams({- set: {- [key]: multiFilters[key].filter((id) => id !== value).join(","),- },- del: "page",- });- } else {- queryParams({- del: [key, "page"],- });- }+ (key: string) => {+ queryParams({+ del: [key, "page"],+ });},- [queryParams, multiFilters],+ [queryParams],);const onRemoveAll = useCallback(() =>queryParams({- del: [- ...Object.keys(multiFilters),- "category",- "status",- "search",- "page",- ],+ del: ["rewardType", "category", "status", "search", "page"],}),- [queryParams, multiFilters],+ [queryParams],);const isFiltered = Boolean(diff --git a/apps/web/lib/zod/schemas/program-network.ts b/apps/web/lib/zod/schemas/program-network.tsindex ae7b400507..00e6d772cb 100644--- a/apps/web/lib/zod/schemas/program-network.ts+++ b/apps/web/lib/zod/schemas/program-network.ts@@ -32,20 +32,10 @@ export const NetworkProgramExtendedSchema = NetworkProgramSchema.extend({export const PROGRAM_NETWORK_MAX_PAGE_SIZE = 100;-const rewardTypes = ["sale", "lead", "click", "discount"] as const;-const rewardTypeSchema = z.enum(rewardTypes);-export const getNetworkProgramsQuerySchema = z.object({category: z.enum(Category).optional(),- rewardType: z- .union([z.string(), z.array(rewardTypeSchema)])- .transform((v) =>- Array.isArray(v)- ? v- : v.split(",").filter((v) => rewardTypes.includes(v as any)),- )- .optional(),+ rewardType: z.enum(["sale", "lead", "click", "discount"]).optional(),status: z.preprocess((v) => (v === "null" ? null : v),z.enum(ProgramEnrollmentStatus).nullish(),