The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Restrict archiving to active partners and stop reminder job linking
Kiran Kd4f6cf036624
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsxindex d8ee4bd7ee..d3f65c82d6 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx@@ -11,7 +11,10 @@ import {EnrolledPartnerExtendedProps,EnrolledPartnerProps,} from "@/lib/types";-import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";+import {+ ACTIVE_ENROLLMENT_STATUSES,+ COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES,+} from "@/lib/zod/schemas/partners";import { PageContent } from "@/ui/layout/page-content";import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";import { useArchivePartnerModal } from "@/ui/modals/archive-partner-modal";@@ -441,7 +444,7 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {</div><div className="border-t border-neutral-200" /><div className="grid gap-px p-2">- {!["banned", "deactivated"].includes(partner.status) && (+ {ACTIVE_ENROLLMENT_STATUSES.includes(partner.status) && (<MenuItemicon={BoxArchive}onClick={() => {diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsxindex d37e78125e..ba90bcae48 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx@@ -930,7 +930,7 @@ function RowMenuButton({<Command.Separator className="border-t border-neutral-200" /><Command.Group className="grid gap-px p-1.5">- {!["banned", "deactivated"].includes(+ {ACTIVE_ENROLLMENT_STATUSES.includes(row.original.status,) && (<MenuItemdiff --git a/apps/web/lib/actions/partners/archive-partner.ts b/apps/web/lib/actions/partners/archive-partner.tsindex a89fb80a5c..b15485e865 100644--- a/apps/web/lib/actions/partners/archive-partner.ts+++ b/apps/web/lib/actions/partners/archive-partner.ts@@ -5,7 +5,10 @@ import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";import { prisma } from "@/lib/prisma";-import { archivePartnerSchema } from "@/lib/zod/schemas/partners";+import {+ ACTIVE_ENROLLMENT_STATUSES,+ archivePartnerSchema,+} from "@/lib/zod/schemas/partners";import { waitUntil } from "@vercel/functions";import { authActionClient } from "../safe-action";import { throwIfNoPermission } from "../throw-if-no-permission";@@ -30,6 +33,12 @@ export const archivePartnerAction = authActionClientinclude: {},});+ if (!ACTIVE_ENROLLMENT_STATUSES.includes(programEnrollment.status)) {+ throw new Error(+ `You can only archive or unarchive partners in ${ACTIVE_ENROLLMENT_STATUSES.join(", ")} statuses.`,+ );+ }+const { status } = await prisma.programEnrollment.update({where: {partnerId_programId: {diff --git a/apps/web/lib/jobs/handlers/program-application-reminder-job.ts b/apps/web/lib/jobs/handlers/program-application-reminder-job.tsindex dcd854d6a0..6432c9dab4 100644--- a/apps/web/lib/jobs/handlers/program-application-reminder-job.ts+++ b/apps/web/lib/jobs/handlers/program-application-reminder-job.ts@@ -1,4 +1,3 @@-import { getApplicationStatusFromEnrollment } from "@/lib/partners/get-application-status-from-enrollment";import { prisma } from "@/lib/prisma";import { sendEmail } from "@dub/email";import ProgramApplicationReminder from "@dub/email/templates/program-application-reminder";@@ -64,45 +63,12 @@ export const programApplicationReminderJob = defineJob({},select: {id: true,- partnerId: true,- status: true,},});if (programEnrollment) {- const linked = await prisma.$transaction(async (tx) => {- // Only link if the enrollment has no application yet, otherwise the linked one is orphaned- const { count } = await tx.programEnrollment.updateMany({- where: {- id: programEnrollment.id,- applicationId: null,- },- data: {- applicationId: application.id,- },- });-- await tx.programApplication.update({- where: {- id: application.id,- },- data: {- partnerId: programEnrollment.partnerId,- ...(count > 0 && {- status: getApplicationStatusFromEnrollment(- programEnrollment.status,- ),- }),- },- });-- return count > 0;- });-console.info(- linked- ? `Partner with email ${application.email} has already been enrolled in program ${application.program.name}. Updated applicationId to ${application.id} and skipping...`- : `Partner with email ${application.email} has already been enrolled in program ${application.program.name} with another application. Set partnerId on application ${application.id} and skipping...`,+ `Partner with email ${application.email} is already enrolled in program ${application.program.name}. Skipping reminder...`,);return;}