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.

List program applications from ProgramApplication and add a count endpoint.

Kiran K3e850b1595aa
diff --git a/apps/web/app/(ee)/api/program-applications/count/route.ts b/apps/web/app/(ee)/api/program-applications/count/route.ts
new file mode 100644
index 0000000000..67e577192b
--- /dev/null
+++ b/apps/web/app/(ee)/api/program-applications/count/route.ts
@@ -0,0 +1,33 @@
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { withWorkspace } from "@/lib/auth";
+import { prisma } from "@/lib/prisma";
+import { buildProgramApplicationWhere } from "@/lib/program-applications/program-application-where";
+import { getProgramApplicationsCountQuerySchema } from "@/lib/zod/schemas/program-application";
+import { NextResponse } from "next/server";
+
+// GET /api/program-applications/count - get the count of applications for a program
+export const GET = withWorkspace(
+ async ({ workspace, searchParams }) => {
+ const { country, groupId, status, search } =
+ getProgramApplicationsCountQuerySchema.parse(searchParams);
+
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ const where = buildProgramApplicationWhere({
+ programId,
+ groupId,
+ country,
+ status,
+ search,
+ });
+
+ const count = await prisma.programApplication.count({
+ where,
+ });
+
+ return NextResponse.json(count);
+ },
+ {
+ requiredPlan: ["business", "advanced", "enterprise"],
+ },
+);
diff --git a/apps/web/app/(ee)/api/program-applications/route.ts b/apps/web/app/(ee)/api/program-applications/route.ts
new file mode 100644
index 0000000000..c6aae5c646
--- /dev/null
+++ b/apps/web/app/(ee)/api/program-applications/route.ts
@@ -0,0 +1,37 @@
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { withWorkspace } from "@/lib/auth";
+import { listProgramApplications } from "@/lib/program-applications/list-program-applications";
+import {
+ getPartnerApplicationsQuerySchema,
+ PartnerApplicationSchema,
+} from "@/lib/zod/schemas/program-application";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+// GET /api/program-applications - get all pending applications for a program
+export const GET = withWorkspace(
+ async ({ workspace, searchParams }) => {
+ const { country, groupId, status, search, sortOrder, page, pageSize } =
+ getPartnerApplicationsQuerySchema.parse(searchParams);
+
+ const programId = getDefaultProgramIdOrThrow(workspace);
+
+ const applications = await listProgramApplications({
+ programId,
+ groupId,
+ country,
+ status,
+ search,
+ sortOrder,
+ page,
+ pageSize,
+ });
+
+ const response = z.array(PartnerApplicationSchema).parse(applications);
+
+ return NextResponse.json(response);
+ },
+ {
+ requiredPlan: ["business", "advanced", "enterprise"],
+ },
+);
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
index e65d71d725..8581076866 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
@@ -4,9 +4,10 @@ import { buildSocialPlatformLookup } from "@/lib/social-utils";
import { mutatePrefix } from "@/lib/swr/mutate";
import useGroups from "@/lib/swr/use-groups";
import usePartner from "@/lib/swr/use-partner";
-import usePartnersCount from "@/lib/swr/use-partners-count";
+import { useProgramApplications } from "@/lib/swr/use-program-applications";
+import { useProgramApplicationsCount } from "@/lib/swr/use-program-applications-count";
import useWorkspace from "@/lib/swr/use-workspace";
-import { EnrolledPartnerProps, PartnerPlatformProps } from "@/lib/types";
+import { PartnerApplicationProps } from "@/lib/types";
import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";
import { useBulkApprovePartnersModal } from "@/ui/modals/bulk-approve-partners-modal";
import { useBulkRejectPartnersModal } from "@/ui/modals/bulk-reject-partners-modal";
@@ -34,15 +35,25 @@ import {
useTable,
} from "@dub/ui";
import { Dots, UserCheck, Users, UserXmark } from "@dub/ui/icons";
-import { COUNTRIES, fetcher, formatDate } from "@dub/utils";
-import { PlatformType } from "@prisma/client";
+import { COUNTRIES, formatDate } from "@dub/utils";
import { Row } from "@tanstack/react-table";
import { Command } from "cmdk";
import Link from "next/link";
import { useEffect, useMemo, useState } from "react";
-import useSWR from "swr";
import { usePartnerFilters } from "../use-partner-filters";
+type ApplicationPlatform = NonNullable<
+ PartnerApplicationProps["partner"]["platforms"]
+>[number];
+
+type ApplicationRow = PartnerApplicationProps["partner"] & {
+ createdAt: PartnerApplicationProps["createdAt"];
+ applicationId: string;
+ platformsByType: ReturnType<
+ typeof buildSocialPlatformLookup<ApplicationPlatform>
+ >;
+};
+
const applicationsColumns = {
all: [
"partner",
@@ -96,50 +107,30 @@ export function ProgramPartnersApplicationsPageClient() {
"country",
]);
- const { partnersCount, error: countError } = usePartnersCount<number>({
+ const { applicationsCount, error: countError } =
+ useProgramApplicationsCount<number>({
+ status: "pending",
+ });
+
+ const { applications, error, isValidating } = useProgramApplications({
status: "pending",
});
- // TODO: refactor to use `/partners/applications` endpoint
- const {
- data: partners,
- error,
- isValidating,
- } = useSWR<EnrolledPartnerProps[]>(
- `/api/partners${getQueryString(
- {
- workspaceId,
- status: "pending",
- sortBy,
- sortOrder,
- includePartnerPlatforms: true,
- },
- { exclude: ["partnerId"] },
- )}`,
- fetcher,
- {
- keepPreviousData: true,
- revalidateOnFocus: false,
- },
+ const partners = useMemo(
+ () =>
+ applications?.map((application) => ({
+ ...application.partner,
+ createdAt: application.createdAt,
+ applicationId: application.id,
+ platformsByType: buildSocialPlatformLookup(
+ application.partner.platforms ?? [],
+ ),
+ })),
+ [applications],
);
const { groups } = useGroups();
- // Create a separate map for platform lookups by partner ID
- const platformsMapByPartnerId = useMemo(() => {
- const map = new Map<
- string,
- Record<PlatformType, PartnerPlatformProps | null>
- >();
-
- partners?.forEach((partner) => {
- if (partner.platforms) {
- map.set(partner.id, buildSocialPlatformLookup(partner.platforms));
- }
- });
- return map;
- }, [partners]);
-
const [detailsSheetState, setDetailsSheetState] = useState<
| { open: false; partnerId: string | null }
| { open: true; partnerId: string }
@@ -152,17 +143,16 @@ export function ProgramPartnersApplicationsPageClient() {
const { currentPartner, isLoading: isCurrentPartnerLoading } =
useCurrentPartner({
- partners,
partnerId: detailsSheetState.partnerId,
});
// State for pending bulk actions
const [pendingApprovePartners, setPendingApprovePartners] = useState<
- EnrolledPartnerProps[]
+ ApplicationRow[]
>([]);
const [pendingRejectPartners, setPendingRejectPartners] = useState<
- EnrolledPartnerProps[]
+ ApplicationRow[]
>([]);
const { setShowBulkApprovePartnersModal, BulkApprovePartnersModal } =
@@ -252,91 +242,67 @@ export function ProgramPartnersApplicationsPageClient() {
id: "website",
header: "Website",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.website}
- platformName="website"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.website}
+ platformName="website"
+ />
+ ),
},
{
id: "youtube",
header: "YouTube",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.youtube}
- platformName="youtube"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.youtube}
+ platformName="youtube"
+ />
+ ),
},
{
id: "twitter",
header: "X/Twitter",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.twitter}
- platformName="twitter"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.twitter}
+ platformName="twitter"
+ />
+ ),
},
{
id: "linkedin",
header: "LinkedIn",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.linkedin}
- platformName="linkedin"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.linkedin}
+ platformName="linkedin"
+ />
+ ),
},
{
id: "instagram",
header: "Instagram",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.instagram}
- platformName="instagram"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.instagram}
+ platformName="instagram"
+ />
+ ),
},
{
id: "tiktok",
header: "TikTok",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.tiktok}
- platformName="tiktok"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.tiktok}
+ platformName="tiktok"
+ />
+ ),
},
// Menu
@@ -349,10 +315,10 @@ export function ProgramPartnersApplicationsPageClient() {
),
},
],
- [workspaceId, groups, platformsMapByPartnerId],
+ [workspaceId, groups],
);
- const { table, ...tableProps } = useTable<EnrolledPartnerProps>({
+ const { table, ...tableProps } = useTable<ApplicationRow>({
data: partners || [],
columns,
columnPinning: { right: ["menu"] },
@@ -414,7 +380,7 @@ export function ProgramPartnersApplicationsPageClient() {
thClassName: "border-l-0",
tdClassName: "border-l-0",
resourceName: (p) => `application${p ? "s" : ""}`,
- rowCount: partnersCount || 0,
+ rowCount: applicationsCount || 0,
loading: isValidating || isCurrentPartnerLoading,
error: error || countError ? "Failed to load applications" : undefined,
});
@@ -539,7 +505,7 @@ function RowMenuButton({
row,
workspaceId,
}: {
- row: Row<EnrolledPartnerProps>;
+ row: Row<ApplicationRow>;
workspaceId: string;
}) {
const [isOpen, setIsOpen] = useState(false);
@@ -551,7 +517,11 @@ function RowMenuButton({
partner: row.original,
groupId: row.original.groupId,
onConfirm: async () => {
- await mutatePrefix(["/api/partners", "/api/partners/count"]);
+ await mutatePrefix([
+ "/api/partners",
+ "/api/partners/count",
+ "/api/program-applications",
+ ]);
},
});
@@ -561,7 +531,11 @@ function RowMenuButton({
} = useRejectPartnerApplicationModal({
partner: row.original,
onConfirm: async () => {
- await mutatePrefix(["/api/partners", "/api/partners/count"]);
+ await mutatePrefix([
+ "/api/partners",
+ "/api/partners/count",
+ "/api/program-applications",
+ ]);
},
});
@@ -613,29 +587,14 @@ function RowMenuButton({
}
/** Gets the current partner from the loaded partners array if available, or a separate fetch if not */
-function useCurrentPartner({
- partners,
- partnerId,
-}: {
- partners?: EnrolledPartnerProps[];
- partnerId: string | null;
-}) {
- let currentPartner = partnerId
- ? partners?.find(({ id }) => id === partnerId)
- : null;
-
- const { partner: fetchedPartner, loading: isLoading } = usePartner(
- {
- partnerId: partners && partnerId && !currentPartner ? partnerId : null,
- },
- {
- keepPreviousData: true,
- },
+function useCurrentPartner({ partnerId }: { partnerId: string | null }) {
+ const { partner, loading: isLoading } = usePartner(
+ { partnerId },
+ { keepPreviousData: true },
);
- if (!currentPartner && fetchedPartner?.id === partnerId) {
- currentPartner = fetchedPartner;
- }
-
- return { currentPartner, isLoading };
+ return {
+ currentPartner: partner?.id === partnerId ? partner : null,
+ isLoading: Boolean(partnerId) && isLoading,
+ };
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
index 27774c42e8..a3fba9f601 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
@@ -5,9 +5,10 @@ import { buildSocialPlatformLookup } from "@/lib/social-utils";
import { mutatePrefix } from "@/lib/swr/mutate";
import useGroups from "@/lib/swr/use-groups";
import usePartner from "@/lib/swr/use-partner";
-import usePartnersCount from "@/lib/swr/use-partners-count";
+import { useProgramApplications } from "@/lib/swr/use-program-applications";
+import { useProgramApplicationsCount } from "@/lib/swr/use-program-applications-count";
import useWorkspace from "@/lib/swr/use-workspace";
-import { EnrolledPartnerProps, PartnerPlatformProps } from "@/lib/types";
+import { PartnerApplicationProps } from "@/lib/types";
import { useConfirmModal } from "@/ui/modals/confirm-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerApplicationSheet } from "@/ui/partners/partner-application-sheet";
@@ -30,16 +31,26 @@ import {
useTable,
} from "@dub/ui";
import { Check, Dots, LoadingSpinner, Users } from "@dub/ui/icons";
-import { COUNTRIES, fetcher, formatDate } from "@dub/utils";
-import { PlatformType } from "@prisma/client";
+import { COUNTRIES, formatDate } from "@dub/utils";
import { Row } from "@tanstack/react-table";
import { Command } from "cmdk";
import { useAction } from "next-safe-action/hooks";
import { useEffect, useMemo, useState } from "react";
import { toast } from "sonner";
-import useSWR from "swr";
import { usePartnerFilters } from "../../use-partner-filters";
+type ApplicationPlatform = NonNullable<
+ PartnerApplicationProps["partner"]["platforms"]
+>[number];
+
+type ApplicationRow = PartnerApplicationProps["partner"] & {
+ createdAt: PartnerApplicationProps["createdAt"];
+ applicationId: string;
+ platformsByType: ReturnType<
+ typeof buildSocialPlatformLookup<ApplicationPlatform>
+ >;
+};
+
const applicationsColumns = {
all: [
"partner",
@@ -64,8 +75,7 @@ const applicationsColumns = {
export function ProgramPartnersRejectedApplicationsPageClient() {
const { id: workspaceId } = useWorkspace();
- const { queryParams, searchParams, searchParamsObj, getQueryString } =
- useRouterStuff();
+ const { queryParams, searchParams, searchParamsObj } = useRouterStuff();
const sortBy = searchParams.get("sortBy") || "createdAt";
const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
@@ -82,49 +92,30 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
setSearch,
} = usePartnerFilters({ sortBy, sortOrder, status: "rejected" }, ["country"]);
- const { partnersCount, error: countError } = usePartnersCount<number>({
+ const { applicationsCount, error: countError } =
+ useProgramApplicationsCount<number>({
+ status: "rejected",
+ });
+
+ const { applications, error, isValidating } = useProgramApplications({
status: "rejected",
});
- const {
- data: partners,
- error,
- isValidating,
- } = useSWR<EnrolledPartnerProps[]>(
- `/api/partners${getQueryString(
- {
- workspaceId,
- status: "rejected",
- sortBy,
- sortOrder,
- includePartnerPlatformPropss: true,
- },
- { exclude: ["partnerId"] },
- )}`,
- fetcher,
- {
- keepPreviousData: true,
- revalidateOnFocus: false,
- },
+ const partners = useMemo(
+ () =>
+ applications?.map((application) => ({
+ ...application.partner,
+ createdAt: application.createdAt,
+ applicationId: application.id,
+ platformsByType: buildSocialPlatformLookup(
+ application.partner.platforms ?? [],
+ ),
+ })),
+ [applications],
);
const { groups } = useGroups();
- // Create a separate map for platform lookups by partner ID
- const platformsMapByPartnerId = useMemo(() => {
- const map = new Map<
- string,
- Record<PlatformType, PartnerPlatformProps | null>
- >();
-
- partners?.forEach((partner) => {
- if (partner.platforms) {
- map.set(partner.id, buildSocialPlatformLookup(partner.platforms));
- }
- });
- return map;
- }, [partners]);
-
const [detailsSheetState, setDetailsSheetState] = useState<
| { open: false; partnerId: string | null }
| { open: true; partnerId: string }
@@ -141,7 +132,6 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
const { currentPartner, isLoading: isCurrentPartnerLoading } =
useCurrentPartner({
- partners,
partnerId: detailsSheetState.partnerId,
});
@@ -223,91 +213,67 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
id: "website",
header: "Website",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.website}
- platformName="website"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.website}
+ platformName="website"
+ />
+ ),
},
{
id: "youtube",
header: "YouTube",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.youtube}
- platformName="youtube"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.youtube}
+ platformName="youtube"
+ />
+ ),
},
{
id: "twitter",
header: "X/Twitter",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.twitter}
- platformName="twitter"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.twitter}
+ platformName="twitter"
+ />
+ ),
},
{
id: "linkedin",
header: "LinkedIn",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.linkedin}
- platformName="linkedin"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.linkedin}
+ platformName="linkedin"
+ />
+ ),
},
{
id: "instagram",
header: "Instagram",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.instagram}
- platformName="instagram"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.instagram}
+ platformName="instagram"
+ />
+ ),
},
{
id: "tiktok",
header: "TikTok",
minSize: 150,
- cell: ({ row }: { row: Row<EnrolledPartnerProps> }) => {
- const platformsMap = platformsMapByPartnerId.get(row.original.id);
-
- return (
- <PartnerSocialColumn
- platform={platformsMap?.tiktok}
- platformName="tiktok"
- />
- );
- },
+ cell: ({ row }: { row: Row<ApplicationRow> }) => (
+ <PartnerSocialColumn
+ platform={row.original.platformsByType.tiktok}
+ platformName="tiktok"
+ />
+ ),
},
// Menu
@@ -320,10 +286,10 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
),
},
],
- [workspaceId, groups, platformsMapByPartnerId],
+ [workspaceId, groups],
);
- const { table, ...tableProps } = useTable<EnrolledPartnerProps>({
+ const { table, ...tableProps } = useTable<ApplicationRow>({
data: partners || [],
columns,
columnPinning: { right: ["menu"] },
@@ -352,7 +318,7 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
thClassName: "border-l-0",
tdClassName: "border-l-0",
resourceName: (p) => `application${p ? "s" : ""}`,
- rowCount: partnersCount || 0,
+ rowCount: applicationsCount || 0,
loading: isValidating || isCurrentPartnerLoading,
error: error || countError ? "Failed to load applications" : undefined,
});
@@ -455,7 +421,7 @@ function PartnerRowMenuButton({
row,
workspaceId,
}: {
- row: Row<EnrolledPartnerProps>;
+ row: Row<ApplicationRow>;
workspaceId: string;
}) {
const [isOpen, setIsOpen] = useState(false);
@@ -467,7 +433,11 @@ function PartnerRowMenuButton({
},
onSuccess: () => {
toast.success("Partner application approved");
- mutatePrefix(["/api/partners", "/api/partners/count"]);
+ mutatePrefix([
+ "/api/partners",
+ "/api/partners/count",
+ "/api/program-applications",
+ ]);
},
});
@@ -527,30 +497,14 @@ function PartnerRowMenuButton({
);
}
-/** Gets the current partner from the loaded partners array if available, or a separate fetch if not */
-function useCurrentPartner({
- partners,
- partnerId,
-}: {
- partners?: EnrolledPartnerProps[];
- partnerId: string | null;
-}) {
- let currentPartner = partnerId
- ? partners?.find(({ id }) => id === partnerId)
- : null;
-
- const { partner: fetchedPartner, loading: isLoading } = usePartner(
- {
- partnerId: partners && partnerId && !currentPartner ? partnerId : null,
- },
- {
- keepPreviousData: true,
- },
+function useCurrentPartner({ partnerId }: { partnerId: string | null }) {
+ const { partner, loading: isLoading } = usePartner(
+ { partnerId },
+ { keepPreviousData: true },
);
- if (!currentPartner && fetchedPartner?.id === partnerId) {
- currentPartner = fetchedPartner;
- }
-
- return { currentPartner, isLoading };
+ return {
+ currentPartner: partner?.id === partnerId ? partner : null,
+ isLoading: Boolean(partnerId) && isLoading,
+ };
}
diff --git a/apps/web/lib/openapi/partners/index.ts b/apps/web/lib/openapi/partners/index.ts
index 720fb5d76a..01ceaf9def 100644
--- a/apps/web/lib/openapi/partners/index.ts
+++ b/apps/web/lib/openapi/partners/index.ts
@@ -4,8 +4,8 @@ import { banPartner } from "./ban-partner";
import { createPartner } from "./create-partner";
import { createPartnerLink } from "./create-partner-link";
import { deactivatePartner } from "./deactivate-partner";
-import { listPartnerApplications } from "./list-partner-applications";
import { listPartners } from "./list-partners";
+import { listProgramApplications } from "./list-program-applications";
import { rejectPartner } from "./reject-partner";
import { retrievePartnerAnalytics } from "./retrieve-analytics";
import { retrievePartnerLinks } from "./retrieve-partner-links";
@@ -16,8 +16,8 @@ export const partnersPaths: ZodOpenApiPathsObject = {
post: createPartner,
get: listPartners,
},
- "/partners/applications": {
- get: listPartnerApplications,
+ "/program-applications": {
+ get: listProgramApplications,
},
"/partners/links": {
post: createPartnerLink,
diff --git a/apps/web/lib/program-applications/list-program-applications.ts b/apps/web/lib/program-applications/list-program-applications.ts
new file mode 100644
index 0000000000..73491f3813
--- /dev/null
+++ b/apps/web/lib/program-applications/list-program-applications.ts
@@ -0,0 +1,123 @@
+import { formatApplicationFormData } from "@/lib/partners/format-application-form-data";
+import { prisma } from "@/lib/prisma";
+import { buildSocialPlatformLookup } from "@/lib/social-utils";
+import { getPartnerApplicationsQuerySchema } from "@/lib/zod/schemas/program-application";
+import { ProgramEnrollmentStatus } from "@prisma/client";
+import * as z from "zod/v4";
+import { buildProgramApplicationWhere } from "./program-application-where";
+
+type ListProgramApplicationsParams = z.infer<
+ typeof getPartnerApplicationsQuerySchema
+> & {
+ programId: string;
+};
+
+export async function listProgramApplications({
+ programId,
+ groupId,
+ country,
+ status = ProgramEnrollmentStatus.pending,
+ search,
+ sortOrder = "desc",
+ page = 1,
+ pageSize,
+}: ListProgramApplicationsParams) {
+ const where = buildProgramApplicationWhere({
+ programId,
+ groupId,
+ country,
+ status,
+ search,
+ });
+
+ const applications = await prisma.programApplication.findMany({
+ where,
+ include: {
+ enrollment: {
+ include: {
+ partner: {
+ include: {
+ platforms: true,
+ },
+ },
+ },
+ },
+ },
+ orderBy: {
+ createdAt: sortOrder,
+ },
+ take: pageSize,
+ skip: (page - 1) * pageSize,
+ });
+
+ return applications.flatMap((application) => {
+ const enrollment = application.enrollment;
+
+ if (!enrollment) {
+ return [];
+ }
+
+ const applicationFormData = formatApplicationFormData(application).map(
+ ({ title, value }) => ({
+ label: title,
+ value: value !== "" ? value : null,
+ }),
+ );
+
+ const platformsByType = buildSocialPlatformLookup(
+ enrollment.partner.platforms,
+ );
+
+ const platforms = (
+ [
+ "website",
+ "youtube",
+ "twitter",
+ "linkedin",
+ "instagram",
+ "tiktok",
+ ] as const
+ ).flatMap((type) => {
+ const platform = platformsByType[type];
+ const identifier = application[type] ?? platform?.identifier;
+
+ if (!identifier) {
+ return [];
+ }
+
+ return [
+ {
+ type,
+ identifier,
+ verifiedAt:
+ platform?.identifier === identifier
+ ? platform.verifiedAt ?? null
+ : null,
+ },
+ ];
+ });
+
+ return [
+ {
+ id: application.id,
+ createdAt: application.createdAt,
+ applicationFormData,
+ partner: {
+ ...enrollment.partner,
+ name: application.name,
+ email: application.email,
+ country: application.country,
+ groupId: application.groupId,
+ status: enrollment.status,
+ website: application.website,
+ youtube: application.youtube,
+ twitter: application.twitter,
+ linkedin: application.linkedin,
+ instagram: application.instagram,
+ tiktok: application.tiktok,
+ platforms,
+ },
+ },
+ ];
+ });
+}
diff --git a/apps/web/lib/program-applications/program-application-where.ts b/apps/web/lib/program-applications/program-application-where.ts
new file mode 100644
index 0000000000..6669c786d9
--- /dev/null
+++ b/apps/web/lib/program-applications/program-application-where.ts
@@ -0,0 +1,48 @@
+import { getProgramApplicationsCountQuerySchema } from "@/lib/zod/schemas/program-application";
+import { parseFilterValue } from "@dub/utils";
+import { Prisma, ProgramEnrollmentStatus } from "@prisma/client";
+import * as z from "zod/v4";
+
+function applicationFieldFilter(
+ value?: string,
+): Prisma.StringNullableFilter | undefined {
+ const parsed = parseFilterValue(value);
+
+ if (!parsed?.values.length) {
+ return undefined;
+ }
+
+ return parsed.sqlOperator === "NOT IN"
+ ? { notIn: parsed.values }
+ : { in: parsed.values };
+}
+
+type ProgramApplicationWhereParams = z.infer<
+ typeof getProgramApplicationsCountQuerySchema
+> & {
+ programId: string;
+};
+
+export function buildProgramApplicationWhere({
+ programId,
+ groupId,
+ country,
+ status = ProgramEnrollmentStatus.pending,
+ search,
+}: ProgramApplicationWhereParams): Prisma.ProgramApplicationWhereInput {
+ const query = search?.trim();
+ const groupIdFilter = applicationFieldFilter(groupId);
+ const countryFilter = applicationFieldFilter(country);
+
+ return {
+ programId,
+ enrollment: {
+ status,
+ },
+ ...(groupIdFilter && { groupId: groupIdFilter }),
+ ...(countryFilter && { country: countryFilter }),
+ ...(query && {
+ OR: [{ name: { contains: query } }, { email: { contains: query } }],
+ }),
+ };
+}
diff --git a/apps/web/lib/swr/use-program-applications-count.ts b/apps/web/lib/swr/use-program-applications-count.ts
new file mode 100644
index 0000000000..33b600681b
--- /dev/null
+++ b/apps/web/lib/swr/use-program-applications-count.ts
@@ -0,0 +1,51 @@
+import { useRouterStuff } from "@dub/ui";
+import { fetcher } from "@dub/utils";
+import useSWR from "swr";
+import * as z from "zod/v4";
+import { getProgramApplicationsCountQuerySchema } from "../zod/schemas/program-application";
+import useWorkspace from "./use-workspace";
+
+export function useProgramApplicationsCount<T>({
+ ignoreParams,
+ enabled,
+ ...params
+}: z.input<typeof getProgramApplicationsCountQuerySchema> & {
+ ignoreParams?: boolean;
+ enabled?: boolean;
+} = {}) {
+ const { id: workspaceId, defaultProgramId } = useWorkspace();
+ const { getQueryString } = useRouterStuff();
+
+ const definedParams = Object.fromEntries(
+ Object.entries({ ...params, workspaceId }).filter(
+ ([, value]) => value !== undefined && value !== null,
+ ),
+ );
+
+ const queryString = ignoreParams
+ ? `?${new URLSearchParams(definedParams as Record<string, string>).toString()}`
+ : getQueryString(definedParams, {
+ exclude: ["partnerId", "sortBy", "sortOrder", "page"],
+ });
+
+ const {
+ data: applicationsCount,
+ error,
+ isValidating,
+ } = useSWR<number>(
+ enabled !== false && defaultProgramId
+ ? `/api/program-applications/count${queryString}`
+ : null,
+ fetcher,
+ {
+ keepPreviousData: true,
+ },
+ );
+
+ return {
+ applicationsCount: applicationsCount as T,
+ error,
+ loading: enabled !== false && !error && applicationsCount === undefined,
+ isValidating,
+ };
+}
diff --git a/apps/web/lib/swr/use-program-applications.ts b/apps/web/lib/swr/use-program-applications.ts
new file mode 100644
index 0000000000..1a65908942
--- /dev/null
+++ b/apps/web/lib/swr/use-program-applications.ts
@@ -0,0 +1,53 @@
+import { useRouterStuff } from "@dub/ui";
+import { fetcher } from "@dub/utils";
+import useSWR from "swr";
+import * as z from "zod/v4";
+import { PartnerApplicationProps } from "../types";
+import { getPartnerApplicationsQuerySchema } from "../zod/schemas/program-application";
+import useWorkspace from "./use-workspace";
+
+export function useProgramApplications({
+ ignoreParams,
+ enabled,
+ ...params
+}: z.input<typeof getPartnerApplicationsQuerySchema> & {
+ ignoreParams?: boolean;
+ enabled?: boolean;
+} = {}) {
+ const { id: workspaceId, defaultProgramId } = useWorkspace();
+ const { getQueryString } = useRouterStuff();
+
+ const definedParams = Object.fromEntries(
+ Object.entries({ ...params, workspaceId }).filter(
+ ([, value]) => value !== undefined && value !== null,
+ ),
+ );
+
+ const queryString = ignoreParams
+ ? `?${new URLSearchParams(definedParams as Record<string, string>).toString()}`
+ : getQueryString(definedParams, {
+ exclude: ["partnerId", "sortBy"],
+ });
+
+ const {
+ data: applications,
+ error,
+ isValidating,
+ } = useSWR<PartnerApplicationProps[]>(
+ enabled !== false && defaultProgramId
+ ? `/api/program-applications${queryString}`
+ : null,
+ fetcher,
+ {
+ keepPreviousData: true,
+ revalidateOnFocus: false,
+ },
+ );
+
+ return {
+ applications,
+ error,
+ isValidating,
+ loading: enabled !== false && !error && applications === undefined,
+ };
+}
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index f19ea2cc25..712d4a6ea3 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -1,9 +1,11 @@
+import { ProgramEnrollmentStatus } from "@prisma/client";
import * as z from "zod/v4";
import { getPaginationQuerySchema } from "./misc";
import {
EnrolledPartnerSchema,
getPartnersQuerySchema,
OldPartnerPlatformsFields,
+ partnerPlatformSchema,
PARTNERS_MAX_PAGE_SIZE,
} from "./partners";
import { ProgramEnrollmentSchema } from "./programs";
@@ -26,7 +28,21 @@ export const PartnerApplicationSchema = z.object({
status: true,
}).shape,
)
- .extend(OldPartnerPlatformsFields.shape),
+ .extend(OldPartnerPlatformsFields.shape)
+ .extend({
+ platforms: z
+ .array(
+ partnerPlatformSchema.pick({
+ type: true,
+ identifier: true,
+ verifiedAt: true,
+ }),
+ )
+ .nullish()
+ .describe(
+ "The partner's website and social profiles, including when each was verified.",
+ ),
+ }),
applicationFormData: z
.array(
z.object({
@@ -39,13 +55,33 @@ export const PartnerApplicationSchema = z.object({
export const partnerApplicationWebhookSchema = PartnerApplicationSchema;
+const ProgramApplicationStatuses = [
+ ProgramEnrollmentStatus.pending,
+ ProgramEnrollmentStatus.rejected,
+];
+
export const getPartnerApplicationsQuerySchema = getPartnersQuerySchema
.pick({
country: true,
groupId: true,
+ search: true,
+ sortOrder: true,
})
- .extend(
- getPaginationQuerySchema({
+ .extend({
+ status: z
+ .enum(ProgramApplicationStatuses)
+ .default(ProgramEnrollmentStatus.pending)
+ .describe(
+ "Filter applications by enrollment status. One of `pending` or `rejected`. Defaults to `pending`.",
+ ),
+ ...getPaginationQuerySchema({
pageSize: PARTNERS_MAX_PAGE_SIZE,
}),
- );
+ });
+
+export const getProgramApplicationsCountQuerySchema =
+ getPartnerApplicationsQuerySchema.omit({
+ sortOrder: true,
+ page: true,
+ pageSize: true,
+ });
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index 82530fd667..e5442a197a 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -11,6 +11,7 @@ import {
import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
+import { useProgramApplicationsCount } from "@/lib/swr/use-program-applications-count";
import { useProgramSubmittedLeadsCount } from "@/lib/swr/use-program-submitted-leads-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { useKeyboardShortcut, useRouterStuff } from "@dub/ui";
@@ -67,7 +68,6 @@ import { User } from "./icons/user";
import { SidebarNav, SidebarNavAreas, SidebarNavGroups } from "./sidebar-nav";
import { SidebarUsage } from "./sidebar-usage";
import { SpecialNewsContent } from "./special-news-content";
-import { useProgramApplicationsCount } from "./use-program-applications-count";
import { WorkspaceDropdown } from "./workspace-dropdown";
type SidebarNavData = {
@@ -598,9 +598,13 @@ export function AppSidebarNav({
enabled: Boolean(currentArea === "program" && defaultProgramId),
});
- const applicationsCount = useProgramApplicationsCount({
- enabled: Boolean(currentArea === "program" && defaultProgramId),
- });
+ const { applicationsCount } = useProgramApplicationsCount<number | undefined>(
+ {
+ status: "pending",
+ ignoreParams: true,
+ enabled: Boolean(currentArea === "program" && defaultProgramId),
+ },
+ );
const { submissionsCount } = useBountySubmissionsCount<
SubmissionsCountByStatus[]
diff --git a/apps/web/ui/layout/sidebar/use-program-applications-count.tsx b/apps/web/ui/layout/sidebar/use-program-applications-count.tsx
deleted file mode 100644
index 72d0a9b178..0000000000
--- a/apps/web/ui/layout/sidebar/use-program-applications-count.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-"use client";
-
-import usePartnersCount from "@/lib/swr/use-partners-count";
-
-export function useProgramApplicationsCount({
- enabled,
-}: {
- enabled?: boolean;
-}) {
- const { partnersCount } = usePartnersCount<number | undefined>({
- status: "pending",
- ignoreParams: true,
- enabled,
- });
-
- return partnersCount;
-}
diff --git a/apps/web/ui/modals/bulk-approve-partners-modal.tsx b/apps/web/ui/modals/bulk-approve-partners-modal.tsx
index c2165d163c..fdd2df8cc1 100644
--- a/apps/web/ui/modals/bulk-approve-partners-modal.tsx
+++ b/apps/web/ui/modals/bulk-approve-partners-modal.tsx
@@ -2,7 +2,7 @@ import { bulkApprovePartnersAction } from "@/lib/actions/partners/bulk-approve-p
import { mutatePrefix } from "@/lib/swr/mutate";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
-import { EnrolledPartnerProps } from "@/lib/types";
+import { PartnerProps } from "@/lib/types";
import { useTrialLimitActivateModal } from "@/ui/modals/trial-limit-activate-modal";
import { GroupSelector } from "@/ui/partners/groups/group-selector";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
@@ -25,7 +25,7 @@ function BulkApprovePartnersModal({
}: {
showBulkApprovePartnersModal: boolean;
setShowBulkApprovePartnersModal: Dispatch<SetStateAction<boolean>>;
- partners: EnrolledPartnerProps[];
+ partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
}) {
const { id: workspaceId, trialEndsAt } = useWorkspace();
const { program } = useProgram();
@@ -40,7 +40,7 @@ function BulkApprovePartnersModal({
const { executeAsync, isPending } = useAction(bulkApprovePartnersAction, {
onSuccess: async () => {
setShowBulkApprovePartnersModal(false);
- await mutatePrefix("/api/partners");
+ await mutatePrefix(["/api/partners", "/api/program-applications"]);
toast.success(`${pluralize("Partner", partners.length)} approved.`);
},
onError({ error }) {
@@ -156,7 +156,7 @@ function BulkApprovePartnersModal({
export function useBulkApprovePartnersModal({
partners,
}: {
- partners: EnrolledPartnerProps[];
+ partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
}) {
const [showBulkApprovePartnersModal, setShowBulkApprovePartnersModal] =
useState(false);
diff --git a/apps/web/ui/modals/bulk-reject-partners-modal.tsx b/apps/web/ui/modals/bulk-reject-partners-modal.tsx
index f3ea5be86c..cc05725fb7 100644
--- a/apps/web/ui/modals/bulk-reject-partners-modal.tsx
+++ b/apps/web/ui/modals/bulk-reject-partners-modal.tsx
@@ -1,7 +1,7 @@
import { bulkRejectPartnerApplicationsAction } from "@/lib/actions/partners/bulk-reject-partner-applications";
import { mutatePrefix } from "@/lib/swr/mutate";
import useWorkspace from "@/lib/swr/use-workspace";
-import { EnrolledPartnerProps } from "@/lib/types";
+import { PartnerProps } from "@/lib/types";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
import { Button, Modal } from "@dub/ui";
import { cn, pluralize } from "@dub/utils";
@@ -23,7 +23,7 @@ function BulkRejectPartnersModal({
}: {
showBulkRejectPartnersModal: boolean;
setShowBulkRejectPartnersModal: Dispatch<SetStateAction<boolean>>;
- partners: EnrolledPartnerProps[];
+ partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
}) {
const { id: workspaceId } = useWorkspace();
@@ -32,7 +32,7 @@ function BulkRejectPartnersModal({
{
onSuccess: async () => {
setShowBulkRejectPartnersModal(false);
- await mutatePrefix(["/api/partners", "/api/partners/count"]);
+ await mutatePrefix(["/api/partners", "/api/partners/count", "/api/program-applications"]);
toast.success(`${pluralize("Partner", partners.length)} rejected.`);
},
onError({ error }) {
@@ -126,7 +126,7 @@ function BulkRejectPartnersModal({
export function useBulkRejectPartnersModal({
partners,
}: {
- partners: EnrolledPartnerProps[];
+ partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
}) {
const [showBulkRejectPartnersModal, setShowBulkRejectPartnersModal] =
useState(false);
diff --git a/apps/web/ui/partners/partner-application-sheet.tsx b/apps/web/ui/partners/partner-application-sheet.tsx
index f3a4225f4b..950a866feb 100644
--- a/apps/web/ui/partners/partner-application-sheet.tsx
+++ b/apps/web/ui/partners/partner-application-sheet.tsx
@@ -232,7 +232,7 @@ function PartnerApproval({
groupId,
onConfirm: async () => {
onNext ? onNext() : setIsOpen(false);
- await mutatePrefix("/api/partners");
+ await mutatePrefix(["/api/partners", "/api/program-applications"]);
},
confirmShortcutOptions: { sheet: true, modal: true },
});
@@ -283,7 +283,7 @@ function PartnerRejectButton({
partner,
onConfirm: async () => {
onNext ? onNext() : setIsOpen(false);
- await mutatePrefix("/api/partners");
+ await mutatePrefix(["/api/partners", "/api/program-applications"]);
},
confirmShortcutOptions: { sheet: true, modal: true },
});