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.

fix partner referrals filters

Steven Teyff9022cdc1fa
diff --git a/apps/web/app/(ee)/api/programs/referrals/count/route.ts b/apps/web/app/(ee)/api/programs/[programId]/referrals/count/route.ts
similarity index 96%
rename from apps/web/app/(ee)/api/programs/referrals/count/route.ts
rename to apps/web/app/(ee)/api/programs/[programId]/referrals/count/route.ts
index b1f4d26833..582c0478fc 100644
--- a/apps/web/app/(ee)/api/programs/referrals/count/route.ts
+++ b/apps/web/app/(ee)/api/programs/[programId]/referrals/count/route.ts
@@ -8,7 +8,7 @@ import { prisma, sanitizeFullTextSearch } from "@dub/prisma";
import { Prisma, ReferralStatus } from "@dub/prisma/client";
import { NextResponse } from "next/server";
-// GET /api/programs/referrals/count - get the count of partner referrals for a program
+// GET /api/programs/[programId]/referrals/count - get the count of partner referrals for a program
export const GET = withWorkspace(
async ({ workspace, searchParams }) => {
const programId = getDefaultProgramIdOrThrow(workspace);
diff --git a/apps/web/app/(ee)/api/programs/referrals/route.ts b/apps/web/app/(ee)/api/programs/[programId]/referrals/route.ts
similarity index 95%
rename from apps/web/app/(ee)/api/programs/referrals/route.ts
rename to apps/web/app/(ee)/api/programs/[programId]/referrals/route.ts
index 7dbb48565f..907796b5d6 100644
--- a/apps/web/app/(ee)/api/programs/referrals/route.ts
+++ b/apps/web/app/(ee)/api/programs/[programId]/referrals/route.ts
@@ -8,7 +8,7 @@ import { prisma, sanitizeFullTextSearch } from "@dub/prisma";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
-// GET /api/programs/referrals - get all partner referrals for a program
+// GET /api/programs/[programId]/referrals - get all partner referrals for a program
export const GET = withWorkspace(
async ({ workspace, searchParams }) => {
const programId = getDefaultProgramIdOrThrow(workspace);
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/layout.tsx
index 7bcdc88125..b156257f57 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/layout.tsx
@@ -30,7 +30,7 @@ export default function PartnerCustomersLayout({
});
const { data: referralsCount } = usePartnerReferralsCount<number>({
- includeParams: [],
+ ignoreParams: true,
});
const referralFormDataRaw = programEnrollment?.program?.referralFormData;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/layout.tsx
index 7684e43ad3..c570ccd93f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/layout.tsx
@@ -2,10 +2,10 @@
import { REFERRAL_ENABLED_PROGRAM_IDS } from "@/lib/referrals/constants";
import useCustomersCount from "@/lib/swr/use-customers-count";
+import { useProgramReferralsCount } from "@/lib/swr/use-program-referrals-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { usePartnerReferralsCount } from "@/ui/referrals/use-partner-referrals-count";
import { InfoTooltip } from "@dub/ui";
import { cn } from "@dub/utils";
import Link from "next/link";
@@ -25,8 +25,8 @@ export default function PartnerCustomersLayout({
includeParams: [],
});
- const { data: referralsCount } = usePartnerReferralsCount<number>({
- includeParams: [],
+ const { data: referralsCount } = useProgramReferralsCount<number>({
+ ignoreParams: true,
});
const isEnabled = defaultProgramId
diff --git a/apps/web/lib/swr/use-partner-referrals-count.ts b/apps/web/lib/swr/use-partner-referrals-count.ts
index 36036c1145..7370ae4809 100644
--- a/apps/web/lib/swr/use-partner-referrals-count.ts
+++ b/apps/web/lib/swr/use-partner-referrals-count.ts
@@ -7,11 +7,11 @@ import * as z from "zod/v4";
export default function usePartnerReferralsCount<T = number>({
query,
- includeParams = ["status", "search"],
+ ignoreParams,
enabled = true,
}: {
query?: Partial<z.infer<typeof getPartnerReferralsCountQuerySchema>>;
- includeParams?: string[];
+ ignoreParams?: boolean;
enabled?: boolean;
} = {}) {
const { programSlug } = useParams<{ programSlug: string }>();
@@ -29,7 +29,7 @@ export default function usePartnerReferralsCount<T = number>({
)
: undefined,
{
- include: includeParams,
+ include: ignoreParams ? [] : ["status", "search"],
},
)}`,
fetcher,
diff --git a/apps/web/ui/referrals/use-partner-referrals-count.ts b/apps/web/lib/swr/use-program-referrals-count.ts
similarity index 61%
rename from apps/web/ui/referrals/use-partner-referrals-count.ts
rename to apps/web/lib/swr/use-program-referrals-count.ts
index 9f692bd3ab..286f6e8c33 100644
--- a/apps/web/ui/referrals/use-partner-referrals-count.ts
+++ b/apps/web/lib/swr/use-program-referrals-count.ts
@@ -5,22 +5,26 @@ import { fetcher } from "@dub/utils";
import useSWR from "swr";
import * as z from "zod/v4";
-export function usePartnerReferralsCount<T = number>({
+export function useProgramReferralsCount<T = number>({
query,
- includeParams = ["partnerId", "status", "search"],
+ ignoreParams,
+ enabled = true,
}: {
query?: z.infer<typeof getPartnerReferralsCountQuerySchema>;
- includeParams?: string[];
+ ignoreParams?: boolean;
+ enabled?: boolean;
} = {}) {
- const { id: workspaceId } = useWorkspace();
+ const { id: workspaceId, defaultProgramId } = useWorkspace();
const { getQueryString } = useRouterStuff();
const { data, error, isLoading } = useSWR<T>(
- workspaceId &&
- `/api/programs/referrals/count${getQueryString(
+ enabled &&
+ workspaceId &&
+ defaultProgramId &&
+ `/api/programs/${defaultProgramId}/referrals/count${getQueryString(
{ workspaceId, ...query },
{
- include: includeParams,
+ include: ignoreParams ? [] : ["partnerId", "status", "search"],
},
)}`,
fetcher,
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index b73d3dede8..c5df9c731d 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -9,9 +9,9 @@ import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
import { usePartnerMessagesCount } from "@/lib/swr/use-partner-messages-count";
import usePayoutsCount from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
+import { useProgramReferralsCount } from "@/lib/swr/use-program-referrals-count";
import useWorkspace from "@/lib/swr/use-workspace";
import useWorkspaces from "@/lib/swr/use-workspaces";
-import { usePartnerReferralsCount } from "@/ui/referrals/use-partner-referrals-count";
import { useRouterStuff } from "@dub/ui";
import {
Bell,
@@ -295,13 +295,11 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
name: "Customers",
icon: UserCheck,
href: `/${slug}/program/customers`,
- badge:
- pathname?.includes("/customers/referrals") &&
- pendingReferralsCount
- ? pendingReferralsCount > 99
- ? "99+"
- : pendingReferralsCount
- : undefined,
+ badge: pendingReferralsCount
+ ? pendingReferralsCount > 99
+ ? "99+"
+ : pendingReferralsCount
+ : undefined,
},
{
name: "Commissions",
@@ -602,12 +600,10 @@ export function AppSidebarNav({
ignoreParams: true,
});
- const { data: pendingReferralsCount } = usePartnerReferralsCount<number>({
- query:
- currentArea === "program" && defaultProgramId
- ? { status: "pending" }
- : undefined,
- includeParams: ["status"],
+ const { data: pendingReferralsCount } = useProgramReferralsCount<number>({
+ query: { status: "pending" },
+ ignoreParams: true,
+ enabled: Boolean(currentArea === "program" && defaultProgramId),
});
const { canTrackConversions } = getPlanCapabilities(plan);
diff --git a/apps/web/ui/modals/mark-referral-closed-lost-modal.tsx b/apps/web/ui/modals/mark-referral-closed-lost-modal.tsx
index 3c5d7bd8f2..2d6002728d 100644
--- a/apps/web/ui/modals/mark-referral-closed-lost-modal.tsx
+++ b/apps/web/ui/modals/mark-referral-closed-lost-modal.tsx
@@ -13,12 +13,12 @@ export function useMarkReferralClosedLostModal({
}: {
referral: ReferralProps;
}) {
- const { id: workspaceId } = useWorkspace();
+ const { id: workspaceId, defaultProgramId } = useWorkspace();
const { executeAsync, isPending } = useAction(markReferralClosedLostAction, {
onSuccess: async () => {
toast.success("Partner referral marked as closed lost successfully!");
- mutatePrefix("/api/programs/referrals");
+ mutatePrefix(`/api/programs/${defaultProgramId}/referrals`);
},
onError({ error }) {
toast.error(error.serverError);
diff --git a/apps/web/ui/modals/mark-referral-closed-won-modal.tsx b/apps/web/ui/modals/mark-referral-closed-won-modal.tsx
index 25806a063f..b8d75c40f6 100644
--- a/apps/web/ui/modals/mark-referral-closed-won-modal.tsx
+++ b/apps/web/ui/modals/mark-referral-closed-won-modal.tsx
@@ -193,14 +193,14 @@ export function useMarkReferralClosedWonModal({
}: {
referral: ReferralProps;
}) {
- const { id: workspaceId } = useWorkspace();
+ const { id: workspaceId, defaultProgramId } = useWorkspace();
const [showModal, setShowModal] = useState(false);
const resetFormRef = useRef<(() => void) | null>(null);
const { executeAsync, isPending } = useAction(markReferralClosedWonAction, {
onSuccess: async () => {
toast.success("Partner referral marked as closed won successfully!");
- mutatePrefix("/api/programs/referrals");
+ mutatePrefix(`/api/programs/${defaultProgramId}/referrals`);
setShowModal(false);
resetFormRef.current?.();
},
diff --git a/apps/web/ui/modals/mark-referral-qualified-modal.tsx b/apps/web/ui/modals/mark-referral-qualified-modal.tsx
index 18cbc71405..6d72e6383f 100644
--- a/apps/web/ui/modals/mark-referral-qualified-modal.tsx
+++ b/apps/web/ui/modals/mark-referral-qualified-modal.tsx
@@ -160,14 +160,14 @@ export function useMarkReferralQualifiedModal({
}: {
referral: ReferralProps;
}) {
- const { id: workspaceId } = useWorkspace();
+ const { id: workspaceId, defaultProgramId } = useWorkspace();
const [showModal, setShowModal] = useState(false);
const resetFormRef = useRef<(() => void) | null>(null);
const { executeAsync, isPending } = useAction(markReferralQualifiedAction, {
onSuccess: async () => {
toast.success("Partner referral qualified successfully!");
- mutatePrefix("/api/programs/referrals");
+ mutatePrefix(`/api/programs/${defaultProgramId}/referrals`);
setShowModal(false);
resetFormRef.current?.();
},
diff --git a/apps/web/ui/modals/unqualify-referral-modal.tsx b/apps/web/ui/modals/unqualify-referral-modal.tsx
index eea235221d..f027cc525f 100644
--- a/apps/web/ui/modals/unqualify-referral-modal.tsx
+++ b/apps/web/ui/modals/unqualify-referral-modal.tsx
@@ -13,12 +13,12 @@ export function useUnqualifyReferralModal({
}: {
referral: ReferralProps;
}) {
- const { id: workspaceId } = useWorkspace();
+ const { id: workspaceId, defaultProgramId } = useWorkspace();
const { executeAsync, isPending } = useAction(markReferralUnqualifiedAction, {
onSuccess: async () => {
toast.success("Partner referral unqualified successfully!");
- mutatePrefix("/api/programs/referrals");
+ mutatePrefix(`/api/programs/${defaultProgramId}/referrals`);
},
onError({ error }) {
toast.error(error.serverError);
diff --git a/apps/web/ui/referrals/partner-referral-table.tsx b/apps/web/ui/referrals/partner-referral-table.tsx
index 72bfdde026..2314ecbcd3 100644
--- a/apps/web/ui/referrals/partner-referral-table.tsx
+++ b/apps/web/ui/referrals/partner-referral-table.tsx
@@ -1,10 +1,7 @@
"use client";
import useWorkspace from "@/lib/swr/use-workspace";
-import {
- getPartnerReferralsQuerySchema,
- referralSchema,
-} from "@/lib/zod/schemas/referrals";
+import { referralSchema } from "@/lib/zod/schemas/referrals";
import { PartnerRowItem } from "@/ui/partners/partner-row-item";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
import { SearchBoxPersisted } from "@/ui/shared/search-box";
@@ -24,22 +21,18 @@ import { Row } from "@tanstack/react-table";
import { useEffect, useMemo, useState } from "react";
import useSWR from "swr";
import * as z from "zod/v4";
+import { useProgramReferralsCount } from "../../lib/swr/use-program-referrals-count";
import { ReferralSheet } from "./partner-referral-sheet";
import { ReferralStatusBadges } from "./referral-status-badges";
import { getCompanyLogoUrl } from "./referral-utils";
-import { usePartnerReferralFilters } from "./use-partner-referral-filters";
-import { usePartnerReferralsCount } from "./use-partner-referrals-count";
+import { useProgramReferralsFilters } from "./use-program-referral-filters";
type PartnerReferralProps = z.infer<typeof referralSchema>;
-export function PartnerReferralTable({
- query,
-}: {
- query?: Partial<z.infer<typeof getPartnerReferralsQuerySchema>>;
-}) {
+export function PartnerReferralTable() {
const { getQueryString, queryParams, searchParams } = useRouterStuff();
const { pagination, setPagination } = usePagination();
- const { id: workspaceId, slug: workspaceSlug } = useWorkspace();
+ const { id: workspaceId, defaultProgramId } = useWorkspace();
const referralIdFromUrl = searchParams.get("referralId");
@@ -59,20 +52,18 @@ export function PartnerReferralTable({
onRemoveAll,
setSearch,
setSelectedFilter,
- } = usePartnerReferralFilters({});
+ } = useProgramReferralsFilters({});
- const { data: referralsCount, error: countError } = usePartnerReferralsCount({
- query,
- });
+ const { data: referralsCount, error: countError } =
+ useProgramReferralsCount();
const {
data: referrals,
error,
isLoading,
} = useSWR<PartnerReferralProps[]>(
- `/api/programs/referrals${getQueryString({
+ `/api/programs/${defaultProgramId}/referrals${getQueryString({
workspaceId,
- ...query,
})}`,
fetcher,
{
diff --git a/apps/web/ui/referrals/use-partner-referral-filters.tsx b/apps/web/ui/referrals/use-program-referral-filters.tsx
similarity index 95%
rename from apps/web/ui/referrals/use-partner-referral-filters.tsx
rename to apps/web/ui/referrals/use-program-referral-filters.tsx
index e90d95c975..2bd2ec65bf 100644
--- a/apps/web/ui/referrals/use-partner-referral-filters.tsx
+++ b/apps/web/ui/referrals/use-program-referral-filters.tsx
@@ -11,10 +11,10 @@ import { cn, nFormatter, OG_AVATAR_URL } from "@dub/utils";
import { useCallback, useMemo, useState } from "react";
import { useDebounce } from "use-debounce";
import * as z from "zod/v4";
+import { useProgramReferralsCount } from "../../lib/swr/use-program-referrals-count";
import { ReferralStatusBadges } from "./referral-status-badges";
-import { usePartnerReferralsCount } from "./use-partner-referrals-count";
-export function usePartnerReferralFilters(
+export function useProgramReferralsFilters(
extraSearchParams: Record<string, string>,
) {
const [search, setSearch] = useState("");
@@ -27,7 +27,7 @@ export function usePartnerReferralFilters(
selectedFilter === "partnerId" ? debouncedSearch : "",
);
- const { data: statusCount } = usePartnerReferralsCount<
+ const { data: statusCount } = useProgramReferralsCount<
z.infer<typeof partnerReferralsCountByStatusSchema>[] | undefined
>({
query: {
@@ -35,7 +35,7 @@ export function usePartnerReferralFilters(
},
});
- const { data: partnersCount } = usePartnerReferralsCount<
+ const { data: partnersCount } = useProgramReferralsCount<
z.infer<typeof partnerReferralsCountByPartnerIdSchema>[] | undefined
>({
query: {