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 by pending, approved, and rejected.

Kiran K60cfa1c6fb3b
diff --git a/apps/web/app/(ee)/api/program-applications/route.ts b/apps/web/app/(ee)/api/program-applications/route.ts
index 82c014953b..9dd69d25c0 100644
--- a/apps/web/app/(ee)/api/program-applications/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/route.ts
@@ -8,7 +8,7 @@ import {
import { NextResponse } from "next/server";
import * as z from "zod/v4";
-// GET /api/program-applications - get all pending applications for a program
+// GET /api/program-applications - get all applications for a program, filtered by status
export const GET = withWorkspace(
async ({ workspace, searchParams }) => {
const { country, groupId, status, search, sortOrder, page, pageSize } =
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-menu-popover.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-menu-popover.tsx
index cf2fce9873..bd4cca3217 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-menu-popover.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-menu-popover.tsx
@@ -1,65 +1,45 @@
"use client";
import useProgram from "@/lib/swr/use-program";
-import useWorkspace from "@/lib/swr/use-workspace";
import { useApplicationSettingsModal } from "@/ui/modals/application-settings-modal";
import { useExportApplicationsModal } from "@/ui/modals/export-applications-modal";
import { ThreeDots } from "@/ui/shared/icons";
-import {
- Button,
- Download,
- IconMenu,
- Popover,
- useMediaQuery,
- UserXmark,
-} from "@dub/ui";
-import Link from "next/link";
+import { Button, Download, IconMenu, Popover, useMediaQuery } from "@dub/ui";
import { useState } from "react";
-export function ApplicationsMenuPopover() {
- const { slug: workspaceSlug } = useWorkspace();
- const { program } = useProgram();
-
- const [openPopover, setOpenPopover] = useState(false);
-
- const { setShowExportApplicationsModal, ExportApplicationsModal } =
- useExportApplicationsModal();
+export function ApplicationSettingsButton() {
+ const { isMobile } = useMediaQuery();
const { setShowApplicationSettingsModal, ApplicationSettingsModal } =
useApplicationSettingsModal();
- const { isMobile } = useMediaQuery();
-
return (
<>
<ApplicationSettingsModal />
- <ExportApplicationsModal />
<Button
text={isMobile ? "Settings" : "Application settings"}
onClick={() => setShowApplicationSettingsModal(true)}
variant="secondary"
/>
+ </>
+ );
+}
+
+export function ApplicationsMenuPopover() {
+ const { program } = useProgram();
+ const [openPopover, setOpenPopover] = useState(false);
+
+ const { setShowExportApplicationsModal, ExportApplicationsModal } =
+ useExportApplicationsModal();
+
+ return (
+ <>
+ <ExportApplicationsModal />
<Popover
openPopover={openPopover}
setOpenPopover={setOpenPopover}
content={
- <div className="w-full md:w-60">
- <div className="grid gap-px p-2">
- <Link
- href={`/${workspaceSlug}/program/partners/applications/rejected`}
- onClick={() => setOpenPopover(false)}
- >
- <button className="w-full rounded-md p-2 hover:bg-neutral-100 active:bg-neutral-200">
- <IconMenu
- text="View rejected applications"
- icon={<UserXmark className="size-4" />}
- />
- </button>
- </Link>
- </div>
-
- <div className="border-t border-neutral-200" />
-
+ <div className="w-full md:w-52">
<div className="grid gap-px p-2">
<p className="mb-1.5 mt-1 flex items-center gap-2 px-1 text-xs font-medium text-neutral-500">
Export Applications
@@ -85,7 +65,7 @@ export function ApplicationsMenuPopover() {
type="button"
onClick={() => setOpenPopover(!openPopover)}
variant="secondary"
- className="h-8 w-auto whitespace-nowrap px-1.5 sm:h-9"
+ className="h-10 w-auto whitespace-nowrap px-1.5"
disabled={!program}
icon={<ThreeDots className="h-5 w-5 text-neutral-500" />}
/>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-nav.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-nav.tsx
new file mode 100644
index 0000000000..432d2fa19c
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-nav.tsx
@@ -0,0 +1,42 @@
+"use client";
+
+import useWorkspace from "@/lib/swr/use-workspace";
+import { PageNavTabs } from "@/ui/layout/page-nav-tabs";
+import { CircleCheck, CircleHalfDottedClock, UserXmark } from "@dub/ui/icons";
+import { ProgramApplicationStatus } from "@prisma/client";
+
+export function ApplicationsNav() {
+ const { slug } = useWorkspace();
+ const basePath = `/${slug}/program/partners/applications`;
+
+ return (
+ <PageNavTabs
+ basePath={basePath}
+ tabs={[
+ {
+ id: ProgramApplicationStatus.pending,
+ label: "Pending",
+ icon: CircleHalfDottedClock,
+ href: basePath,
+ },
+ {
+ id: ProgramApplicationStatus.approved,
+ label: "Approved",
+ icon: CircleCheck,
+ },
+ {
+ id: ProgramApplicationStatus.rejected,
+ label: "Rejected",
+ icon: UserXmark,
+ },
+ ]}
+ preservedQueryParams={[
+ "search",
+ "country",
+ "groupId",
+ "sortBy",
+ "sortOrder",
+ ]}
+ />
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-shell.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-shell.tsx
new file mode 100644
index 0000000000..08cf5d99a3
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-shell.tsx
@@ -0,0 +1,122 @@
+"use client";
+
+import { useProgramApplicationsFilters } from "@/lib/program-applications/hooks/use-program-applications-filters";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { SearchBoxPersisted } from "@/ui/shared/search-box";
+import {
+ AnimatedSizeContainer,
+ Button,
+ ChartLine,
+ Filter,
+ useMediaQuery,
+ useRouterStuff,
+} from "@dub/ui";
+import { ProgramApplicationStatus } from "@prisma/client";
+import Link from "next/link";
+import { usePathname } from "next/navigation";
+import { ReactNode } from "react";
+import { ApplicationsMenuPopover } from "./applications-menu-popover";
+import { ApplicationsNav } from "./applications-nav";
+
+export function ApplicationsShell({ children }: { children: ReactNode }) {
+ const { slug } = useWorkspace();
+ const { getQueryString } = useRouterStuff();
+ const { isMobile } = useMediaQuery();
+ const status = useApplicationStatus();
+
+ const {
+ filters,
+ activeFilters,
+ onSelect,
+ onRemove,
+ onRemoveFilter,
+ onRemoveAll,
+ onToggleOperator,
+ setSelectedFilter,
+ setSearch,
+ } = useProgramApplicationsFilters({
+ status,
+ enabledFilters: ["groupId", "country"],
+ });
+
+ return (
+ <div className="flex flex-col gap-4 pb-10">
+ <div>
+ <div className="flex w-full flex-col items-center gap-2 min-[550px]:flex-row min-[550px]:items-center">
+ <Filter.Select
+ className="w-full md:w-fit"
+ filters={filters}
+ activeFilters={activeFilters}
+ onSelect={onSelect}
+ onRemove={onRemove}
+ onRemoveFilter={onRemoveFilter}
+ onSearchChange={setSearch}
+ onSelectedFilterChange={setSelectedFilter}
+ />
+ <div className="flex w-full grow items-center gap-2 md:w-auto">
+ <div className="min-w-0 flex-1">
+ <SearchBoxPersisted
+ placeholder="Search by name, email, or company"
+ inputClassName="w-full md:w-80"
+ />
+ </div>
+ <div className="flex shrink-0 justify-end gap-2">
+ <Link
+ href={`/${slug}/program/analytics/applications${getQueryString(
+ undefined,
+ { include: ["country"] },
+ )}`}
+ >
+ <Button
+ variant="secondary"
+ className="w-fit"
+ icon={<ChartLine className="h-4 w-4 text-neutral-600" />}
+ text={isMobile ? undefined : "View Analytics"}
+ />
+ </Link>
+ <ApplicationsMenuPopover />
+ </div>
+ </div>
+ </div>
+ <AnimatedSizeContainer height>
+ <div>
+ {activeFilters.length > 0 && (
+ <div className="pt-3">
+ <Filter.List
+ filters={filters}
+ activeFilters={activeFilters}
+ onSelect={onSelect}
+ onRemove={onRemove}
+ onRemoveFilter={onRemoveFilter}
+ onRemoveAll={onRemoveAll}
+ onToggleOperator={onToggleOperator}
+ />
+ </div>
+ )}
+ </div>
+ </AnimatedSizeContainer>
+ </div>
+
+ <div className="border-border-subtle overflow-hidden rounded-xl border bg-neutral-100">
+ <ApplicationsNav />
+ <div className="border-border-subtle -mx-px -mb-px overflow-hidden rounded-xl border bg-white">
+ {children}
+ </div>
+ </div>
+ </div>
+ );
+}
+
+function useApplicationStatus(): ProgramApplicationStatus {
+ const pathname = usePathname();
+
+ if (pathname.endsWith(`/${ProgramApplicationStatus.approved}`)) {
+ return ProgramApplicationStatus.approved;
+ }
+
+ if (pathname.endsWith(`/${ProgramApplicationStatus.rejected}`)) {
+ return ProgramApplicationStatus.rejected;
+ }
+
+ return ProgramApplicationStatus.pending;
+}
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/applications-table.tsx
similarity index 75%
rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
rename to apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
index e3225378b1..cae8186a2d 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/applications-table.tsx
@@ -1,5 +1,6 @@
"use client";
+import { approvePartnerApplicationAction } from "@/lib/actions/partners/approve-partner-application";
import { useProgramApplications } from "@/lib/program-applications/hooks/use-program-applications";
import { useProgramApplicationsCount } from "@/lib/program-applications/hooks/use-program-applications-count";
import { buildSocialPlatformLookup } from "@/lib/social-utils";
@@ -11,6 +12,7 @@ import { ProgramApplicationProps } 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";
+import { useConfirmModal } from "@/ui/modals/confirm-modal";
import { useRejectPartnerApplicationModal } from "@/ui/modals/reject-partner-application-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerApplicationSheet } from "@/ui/partners/partner-application-sheet";
@@ -18,29 +20,32 @@ import { PartnerRowItem } from "@/ui/partners/partner-row-item";
import { PartnerSocialColumn } from "@/ui/partners/partner-social-column";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
import { CountryFlag } from "@/ui/shared/country-flag";
-import { SearchBoxPersisted } from "@/ui/shared/search-box";
import {
- AnimatedSizeContainer,
Button,
- ChartLine,
EditColumnsButton,
- Filter,
MenuItem,
Popover,
Table,
useColumnVisibility,
- useMediaQuery,
usePagination,
useRouterStuff,
useTable,
} from "@dub/ui";
-import { Dots, UserCheck, Users, UserXmark } from "@dub/ui/icons";
+import {
+ Check,
+ Dots,
+ LoadingSpinner,
+ UserCheck,
+ Users,
+ UserXmark,
+} from "@dub/ui/icons";
import { COUNTRIES, formatDate } from "@dub/utils";
+import { ProgramApplicationStatus } from "@prisma/client";
import { Row } from "@tanstack/react-table";
import { Command } from "cmdk";
-import Link from "next/link";
+import { useAction } from "next-safe-action/hooks";
import { useEffect, useMemo, useState } from "react";
-import { useProgramApplicationsFilters } from "@/lib/program-applications/hooks/use-program-applications-filters";
+import { toast } from "sonner";
type ApplicationPlatform = NonNullable<
ProgramApplicationProps["partner"]["platforms"]
@@ -79,11 +84,19 @@ const applicationsColumns = {
],
};
-export function ProgramPartnersApplicationsPageClient() {
- const { id: workspaceId, slug } = useWorkspace();
- const { queryParams, searchParams, searchParamsObj, getQueryString } =
- useRouterStuff();
- const { isMobile } = useMediaQuery();
+const EMPTY_STATE_TITLES: Record<ProgramApplicationStatus, string> = {
+ pending: "No applications found",
+ approved: "No approved applications found",
+ rejected: "No rejected applications found",
+};
+
+export function ApplicationsTable({
+ status,
+}: {
+ status: ProgramApplicationStatus;
+}) {
+ const { id: workspaceId } = useWorkspace();
+ const { queryParams, searchParams, searchParamsObj } = useRouterStuff();
const sortBy = searchParams.get("sortBy") || "createdAt";
const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
@@ -92,28 +105,13 @@ export function ProgramPartnersApplicationsPageClient() {
(key) => !["sortBy", "sortOrder", "page"].includes(key),
);
- const {
- filters,
- activeFilters,
- onSelect,
- onRemove,
- onRemoveFilter,
- onRemoveAll,
- onToggleOperator,
- setSelectedFilter,
- setSearch,
- } = useProgramApplicationsFilters({
- status: "pending",
- enabledFilters: ["groupId", "country"],
- });
-
const { applicationsCount, error: countError } =
useProgramApplicationsCount<number>({
- status: "pending",
+ status,
});
const { applications, error, isValidating } = useProgramApplications({
- status: "pending",
+ status,
});
const partners = useMemo(
@@ -185,7 +183,7 @@ export function ProgramPartnersApplicationsPageClient() {
<PartnerRowItem
partner={row.original}
showPermalink={false}
- showFraudIndicator={true}
+ showFraudIndicator={status === ProgramApplicationStatus.pending}
/>
);
},
@@ -311,12 +309,15 @@ export function ProgramPartnersApplicationsPageClient() {
id: "menu",
enableHiding: false,
header: ({ table }) => <EditColumnsButton table={table} />,
- cell: ({ row }) => (
- <RowMenuButton row={row} workspaceId={workspaceId!} />
- ),
+ cell: ({ row }) =>
+ status === ProgramApplicationStatus.pending ? (
+ <PendingRowMenuButton row={row} />
+ ) : status === ProgramApplicationStatus.rejected ? (
+ <RejectedRowMenuButton row={row} workspaceId={workspaceId!} />
+ ) : null,
},
],
- [workspaceId, groups],
+ [workspaceId, groups, status],
);
const { table, ...tableProps } = useTable<ApplicationRow>({
@@ -346,38 +347,41 @@ export function ProgramPartnersApplicationsPageClient() {
del: "page",
}),
- getRowId: (row) => row.id,
- selectionControls: (table) => (
- <>
- <Button
- variant="primary"
- text="Approve"
- className="h-7 w-fit rounded-lg px-2.5"
- onClick={() => {
- const partners = table
- .getSelectedRowModel()
- .rows.map((row) => row.original);
-
- setPendingApprovePartners(partners);
- setShowBulkApprovePartnersModal(true);
- }}
- />
- <Button
- variant="secondary"
- text="Reject"
- className="h-7 w-fit rounded-lg px-2.5"
- onClick={() => {
- const selectedPartners = table
- .getSelectedRowModel()
- .rows.map((row) => row.original);
-
- setPendingRejectPartners(selectedPartners);
- setShowBulkRejectPartnersModal(true);
- }}
- />
- </>
- ),
+ ...(status === ProgramApplicationStatus.pending && {
+ getRowId: (row: ApplicationRow) => row.id,
+ selectionControls: (table) => (
+ <>
+ <Button
+ variant="primary"
+ text="Approve"
+ className="h-7 w-fit rounded-lg px-2.5"
+ onClick={() => {
+ const partners = table
+ .getSelectedRowModel()
+ .rows.map((row) => row.original);
+
+ setPendingApprovePartners(partners);
+ setShowBulkApprovePartnersModal(true);
+ }}
+ />
+ <Button
+ variant="secondary"
+ text="Reject"
+ className="h-7 w-fit rounded-lg px-2.5"
+ onClick={() => {
+ const selectedPartners = table
+ .getSelectedRowModel()
+ .rows.map((row) => row.original);
+
+ setPendingRejectPartners(selectedPartners);
+ setShowBulkRejectPartnersModal(true);
+ }}
+ />
+ </>
+ ),
+ }),
+ containerClassName: "border-none",
thClassName: "border-l-0",
tdClassName: "border-l-0",
resourceName: (p) => `application${p ? "s" : ""}`,
@@ -401,7 +405,7 @@ export function ProgramPartnersApplicationsPageClient() {
}, [partners, detailsSheetState.partnerId]);
return (
- <div className="flex flex-col gap-4">
+ <>
{detailsSheetState.partnerId && currentPartner && (
<PartnerApplicationSheet
isOpen={detailsSheetState.open}
@@ -430,66 +434,13 @@ export function ProgramPartnersApplicationsPageClient() {
<BulkApprovePartnersModal />
<BulkRejectPartnersModal />
- <div>
- <div className="flex w-full flex-col items-center gap-2 min-[550px]:flex-row min-[550px]:items-center">
- <Filter.Select
- className="w-full md:w-fit"
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- onRemoveFilter={onRemoveFilter}
- onSearchChange={setSearch}
- onSelectedFilterChange={setSelectedFilter}
- />
- <div className="flex w-full grow items-center gap-2 md:w-auto">
- <div className="min-w-0 flex-1">
- <SearchBoxPersisted
- placeholder="Search by name, email, or company"
- inputClassName="w-full md:w-80"
- />
- </div>
- <div className="flex shrink-0 justify-end gap-2">
- <Link
- href={`/${slug}/program/analytics/applications${getQueryString(
- undefined,
- { include: ["country"] },
- )}`}
- >
- <Button
- variant="secondary"
- className="w-fit"
- icon={<ChartLine className="h-4 w-4 text-neutral-600" />}
- text={isMobile ? undefined : "View Analytics"}
- />
- </Link>
- </div>
- </div>
- </div>
- <AnimatedSizeContainer height>
- <div>
- {activeFilters.length > 0 && (
- <div className="pt-3">
- <Filter.List
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- onRemoveFilter={onRemoveFilter}
- onRemoveAll={onRemoveAll}
- onToggleOperator={onToggleOperator}
- />
- </div>
- )}
- </div>
- </AnimatedSizeContainer>
- </div>
{partners?.length !== 0 ? (
<Table {...tableProps} table={table} />
) : (
<AnimatedEmptyState
- title="No applications found"
- description={`No applications found${isFiltered ? " for the selected filters" : " for this program"}.`}
+ className="border-none"
+ title={EMPTY_STATE_TITLES[status]}
+ description={`${EMPTY_STATE_TITLES[status]}${isFiltered ? " for the selected filters" : " for this program"}.`}
cardContent={() => (
<>
<Users className="size-4 text-neutral-700" />
@@ -498,17 +449,11 @@ export function ProgramPartnersApplicationsPageClient() {
)}
/>
)}
- </div>
+ </>
);
}
-function RowMenuButton({
- row,
- workspaceId,
-}: {
- row: Row<ApplicationRow>;
- workspaceId: string;
-}) {
+function PendingRowMenuButton({ row }: { row: Row<ApplicationRow> }) {
const [isOpen, setIsOpen] = useState(false);
const {
@@ -587,6 +532,86 @@ function RowMenuButton({
);
}
+function RejectedRowMenuButton({
+ row,
+ workspaceId,
+}: {
+ row: Row<ApplicationRow>;
+ workspaceId: string;
+}) {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const { executeAsync: approvePartner, isPending: isApprovingPartner } =
+ useAction(approvePartnerApplicationAction, {
+ onError: ({ error }) => {
+ toast.error(error.serverError);
+ },
+ onSuccess: () => {
+ toast.success("Partner application approved");
+ mutatePrefix([
+ "/api/partners",
+ "/api/partners/count",
+ "/api/program-applications",
+ ]);
+ },
+ });
+
+ const {
+ setShowConfirmModal: setShowApproveModal,
+ confirmModal: approveModal,
+ } = useConfirmModal({
+ title: "Approve Application",
+ description: "Are you sure you want to approve this application?",
+ confirmText: "Approve",
+ onConfirm: async () => {
+ await approvePartner({
+ workspaceId: workspaceId!,
+ partnerId: row.original.id,
+ });
+ },
+ });
+
+ return (
+ <>
+ {approveModal}
+ <Popover
+ openPopover={isOpen}
+ setOpenPopover={setIsOpen}
+ content={
+ <Command tabIndex={0} loop className="focus:outline-none">
+ <Command.List className="flex w-screen flex-col gap-1 p-1 text-sm sm:w-auto sm:min-w-[130px]">
+ <MenuItem
+ as={Command.Item}
+ icon={Check}
+ onSelect={() => {
+ setIsOpen(false);
+ setShowApproveModal(true);
+ }}
+ >
+ Approve partner
+ </MenuItem>
+ </Command.List>
+ </Command>
+ }
+ align="end"
+ >
+ <Button
+ type="button"
+ className="size-8 shrink-0 whitespace-nowrap rounded-lg p-0"
+ variant="outline"
+ icon={
+ isApprovingPartner ? (
+ <LoadingSpinner className="size-4 shrink-0" />
+ ) : (
+ <Dots className="size-4 shrink-0" />
+ )
+ }
+ />
+ </Popover>
+ </>
+ );
+}
+
/** Gets the current partner from the loaded partners array if available, or a separate fetch if not */
function useCurrentPartner({
partners,
@@ -596,7 +621,7 @@ function useCurrentPartner({
partnerId: string | null;
}) {
const listedPartner = partnerId
- ? (partners?.find(({ id }) => id === partnerId) ?? null)
+ ? partners?.find(({ id }) => id === partnerId) ?? null
: null;
const { partner: fetchedPartner, loading: isLoading } = usePartner(
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/approved/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/approved/page.tsx
new file mode 100644
index 0000000000..fd9237f5e0
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/approved/page.tsx
@@ -0,0 +1,5 @@
+import { ApplicationsTable } from "../applications-table";
+
+export default function ProgramPartnersApprovedApplications() {
+ return <ApplicationsTable status="approved" />;
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/layout.tsx
new file mode 100644
index 0000000000..fd6c20568b
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/layout.tsx
@@ -0,0 +1,26 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { ReactNode } from "react";
+import { ApplicationSettingsButton } from "./applications-menu-popover";
+import { ApplicationsShell } from "./applications-shell";
+
+export default function ProgramPartnersApplicationsLayout({
+ children,
+}: {
+ children: ReactNode;
+}) {
+ return (
+ <PageContent
+ title="Applications"
+ titleInfo={{
+ title:
+ "Learn how to review and [manage your program applications](https://dub.co/help/article/program-applications) and bring the best partners to your program.",
+ }}
+ controls={<ApplicationSettingsButton />}
+ >
+ <PageWidthWrapper>
+ <ApplicationsShell>{children}</ApplicationsShell>
+ </PageWidthWrapper>
+ </PageContent>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page.tsx
index 0d500de248..c09d004bce 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page.tsx
@@ -1,21 +1,5 @@
-import { PageContent } from "@/ui/layout/page-content";
-import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { ApplicationsMenuPopover } from "./applications-menu-popover";
-import { ProgramPartnersApplicationsPageClient } from "./page-client";
+import { ApplicationsTable } from "./applications-table";
export default function ProgramPartnersApplications() {
- return (
- <PageContent
- title="Applications"
- titleInfo={{
- title:
- "Learn how to review and [manage your program applications](https://dub.co/help/article/program-applications) and bring the best partners to your program.",
- }}
- controls={<ApplicationsMenuPopover />}
- >
- <PageWidthWrapper>
- <ProgramPartnersApplicationsPageClient />
- </PageWidthWrapper>
- </PageContent>
- );
+ return <ApplicationsTable status="pending" />;
}
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
deleted file mode 100644
index 6f1e90f46b..0000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
+++ /dev/null
@@ -1,535 +0,0 @@
-"use client";
-
-import { approvePartnerApplicationAction } from "@/lib/actions/partners/approve-partner-application";
-import { useProgramApplications } from "@/lib/program-applications/hooks/use-program-applications";
-import { useProgramApplicationsCount } from "@/lib/program-applications/hooks/use-program-applications-count";
-import { useProgramApplicationsFilters } from "@/lib/program-applications/hooks/use-program-applications-filters";
-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 useWorkspace from "@/lib/swr/use-workspace";
-import { ProgramApplicationProps } 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";
-import { PartnerRowItem } from "@/ui/partners/partner-row-item";
-import { PartnerSocialColumn } from "@/ui/partners/partner-social-column";
-import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
-import { CountryFlag } from "@/ui/shared/country-flag";
-import { SearchBoxPersisted } from "@/ui/shared/search-box";
-import {
- AnimatedSizeContainer,
- Button,
- EditColumnsButton,
- Filter,
- MenuItem,
- Popover,
- Table,
- useColumnVisibility,
- usePagination,
- useRouterStuff,
- useTable,
-} from "@dub/ui";
-import { Check, Dots, LoadingSpinner, Users } from "@dub/ui/icons";
-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";
-
-type ApplicationPlatform = NonNullable<
- ProgramApplicationProps["partner"]["platforms"]
->[number];
-
-type ApplicationRow = ProgramApplicationProps["partner"] & {
- createdAt: ProgramApplicationProps["createdAt"];
- applicationId: string;
- platformsByType: ReturnType<
- typeof buildSocialPlatformLookup<ApplicationPlatform>
- >;
-};
-
-const applicationsColumns = {
- all: [
- "partner",
- "createdAt",
- "location",
- "website",
- "youtube",
- "twitter",
- "linkedin",
- "instagram",
- "tiktok",
- ],
- defaultVisible: [
- "partner",
- "createdAt",
- "location",
- "website",
- "youtube",
- "linkedin",
- ],
-};
-
-export function ProgramPartnersRejectedApplicationsPageClient() {
- const { id: workspaceId } = useWorkspace();
- const { queryParams, searchParams, searchParamsObj } = useRouterStuff();
-
- const sortBy = searchParams.get("sortBy") || "createdAt";
- const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
-
- const {
- filters,
- activeFilters,
- onSelect,
- onRemove,
- onRemoveFilter,
- onRemoveAll,
- onToggleOperator,
- setSelectedFilter,
- setSearch,
- } = useProgramApplicationsFilters({
- status: "rejected",
- enabledFilters: ["country"],
- });
-
- const { applicationsCount, error: countError } =
- useProgramApplicationsCount<number>({
- status: "rejected",
- });
-
- const { applications, error, isValidating } = useProgramApplications({
- status: "rejected",
- });
-
- const partners = useMemo(
- () =>
- applications?.map((application) => ({
- ...application.partner,
- createdAt: application.createdAt,
- applicationId: application.id,
- platformsByType: buildSocialPlatformLookup(
- application.partner.platforms ?? [],
- ),
- })),
- [applications],
- );
-
- const { groups } = useGroups();
-
- const [detailsSheetState, setDetailsSheetState] = useState<
- | { open: false; partnerId: string | null }
- | { open: true; partnerId: string }
- >({ open: false, partnerId: null });
-
- const isFiltered = Object.keys(searchParamsObj).some(
- (key) => !["sortBy", "sortOrder", "page"].includes(key),
- );
-
- useEffect(() => {
- const partnerId = searchParams.get("partnerId");
- if (partnerId) setDetailsSheetState({ open: true, partnerId });
- }, [searchParams]);
-
- const { currentPartner, isLoading: isCurrentPartnerLoading } =
- useCurrentPartner({
- partners,
- partnerId: detailsSheetState.partnerId,
- });
-
- const { columnVisibility, setColumnVisibility } = useColumnVisibility(
- "applications-table-columns",
- applicationsColumns,
- );
-
- const { pagination, setPagination } = usePagination();
-
- const columns = useMemo(
- () => [
- {
- id: "partner",
- header: "Partner",
- enableHiding: false,
- minSize: 250,
- cell: ({ row }) => {
- return (
- <PartnerRowItem
- partner={row.original}
- showPermalink={false}
- showFraudIndicator={false}
- />
- );
- },
- },
- {
- id: "createdAt",
- header: "Applied",
- accessorFn: (d) => formatDate(d.createdAt, { month: "short" }),
- },
- {
- id: "group",
- header: "Group",
- enableHiding: false,
- minSize: 150,
- cell: ({ row }) => {
- if (!groups || !row.original.groupId) {
- return "-";
- }
-
- const partnerGroup = groups.find(
- (g) => g.id === row.original.groupId,
- );
-
- if (!partnerGroup) {
- return "-";
- }
-
- return (
- <div className="flex items-center gap-2">
- <GroupColorCircle group={partnerGroup} />
- <span className="truncate text-sm font-medium">
- {partnerGroup.name}
- </span>
- </div>
- );
- },
- },
- {
- id: "location",
- header: "Location",
- minSize: 150,
- cell: ({ row }) => {
- const country = row.original.country;
- return (
- <div className="flex items-center gap-2">
- {country && <CountryFlag countryCode={country} />}
- <span className="min-w-0 truncate">
- {(country ? COUNTRIES[country] : null) ?? "-"}
- </span>
- </div>
- );
- },
- },
- // Socials
- {
- id: "website",
- header: "Website",
- minSize: 150,
- cell: ({ row }: { row: Row<ApplicationRow> }) => (
- <PartnerSocialColumn
- platform={row.original.platformsByType.website}
- platformName="website"
- />
- ),
- },
- {
- id: "youtube",
- header: "YouTube",
- minSize: 150,
- cell: ({ row }: { row: Row<ApplicationRow> }) => (
- <PartnerSocialColumn
- platform={row.original.platformsByType.youtube}
- platformName="youtube"
- />
- ),
- },
- {
- id: "twitter",
- header: "X/Twitter",
- minSize: 150,
- cell: ({ row }: { row: Row<ApplicationRow> }) => (
- <PartnerSocialColumn
- platform={row.original.platformsByType.twitter}
- platformName="twitter"
- />
- ),
- },
- {
- id: "linkedin",
- header: "LinkedIn",
- minSize: 150,
- cell: ({ row }: { row: Row<ApplicationRow> }) => (
- <PartnerSocialColumn
- platform={row.original.platformsByType.linkedin}
- platformName="linkedin"
- />
- ),
- },
- {
- id: "instagram",
- header: "Instagram",
- minSize: 150,
- cell: ({ row }: { row: Row<ApplicationRow> }) => (
- <PartnerSocialColumn
- platform={row.original.platformsByType.instagram}
- platformName="instagram"
- />
- ),
- },
- {
- id: "tiktok",
- header: "TikTok",
- minSize: 150,
- cell: ({ row }: { row: Row<ApplicationRow> }) => (
- <PartnerSocialColumn
- platform={row.original.platformsByType.tiktok}
- platformName="tiktok"
- />
- ),
- },
-
- // Menu
- {
- id: "menu",
- enableHiding: false,
- header: ({ table }) => <EditColumnsButton table={table} />,
- cell: ({ row }) => (
- <PartnerRowMenuButton row={row} workspaceId={workspaceId!} />
- ),
- },
- ],
- [workspaceId, groups],
- );
-
- const { table, ...tableProps } = useTable<ApplicationRow>({
- data: partners || [],
- columns,
- columnPinning: { right: ["menu"] },
- onRowClick: (row) => {
- queryParams({
- set: {
- partnerId: row.original.id,
- },
- });
- },
- pagination,
- onPaginationChange: setPagination,
- columnVisibility,
- onColumnVisibilityChange: setColumnVisibility,
- sortableColumns: ["createdAt"],
- sortBy,
- sortOrder,
- onSortChange: ({ sortBy, sortOrder }) =>
- queryParams({
- set: {
- ...(sortBy && { sortBy }),
- ...(sortOrder && { sortOrder }),
- },
- del: "page",
- }),
- thClassName: "border-l-0",
- tdClassName: "border-l-0",
- resourceName: (p) => `application${p ? "s" : ""}`,
- rowCount: applicationsCount || 0,
- loading: isValidating || isCurrentPartnerLoading,
- error: error || countError ? "Failed to load applications" : undefined,
- });
-
- const [previousPartnerId, nextPartnerId] = useMemo(() => {
- if (!partners || !detailsSheetState.partnerId) return [null, null];
-
- const currentIndex = partners.findIndex(
- ({ id }) => id === detailsSheetState.partnerId,
- );
- if (currentIndex === -1) return [null, null];
-
- return [
- currentIndex > 0 ? partners[currentIndex - 1].id : null,
- currentIndex < partners.length - 1 ? partners[currentIndex + 1].id : null,
- ];
- }, [partners, detailsSheetState.partnerId]);
-
- return (
- <div className="flex flex-col gap-6">
- {detailsSheetState.partnerId && currentPartner && (
- <PartnerApplicationSheet
- isOpen={detailsSheetState.open}
- setIsOpen={(open) =>
- setDetailsSheetState((s) => ({ ...s, open }) as any)
- }
- partner={currentPartner}
- onPrevious={
- previousPartnerId
- ? () =>
- queryParams({
- set: { partnerId: previousPartnerId },
- })
- : undefined
- }
- onNext={
- nextPartnerId
- ? () =>
- queryParams({
- set: { partnerId: nextPartnerId },
- })
- : undefined
- }
- />
- )}
- <div>
- <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
- <Filter.Select
- className="w-full md:w-fit"
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- onRemoveFilter={onRemoveFilter}
- onSearchChange={setSearch}
- onSelectedFilterChange={setSelectedFilter}
- />
- <SearchBoxPersisted
- placeholder="Search by name, email, or company"
- inputClassName="md:w-80"
- />
- </div>
- <AnimatedSizeContainer height>
- <div>
- {activeFilters.length > 0 && (
- <div className="pt-3">
- <Filter.List
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- onRemoveFilter={onRemoveFilter}
- onRemoveAll={onRemoveAll}
- onToggleOperator={onToggleOperator}
- />
- </div>
- )}
- </div>
- </AnimatedSizeContainer>
- </div>
- {partners?.length !== 0 ? (
- <Table {...tableProps} table={table} />
- ) : (
- <AnimatedEmptyState
- title="No rejected applications found"
- description={`No rejected applications found${isFiltered ? " for the selected filters" : " for this program"}.`}
- cardContent={() => (
- <>
- <Users className="size-4 text-neutral-700" />
- <div className="h-2.5 w-24 min-w-0 rounded-sm bg-neutral-200" />
- </>
- )}
- />
- )}
- </div>
- );
-}
-
-function PartnerRowMenuButton({
- row,
- workspaceId,
-}: {
- row: Row<ApplicationRow>;
- workspaceId: string;
-}) {
- const [isOpen, setIsOpen] = useState(false);
-
- const { executeAsync: approvePartner, isPending: isApprovingPartner } =
- useAction(approvePartnerApplicationAction, {
- onError: ({ error }) => {
- toast.error(error.serverError);
- },
- onSuccess: () => {
- toast.success("Partner application approved");
- mutatePrefix([
- "/api/partners",
- "/api/partners/count",
- "/api/program-applications",
- ]);
- },
- });
-
- const {
- setShowConfirmModal: setShowApproveModal,
- confirmModal: approveModal,
- } = useConfirmModal({
- title: "Approve Application",
- description: "Are you sure you want to approve this application?",
- confirmText: "Approve",
- onConfirm: async () => {
- await approvePartner({
- workspaceId: workspaceId!,
- partnerId: row.original.id,
- });
- },
- });
-
- return (
- <>
- {approveModal}
- <Popover
- openPopover={isOpen}
- setOpenPopover={setIsOpen}
- content={
- <Command tabIndex={0} loop className="focus:outline-none">
- <Command.List className="flex w-screen flex-col gap-1 p-1 text-sm sm:w-auto sm:min-w-[130px]">
- <MenuItem
- as={Command.Item}
- icon={Check}
- onSelect={() => {
- setIsOpen(false);
- setShowApproveModal(true);
- }}
- >
- Approve partner
- </MenuItem>
- </Command.List>
- </Command>
- }
- align="end"
- >
- <Button
- type="button"
- className="size-8 shrink-0 whitespace-nowrap rounded-lg p-0"
- variant="outline"
- icon={
- isApprovingPartner ? (
- <LoadingSpinner className="size-4 shrink-0" />
- ) : (
- <Dots className="size-4 shrink-0" />
- )
- }
- />
- </Popover>
- </>
- );
-}
-
-function useCurrentPartner({
- partners,
- partnerId,
-}: {
- partners?: ApplicationRow[];
- partnerId: string | null;
-}) {
- const listedPartner = partnerId
- ? partners?.find(({ id }) => id === partnerId) ?? null
- : null;
-
- const { partner: fetchedPartner, loading: isLoading } = usePartner(
- { partnerId },
- { keepPreviousData: true },
- );
-
- const matchingFetchedPartner =
- fetchedPartner?.id === partnerId ? fetchedPartner : null;
-
- const currentPartner = useMemo(
- () =>
- listedPartner
- ? { ...matchingFetchedPartner, ...listedPartner }
- : matchingFetchedPartner,
- [listedPartner, matchingFetchedPartner],
- );
-
- return {
- currentPartner,
- isLoading: Boolean(partnerId) && !listedPartner && isLoading,
- };
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page.tsx
index e07f3ee328..644c7ea745 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page.tsx
@@ -1,19 +1,5 @@
-import { PageContent } from "@/ui/layout/page-content";
-import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { ProgramPartnersRejectedApplicationsPageClient } from "./page-client";
+import { ApplicationsTable } from "../applications-table";
-export default async function ProgramPartnersRejectedApplications(props: {
- params: Promise<{ slug: string }>;
-}) {
- const params = await props.params;
- return (
- <PageContent
- title="Rejected applications"
- titleBackHref={`/${params.slug}/program/partners/applications`}
- >
- <PageWidthWrapper>
- <ProgramPartnersRejectedApplicationsPageClient />
- </PageWidthWrapper>
- </PageContent>
- );
+export default function ProgramPartnersRejectedApplications() {
+ return <ApplicationsTable status="rejected" />;
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/page.tsx
index 3607b48b4f..83d3a66331 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/page.tsx
@@ -1,6 +1,5 @@
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { RiskCenterMenu } from "./risk-center-menu";
import { RiskEventsTable } from "./risk-events-table";
import { RiskRulesButton } from "./risk-rules-button";
@@ -13,12 +12,7 @@ export default function RiskCenterPage() {
"Safeguard your partner program by automatically flagging, reviewing, and resolving potential risk events.",
href: "https://dub.co/help/article/risk-monitoring",
}}
- controls={
- <>
- <RiskRulesButton />
- <RiskCenterMenu />
- </>
- }
+ controls={<RiskRulesButton />}
>
<PageWidthWrapper>
<RiskEventsTable />
diff --git a/apps/web/lib/openapi/partners/list-program-applications.ts b/apps/web/lib/openapi/partners/list-program-applications.ts
index 5dd1773395..5e8d3ab1bd 100644
--- a/apps/web/lib/openapi/partners/list-program-applications.ts
+++ b/apps/web/lib/openapi/partners/list-program-applications.ts
@@ -9,15 +9,15 @@ import * as z from "zod/v4";
export const listProgramApplications: ZodOpenApiOperationObject = {
operationId: "listPartnerApplications",
"x-speakeasy-name-override": "list",
- summary: "List all pending program applications",
+ summary: "List all program applications",
description:
- "Retrieve a paginated list of pending applications for your partner program.",
+ "Retrieve a paginated list of applications for your partner program. Filter by `status` to list pending, approved, or rejected applications.",
requestParams: {
query: getPartnerApplicationsQuerySchema,
},
responses: {
"200": {
- description: "The list of pending program applications.",
+ description: "The list of program applications.",
content: {
"application/json": {
schema: z.array(ProgramApplicationSchema),
diff --git a/apps/web/lib/program-applications/list-program-applications.ts b/apps/web/lib/program-applications/list-program-applications.ts
index a05ea8035d..6954e5b5ed 100644
--- a/apps/web/lib/program-applications/list-program-applications.ts
+++ b/apps/web/lib/program-applications/list-program-applications.ts
@@ -2,7 +2,7 @@ import { formatApplicationFormData } from "@/lib/partners/format-application-for
import { prisma } from "@/lib/prisma";
import { buildSocialPlatformLookup } from "@/lib/social-utils";
import { getPartnerApplicationsQuerySchema } from "@/lib/zod/schemas/program-application";
-import { Prisma, ProgramEnrollmentStatus } from "@prisma/client";
+import { Prisma, ProgramApplicationStatus } from "@prisma/client";
import * as z from "zod/v4";
import { buildProgramApplicationWhere } from "./program-application-where";
@@ -28,7 +28,7 @@ export async function listProgramApplications({
programId,
groupId,
country,
- status = ProgramEnrollmentStatus.pending,
+ status = ProgramApplicationStatus.pending,
search,
sortOrder = "desc",
page = 1,
diff --git a/apps/web/lib/program-applications/program-application-where.ts b/apps/web/lib/program-applications/program-application-where.ts
index 9e0807269d..f3cdfb1759 100644
--- a/apps/web/lib/program-applications/program-application-where.ts
+++ b/apps/web/lib/program-applications/program-application-where.ts
@@ -2,11 +2,7 @@ import { isExactPartnerIdQuery } from "@/lib/api/partners/program-enrollment-que
import { sanitizeFullTextSearch } from "@/lib/prisma";
import { getProgramApplicationsCountQuerySchema } from "@/lib/zod/schemas/program-application";
import { parseFilterValue } from "@dub/utils";
-import {
- Prisma,
- ProgramApplicationStatus,
- ProgramEnrollmentStatus,
-} from "@prisma/client";
+import { Prisma, ProgramApplicationStatus } from "@prisma/client";
import * as z from "zod/v4";
function applicationFieldFilter(
@@ -64,23 +60,16 @@ export function buildProgramApplicationWhere({
programId,
groupId,
country,
- status = ProgramEnrollmentStatus.pending,
+ status = ProgramApplicationStatus.pending,
search,
}: ProgramApplicationWhereParams): Prisma.ProgramApplicationWhereInput {
const query = search?.trim();
const groupIdFilter = applicationFieldFilter(groupId);
const countryFilter = applicationFieldFilter(country);
- // The query schema accepts enrollment statuses (pending | rejected), so map
- // them onto the application's own status. Approved applications are never listed.
- const applicationStatus =
- status === ProgramEnrollmentStatus.rejected
- ? ProgramApplicationStatus.rejected
- : ProgramApplicationStatus.pending;
-
return {
programId,
- status: applicationStatus,
+ status,
partnerId: { not: null },
...(groupIdFilter && { groupId: groupIdFilter }),
...(countryFilter && { country: countryFilter }),
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index 6d7e87cb38..2f279e4c91 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -1,4 +1,4 @@
-import { ProgramEnrollmentStatus } from "@prisma/client";
+import { ProgramApplicationStatus } from "@prisma/client";
import * as z from "zod/v4";
import { getPaginationQuerySchema } from "./misc";
import {
@@ -76,11 +76,6 @@ export const ProgramApplicationSchema = PartnerApplicationSchema.extend({
export const partnerApplicationWebhookSchema = PartnerApplicationSchema;
-const ProgramApplicationStatuses = [
- ProgramEnrollmentStatus.pending,
- ProgramEnrollmentStatus.rejected,
-];
-
export const getPartnerApplicationsQuerySchema = getPartnersQuerySchema
.pick({
country: true,
@@ -95,10 +90,10 @@ export const getPartnerApplicationsQuerySchema = getPartnersQuerySchema
"Filter applications by name, email, or company name. Partial matches are supported. An exact partner ID is also matched.",
),
status: z
- .enum(ProgramApplicationStatuses)
- .default(ProgramEnrollmentStatus.pending)
+ .enum(ProgramApplicationStatus)
+ .default(ProgramApplicationStatus.pending)
.describe(
- "Filter applications by status. One of `pending` or `rejected`. Defaults to `pending`.",
+ "Filter applications by status. One of `pending`, `approved`, or `rejected`. Defaults to `pending`.",
),
...getPaginationQuerySchema({
pageSize: PARTNERS_MAX_PAGE_SIZE,
diff --git a/apps/web/playwright/api/program-applications/program-applications.spec.ts b/apps/web/playwright/api/program-applications/program-applications.spec.ts
index b64844837a..7e0437e425 100644
--- a/apps/web/playwright/api/program-applications/program-applications.spec.ts
+++ b/apps/web/playwright/api/program-applications/program-applications.spec.ts
@@ -69,6 +69,7 @@ test.describe("program applications", () => {
let pendingDefaultGroup: SeededApplication;
let rejectedUs: SeededApplication;
let rejectedGb: SeededApplication;
+ let approvedUs: SeededApplication;
test.beforeAll(async ({ api, program }) => {
defaultGroupId = program.defaultGroupId;
@@ -86,8 +87,8 @@ test.describe("program applications", () => {
{ country: "US", groupId: defaultGroupId, status: "pending" },
{ country: "US", groupId: extraGroup.id, status: "rejected" },
{ country: "GB", groupId: extraGroup.id, status: "rejected" },
- // Never listed: approved, orphaned (no partner), and another program's.
{ country: "US", groupId: extraGroup.id, status: "approved" },
+ // Never listed: orphaned (no partner), and another program's.
{
country: "US",
groupId: extraGroup.id,
@@ -156,6 +157,7 @@ test.describe("program applications", () => {
pendingDefaultGroup,
rejectedUs,
rejectedGb,
+ approvedUs,
] = seeded;
// Application-level socials take precedence over the partner's platforms;
@@ -315,7 +317,25 @@ test.describe("program applications", () => {
);
});
- test("GET /program-applications – excludes approved, orphaned, and other programs' applications", async ({
+ test("GET /program-applications – status=approved", async ({ api }) => {
+ const { status, data } = await listApplications(api, {
+ groupId: extraGroup.id,
+ status: "approved",
+ });
+ const excludedByCountry = await listApplications(api, {
+ groupId: extraGroup.id,
+ country: "GB",
+ status: "approved",
+ });
+
+ expect(status).toEqual(200);
+ expect(ids(data)).toEqual([approvedUs.id]);
+ expect(data[0].partner.status).toEqual("approved");
+
+ expect(excludedByCountry).toEqual({ status: 200, data: [] });
+ });
+
+ test("GET /program-applications – each status only lists its own applications, excluding orphaned and other programs' applications", async ({
api,
}) => {
const pending = await listApplications(api, { search: batch });
@@ -323,6 +343,10 @@ test.describe("program applications", () => {
search: batch,
status: "rejected",
});
+ const approved = await listApplications(api, {
+ search: batch,
+ status: "approved",
+ });
expect(pending.status).toEqual(200);
expect(ids(pending.data)).toEqual([
@@ -334,6 +358,9 @@ test.describe("program applications", () => {
expect(rejected.status).toEqual(200);
expect(ids(rejected.data)).toEqual([rejectedUs.id, rejectedGb.id]);
+
+ expect(approved.status).toEqual(200);
+ expect(ids(approved.data)).toEqual([approvedUs.id]);
});
test("GET /program-applications – filters by country", async ({ api }) => {
@@ -442,6 +469,21 @@ test.describe("program applications", () => {
}),
).toEqual({ status: 200, data: 2 });
+ expect(
+ await countApplications(api, {
+ groupId: extraGroup.id,
+ status: "approved",
+ }),
+ ).toEqual({ status: 200, data: 1 });
+
+ expect(
+ await countApplications(api, {
+ groupId: extraGroup.id,
+ country: "GB",
+ status: "approved",
+ }),
+ ).toEqual({ status: 200, data: 0 });
+
expect(
await countApplications(api, {
groupId: extraGroup.id,
@@ -454,6 +496,10 @@ test.describe("program applications", () => {
status: 200,
data: 4,
});
+
+ expect(
+ await countApplications(api, { search: batch, status: "approved" }),
+ ).toEqual({ status: 200, data: 1 });
});
test("GET /program-applications/count – groupBy=country ignores the country filter", async ({
@@ -491,10 +537,10 @@ test.describe("program applications", () => {
const listErrorCases: ErrorCase[] = [
{
- name: "GET /program-applications – rejects status=approved",
- params: { status: "approved" },
+ name: "GET /program-applications – rejects status=invited",
+ params: { status: "invited" },
message:
- 'invalid_value: status: Invalid option: expected one of "pending"|"rejected"',
+ 'invalid_value: status: Invalid option: expected one of "pending"|"approved"|"rejected"',
},
{
name: "GET /program-applications – rejects pageSize above max",
@@ -524,10 +570,10 @@ for (const { name, params, message } of listErrorCases) {
const countErrorCases: ErrorCase[] = [
{
- name: "GET /program-applications/count – rejects status=approved",
- params: { status: "approved" },
+ name: "GET /program-applications/count – rejects status=invited",
+ params: { status: "invited" },
message:
- 'invalid_value: status: Invalid option: expected one of "pending"|"rejected"',
+ 'invalid_value: status: Invalid option: expected one of "pending"|"approved"|"rejected"',
},
{
name: "GET /program-applications/count – rejects invalid groupBy",