The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Address reapply-group review: group application approvals and webhook fixes
Kiran K94706973c71a
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.tsindex 957ab1c0eb..eb67402f4b 100644--- a/apps/web/lib/actions/partners/create-program-application.ts+++ b/apps/web/lib/actions/partners/create-program-application.ts@@ -365,8 +365,8 @@ async function createApplicationAndEnrollment({applicationFormData,partner: {...partner,- ...programEnrollment,- id: partner.id,+ groupId: programApplication.groupId,+ status: programApplication.status,},};@@ -387,12 +387,8 @@ async function createApplicationAndEnrollment({// Auto-approve the partner if the group has auto-approval enabledgroup.autoApprovePartnersEnabledAt? autoApproveProgramApplicationJob.dispatch(- {- applicationId: programApplication.id,- },- {- label: partner.id,- },+ { applicationId: programApplication.id },+ { label: partner.id },): Promise.resolve(null),@@ -431,7 +427,11 @@ async function createApplicationAndEnrollment({},}),- markApplicationEventSubmitted(programEnrollment),+ markApplicationEventSubmitted({+ programId: program.id,+ partnerId: partner.id,+ applicationId: programApplication.id,+ }),// Queue an index update because a new pending enrollment was created.queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }),@@ -441,7 +441,7 @@ async function createApplicationAndEnrollment({return {programApplicationId: applicationId,- programEnrollmentId: enrollmentId,+ programEnrollmentId: programEnrollment.id,partnerData: {name: data.name,country: partner.country ?? data.country ?? undefined,diff --git a/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts b/apps/web/lib/jobs/handlers/auto-approve-partner-job.tsindex 49a6603618..f2aeebcf8a 100644--- a/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts+++ b/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts@@ -37,12 +37,8 @@ export const autoApprovePartnerJob = defineJob({}await autoApproveProgramApplicationJob.dispatch(- {- applicationId: programEnrollment.applicationId,- },- {- label: partnerId,- },+ { applicationId: programEnrollment.applicationId },+ { label: partnerId },);},});diff --git a/apps/web/lib/jobs/handlers/auto-approve-program-application-job.ts b/apps/web/lib/jobs/handlers/auto-approve-program-application-job.tsindex 2e07df090a..6eeeb5074f 100644--- a/apps/web/lib/jobs/handlers/auto-approve-program-application-job.ts+++ b/apps/web/lib/jobs/handlers/auto-approve-program-application-job.ts@@ -15,6 +15,11 @@ const inputSchema = z.object({applicationId: z.string(),});+const AUTO_APPROVABLE_ENROLLMENT_STATUSES: ProgramEnrollmentStatus[] = [+ ProgramEnrollmentStatus.pending,+ ProgramEnrollmentStatus.approved,+];+// This job is used to auto-approve a program application whose group has auto-approval enabledexport const autoApproveProgramApplicationJob = defineJob({name: "auto-approve-program-application-job",@@ -118,8 +123,12 @@ export const autoApproveProgramApplicationJob = defineJob({return;}- if (programEnrollment.status !== ProgramEnrollmentStatus.pending) {- console.warn(`${partnerId} is in ${programEnrollment.status} status.`);+ if (+ !AUTO_APPROVABLE_ENROLLMENT_STATUSES.includes(programEnrollment.status)+ ) {+ console.warn(+ `Application ${applicationId} was not auto-approved because partner ${partnerId} is in ${programEnrollment.status} status.`,+ );return;}diff --git a/apps/web/lib/jobs/handlers/auto-reject-program-application-job.ts b/apps/web/lib/jobs/handlers/auto-reject-program-application-job.tsindex f9f65fac6f..390f5d1b09 100644--- a/apps/web/lib/jobs/handlers/auto-reject-program-application-job.ts+++ b/apps/web/lib/jobs/handlers/auto-reject-program-application-job.ts@@ -14,6 +14,11 @@ const inputSchema = z.object({applicationId: z.string(),});+const AUTO_REJECTABLE_ENROLLMENT_STATUSES: ProgramEnrollmentStatus[] = [+ ProgramEnrollmentStatus.pending,+ ProgramEnrollmentStatus.approved,+];+// This job is used to auto-reject a program application (e.g. when eligibility requirements are not met)export const autoRejectProgramApplicationJob = defineJob({name: "auto-reject-program-application-job",@@ -81,8 +86,12 @@ export const autoRejectProgramApplicationJob = defineJob({return;}- if (programEnrollment.status !== ProgramEnrollmentStatus.pending) {- console.warn(`${partnerId} is in ${programEnrollment.status} status.`);+ if (+ !AUTO_REJECTABLE_ENROLLMENT_STATUSES.includes(programEnrollment.status)+ ) {+ console.warn(+ `Application ${applicationId} was not auto-rejected because partner ${partnerId} is in ${programEnrollment.status} status.`,+ );return;}diff --git a/apps/web/lib/partners/complete-program-applications.ts b/apps/web/lib/partners/complete-program-applications.tsindex d0d881d915..c55ed92d94 100644--- a/apps/web/lib/partners/complete-program-applications.ts+++ b/apps/web/lib/partners/complete-program-applications.ts@@ -219,12 +219,8 @@ export async function completeProgramApplications(userEmail: string) {// Auto-approve the partner if the group has auto-approval enabledgroup?.autoApprovePartnersEnabledAt? autoApproveProgramApplicationJob.dispatch(- {- applicationId: application.id,- },- {- label: partner.id,- },+ { applicationId: application.id },+ { label: partner.id },): Promise.resolve(null),diff --git a/apps/web/lib/program-applications/approve-program-application.ts b/apps/web/lib/program-applications/approve-program-application.tsindex ab4b4901ff..b042c8251f 100644--- a/apps/web/lib/program-applications/approve-program-application.ts+++ b/apps/web/lib/program-applications/approve-program-application.ts@@ -24,6 +24,11 @@ type ApproveProgramApplicationInput = z.infer<userId: string;};+const APPROVABLE_APPLICATION_STATUSES: ProgramApplicationStatus[] = [+ ProgramApplicationStatus.pending,+ ProgramApplicationStatus.rejected,+];+export async function approveProgramApplication({programId,partnerId,@@ -38,10 +43,7 @@ export async function approveProgramApplication({programId,partnerId,status: {- in: [- ProgramApplicationStatus.pending,- ProgramApplicationStatus.rejected,- ],+ in: APPROVABLE_APPLICATION_STATUSES,},},select: {@@ -113,11 +115,13 @@ export async function approveProgramApplication({await prisma.$transaction(async (tx) => {if (isNewEnrollment) {throwIfPartnersLimitExceeded(program.workspace);+ }- const programEnrollment: Partial<ProgramEnrollment> = {+ const programEnrollment: Partial<ProgramEnrollment> = {+ ...(programApplication && { applicationId: programApplication.id }),+ ...(isNewEnrollment && {status: ProgramEnrollmentStatus.approved,createdAt: now,- ...(programApplication && { applicationId: programApplication.id }),groupId: group.id,clickRewardId: group.clickRewardId,leadRewardId: group.leadRewardId,@@ -125,26 +129,26 @@ export async function approveProgramApplication({referralRewardId: group.referralRewardId,customRewardId: group.customRewardId,discountId: group.discountId,- };+ }),+ };- await tx.programEnrollment.upsert({- where: {- partnerId_programId: {- partnerId,- programId,- },- },- create: {- id: createId({ prefix: "pge_" }),+ await tx.programEnrollment.upsert({+ where: {+ partnerId_programId: {partnerId,programId,- ...programEnrollment,},- update: {- ...programEnrollment,- },- });- }+ },+ create: {+ id: createId({ prefix: "pge_" }),+ partnerId,+ programId,+ ...programEnrollment,+ },+ update: {+ ...programEnrollment,+ },+ });if (programApplication) {await tx.programApplication.update({diff --git a/apps/web/lib/webhook/utils.ts b/apps/web/lib/webhook/utils.tsindex 04284a8cd7..1dfe595798 100644--- a/apps/web/lib/webhook/utils.ts+++ b/apps/web/lib/webhook/utils.ts@@ -31,7 +31,9 @@ export const identifyWebhookReceiver = (url: string): WebhookReceiver => {* - array (editing): show both events if the webhook is already subscribed to* the legacy one (so it can migrate in a single edit), otherwise show only* the current event.- * - `undefined` (saved webhook still loading): hide both until it's known.+ * - `undefined` (saved webhook loading or failed to load): treated like `null`,+ * so the current event is never hidden. The legacy event appears once the+ * saved webhook is known to be subscribed to it.** Hidden events that are already subscribed stay in the webhook's saved* triggers; this only affects which checkboxes are rendered.@@ -41,11 +43,7 @@ export function getVisibleWebhookTriggers(subscribedTriggers: readonly WebhookTrigger[] | null | undefined,): WebhookTrigger[] {const hiddenTriggers = new Set<WebhookTrigger>(- [...DEPRECATED_WEBHOOK_TRIGGERS].flatMap(([legacy, current]) => {- if (subscribedTriggers === undefined) {- return [legacy, current];- }-+ [...DEPRECATED_WEBHOOK_TRIGGERS].flatMap(([legacy]) => {const showLegacy = subscribedTriggers?.includes(legacy) ?? false;return showLegacy ? [] : [legacy];diff --git a/apps/web/ui/modals/send-test-webhook-modal.tsx b/apps/web/ui/modals/send-test-webhook-modal.tsxindex 8597f59ed4..6dfe5f1623 100644--- a/apps/web/ui/modals/send-test-webhook-modal.tsx+++ b/apps/web/ui/modals/send-test-webhook-modal.tsx@@ -127,7 +127,7 @@ export function useSendTestWebhookModal({webhook={webhook}/>);- }, [showSendTestWebhookModal, setShowSendTestWebhookModal]);+ }, [showSendTestWebhookModal, setShowSendTestWebhookModal, webhook]);return useMemo(() => ({