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.

Remove applicationId from approve/reject program application inputs

Kiran K1988bc0bf304
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 a6014c837e..9872802089 100644
--- a/apps/web/app/(ee)/api/program-applications/approve/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/approve/route.ts
@@ -8,8 +8,9 @@ import { NextResponse } from "next/server";
// POST /api/program-applications/approve – Approve a pending partner
export const POST = withWorkspace(
async ({ workspace, req, session }) => {
- const { partnerId, groupId, applicationId } =
- approveProgramApplicationSchema.parse(await parseRequestBody(req));
+ const { partnerId, groupId } = approveProgramApplicationSchema.parse(
+ await parseRequestBody(req),
+ );
const programId = getDefaultProgramIdOrThrow(workspace);
@@ -17,7 +18,6 @@ export const POST = withWorkspace(
programId,
partnerId,
groupId,
- applicationId,
userId: session.user.id,
});
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 235c28dcb2..8f23843bfe 100644
--- a/apps/web/app/(ee)/api/program-applications/reject/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/reject/route.ts
@@ -9,7 +9,6 @@ export const POST = withWorkspace(
async ({ workspace, req, session }) => {
const {
partnerId,
- applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
@@ -20,7 +19,6 @@ export const POST = withWorkspace(
await rejectProgramApplication({
workspace,
partnerId,
- applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
diff --git a/apps/web/lib/actions/partners/approve-program-application.ts b/apps/web/lib/actions/partners/approve-program-application.ts
index 025243b144..dde73acbb9 100644
--- a/apps/web/lib/actions/partners/approve-program-application.ts
+++ b/apps/web/lib/actions/partners/approve-program-application.ts
@@ -15,7 +15,7 @@ export const approveProgramApplicationAction = authActionClient
.inputSchema(inputSchema)
.action(async ({ parsedInput, ctx }) => {
const { workspace, user } = ctx;
- const { partnerId, groupId, applicationId } = parsedInput;
+ const { partnerId, groupId } = parsedInput;
throwIfNoPermission({
role: workspace.role,
@@ -29,6 +29,5 @@ export const approveProgramApplicationAction = authActionClient
partnerId,
userId: user.id,
groupId,
- applicationId,
});
});
diff --git a/apps/web/lib/actions/partners/reject-program-application.ts b/apps/web/lib/actions/partners/reject-program-application.ts
index 693a45a409..ce4a5fdfa3 100644
--- a/apps/web/lib/actions/partners/reject-program-application.ts
+++ b/apps/web/lib/actions/partners/reject-program-application.ts
@@ -17,7 +17,6 @@ export const rejectProgramApplicationAction = authActionClient
const { workspace, user } = ctx;
const {
partnerId,
- applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
@@ -33,7 +32,6 @@ export const rejectProgramApplicationAction = authActionClient
await rejectProgramApplication({
workspace,
partnerId,
- applicationId,
rejectionReason,
rejectionNote,
reapplicationTimeframe,
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index e9a6891189..d923be0b8c 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -115,12 +115,6 @@ export const approveProgramApplicationSchema = 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 bulkApproveProgramApplicationsSchema = z.object({
@@ -147,12 +141,6 @@ export const PROGRAM_APPLICATION_REJECTION_NOTE_MAX_LENGTH = 500;
export const rejectProgramApplicationSchema = 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/reject-program-application-modal.tsx b/apps/web/ui/modals/reject-program-application-modal.tsx
index 28af9dc2f5..4189a3a01c 100644
--- a/apps/web/ui/modals/reject-program-application-modal.tsx
+++ b/apps/web/ui/modals/reject-program-application-modal.tsx
@@ -55,17 +55,10 @@ 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 RejectProgramApplicationModalProps {
showRejectProgramApplicationModal: boolean;
setShowRejectProgramApplicationModal: Dispatch<SetStateAction<boolean>>;
- partner: ApplicationPartner;
+ partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
onConfirm?: () => void | Promise<void>;
confirmShortcutOptions?: {
modal?: boolean;
@@ -140,7 +133,6 @@ export function RejectProgramApplicationModal({
await rejectProgramApplication({
workspaceId,
partnerId: partner.id,
- applicationId: partner.applicationId ?? undefined,
reapplicationTimeframe,
...(flagForFraud
? { flagForFraud: true, flagForFraudReason: flagForFraudReason.trim() }
@@ -382,7 +374,7 @@ export function useRejectProgramApplicationModal({
onConfirm,
confirmShortcutOptions,
}: {
- partner: ApplicationPartner;
+ partner: Pick<PartnerProps, "id" | "name" | "email" | "image">;
onConfirm?: () => void | Promise<void>;
confirmShortcutOptions?: {
modal?: boolean;