The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Key application review sheet and email links by application ID
Kiran K64366a9b8bcd
diff --git a/apps/web/app/(ee)/api/cron/pending-applications-summary/route.ts b/apps/web/app/(ee)/api/cron/pending-applications-summary/route.tsindex 8f2e25f9a6..47696e42e5 100644--- a/apps/web/app/(ee)/api/cron/pending-applications-summary/route.ts+++ b/apps/web/app/(ee)/api/cron/pending-applications-summary/route.ts@@ -22,6 +22,32 @@ const schema = z.object({startingAfter: z.string().optional(),});+type PendingApplicationSummaryRow = {+ programId: string;+ applicationId: string;+ partnerId: string;+ partnerName: string | null;+ partnerEmail: string | null;+ partnerImage: string | null;+};++type PendingApplicationSummaryPartner = {+ id: string;+ applicationId: string;+ name: string | null;+ email: string | null;+ image: string | null;+};++type PendingApplicationSummaryRecipients = {+ users: {+ email: string;+ }[];+ workspace: {+ slug: string;+ };+};+// GET/POST /api/cron/pending-applications-summary// This route sends a daily summary of pending partner applications to program owners// Runs daily at 9:00 AM UTC@@ -34,9 +60,10 @@ export const GET = withCron(async ({ rawBody }) => {const programs = await prisma.program.findMany({where: {deactivatedAt: null,- partners: {+ applications: {some: {status: "pending",+ partnerId: { not: null },},},},@@ -68,71 +95,62 @@ export const GET = withCron(async ({ rawBody }) => {const programIds = programs.map((p) => p.id);- // Get top 3 pending enrollments per program using SQL window function+ // Get top 3 pending applications per program using SQL window function// This efficiently gets only the top 3 from each program directly from the database- const topEnrollments = await prisma.$queryRaw<- Array<{- programId: string;- partnerId: string;- partnerName: string | null;- partnerEmail: string | null;- partnerImage: string | null;- }>+ const topApplications = await prisma.$queryRaw<+ PendingApplicationSummaryRow[]>(Prisma.sql`- SELECT- pe.programId,+ SELECT+ pa.programId,+ pa.id as applicationId,p.id as partnerId,p.name as partnerName,p.email as partnerEmail,p.image as partnerImageFROM (- SELECT+ SELECTid,- programId,- partnerId,ROW_NUMBER() OVER (PARTITION BY programId ORDER BY createdAt DESC) as rn- FROM ProgramEnrollment+ FROM ProgramApplicationWHERE programId IN (${Prisma.join(programIds)})AND status = 'pending'+ AND partnerId IS NOT NULL) ranked- INNER JOIN ProgramEnrollment pe ON pe.id = ranked.id- INNER JOIN Partner p ON p.id = pe.partnerId+ INNER JOIN ProgramApplication pa ON pa.id = ranked.id+ INNER JOIN Partner p ON p.id = pa.partnerIdWHERE ranked.rn <= 3- ORDER BY pe.programId, pe.createdAt DESC+ ORDER BY pa.programId, pa.createdAt DESC`);- // Group enrollments by programId- const enrollmentsByProgramMap = new Map<+ // Group applications by programId+ const applicationsByProgramMap = new Map<string,- Array<{- id: string;- name: string | null;- email: string | null;- image: string | null;- }>+ PendingApplicationSummaryPartner[]>();- for (const enrollment of topEnrollments) {- const existing = enrollmentsByProgramMap.get(enrollment.programId) || [];- enrollmentsByProgramMap.set(enrollment.programId, [+ for (const application of topApplications) {+ const existing = applicationsByProgramMap.get(application.programId) || [];+ applicationsByProgramMap.set(application.programId, [...existing,{- id: enrollment.partnerId,- name: enrollment.partnerName,- email: enrollment.partnerEmail,- image: enrollment.partnerImage,+ id: application.partnerId,+ applicationId: application.applicationId,+ name: application.partnerName,+ email: application.partnerEmail,+ image: application.partnerImage,},]);}- // Get counts of pending enrollments per program- const pendingCounts = await prisma.programEnrollment.groupBy({+ // Get counts of pending applications per program+ const pendingCounts = await prisma.programApplication.groupBy({by: ["programId"],where: {programId: {in: programIds,},status: "pending",+ partnerId: { not: null },},_count: true,});@@ -176,14 +194,7 @@ export const GET = withCron(async ({ rawBody }) => {// create a map of programId -> workspace usersconst programWorkspaceUsersMap = new Map<string,- {- users: {- email: string;- }[];- workspace: {- slug: string;- };- }+ PendingApplicationSummaryRecipients>();for (const workspaceUser of workspaceUsers) {@@ -218,7 +229,7 @@ export const GET = withCron(async ({ rawBody }) => {continue;}- const pendingEnrollments = enrollmentsByProgramMap.get(program.id) || [];+ const pendingApplications = applicationsByProgramMap.get(program.id) || [];const { users, workspace } = programWorkspaceUsersMap.get(program.id) || {};@@ -234,7 +245,7 @@ export const GET = withCron(async ({ rawBody }) => {subject: `You have ${nFormatter(totalPendingApplications, { full: true })} partner ${pluralize("application", totalPendingApplications)} pending review`,react: PendingApplicationsSummary({email: user.email,- partners: pendingEnrollments,+ partners: pendingApplications,totalCount: totalPendingApplications,date: new Date(),workspace: {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.tsxindex 064e4740ac..68f79e7802 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@@ -88,7 +88,10 @@ export function ApplicationsTable({const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";const isFiltered = Object.keys(searchParamsObj).some(- (key) => !["sortBy", "sortOrder", "page"].includes(key),+ (key) =>+ !["sortBy", "sortOrder", "page", "partnerId", "applicationId"].includes(+ key,+ ),);const { applicationsCount, error: countError } =@@ -116,19 +119,22 @@ export function ApplicationsTable({const { groups } = useGroups();const [detailsSheetState, setDetailsSheetState] = useState<- | { open: false; partnerId: string | null }- | { open: true; partnerId: string }- >({ open: false, partnerId: null });+ | { open: false; applicationId: string | null }+ | { open: true; applicationId: string }+ >({ open: false, applicationId: null });useEffect(() => {- const partnerId = searchParams.get("partnerId");- if (partnerId) setDetailsSheetState({ open: true, partnerId });+ const applicationId = searchParams.get("applicationId");++ if (applicationId) {+ setDetailsSheetState({ open: true, applicationId });+ }}, [searchParams]);- const { currentPartner, isLoading: isCurrentPartnerLoading } =- useCurrentPartner({+ const { currentApplication, isLoading: isCurrentApplicationLoading } =+ useCurrentApplication({partners,- partnerId: detailsSheetState.partnerId,+ applicationId: detailsSheetState.applicationId,});// State for pending bulk actions@@ -317,8 +323,9 @@ export function ApplicationsTable({onRowClick: (row) => {queryParams({set: {- partnerId: row.original.id,+ applicationId: row.original.applicationId,},+ del: "partnerId",});},pagination,@@ -338,7 +345,7 @@ export function ApplicationsTable({}),...(status !== ProgramApplicationStatus.approved && {- getRowId: (row: ApplicationRow) => row.id,+ getRowId: (row: ApplicationRow) => row.applicationId,selectionControls: (table) => (<><Button@@ -378,46 +385,48 @@ export function ApplicationsTable({tdClassName: "border-l-0",resourceName: (p) => `application${p ? "s" : ""}`,rowCount: applicationsCount || 0,- loading: isValidating || isCurrentPartnerLoading,+ loading: isValidating || isCurrentApplicationLoading,error: error || countError ? "Failed to load applications" : undefined,});- const [previousPartnerId, nextPartnerId] = useMemo(() => {- if (!partners || !detailsSheetState.partnerId) return [null, null];+ const [previousApplication, nextApplication] = useMemo(() => {+ if (!partners || !detailsSheetState.applicationId) return [null, null];const currentIndex = partners.findIndex(- ({ id }) => id === detailsSheetState.partnerId,+ ({ applicationId }) => applicationId === detailsSheetState.applicationId,);if (currentIndex === -1) return [null, null];return [- currentIndex > 0 ? partners[currentIndex - 1].id : null,- currentIndex < partners.length - 1 ? partners[currentIndex + 1].id : null,+ currentIndex > 0 ? partners[currentIndex - 1] : null,+ currentIndex < partners.length - 1 ? partners[currentIndex + 1] : null,];- }, [partners, detailsSheetState.partnerId]);+ }, [partners, detailsSheetState.applicationId]);return (<>- {detailsSheetState.partnerId && currentPartner && (+ {detailsSheetState.applicationId && currentApplication && (<ProgramApplicationReviewSheetisOpen={detailsSheetState.open}setIsOpen={(open) =>setDetailsSheetState((s) => ({ ...s, open }) as any)}- partner={currentPartner}+ partner={currentApplication}onPrevious={- previousPartnerId+ previousApplication? () =>queryParams({- set: { partnerId: previousPartnerId },+ set: { applicationId: previousApplication.applicationId },+ del: "partnerId",}): undefined}onNext={- nextPartnerId+ nextApplication? () =>queryParams({- set: { partnerId: nextPartnerId },+ set: { applicationId: nextApplication.applicationId },+ del: "partnerId",}): undefined}@@ -567,36 +576,38 @@ function RejectedRowMenuButton({ row }: { row: Row<ApplicationRow> }) {);}-/** Gets the current partner from the loaded partners array if available, or a separate fetch if not */-function useCurrentPartner({+/** Gets the application row from the loaded list, then loads that partner for fields the list does not include. */+function useCurrentApplication({partners,- partnerId,+ applicationId,}: {partners?: ApplicationRow[];- partnerId: string | null;+ applicationId: string | null;}) {- const listedPartner = partnerId- ? partners?.find(({ id }) => id === partnerId) ?? null+ const listedApplication = applicationId+ ? partners?.find(+ (application) => application.applicationId === applicationId,+ ) ?? null: null;const { partner: fetchedPartner, loading: isLoading } = usePartner(- { partnerId },+ { partnerId: listedApplication?.id ?? null },{ keepPreviousData: true },);const matchingFetchedPartner =- fetchedPartner?.id === partnerId ? fetchedPartner : null;+ fetchedPartner?.id === listedApplication?.id ? fetchedPartner : null;- const currentPartner = useMemo(+ const currentApplication = useMemo(() =>- listedPartner- ? { ...matchingFetchedPartner, ...listedPartner }- : matchingFetchedPartner,- [listedPartner, matchingFetchedPartner],+ listedApplication+ ? { ...matchingFetchedPartner, ...listedApplication }+ : null,+ [listedApplication, matchingFetchedPartner],);return {- currentPartner,- isLoading: Boolean(partnerId) && !listedPartner && isLoading,+ currentApplication,+ isLoading: Boolean(applicationId) && !listedApplication && isLoading,};}diff --git a/apps/web/lib/api/partners/notify-program-application.ts b/apps/web/lib/api/partners/notify-program-application.tsindex 5f6b99042e..0d84216f62 100644--- a/apps/web/lib/api/partners/notify-program-application.ts+++ b/apps/web/lib/api/partners/notify-program-application.ts@@ -58,6 +58,7 @@ export async function notifyProgramApplication({email: user.email!,partner: {id: partner.id,+ applicationId: application.id,name: partner.name,email: partner.email!,image: partner.image,diff --git a/apps/web/lib/integrations/slack/transform.ts b/apps/web/lib/integrations/slack/transform.tsindex 1db5cc89fd..4c8c23174a 100644--- a/apps/web/lib/integrations/slack/transform.ts+++ b/apps/web/lib/integrations/slack/transform.ts@@ -314,7 +314,7 @@ const programApplicationSubmittedTemplate = ({data: PartnerApplicationWebhookPayload;}) => {const { partner } = data;- const hrefToApplicationPage = `${APP_DOMAIN}/program/partners/applications?partnerId=${partner.id}`;+ const hrefToApplicationPage = `${APP_DOMAIN}/program/partners/applications?applicationId=${data.id}`;return {blocks: [diff --git a/apps/web/lib/partners/backfill-partner-platforms.ts b/apps/web/lib/partners/backfill-partner-platforms.tsindex 400972d267..90891d03df 100644--- a/apps/web/lib/partners/backfill-partner-platforms.ts+++ b/apps/web/lib/partners/backfill-partner-platforms.ts@@ -21,7 +21,7 @@ type ApplicationPlatform = Pick<// so webhook payloads and the platform backfill agree on what the partner has.// Application values only fill in platforms the partner doesn't already have (the// profile may be verified), and are marked unverified.-const mergeApplicationSocialPlatforms = ({+export const mergeApplicationSocialPlatforms = ({platforms,application,}: {diff --git a/apps/web/lib/partners/complete-program-applications.ts b/apps/web/lib/partners/complete-program-applications.tsindex c7bb49b9bb..66db4f6c03 100644--- a/apps/web/lib/partners/complete-program-applications.ts+++ b/apps/web/lib/partners/complete-program-applications.ts@@ -13,7 +13,10 @@ import {partnerApplicationWebhookSchema,programApplicationWebhookSchema,} from "../zod/schemas/program-application";-import { backfillPartnerPlatforms } from "./backfill-partner-platforms";+import {+ backfillPartnerPlatforms,+ mergeApplicationSocialPlatforms,+} from "./backfill-partner-platforms";import { evaluateApplicationRequirements } from "./evaluate-application-requirements";import {formatApplicationFormData,@@ -161,7 +164,7 @@ export async function completeProgramApplications(userEmail: string) {workspaces.map((ws) => [ws.defaultProgramId, ws]),);- const { platforms, socialFields } = await backfillPartnerPlatforms({+ await backfillPartnerPlatforms({partnerId: partner.id,platforms: partner.platforms,applications: filteredProgramApplications,@@ -191,6 +194,11 @@ export async function completeProgramApplications(userEmail: string) {},});+ const { platforms, socialFields } = mergeApplicationSocialPlatforms({+ platforms: partner.platforms,+ application,+ });+const webhookData = {id: application.id,createdAt: application.createdAt,diff --git a/apps/web/lib/program-applications/hooks/use-program-applications-count.ts b/apps/web/lib/program-applications/hooks/use-program-applications-count.tsindex 467ad1865c..c841c27fc4 100644--- a/apps/web/lib/program-applications/hooks/use-program-applications-count.ts+++ b/apps/web/lib/program-applications/hooks/use-program-applications-count.ts@@ -25,7 +25,7 @@ export function useProgramApplicationsCount<T>({const queryString = ignoreParams? `?${new URLSearchParams(definedParams as Record<string, string>).toString()}`: getQueryString(definedParams, {- exclude: ["partnerId", "sortBy", "sortOrder", "page"],+ exclude: ["partnerId", "applicationId", "sortBy", "sortOrder", "page"],});const {diff --git a/apps/web/lib/program-applications/hooks/use-program-applications.ts b/apps/web/lib/program-applications/hooks/use-program-applications.tsindex f71c7f3cb0..07a9a61ee8 100644--- a/apps/web/lib/program-applications/hooks/use-program-applications.ts+++ b/apps/web/lib/program-applications/hooks/use-program-applications.ts@@ -26,7 +26,7 @@ export function useProgramApplications({const queryString = ignoreParams? `?${new URLSearchParams(definedParams as Record<string, string>).toString()}`: getQueryString(definedParams, {- exclude: ["partnerId", "sortBy"],+ exclude: ["partnerId", "applicationId", "sortBy"],});const {diff --git a/apps/web/ui/partners/program-application-review-sheet.tsx b/apps/web/ui/partners/program-application-review-sheet.tsxindex b4c75d9076..d3ac0f109a 100644--- a/apps/web/ui/partners/program-application-review-sheet.tsx+++ b/apps/web/ui/partners/program-application-review-sheet.tsx@@ -34,7 +34,9 @@ type ListedApplicationPartner = ProgramApplicationProps["partner"] & {};type ProgramApplicationReviewSheetProps = {- partner: EnrolledPartnerProps | ListedApplicationPartner;+ partner: (EnrolledPartnerProps | ListedApplicationPartner) & {+ applicationId: string;+ };onNext?: () => void;onPrevious?: () => void;setIsOpen: Dispatch<SetStateAction<boolean>>;@@ -76,10 +78,12 @@ function ProgramApplicationReviewSheetContent({{ sheet: true },);- // Reset selection when navigating between partners+ const applicationKey = sheetPartner.applicationId;++ // Reset selection when navigating between applicationsuseEffect(() => {setSelectedGroupId(partner.groupId ?? null);- }, [partner.groupId]);+ }, [applicationKey, partner.groupId]);return (<div className="flex size-full flex-col">@@ -149,7 +153,12 @@ function ProgramApplicationReviewSheetContent({/><div className="border-border-subtle -mx-px -mb-px rounded-xl border bg-white p-4">{currentTabId === "about" && (- <ProgramApplicationAbout partner={partner} />+ <ProgramApplicationAbout+ partner={{+ ...partner,+ applicationId: sheetPartner.applicationId,+ }}+ />)}{currentTabId === "comments" && (<ProgramApplicationComments partnerId={partner.id} />@@ -162,7 +171,7 @@ function ProgramApplicationReviewSheetContent({{["pending", "rejected"].includes(partner.status) && (<div className="shrink-0 border-t border-neutral-200 p-5"><PartnerApproval- key={partner.id} // Reset when navigating between partners to avoid memoized action callback issues+ key={applicationKey} // Reset when navigating between applications to avoid memoized action callback issuespartner={partner}groupId={partner.status === "rejected" ? selectedGroupId : partner.groupId@@ -179,13 +188,13 @@ function ProgramApplicationReviewSheetContent({function ProgramApplicationAbout({partner,}: {- partner: EnrolledPartnerProps;+ partner: EnrolledPartnerProps & { applicationId: string };}) {return (<div className="grid grid-cols-1 gap-5 text-sm text-neutral-600"><ProgramApplicationDetailspartnerId={partner.id}- preferredApplicationId={partner.applicationId ?? null}+ preferredApplicationId={partner.applicationId}/><hr className="border-neutral-200" /><PartnerAbout partner={partner} />@@ -215,7 +224,7 @@ export function ProgramApplicationReviewSheet({<Sheetopen={isOpen}onOpenChange={rest.setIsOpen}- onClose={() => queryParams({ del: "partnerId" })}+ onClose={() => queryParams({ del: ["applicationId", "partnerId"] })}nested={nested}contentProps={{// 540px - 1170px width based on viewportdiff --git a/packages/email/src/templates/pending-applications-summary.tsx b/packages/email/src/templates/pending-applications-summary.tsxindex f532abe063..9d27aa87f4 100644--- a/packages/email/src/templates/pending-applications-summary.tsx+++ b/packages/email/src/templates/pending-applications-summary.tsx@@ -25,18 +25,21 @@ export default function PendingApplicationsSummary({partners = [{id: "pn_1JPBEGP7EXF76CXT1W99VERW5",+ applicationId: "pga_1JPBEGP7EXF76CXT1W99VERW5",name: "Sarah Charpentier",email: "[email protected]",image: `${OG_AVATAR_URL}pn_1JPBEGP7EXF76CXT1W99VERW5`,},{id: "pn_1JPBEGP7EXF76CXT1W99VERW6",+ applicationId: "pga_1JPBEGP7EXF76CXT1W99VERW6",name: "Derek Forbes",email: "[email protected]",image: `${OG_AVATAR_URL}pn_1JPBEGP7EXF76CXT1W99VERW6`,},{id: "pn_1JPBEGP7EXF76CXT1W99VERW7",+ applicationId: "pga_1JPBEGP7EXF76CXT1W99VERW7",name: "Marvin Ta",email: "[email protected]",image: `${OG_AVATAR_URL}pn_1JPBEGP7EXF76CXT1W99VERW7`,@@ -51,6 +54,7 @@ export default function PendingApplicationsSummary({};partners: {id: string;+ applicationId: string;name: string | null;email: string | null;image: string | null;@@ -96,7 +100,7 @@ export default function PendingApplicationsSummary({{partners.map((partner, index) => {return (<Section- key={partner.id}+ key={partner.applicationId}className={`rounded-lg border border-solid border-neutral-200 bg-neutral-50 p-4 ${index < partners.length - 1 ? "mb-3" : ""}`}><Row>@@ -130,7 +134,7 @@ export default function PendingApplicationsSummary({</Column><Column width={90} align="right" valign="middle"><Link- href={`${applicationsUrl}?partnerId=${partner.id}`}+ href={`${applicationsUrl}?applicationId=${partner.applicationId}`}className="box-border inline-block rounded-md border border-solid border-neutral-200 bg-white px-4 py-2 text-center text-sm font-medium leading-none text-black no-underline"style={{ whiteSpace: "nowrap" }}>diff --git a/packages/email/src/templates/program-application-received.tsx b/packages/email/src/templates/program-application-received.tsxindex a11f5f12fa..73c30f9d3a 100644--- a/packages/email/src/templates/program-application-received.tsx+++ b/packages/email/src/templates/program-application-received.tsx@@ -18,6 +18,7 @@ export default function ProgramApplicationReceived({email = "[email protected]",partner = {id: "pn_1JPBEGP7EXF76CXT1W99VERW5",+ applicationId: "pga_1JPBEGP7EXF76CXT1W99VERW5",name: "John Doe",email: "[email protected]",image:@@ -47,6 +48,7 @@ export default function ProgramApplicationReceived({email: string;partner: {id: string;+ applicationId: string;name: string;email: string;image: string | null;@@ -61,7 +63,7 @@ export default function ProgramApplicationReceived({slug: string;};}) {- const applicationUrl = `https://app.dub.co/${workspace.slug}/program/partners/applications?partnerId=${partner.id}`;+ const applicationUrl = `https://app.dub.co/${workspace.slug}/program/partners/applications?applicationId=${partner.applicationId}`;return (<Html>