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.

Support approving/rejecting specific group applications by applicationId

Kiran Kfe73eb4fe5b1
diff --git a/apps/web/app/(ee)/api/cron/cleanup/rejected-applications/route.ts b/apps/web/app/(ee)/api/cron/cleanup/rejected-applications/route.ts
index c6be2fa1f4..67ddb18586 100644
--- a/apps/web/app/(ee)/api/cron/cleanup/rejected-applications/route.ts
+++ b/apps/web/app/(ee)/api/cron/cleanup/rejected-applications/route.ts
@@ -2,6 +2,7 @@ import { handleAndReturnErrorResponse } from "@/lib/api/errors";
import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { STANDARD_REAPPLICATION_DAYS } from "@/lib/partners/program-application-rejection";
import { prisma } from "@/lib/prisma";
import { log } from "@dub/utils";
import { subDays } from "date-fns";
@@ -29,7 +30,7 @@ export async function POST(req: Request) {
where: {
status: "rejected",
updatedAt: {
- lt: subDays(new Date(), 30),
+ lt: subDays(new Date(), STANDARD_REAPPLICATION_DAYS),
},
reapplicationTimeframe: "standard",
// only delete if there are no commissions
diff --git a/apps/web/app/(ee)/api/partners/applications/approve/route.ts b/apps/web/app/(ee)/api/partners/applications/approve/route.ts
index af7ec71982..947524b952 100644
--- a/apps/web/app/(ee)/api/partners/applications/approve/route.ts
+++ b/apps/web/app/(ee)/api/partners/applications/approve/route.ts
@@ -8,7 +8,7 @@ import { NextResponse } from "next/server";
// POST /api/partners/applications/approve – Approve a pending partner
export const POST = withWorkspace(
async ({ workspace, req, session }) => {
- const { partnerId, groupId } = approvePartnerSchema.parse(
+ const { partnerId, groupId, applicationId } = approvePartnerSchema.parse(
await parseRequestBody(req),
);
@@ -18,6 +18,7 @@ export const POST = withWorkspace(
programId,
partnerId,
groupId,
+ applicationId,
userId: session.user.id,
});
diff --git a/apps/web/app/(ee)/api/partners/applications/reject/route.ts b/apps/web/app/(ee)/api/partners/applications/reject/route.ts
index b16d7eab1f..6e442a0024 100644
--- a/apps/web/app/(ee)/api/partners/applications/reject/route.ts
+++ b/apps/web/app/(ee)/api/partners/applications/reject/route.ts
@@ -9,6 +9,7 @@ export const POST = withWorkspace(
async ({ workspace, req, session }) => {
const {
partnerId,
+ applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
@@ -19,6 +20,7 @@ export const POST = withWorkspace(
await rejectPartner({
workspace,
partnerId,
+ applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
index 6f1e90f46b..a77ba43213 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
@@ -456,6 +456,7 @@ function PartnerRowMenuButton({
await approvePartner({
workspaceId: workspaceId!,
partnerId: row.original.id,
+ applicationId: row.original.applicationId,
});
},
});
diff --git a/apps/web/lib/actions/partners/approve-partner-application.ts b/apps/web/lib/actions/partners/approve-partner-application.ts
index 3267315195..4af897e480 100644
--- a/apps/web/lib/actions/partners/approve-partner-application.ts
+++ b/apps/web/lib/actions/partners/approve-partner-application.ts
@@ -15,7 +15,7 @@ export const approvePartnerApplicationAction = authActionClient
.inputSchema(inputSchema)
.action(async ({ parsedInput, ctx }) => {
const { workspace, user } = ctx;
- const { partnerId, groupId } = parsedInput;
+ const { partnerId, groupId, applicationId } = parsedInput;
throwIfNoPermission({
role: workspace.role,
@@ -29,5 +29,6 @@ export const approvePartnerApplicationAction = authActionClient
partnerId,
userId: user.id,
groupId,
+ applicationId,
});
});
diff --git a/apps/web/lib/actions/partners/reject-partner-application.ts b/apps/web/lib/actions/partners/reject-partner-application.ts
index db6d474c0a..2f8dcbdab7 100644
--- a/apps/web/lib/actions/partners/reject-partner-application.ts
+++ b/apps/web/lib/actions/partners/reject-partner-application.ts
@@ -17,6 +17,7 @@ export const rejectPartnerApplicationAction = authActionClient
const { workspace, user } = ctx;
const {
partnerId,
+ applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
@@ -32,6 +33,7 @@ export const rejectPartnerApplicationAction = authActionClient
await rejectPartner({
workspace,
partnerId,
+ applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
diff --git a/apps/web/lib/partners/program-application-rejection.ts b/apps/web/lib/partners/program-application-rejection.ts
index a409bec0a4..11589b7f70 100644
--- a/apps/web/lib/partners/program-application-rejection.ts
+++ b/apps/web/lib/partners/program-application-rejection.ts
@@ -14,6 +14,8 @@ export const PROGRAM_APPLICATION_REJECTION_REASON_LABELS: Record<
other: "Other",
} as const;
+export const STANDARD_REAPPLICATION_DAYS = 30;
+
export type ProgramApplicationRejectionReasonKey =
keyof typeof PROGRAM_APPLICATION_REJECTION_REASON_LABELS;
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index c411b23f8a..d1d0a2e694 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -956,6 +956,12 @@ export const approvePartnerSchema = z.object({
.describe(
"The ID of the group to assign the partner to. If not provided, the partner will be assigned to the group they applied to, or the program's default group if no application group is set.",
),
+ applicationId: z
+ .string()
+ .nullish()
+ .describe(
+ "The ID of the application to approve. Only used for group applications from partners who are already enrolled; defaults to their pending application.",
+ ),
});
export const bulkApprovePartnersSchema = z.object({
@@ -976,6 +982,12 @@ export const MAX_FRAUD_REASON_LENGTH = 2000;
export const rejectPartnerSchema = z.object({
partnerId: z.string().describe("The ID of the partner to reject."),
+ applicationId: z
+ .string()
+ .nullish()
+ .describe(
+ "The ID of the application to reject. Only used for group applications from partners who are already enrolled; defaults to their pending application.",
+ ),
rejectionReason: z
.enum(ProgramApplicationRejectionReason)
.optional()
diff --git a/apps/web/ui/modals/approve-partner-application-modal.tsx b/apps/web/ui/modals/approve-partner-application-modal.tsx
index 21f7ac83e5..b3734c6864 100644
--- a/apps/web/ui/modals/approve-partner-application-modal.tsx
+++ b/apps/web/ui/modals/approve-partner-application-modal.tsx
@@ -15,10 +15,17 @@ import {
import { toast } from "sonner";
import { useTrialLimitActivateModal } from "./trial-limit-activate-modal";
+type ApplicationPartner = Pick<
+ PartnerProps,
+ "id" | "name" | "email" | "image"
+> & {
+ applicationId?: string | null;
+};
+
interface ApprovePartnerApplicationModalProps {
showApprovePartnerApplicationModal: boolean;
setShowApprovePartnerApplicationModal: Dispatch<SetStateAction<boolean>>;
- partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
+ partner: ApplicationPartner;
groupId?: string | null;
onConfirm?: () => void | Promise<void>;
confirmShortcutOptions?: {
@@ -73,6 +80,7 @@ export function ApprovePartnerApplicationModal({
workspaceId,
partnerId: partner.id,
groupId: groupId ?? undefined,
+ applicationId: partner.applicationId ?? undefined,
});
}, [workspaceId, partner, groupId, approvePartnerApplication]);
@@ -146,7 +154,7 @@ export function useApprovePartnerApplicationModal({
onConfirm,
confirmShortcutOptions,
}: {
- partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
+ partner: ApplicationPartner;
groupId?: string | null;
onConfirm?: () => void | Promise<void>;
confirmShortcutOptions?: {
diff --git a/apps/web/ui/modals/reject-partner-application-modal.tsx b/apps/web/ui/modals/reject-partner-application-modal.tsx
index bf6fa718d4..a23ddb434d 100644
--- a/apps/web/ui/modals/reject-partner-application-modal.tsx
+++ b/apps/web/ui/modals/reject-partner-application-modal.tsx
@@ -57,10 +57,17 @@ const REAPPLICATION_TIMEFRAME_DESCRIPTIONS: Record<
never: "The partner can never reapply for the program.",
};
+type ApplicationPartner = Pick<
+ PartnerProps,
+ "id" | "name" | "email" | "image"
+> & {
+ applicationId?: string | null;
+};
+
interface RejectPartnerApplicationModalProps {
showRejectPartnerApplicationModal: boolean;
setShowRejectPartnerApplicationModal: Dispatch<SetStateAction<boolean>>;
- partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
+ partner: ApplicationPartner;
onConfirm?: () => void | Promise<void>;
confirmShortcutOptions?: {
modal?: boolean;
@@ -135,6 +142,7 @@ export function RejectPartnerApplicationModal({
await rejectPartnerApplication({
workspaceId,
partnerId: partner.id,
+ applicationId: partner.applicationId ?? undefined,
reapplicationTimeframe,
...(flagForFraud
? { flagForFraud: true, flagForFraudReason: flagForFraudReason.trim() }
@@ -376,7 +384,7 @@ export function useRejectPartnerApplicationModal({
onConfirm,
confirmShortcutOptions,
}: {
- partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
+ partner: ApplicationPartner;
onConfirm?: () => void | Promise<void>;
confirmShortcutOptions?: {
modal?: boolean;
diff --git a/apps/web/ui/partners/groups/design/application-form/program-application-form.tsx b/apps/web/ui/partners/groups/design/application-form/program-application-form.tsx
index 27c64a4a28..eea0501667 100644
--- a/apps/web/ui/partners/groups/design/application-form/program-application-form.tsx
+++ b/apps/web/ui/partners/groups/design/application-form/program-application-form.tsx
@@ -4,6 +4,7 @@ import {
createProgramApplicationAction,
PartnerData,
} from "@/lib/actions/partners/create-program-application";
+import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import {
GroupWithFormDataProps,
ProgramApplicationFormDataWithValues,
@@ -14,6 +15,7 @@ import { Button, useLocalStorage, useMediaQuery } from "@dub/ui";
import { cn } from "@dub/utils";
import { useSession } from "next-auth/react";
import { useAction } from "next-safe-action/hooks";
+import Link from "next/link";
import { useRouter } from "next/navigation";
import { useCallback, useEffect, useState } from "react";
import { FormProvider, useForm } from "react-hook-form";
@@ -45,6 +47,14 @@ export function ProgramApplicationForm({
preview,
});
+ const { programEnrollment } = useProgramEnrollment({
+ enabled: !preview,
+ programSlug: program.slug,
+ swrOpts: {
+ shouldRetryOnError: false,
+ },
+ });
+
const form = useForm<FormData>({
defaultValues: {
name: "",
@@ -130,6 +140,25 @@ export function ProgramApplicationForm({
const isLoading =
isSubmitting || isSubmitSuccessful || isPending || hasAnyLoadingStatus;
+ if (
+ programEnrollment?.status === "approved" &&
+ programEnrollment.groupId === group.id
+ ) {
+ return (
+ <div className="flex flex-col items-center gap-4 rounded-lg border border-neutral-200 bg-neutral-50 p-6 text-center">
+ <p className="text-content-default text-sm">
+ You&apos;re already in this group.
+ </p>
+ <Link
+ href={`/programs/${program.slug}`}
+ className="text-sm font-medium text-[var(--brand)] underline underline-offset-2 hover:opacity-80"
+ >
+ Go to program dashboard
+ </Link>
+ </div>
+ );
+ }
+
return (
<FormProvider {...form}>
<form