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.

Improve program application review flow

Steven Tey7dacb21387e0
diff --git a/apps/web/app/(ee)/api/program-applications/approve/route.ts b/apps/web/app/(ee)/api/program-applications/approve/route.ts
index e5a5cc8866..9872802089 100644
--- a/apps/web/app/(ee)/api/program-applications/approve/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/approve/route.ts
@@ -1,7 +1,7 @@
-import { approvePartner } from "@/lib/api/partners/applications/approve-partner";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { parseRequestBody } from "@/lib/api/utils";
import { withWorkspace } from "@/lib/auth";
+import { approveProgramApplication } from "@/lib/program-applications/approve-program-application";
import { approveProgramApplicationSchema } from "@/lib/zod/schemas/program-application";
import { NextResponse } from "next/server";
@@ -14,7 +14,7 @@ export const POST = withWorkspace(
const programId = getDefaultProgramIdOrThrow(workspace);
- await approvePartner({
+ await approveProgramApplication({
programId,
partnerId,
groupId,
diff --git a/apps/web/app/(ee)/api/program-applications/reject/route.ts b/apps/web/app/(ee)/api/program-applications/reject/route.ts
index ef2942faf6..8f23843bfe 100644
--- a/apps/web/app/(ee)/api/program-applications/reject/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/reject/route.ts
@@ -1,6 +1,6 @@
-import { rejectPartner } from "@/lib/api/partners/applications/reject-partner";
import { parseRequestBody } from "@/lib/api/utils";
import { withWorkspace } from "@/lib/auth";
+import { rejectProgramApplication } from "@/lib/program-applications/reject-program-application";
import { rejectProgramApplicationSchema } from "@/lib/zod/schemas/program-application";
import { NextResponse } from "next/server";
@@ -16,7 +16,7 @@ export const POST = withWorkspace(
flagForFraudReason,
} = rejectProgramApplicationSchema.parse(await parseRequestBody(req));
- await rejectPartner({
+ await rejectProgramApplication({
workspace,
partnerId,
rejectionReason,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
index 7305595c93..b2d39c8f69 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
@@ -9,15 +9,14 @@ 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 { useApproveProgramApplicationModal } from "@/ui/modals/approve-program-application-modal";
-import { useBulkApprovePartnersModal } from "@/ui/modals/bulk-approve-partners-modal";
-import { useBulkRejectPartnersModal } from "@/ui/modals/bulk-reject-partners-modal";
+import { useBulkApproveProgramApplicationsModal } from "@/ui/modals/bulk-approve-program-applications-modal";
+import { useBulkRejectProgramApplicationsModal } from "@/ui/modals/bulk-reject-program-applications-modal";
import { useConfirmModal } from "@/ui/modals/confirm-modal";
import { useRejectProgramApplicationModal } from "@/ui/modals/reject-program-application-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
-import { ProgramApplicationSheet } from "@/ui/partners/partner-application-sheet";
import { PartnerRowItem } from "@/ui/partners/partner-row-item";
import { PartnerSocialColumn } from "@/ui/partners/partner-social-column";
+import { ProgramApplicationReviewSheet } from "@/ui/partners/program-application-review-sheet";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
import { CountryFlag } from "@/ui/shared/country-flag";
import {
@@ -154,15 +153,19 @@ export function ApplicationsTable({
ApplicationRow[]
>([]);
- const { setShowBulkApprovePartnersModal, BulkApprovePartnersModal } =
- useBulkApprovePartnersModal({
- partners: pendingApprovePartners,
- });
+ const {
+ setShowBulkApproveProgramApplicationsModal,
+ BulkApproveProgramApplicationsModal,
+ } = useBulkApproveProgramApplicationsModal({
+ partners: pendingApprovePartners,
+ });
- const { setShowBulkRejectPartnersModal, BulkRejectPartnersModal } =
- useBulkRejectPartnersModal({
- partners: pendingRejectPartners,
- });
+ const {
+ setShowBulkRejectProgramApplicationsModal,
+ BulkRejectProgramApplicationsModal,
+ } = useBulkRejectProgramApplicationsModal({
+ partners: pendingRejectPartners,
+ });
const { columnVisibility, setColumnVisibility } = useColumnVisibility(
"applications-table-columns-v2",
@@ -361,7 +364,7 @@ export function ApplicationsTable({
.rows.map((row) => row.original);
setPendingApprovePartners(partners);
- setShowBulkApprovePartnersModal(true);
+ setShowBulkApproveProgramApplicationsModal(true);
}}
/>
<Button
@@ -374,7 +377,7 @@ export function ApplicationsTable({
.rows.map((row) => row.original);
setPendingRejectPartners(selectedPartners);
- setShowBulkRejectPartnersModal(true);
+ setShowBulkRejectProgramApplicationsModal(true);
}}
/>
</>
@@ -407,7 +410,7 @@ export function ApplicationsTable({
return (
<>
{detailsSheetState.partnerId && currentPartner && (
- <ProgramApplicationSheet
+ <ProgramApplicationReviewSheet
isOpen={detailsSheetState.open}
setIsOpen={(open) =>
setDetailsSheetState((s) => ({ ...s, open }) as any)
@@ -431,8 +434,8 @@ export function ApplicationsTable({
}
/>
)}
- <BulkApprovePartnersModal />
- <BulkRejectPartnersModal />
+ {BulkApproveProgramApplicationsModal}
+ <BulkRejectProgramApplicationsModal />
{partners?.length !== 0 ? (
<Table {...tableProps} table={table} />
@@ -456,19 +459,14 @@ export function ApplicationsTable({
function PendingRowMenuButton({ row }: { row: Row<ApplicationRow> }) {
const [isOpen, setIsOpen] = useState(false);
+ const partners = useMemo(() => [row.original], [row.original]);
+
const {
- ApproveProgramApplicationModal,
- setShowApproveProgramApplicationModal,
- } = useApproveProgramApplicationModal({
- partner: row.original,
+ BulkApproveProgramApplicationsModal,
+ setShowBulkApproveProgramApplicationsModal,
+ } = useBulkApproveProgramApplicationsModal({
+ partners,
groupId: row.original.groupId,
- onConfirm: async () => {
- await mutatePrefix([
- "/api/partners",
- "/api/partners/count",
- "/api/program-applications",
- ]);
- },
});
const {
@@ -487,7 +485,7 @@ function PendingRowMenuButton({ row }: { row: Row<ApplicationRow> }) {
return (
<>
- {ApproveProgramApplicationModal}
+ {BulkApproveProgramApplicationsModal}
{RejectProgramApplicationModal}
<Popover
openPopover={isOpen}
@@ -500,7 +498,7 @@ function PendingRowMenuButton({ row }: { row: Row<ApplicationRow> }) {
icon={UserCheck}
onSelect={() => {
setIsOpen(false);
- setShowApproveProgramApplicationModal(true);
+ setShowBulkApproveProgramApplicationsModal(true);
}}
>
Approve application
@@ -547,7 +545,7 @@ function RejectedRowMenuButton({
toast.error(error.serverError);
},
onSuccess: () => {
- toast.success("Partner application approved");
+ toast.success("Program application approved");
mutatePrefix([
"/api/partners",
"/api/partners/count",
diff --git a/apps/web/lib/actions/partners/approve-program-application.ts b/apps/web/lib/actions/partners/approve-program-application.ts
index 3c3848991a..dde73acbb9 100644
--- a/apps/web/lib/actions/partners/approve-program-application.ts
+++ b/apps/web/lib/actions/partners/approve-program-application.ts
@@ -1,7 +1,7 @@
"use server";
-import { approvePartner } from "@/lib/api/partners/applications/approve-partner";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { approveProgramApplication } from "@/lib/program-applications/approve-program-application";
import { approveProgramApplicationSchema } from "@/lib/zod/schemas/program-application";
import * as z from "zod/v4";
import { authActionClient } from "../safe-action";
@@ -24,7 +24,7 @@ export const approveProgramApplicationAction = authActionClient
const programId = getDefaultProgramIdOrThrow(workspace);
- await approvePartner({
+ await approveProgramApplication({
programId,
partnerId,
userId: user.id,
diff --git a/apps/web/lib/actions/partners/bulk-approve-program-applications.ts b/apps/web/lib/actions/partners/bulk-approve-program-applications.ts
index 557a5ca50c..6df8ca21b9 100644
--- a/apps/web/lib/actions/partners/bulk-approve-program-applications.ts
+++ b/apps/web/lib/actions/partners/bulk-approve-program-applications.ts
@@ -39,7 +39,9 @@ export const bulkApproveProgramApplicationsAction = authActionClient
include: {
partners: {
where: {
- status: "pending",
+ status: {
+ in: ["pending", "rejected"],
+ },
partnerId: {
in: partnerIds,
},
@@ -62,7 +64,9 @@ export const bulkApproveProgramApplicationsAction = authActionClient
id: {
in: programEnrollments.map(({ id }) => id),
},
- status: "pending",
+ status: {
+ in: ["pending", "rejected"],
+ },
},
data: {
status: "approved",
diff --git a/apps/web/lib/actions/partners/bulk-reject-program-applications.ts b/apps/web/lib/actions/partners/bulk-reject-program-applications.ts
index bc2e38906e..4446f10def 100644
--- a/apps/web/lib/actions/partners/bulk-reject-program-applications.ts
+++ b/apps/web/lib/actions/partners/bulk-reject-program-applications.ts
@@ -6,7 +6,7 @@ import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
import { prisma } from "@/lib/prisma";
-import { bulkRejectPartnersSchema } from "@/lib/zod/schemas/partners";
+import { bulkRejectProgramApplicationsSchema } from "@/lib/zod/schemas/program-application";
import { sendBatchEmail } from "@dub/email";
import ProgramApplicationRejected from "@dub/email/templates/program-application-rejected";
import {
@@ -19,7 +19,7 @@ import { throwIfNoPermission } from "../throw-if-no-permission";
// Reject a list of pending partners
export const bulkRejectProgramApplicationsAction = authActionClient
- .inputSchema(bulkRejectPartnersSchema)
+ .inputSchema(bulkRejectProgramApplicationsSchema)
.action(async ({ parsedInput, ctx }) => {
const { workspace, user } = ctx;
const { partnerIds } = parsedInput;
diff --git a/apps/web/lib/actions/partners/reject-program-application.ts b/apps/web/lib/actions/partners/reject-program-application.ts
index 7056e430da..ce4a5fdfa3 100644
--- a/apps/web/lib/actions/partners/reject-program-application.ts
+++ b/apps/web/lib/actions/partners/reject-program-application.ts
@@ -1,6 +1,6 @@
"use server";
-import { rejectPartner } from "@/lib/api/partners/applications/reject-partner";
+import { rejectProgramApplication } from "@/lib/program-applications/reject-program-application";
import { rejectProgramApplicationSchema } from "@/lib/zod/schemas/program-application";
import * as z from "zod/v4";
import { authActionClient } from "../safe-action";
@@ -29,7 +29,7 @@ export const rejectProgramApplicationAction = authActionClient
requiredRoles: ["owner", "member"],
});
- await rejectPartner({
+ await rejectProgramApplication({
workspace,
partnerId,
rejectionReason,
diff --git a/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts b/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts
index 8fcdda3069..757fca5804 100644
--- a/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts
+++ b/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts
@@ -1,8 +1,8 @@
import { getProgramApplicationRisks } from "@/lib/api/fraud/get-program-application-risks";
-import { approvePartner } from "@/lib/api/partners/applications/approve-partner";
import { evaluateApplicationRequirements } from "@/lib/partners/evaluate-application-requirements";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { prisma } from "@/lib/prisma";
+import { approveProgramApplication } from "@/lib/program-applications/approve-program-application";
import { ProgramEnrollmentStatus } from "@prisma/client";
import * as z from "zod/v4";
import { defineJob } from "../index";
@@ -133,7 +133,7 @@ export const autoApprovePartnerJob = defineJob({
return;
}
- await approvePartner({
+ await approveProgramApplication({
programId,
partnerId,
userId: owner.userId,
diff --git a/apps/web/lib/api/partners/applications/approve-partner.ts b/apps/web/lib/program-applications/approve-program-application.ts
similarity index 85%
rename from apps/web/lib/api/partners/applications/approve-partner.ts
rename to apps/web/lib/program-applications/approve-program-application.ts
index f0d00beb04..e6044a4109 100644
--- a/apps/web/lib/api/partners/applications/approve-partner.ts
+++ b/apps/web/lib/program-applications/approve-program-application.ts
@@ -1,30 +1,32 @@
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
+import { DubApiError } from "@/lib/api/errors";
+import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
+import { throwIfPartnersLimitExceeded } from "@/lib/partners/throw-if-partners-limit-exceeded";
import { prisma } from "@/lib/prisma";
+import { approveProgramApplicationSchema } from "@/lib/zod/schemas/program-application";
import {
ProgramApplicationStatus,
ProgramEnrollmentStatus,
} from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import * as z from "zod/v4";
-import { throwIfPartnersLimitExceeded } from "../../../partners/throw-if-partners-limit-exceeded";
-import { approveProgramApplicationSchema } from "../../../zod/schemas/program-application";
-import { trackActivityLog } from "../../activity-log/track-activity-log";
-import { DubApiError } from "../../errors";
-import { getGroupOrThrow } from "../../groups/get-group-or-throw";
-import { queuePartnerSearchSync } from "../queue-partner-search-sync";
-
-type ApprovePartnerInput = z.infer<typeof approveProgramApplicationSchema> & {
+
+type ApproveProgramApplicationInput = z.infer<
+ typeof approveProgramApplicationSchema
+> & {
programId: string;
userId: string;
};
-export async function approvePartner({
+export async function approveProgramApplication({
programId,
partnerId,
groupId,
userId,
-}: ApprovePartnerInput) {
+}: ApproveProgramApplicationInput) {
const programEnrollment = await prisma.programEnrollment.findUnique({
where: {
partnerId_programId: {
diff --git a/apps/web/lib/api/partners/applications/reject-partner.ts b/apps/web/lib/program-applications/reject-program-application.ts
similarity index 90%
rename from apps/web/lib/api/partners/applications/reject-partner.ts
rename to apps/web/lib/program-applications/reject-program-application.ts
index 96d48689b6..ba68f4b70f 100644
--- a/apps/web/lib/api/partners/applications/reject-partner.ts
+++ b/apps/web/lib/program-applications/reject-program-application.ts
@@ -1,3 +1,8 @@
+import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
+import { DubApiError } from "@/lib/api/errors";
+import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
import { getProgramApplicationRejectionReasonLabel } from "@/lib/partners/program-application-rejection";
import { prisma } from "@/lib/prisma";
@@ -11,18 +16,15 @@ import {
} from "@prisma/client";
import { waitUntil } from "@vercel/functions";
import * as z from "zod/v4";
-import { trackActivityLog } from "../../activity-log/track-activity-log";
-import { DubApiError } from "../../errors";
-import { resolveFraudGroups } from "../../fraud/resolve-fraud-groups";
-import { getDefaultProgramIdOrThrow } from "../../programs/get-default-program-id-or-throw";
-import { queuePartnerSearchSync } from "../queue-partner-search-sync";
-type RejectPartnerInput = z.infer<typeof rejectProgramApplicationSchema> & {
+type RejectProgramApplicationInput = z.infer<
+ typeof rejectProgramApplicationSchema
+> & {
userId: string;
workspace: Pick<WorkspaceProps, "id" | "defaultProgramId">;
};
-export async function rejectPartner({
+export async function rejectProgramApplication({
workspace,
partnerId,
rejectionReason,
@@ -31,7 +33,7 @@ export async function rejectPartner({
flagForFraud,
flagForFraudReason,
userId,
-}: RejectPartnerInput) {
+}: RejectProgramApplicationInput) {
const programId = getDefaultProgramIdOrThrow(workspace);
if (flagForFraud && reapplicationTimeframe === "instant") {
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 5234ed1a6f..07a82cc2ba 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -949,16 +949,6 @@ export const bulkInvitePartnersSchema = z.object({
// Max length for optional `flagForFraudReason` on `FraudAlert`
export const MAX_FRAUD_REASON_LENGTH = 2000;
-
-export const bulkRejectPartnersSchema = z.object({
- workspaceId: z.string(),
- partnerIds: z
- .array(z.string())
- .max(100)
- .min(1)
- .transform((v) => [...new Set(v)]),
-});
-
export const retrievePartnerLinksSchema = partnerIdTenantIdSchema;
// Only Dub UI uses the following query parameters
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index 30dedbdceb..d923be0b8c 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -127,6 +127,15 @@ export const bulkApproveProgramApplicationsSchema = z.object({
.transform((v) => [...new Set(v)]),
});
+export const bulkRejectProgramApplicationsSchema = z.object({
+ workspaceId: z.string(),
+ partnerIds: z
+ .array(z.string())
+ .max(100)
+ .min(1)
+ .transform((v) => [...new Set(v)]),
+});
+
// Max length for optional `rejectionNote` on `ProgramApplication`
export const PROGRAM_APPLICATION_REJECTION_NOTE_MAX_LENGTH = 500;
diff --git a/apps/web/ui/modals/approve-program-application-modal.tsx b/apps/web/ui/modals/approve-program-application-modal.tsx
deleted file mode 100644
index 6c8561afe0..0000000000
--- a/apps/web/ui/modals/approve-program-application-modal.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import { approveProgramApplicationAction } from "@/lib/actions/partners/approve-program-application";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { PartnerProps } from "@/lib/types";
-import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
-import { isWorkspaceBillingTrialActive } from "@dub/utils";
-import { useAction } from "next-safe-action/hooks";
-import {
- Dispatch,
- SetStateAction,
- useCallback,
- useMemo,
- useState,
-} from "react";
-import { toast } from "sonner";
-import { useTrialLimitActivateModal } from "./trial-limit-activate-modal";
-
-interface ApproveProgramApplicationModalProps {
- showApproveProgramApplicationModal: boolean;
- setShowApproveProgramApplicationModal: Dispatch<SetStateAction<boolean>>;
- partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
- groupId?: string | null;
- onConfirm?: () => void | Promise<void>;
- confirmShortcutOptions?: {
- modal?: boolean;
- sheet?: boolean;
- };
-}
-
-export function ApproveProgramApplicationModal({
- showApproveProgramApplicationModal,
- setShowApproveProgramApplicationModal,
- partner,
- groupId,
- onConfirm,
- confirmShortcutOptions,
-}: ApproveProgramApplicationModalProps) {
- const { id: workspaceId, trialEndsAt } = useWorkspace();
-
- const { openTrialLimitModal, TrialLimitActivateModal } =
- useTrialLimitActivateModal();
-
- const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
-
- const { executeAsync: approveProgramApplication, isPending } = useAction(
- approveProgramApplicationAction,
- {
- onSuccess: async () => {
- toast.success(
- `Partner ${partner.email} has been approved to your program.`,
- );
- setShowApproveProgramApplicationModal(false);
- await onConfirm?.();
- },
- onError: ({ error }) => {
- const msg = String(error.serverError ?? "");
- if (
- trialActive &&
- (msg.includes("free trial") || msg.includes("enrolled partners"))
- ) {
- openTrialLimitModal("partnerEnrollments");
- } else {
- toast.error(msg || "Failed to approve partner.");
- }
- },
- },
- );
-
- const handleConfirm = useCallback(async () => {
- if (!workspaceId || !partner) return;
-
- await approveProgramApplication({
- workspaceId,
- partnerId: partner.id,
- groupId: groupId ?? undefined,
- });
- }, [workspaceId, partner, groupId, approveProgramApplication]);
-
- const handleClose = useCallback(() => {
- setShowApproveProgramApplicationModal(false);
- }, [setShowApproveProgramApplicationModal]);
-
- useKeyboardShortcut("a", handleConfirm, {
- enabled: showApproveProgramApplicationModal,
- ...(confirmShortcutOptions || { modal: true }),
- });
-
- return (
- <>
- <Modal
- showModal={showApproveProgramApplicationModal}
- setShowModal={setShowApproveProgramApplicationModal}
- onClose={handleClose}
- >
- <div className="border-b border-neutral-200 p-4 sm:p-6">
- <h3 className="text-lg font-medium leading-none">
- Approve application
- </h3>
- </div>
-
- {partner && (
- <div className="flex flex-col gap-6 bg-neutral-50 p-4 sm:p-6">
- <div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3">
- <div className="flex items-center gap-4">
- <PartnerAvatar partner={partner} className="size-10 bg-white" />
- <div className="flex min-w-0 flex-col">
- <h4 className="truncate text-sm font-medium text-neutral-900">
- {partner.name}
- </h4>
- <p className="truncate text-xs text-neutral-500">
- {partner.email}
- </p>
- </div>
- </div>
- </div>
- </div>
- )}
-
- <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 p-4">
- <Button
- variant="secondary"
- text="Cancel"
- className="h-8 w-fit px-3"
- onClick={handleClose}
- disabled={isPending}
- />
- <Button
- className="h-8 w-fit px-3"
- text="Approve"
- variant="primary"
- loading={isPending}
- autoFocus
- shortcut="A"
- onClick={handleConfirm}
- />
- </div>
- </Modal>
- <TrialLimitActivateModal />
- </>
- );
-}
-
-export function useApproveProgramApplicationModal({
- partner,
- groupId,
- onConfirm,
- confirmShortcutOptions,
-}: {
- partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
- groupId?: string | null;
- onConfirm?: () => void | Promise<void>;
- confirmShortcutOptions?: {
- modal?: boolean;
- sheet?: boolean;
- };
-}) {
- const [
- showApproveProgramApplicationModal,
- setShowApproveProgramApplicationModal,
- ] = useState(false);
-
- const ApproveProgramApplicationModalCallback = useMemo(() => {
- return (
- <ApproveProgramApplicationModal
- showApproveProgramApplicationModal={showApproveProgramApplicationModal}
- setShowApproveProgramApplicationModal={
- setShowApproveProgramApplicationModal
- }
- partner={partner}
- groupId={groupId}
- onConfirm={onConfirm}
- confirmShortcutOptions={confirmShortcutOptions}
- />
- );
- }, [
- showApproveProgramApplicationModal,
- partner,
- groupId,
- onConfirm,
- confirmShortcutOptions,
- ]);
-
- return useMemo(
- () => ({
- setShowApproveProgramApplicationModal,
- ApproveProgramApplicationModal: ApproveProgramApplicationModalCallback,
- }),
- [
- setShowApproveProgramApplicationModal,
- ApproveProgramApplicationModalCallback,
- ],
- );
-}
diff --git a/apps/web/ui/modals/bulk-approve-partners-modal.tsx b/apps/web/ui/modals/bulk-approve-partners-modal.tsx
deleted file mode 100644
index 4cb1601d7f..0000000000
--- a/apps/web/ui/modals/bulk-approve-partners-modal.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import { bulkApproveProgramApplicationsAction } from "@/lib/actions/partners/bulk-approve-program-applications";
-import { mutatePrefix } from "@/lib/swr/mutate";
-import useProgram from "@/lib/swr/use-program";
-import useWorkspace from "@/lib/swr/use-workspace";
-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";
-import { Button, Modal } from "@dub/ui";
-import { cn, isWorkspaceBillingTrialActive, pluralize } from "@dub/utils";
-import { useAction } from "next-safe-action/hooks";
-import {
- Dispatch,
- SetStateAction,
- useCallback,
- useMemo,
- useState,
-} from "react";
-import { toast } from "sonner";
-
-function BulkApprovePartnersModal({
- showBulkApprovePartnersModal,
- setShowBulkApprovePartnersModal,
- partners,
-}: {
- showBulkApprovePartnersModal: boolean;
- setShowBulkApprovePartnersModal: Dispatch<SetStateAction<boolean>>;
- partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
-}) {
- const { id: workspaceId, trialEndsAt } = useWorkspace();
- const { program } = useProgram();
- const { openTrialLimitModal, TrialLimitActivateModal } =
- useTrialLimitActivateModal();
- const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
-
- const [selectedGroupId, setSelectedGroupId] = useState<string | null>(
- program?.defaultGroupId ?? null,
- );
-
- const { executeAsync, isPending } = useAction(
- bulkApproveProgramApplicationsAction,
- {
- onSuccess: async () => {
- setShowBulkApprovePartnersModal(false);
- await mutatePrefix(["/api/partners", "/api/program-applications"]);
- toast.success(`${pluralize("Partner", partners.length)} approved.`);
- },
- onError({ error }) {
- const serverMsg = String(error.serverError ?? "").trim();
- if (
- trialActive &&
- (serverMsg.includes("free trial") ||
- serverMsg.includes("enrolled partners"))
- ) {
- openTrialLimitModal("partnerEnrollments");
- return;
- }
- const message =
- serverMsg ||
- ("message" in error &&
- typeof (error as { message?: unknown }).message === "string"
- ? String((error as { message: string }).message).trim()
- : "");
- toast.error(message || "An error occurred");
- },
- },
- );
-
- const handleBulkApprove = async () => {
- const partnerIds = partners.map((p) => p.id);
-
- if (!workspaceId || partnerIds.length === 0) {
- return;
- }
-
- await executeAsync({
- workspaceId,
- partnerIds,
- groupId: selectedGroupId,
- });
- };
-
- return (
- <>
- <TrialLimitActivateModal />
- <Modal
- showModal={showBulkApprovePartnersModal}
- setShowModal={setShowBulkApprovePartnersModal}
- >
- <div className="space-y-1 border-b border-neutral-200 p-4 sm:p-6">
- <h3 className="text-lg font-semibold leading-none">
- Approve {pluralize("application", partners.length)}
- </h3>
-
- <p className="text-content-subtle text-base font-medium">
- Are you sure you want to approve{" "}
- {pluralize("this application", partners.length, {
- plural: "these applications",
- })}
- ?
- </p>
- </div>
-
- <div className="space-y-6 bg-neutral-50 p-4 sm:p-6">
- <div className="flex items-center gap-3 rounded-lg border border-neutral-200 bg-neutral-100 p-3">
- <div className="flex items-center">
- {partners.slice(0, 3).map((partner, index) => (
- <PartnerAvatar
- key={partner.id}
- partner={partner}
- className={cn(
- "inline-block size-7 border-2 border-neutral-100",
- index > 0 && "-ml-2.5",
- )}
- />
- ))}
- </div>
- <span className="text-base font-semibold text-neutral-900">
- {partners.length} {pluralize("partner", partners.length)} selected
- </span>
- </div>
-
- <div className="grid grid-cols-1 gap-6">
- <div>
- <label className="block text-sm font-medium text-neutral-900">
- Assign all to group{" "}
- </label>
-
- <div className="relative mt-2 rounded-md shadow-sm">
- <GroupSelector
- selectedGroupId={selectedGroupId}
- setSelectedGroupId={setSelectedGroupId}
- />
- </div>
- </div>
- </div>
- </div>
-
- <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 px-4 py-5 sm:px-6">
- <Button
- onClick={() => setShowBulkApprovePartnersModal(false)}
- variant="secondary"
- text="Cancel"
- className="h-8 w-fit px-3"
- />
- <Button
- onClick={handleBulkApprove}
- autoFocus
- loading={isPending}
- text="Approve"
- className="h-8 w-fit px-3"
- />
- </div>
- </Modal>
- </>
- );
-}
-
-export function useBulkApprovePartnersModal({
- partners,
-}: {
- partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
-}) {
- const [showBulkApprovePartnersModal, setShowBulkApprovePartnersModal] =
- useState(false);
-
- const BulkApprovePartnersModalCallback = useCallback(() => {
- return (
- <BulkApprovePartnersModal
- showBulkApprovePartnersModal={showBulkApprovePartnersModal}
- setShowBulkApprovePartnersModal={setShowBulkApprovePartnersModal}
- partners={partners}
- />
- );
- }, [showBulkApprovePartnersModal, setShowBulkApprovePartnersModal, partners]);
-
- return useMemo(
- () => ({
- setShowBulkApprovePartnersModal,
- BulkApprovePartnersModal: BulkApprovePartnersModalCallback,
- }),
- [setShowBulkApprovePartnersModal, BulkApprovePartnersModalCallback],
- );
-}
diff --git a/apps/web/ui/modals/bulk-approve-program-applications-modal.tsx b/apps/web/ui/modals/bulk-approve-program-applications-modal.tsx
new file mode 100644
index 0000000000..407cf7f2ca
--- /dev/null
+++ b/apps/web/ui/modals/bulk-approve-program-applications-modal.tsx
@@ -0,0 +1,250 @@
+import { bulkApproveProgramApplicationsAction } from "@/lib/actions/partners/bulk-approve-program-applications";
+import { mutatePrefix } from "@/lib/swr/mutate";
+import useProgram from "@/lib/swr/use-program";
+import useWorkspace from "@/lib/swr/use-workspace";
+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";
+import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
+import { cn, isWorkspaceBillingTrialActive, pluralize } from "@dub/utils";
+import { useAction } from "next-safe-action/hooks";
+import {
+ Dispatch,
+ SetStateAction,
+ useCallback,
+ useEffect,
+ useMemo,
+ useState,
+} from "react";
+import { toast } from "sonner";
+
+type BulkApproveProgramApplicationsModalOptions = {
+ partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
+ groupId?: string | null;
+ onConfirm?: () => void | Promise<void>;
+ confirmShortcutOptions?: {
+ modal?: boolean;
+ sheet?: boolean;
+ };
+};
+
+function BulkApproveProgramApplicationsModal({
+ showBulkApproveProgramApplicationsModal,
+ setShowBulkApproveProgramApplicationsModal,
+ partners,
+ groupId,
+ onConfirm,
+ confirmShortcutOptions,
+}: BulkApproveProgramApplicationsModalOptions & {
+ showBulkApproveProgramApplicationsModal: boolean;
+ setShowBulkApproveProgramApplicationsModal: Dispatch<SetStateAction<boolean>>;
+}) {
+ const { id: workspaceId, trialEndsAt } = useWorkspace();
+ const { program } = useProgram();
+ const { openTrialLimitModal, TrialLimitActivateModal } =
+ useTrialLimitActivateModal();
+ const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
+
+ const initialGroupId = groupId ?? program?.defaultGroupId ?? null;
+ const [selectedGroupId, setSelectedGroupId] = useState<string | null>(
+ initialGroupId,
+ );
+
+ useEffect(() => {
+ if (showBulkApproveProgramApplicationsModal) {
+ setSelectedGroupId(initialGroupId);
+ }
+ }, [showBulkApproveProgramApplicationsModal, initialGroupId]);
+
+ const { executeAsync, isPending } = useAction(
+ bulkApproveProgramApplicationsAction,
+ {
+ onSuccess: async () => {
+ setShowBulkApproveProgramApplicationsModal(false);
+ toast.success(`${pluralize("Partner", partners.length)} approved.`);
+ await onConfirm?.();
+ await mutatePrefix(["/api/partners", "/api/program-applications"]);
+ },
+ onError({ error }) {
+ const serverMsg = String(error.serverError ?? "").trim();
+ if (
+ trialActive &&
+ (serverMsg.includes("free trial") ||
+ serverMsg.includes("enrolled partners"))
+ ) {
+ openTrialLimitModal("partnerEnrollments");
+ return;
+ }
+ const message =
+ serverMsg ||
+ ("message" in error &&
+ typeof (error as { message?: unknown }).message === "string"
+ ? String((error as { message: string }).message).trim()
+ : "");
+ toast.error(message || "An error occurred");
+ },
+ },
+ );
+
+ const handleBulkApprove = useCallback(async () => {
+ const partnerIds = partners.map((p) => p.id);
+
+ if (!workspaceId || partnerIds.length === 0) {
+ return;
+ }
+
+ await executeAsync({
+ workspaceId,
+ partnerIds,
+ groupId: selectedGroupId,
+ });
+ }, [partners, workspaceId, selectedGroupId, executeAsync]);
+
+ useKeyboardShortcut("a", handleBulkApprove, {
+ enabled: showBulkApproveProgramApplicationsModal && !isPending,
+ ...(confirmShortcutOptions || { modal: true }),
+ });
+
+ return (
+ <>
+ <TrialLimitActivateModal />
+ <Modal
+ showModal={showBulkApproveProgramApplicationsModal}
+ setShowModal={setShowBulkApproveProgramApplicationsModal}
+ >
+ <div className="space-y-1 border-b border-neutral-200 p-4 sm:p-6">
+ <h3 className="text-lg font-semibold leading-none">
+ Approve {pluralize("application", partners.length)}
+ </h3>
+
+ <p className="text-content-subtle text-base font-medium">
+ Are you sure you want to approve{" "}
+ {pluralize("this application", partners.length, {
+ plural: "these applications",
+ })}
+ ?
+ </p>
+ </div>
+
+ <div className="space-y-6 bg-neutral-50 p-4 sm:p-6">
+ {partners.length === 1 ? (
+ <div className="flex items-center gap-4 rounded-lg border border-neutral-200 bg-neutral-100 p-3">
+ <PartnerAvatar
+ partner={partners[0]}
+ className="size-10 bg-white"
+ />
+ <div className="flex min-w-0 flex-col">
+ <h4 className="truncate text-sm font-medium text-neutral-900">
+ {partners[0].name}
+ </h4>
+ <p className="truncate text-xs text-neutral-500">
+ {partners[0].email}
+ </p>
+ </div>
+ </div>
+ ) : (
+ <div className="flex items-center gap-3 rounded-lg border border-neutral-200 bg-neutral-100 p-3">
+ <div className="flex items-center">
+ {partners.slice(0, 3).map((partner, index) => (
+ <PartnerAvatar
+ key={partner.id}
+ partner={partner}
+ className={cn(
+ "inline-block size-7 border-2 border-neutral-100",
+ index > 0 && "-ml-2.5",
+ )}
+ />
+ ))}
+ </div>
+ <span className="text-base font-semibold text-neutral-900">
+ {partners.length} {pluralize("partner", partners.length)}{" "}
+ selected
+ </span>
+ </div>
+ )}
+
+ <div className="grid grid-cols-1 gap-6">
+ <div>
+ <label className="block text-sm font-medium text-neutral-900">
+ Assign {partners.length > 1 ? "all " : ""}to group
+ </label>
+
+ <div className="relative mt-2 rounded-md shadow-sm">
+ <GroupSelector
+ selectedGroupId={selectedGroupId}
+ setSelectedGroupId={setSelectedGroupId}
+ />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 px-4 py-5 sm:px-6">
+ <Button
+ onClick={() => setShowBulkApproveProgramApplicationsModal(false)}
+ variant="secondary"
+ text="Cancel"
+ className="h-8 w-fit px-3"
+ disabled={isPending}
+ />
+ <Button
+ onClick={handleBulkApprove}
+ autoFocus
+ loading={isPending}
+ text="Approve"
+ shortcut="A"
+ className="h-8 w-fit px-3"
+ />
+ </div>
+ </Modal>
+ </>
+ );
+}
+
+export function useBulkApproveProgramApplicationsModal({
+ partners,
+ groupId,
+ onConfirm,
+ confirmShortcutOptions,
+}: BulkApproveProgramApplicationsModalOptions) {
+ const [
+ showBulkApproveProgramApplicationsModal,
+ setShowBulkApproveProgramApplicationsModal,
+ ] = useState(false);
+
+ const BulkApproveProgramApplicationsModalCallback = useMemo(() => {
+ return (
+ <BulkApproveProgramApplicationsModal
+ showBulkApproveProgramApplicationsModal={
+ showBulkApproveProgramApplicationsModal
+ }
+ setShowBulkApproveProgramApplicationsModal={
+ setShowBulkApproveProgramApplicationsModal
+ }
+ partners={partners}
+ groupId={groupId}
+ onConfirm={onConfirm}
+ confirmShortcutOptions={confirmShortcutOptions}
+ />
+ );
+ }, [
+ showBulkApproveProgramApplicationsModal,
+ partners,
+ groupId,
+ onConfirm,
+ confirmShortcutOptions,
+ ]);
+
+ return useMemo(
+ () => ({
+ setShowBulkApproveProgramApplicationsModal,
+ BulkApproveProgramApplicationsModal:
+ BulkApproveProgramApplicationsModalCallback,
+ }),
+ [
+ setShowBulkApproveProgramApplicationsModal,
+ BulkApproveProgramApplicationsModalCallback,
+ ],
+ );
+}
diff --git a/apps/web/ui/modals/bulk-reject-partners-modal.tsx b/apps/web/ui/modals/bulk-reject-program-applications-modal.tsx
similarity index 69%
rename from apps/web/ui/modals/bulk-reject-partners-modal.tsx
rename to apps/web/ui/modals/bulk-reject-program-applications-modal.tsx
index eeeddc0cf0..3e663e943f 100644
--- a/apps/web/ui/modals/bulk-reject-partners-modal.tsx
+++ b/apps/web/ui/modals/bulk-reject-program-applications-modal.tsx
@@ -16,13 +16,13 @@ import {
import { toast } from "sonner";
import { PartnerEmailNotificationTooltipHelper } from "../shared/partner-email-notification-tooltip-helper";
-function BulkRejectPartnersModal({
- showBulkRejectPartnersModal,
- setShowBulkRejectPartnersModal,
+function BulkRejectProgramApplicationsModal({
+ showBulkRejectProgramApplicationsModal,
+ setShowBulkRejectProgramApplicationsModal,
partners,
}: {
- showBulkRejectPartnersModal: boolean;
- setShowBulkRejectPartnersModal: Dispatch<SetStateAction<boolean>>;
+ showBulkRejectProgramApplicationsModal: boolean;
+ setShowBulkRejectProgramApplicationsModal: Dispatch<SetStateAction<boolean>>;
partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
}) {
const { id: workspaceId } = useWorkspace();
@@ -31,8 +31,12 @@ function BulkRejectPartnersModal({
bulkRejectProgramApplicationsAction,
{
onSuccess: async () => {
- setShowBulkRejectPartnersModal(false);
- await mutatePrefix(["/api/partners", "/api/partners/count", "/api/program-applications"]);
+ setShowBulkRejectProgramApplicationsModal(false);
+ await mutatePrefix([
+ "/api/partners",
+ "/api/partners/count",
+ "/api/program-applications",
+ ]);
toast.success(`${pluralize("Partner", partners.length)} rejected.`);
},
onError({ error }) {
@@ -55,13 +59,13 @@ function BulkRejectPartnersModal({
};
const handleClose = useCallback(() => {
- setShowBulkRejectPartnersModal(false);
- }, [setShowBulkRejectPartnersModal]);
+ setShowBulkRejectProgramApplicationsModal(false);
+ }, [setShowBulkRejectProgramApplicationsModal]);
return (
<Modal
- showModal={showBulkRejectPartnersModal}
- setShowModal={setShowBulkRejectPartnersModal}
+ showModal={showBulkRejectProgramApplicationsModal}
+ setShowModal={setShowBulkRejectProgramApplicationsModal}
onClose={handleClose}
>
<div className="space-y-1 border-b border-neutral-200 p-4 sm:p-6">
@@ -123,29 +127,43 @@ function BulkRejectPartnersModal({
);
}
-export function useBulkRejectPartnersModal({
+export function useBulkRejectProgramApplicationsModal({
partners,
}: {
partners: Pick<PartnerProps, "id" | "name" | "email" | "image">[];
}) {
- const [showBulkRejectPartnersModal, setShowBulkRejectPartnersModal] =
- useState(false);
+ const [
+ showBulkRejectProgramApplicationsModal,
+ setShowBulkRejectProgramApplicationsModal,
+ ] = useState(false);
- const BulkRejectPartnersModalCallback = useCallback(() => {
+ const BulkRejectProgramApplicationsModalCallback = useCallback(() => {
return (
- <BulkRejectPartnersModal
- showBulkRejectPartnersModal={showBulkRejectPartnersModal}
- setShowBulkRejectPartnersModal={setShowBulkRejectPartnersModal}
+ <BulkRejectProgramApplicationsModal
+ showBulkRejectProgramApplicationsModal={
+ showBulkRejectProgramApplicationsModal
+ }
+ setShowBulkRejectProgramApplicationsModal={
+ setShowBulkRejectProgramApplicationsModal
+ }
partners={partners}
/>
);
- }, [showBulkRejectPartnersModal, setShowBulkRejectPartnersModal, partners]);
+ }, [
+ showBulkRejectProgramApplicationsModal,
+ setShowBulkRejectProgramApplicationsModal,
+ partners,
+ ]);
return useMemo(
() => ({
- setShowBulkRejectPartnersModal,
- BulkRejectPartnersModal: BulkRejectPartnersModalCallback,
+ setShowBulkRejectProgramApplicationsModal,
+ BulkRejectProgramApplicationsModal:
+ BulkRejectProgramApplicationsModalCallback,
}),
- [setShowBulkRejectPartnersModal, BulkRejectPartnersModalCallback],
+ [
+ setShowBulkRejectProgramApplicationsModal,
+ BulkRejectProgramApplicationsModalCallback,
+ ],
);
}
diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsx
index ad3665f5b3..2fe5b7fe89 100644
--- a/apps/web/ui/partners/partner-info-cards.tsx
+++ b/apps/web/ui/partners/partner-info-cards.tsx
@@ -45,13 +45,13 @@ import { CircleMinus } from "lucide-react";
import Link from "next/link";
import { Fragment, ReactNode, createElement, useState } from "react";
import useSWR from "swr";
-import { ProgramApplicationRiskSummary } from "./fraud-risks/program-application-risk-summary";
import { PartnerNetworkActivitySummary } from "./fraud-risks/partner-network-activity-summary";
import {
- ProgramApplicationRiskBanner,
PartnerRiskBanner,
+ ProgramApplicationRiskBanner,
} from "./fraud-risks/partner-risk-banner";
import { PartnerRiskIndicator } from "./fraud-risks/partner-risk-indicator";
+import { ProgramApplicationRiskSummary } from "./fraud-risks/program-application-risk-summary";
import { PartnerAvatar } from "./partner-avatar";
import { PartnerInfoGroup } from "./partner-info-group";
import { PartnerNetworkStatusBadge } from "./partner-network/partner-network-status-badge";
@@ -71,6 +71,7 @@ import {
const MAX_VISIBLE_BOUNTIES = 3;
type PartnerInfoCardsProps = {
+ hideChangeGroupButton?: boolean;
showFraudIndicator?: boolean;
showApplicationRiskAnalysis?: boolean;
controls?: ReactNode;
@@ -104,6 +105,7 @@ export function PartnerInfoCards({
hideStatuses = [],
selectedGroupId,
setSelectedGroupId,
+ hideChangeGroupButton = false,
showFraudIndicator = true,
showApplicationRiskAnalysis = false,
}: PartnerInfoCardsProps) {
@@ -461,8 +463,9 @@ export function PartnerInfoCards({
partner={partner}
changeButtonText="Change"
hideChangeButton={
- "status" in partner &&
- INACTIVE_ENROLLMENT_STATUSES.includes(partner.status)
+ hideChangeGroupButton ||
+ ("status" in partner &&
+ INACTIVE_ENROLLMENT_STATUSES.includes(partner.status))
}
className="rounded-lg bg-white shadow-sm"
selectedGroupId={selectedGroupId}
diff --git a/apps/web/ui/partners/partner-application-sheet.tsx b/apps/web/ui/partners/program-application-review-sheet.tsx
similarity index 89%
rename from apps/web/ui/partners/partner-application-sheet.tsx
rename to apps/web/ui/partners/program-application-review-sheet.tsx
index 6acb4ba662..b4c75d9076 100644
--- a/apps/web/ui/partners/partner-application-sheet.tsx
+++ b/apps/web/ui/partners/program-application-review-sheet.tsx
@@ -5,7 +5,7 @@ import {
EnrolledPartnerProps,
ProgramApplicationProps,
} from "@/lib/types";
-import { useApproveProgramApplicationModal } from "@/ui/modals/approve-program-application-modal";
+import { useBulkApproveProgramApplicationsModal } from "@/ui/modals/bulk-approve-program-applications-modal";
import { useRejectProgramApplicationModal } from "@/ui/modals/reject-program-application-modal";
import { useTrialLimitActivateModal } from "@/ui/modals/trial-limit-activate-modal";
import { X } from "@/ui/shared/icons";
@@ -21,31 +21,31 @@ import {
} from "@dub/ui";
import { isWorkspaceBillingTrialActive } from "@dub/utils";
import Link from "next/link";
-import { Dispatch, SetStateAction, useEffect, useState } from "react";
+import { Dispatch, SetStateAction, useEffect, useMemo, useState } from "react";
import { PartnerAbout } from "./partner-about";
-import { ProgramApplicationDetails } from "./program-application-details";
import { PartnerComments } from "./partner-comments";
import { PartnerInfoCards } from "./partner-info-cards";
import { PartnerSheetTabs } from "./partner-sheet-tabs";
+import { ProgramApplicationDetails } from "./program-application-details";
type ListedApplicationPartner = ProgramApplicationProps["partner"] & {
createdAt: Date;
applicationId: string;
};
-type ProgramApplicationSheetProps = {
+type ProgramApplicationReviewSheetProps = {
partner: EnrolledPartnerProps | ListedApplicationPartner;
onNext?: () => void;
onPrevious?: () => void;
setIsOpen: Dispatch<SetStateAction<boolean>>;
};
-function ProgramApplicationSheetContent({
+function ProgramApplicationReviewSheetContent({
partner: sheetPartner,
onPrevious,
onNext,
setIsOpen,
-}: ProgramApplicationSheetProps) {
+}: ProgramApplicationReviewSheetProps) {
const partner = sheetPartner as EnrolledPartnerExtendedProps;
const { slug: workspaceSlug } = useWorkspace();
const [currentTabId, setCurrentTabId] = useState<string>("about");
@@ -85,7 +85,7 @@ function ProgramApplicationSheetContent({
<div className="flex size-full flex-col">
<div className="flex h-16 shrink-0 items-center justify-between border-b border-neutral-200 px-6 py-4">
<Sheet.Title className="text-lg font-semibold">
- Partner application
+ Program application
</Sheet.Title>
<div className="flex items-center gap-4">
<Link
@@ -132,6 +132,7 @@ function ProgramApplicationSheetContent({
<PartnerInfoCards
partner={partner}
hideStatuses={["pending"]}
+ hideChangeGroupButton
{...(partner.status === "rejected" && {
selectedGroupId,
setSelectedGroupId,
@@ -201,11 +202,11 @@ function ProgramApplicationComments({ partnerId }: { partnerId: string }) {
);
}
-export function ProgramApplicationSheet({
+export function ProgramApplicationReviewSheet({
isOpen,
nested,
...rest
-}: ProgramApplicationSheetProps & {
+}: ProgramApplicationReviewSheetProps & {
isOpen: boolean;
nested?: boolean;
}) {
@@ -221,7 +222,7 @@ export function ProgramApplicationSheet({
className: "md:w-[max(min(calc(100vw-334px),1170px),540px)]",
}}
>
- <ProgramApplicationSheetContent {...rest} />
+ <ProgramApplicationReviewSheetContent {...rest} />
</Sheet>
);
}
@@ -242,28 +243,33 @@ function PartnerApproval({
useTrialLimitActivateModal();
const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
+ const partners = useMemo(() => [partner], [partner]);
+
const {
- ApproveProgramApplicationModal,
- setShowApproveProgramApplicationModal,
- } = useApproveProgramApplicationModal({
- partner,
+ BulkApproveProgramApplicationsModal,
+ setShowBulkApproveProgramApplicationsModal,
+ } = useBulkApproveProgramApplicationsModal({
+ partners,
groupId,
- onConfirm: async () => {
+ onConfirm: () => {
onNext ? onNext() : setIsOpen(false);
- await mutatePrefix(["/api/partners", "/api/program-applications"]);
},
confirmShortcutOptions: { sheet: true, modal: true },
});
- useKeyboardShortcut("a", () => setShowApproveProgramApplicationModal(true), {
- sheet: true,
- enabled: !exceededPartners,
- });
+ useKeyboardShortcut(
+ "a",
+ () => setShowBulkApproveProgramApplicationsModal(true),
+ {
+ sheet: true,
+ enabled: !exceededPartners,
+ },
+ );
return (
<>
<TrialLimitActivateModal />
- {ApproveProgramApplicationModal}
+ {BulkApproveProgramApplicationsModal}
<div className="flex justify-end gap-2">
{partner.status !== "rejected" && (
<div className="flex-shrink-0">
@@ -279,7 +285,7 @@ function PartnerApproval({
variant="primary"
text="Approve"
shortcut="A"
- onClick={() => setShowApproveProgramApplicationModal(true)}
+ onClick={() => setShowBulkApproveProgramApplicationsModal(true)}
className="w-fit shrink-0"
disabledTooltip={
exceededPartners ? (