The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
share STANDARD_REAPPLICATION_DAYS constant and simplify deprecated triggers map
Kiran Kfaac8a3f0ca0
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.tsindex 64d14b8dc0..bdfc3e503e 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@@ -3,8 +3,7 @@ import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";import { verifyQstashSignature } from "@/lib/cron/verify-qstash";import { prisma } from "@/lib/prisma";-import { STANDARD_REAPPLICATION_DAYS } from "@/lib/program-applications/program-application-rejection";-import { log } from "@dub/utils";+import { log, STANDARD_REAPPLICATION_DAYS } from "@dub/utils";import { subDays } from "date-fns";import { NextResponse } from "next/server";@@ -58,7 +57,7 @@ export async function POST(req: Request) {});console.log(- `Deleted ${deletedProgramEnrollments.count} rejected programEnrollments that are older than 30 days`,+ `Deleted ${deletedProgramEnrollments.count} rejected programEnrollments that are older than ${STANDARD_REAPPLICATION_DAYS} days`,);// Queue an index update because the rejected enrollments were deleted.diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/unapproved-program-page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/unapproved-program-page.tsxindex e5ba8a23da..2e1d675921 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/unapproved-program-page.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/unapproved-program-page.tsx@@ -6,6 +6,7 @@ import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";import { useConfirmModal } from "@/ui/modals/confirm-modal";import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";import { Button, StatusBadge } from "@dub/ui";+import { STANDARD_REAPPLICATION_DAYS } from "@dub/utils";import Link from "next/link";import { useRouter } from "next/navigation";import { ReactNode } from "react";@@ -34,8 +35,7 @@ const states: Record<}),rejected: () => ({title: "Application rejected",- description:- "Your application has been rejected. You can re-apply in 30 days.",+ description: `Your application has been rejected. You can re-apply in ${STANDARD_REAPPLICATION_DAYS} days.`,}),};diff --git a/apps/web/lib/program-applications/approve-program-application.ts b/apps/web/lib/program-applications/approve-program-application.tsindex 9ed431984c..ab4b4901ff 100644--- a/apps/web/lib/program-applications/approve-program-application.ts+++ b/apps/web/lib/program-applications/approve-program-application.ts@@ -90,7 +90,7 @@ export async function approveProgramApplication({const { program } = programApplication;const finalGroupId =- groupId || programApplication?.groupId || program.defaultGroupId;+ groupId ?? programApplication.groupId ?? program.defaultGroupId;if (!finalGroupId) {throw new DubApiError({diff --git a/apps/web/lib/program-applications/program-application-rejection.ts b/apps/web/lib/program-applications/program-application-rejection.tsindex d75a0836e9..06fa7c3b63 100644--- a/apps/web/lib/program-applications/program-application-rejection.ts+++ b/apps/web/lib/program-applications/program-application-rejection.ts@@ -34,5 +34,3 @@ export function getProgramApplicationRejectionReasonLabel(return PROGRAM_APPLICATION_REJECTION_REASON_LABELS[reason] ?? null;}--export const STANDARD_REAPPLICATION_DAYS = 30;diff --git a/apps/web/lib/webhook/constants.ts b/apps/web/lib/webhook/constants.tsindex ae128817f3..ccb73bb7c7 100644--- a/apps/web/lib/webhook/constants.ts+++ b/apps/web/lib/webhook/constants.ts@@ -37,25 +37,11 @@ export const WEBHOOK_TRIGGERS = [...PROGRAM_LEVEL_WEBHOOK_TRIGGERS,] as const;-export const LEGACY_WEBHOOK_TRIGGER_REPLACEMENTS = [- {- legacy: "partner.application_submitted",- current: "program_application.created",- },-] as const satisfies readonly {- legacy: WebhookTrigger;- current: WebhookTrigger;-}[];-+// Maps each deprecated event to the current event that replaces it (Eg: old:new)export const DEPRECATED_WEBHOOK_TRIGGERS = new Map<WebhookTrigger,WebhookTrigger->(- LEGACY_WEBHOOK_TRIGGER_REPLACEMENTS.map(({ legacy, current }) => [- legacy,- current,- ]),-);+>([["partner.application_submitted", "program_application.created"]]);export const WEBHOOK_TRIGGER_DESCRIPTIONS: Record<WebhookTrigger, string> = {"link.created": "Occurs whenever a link is created",diff --git a/apps/web/lib/webhook/utils.ts b/apps/web/lib/webhook/utils.tsindex 965400278c..04284a8cd7 100644--- a/apps/web/lib/webhook/utils.ts+++ b/apps/web/lib/webhook/utils.ts@@ -2,7 +2,7 @@ import { EXTERNAL_PAYOUTS_PROGRAM_IDS } from "@/lib/constants/program";import type { WorkspaceProps } from "@/lib/types";import { WebhookReceiver } from "@prisma/client";import {- LEGACY_WEBHOOK_TRIGGER_REPLACEMENTS,+ DEPRECATED_WEBHOOK_TRIGGERS,PROGRAM_LEVEL_WEBHOOK_TRIGGERS,WORKSPACE_LEVEL_WEBHOOK_TRIGGERS,} from "./constants";@@ -24,7 +24,7 @@ export const identifyWebhookReceiver = (url: string): WebhookReceiver => {/*** Filters `triggers` so only one event from each legacy/current pair in- * `LEGACY_WEBHOOK_TRIGGER_REPLACEMENTS` is shown in the webhook picker.+ * `DEPRECATED_WEBHOOK_TRIGGERS` is shown in the webhook picker.** `subscribedTriggers` is the saved webhook's events:* - `null` (creating a new webhook): show the current event, hide the legacy one.@@ -41,7 +41,7 @@ export function getVisibleWebhookTriggers(subscribedTriggers: readonly WebhookTrigger[] | null | undefined,): WebhookTrigger[] {const hiddenTriggers = new Set<WebhookTrigger>(- LEGACY_WEBHOOK_TRIGGER_REPLACEMENTS.flatMap(({ legacy, current }) => {+ [...DEPRECATED_WEBHOOK_TRIGGERS].flatMap(([legacy, current]) => {if (subscribedTriggers === undefined) {return [legacy, current];}diff --git a/apps/web/ui/modals/reject-program-application-modal.tsx b/apps/web/ui/modals/reject-program-application-modal.tsxindex 4189a3a01c..5aea88ec4d 100644--- a/apps/web/ui/modals/reject-program-application-modal.tsx+++ b/apps/web/ui/modals/reject-program-application-modal.tsx@@ -18,7 +18,7 @@ import {ToggleGroup,useKeyboardShortcut,} from "@dub/ui";-import { cn } from "@dub/utils";+import { cn, STANDARD_REAPPLICATION_DAYS } from "@dub/utils";import { ProgramApplicationRejectionReason } from "@prisma/client";import { motion } from "motion/react";import { useAction } from "next-safe-action/hooks";@@ -42,7 +42,7 @@ const REJECTION_REASON_COMBO_OPTIONS: ComboboxOption[] =const REAPPLICATION_TIMEFRAME_OPTIONS = [{ value: "instant", label: "Immediate" },- { value: "standard", label: "30 days" },+ { value: "standard", label: `${STANDARD_REAPPLICATION_DAYS} days` },{ value: "never", label: "Never" },] as const;@@ -51,7 +51,7 @@ const REAPPLICATION_TIMEFRAME_DESCRIPTIONS: Record<string> = {instant: "The partner can reapply immediately.",- standard: "The partner can reapply after 30 days.",+ standard: `The partner can reapply after ${STANDARD_REAPPLICATION_DAYS} days.`,never: "The partner can never reapply for the program.",};diff --git a/apps/web/ui/partners/program-card.tsx b/apps/web/ui/partners/program-card.tsxindex 0b9f30ff3a..b68dc47568 100644--- a/apps/web/ui/partners/program-card.tsx+++ b/apps/web/ui/partners/program-card.tsx@@ -13,7 +13,12 @@ import {MiniAreaChart,Note,} from "@dub/ui";-import { formatDate, getPrettyUrl, OG_AVATAR_URL } from "@dub/utils";+import {+ formatDate,+ getPrettyUrl,+ OG_AVATAR_URL,+ STANDARD_REAPPLICATION_DAYS,+} from "@dub/utils";import NumberFlow from "@number-flow/react";import Link from "next/link";import { useRouter } from "next/navigation";@@ -113,7 +118,12 @@ function ProgramCardNonApprovedStatus({if (status === "rejected") {const tipContent = rejectedApplicationTooltipContent(application);- const body = <>{statusDescription} You can re-apply in 30 days.</>;+ const body = (+ <>+ {statusDescription} You can re-apply in {STANDARD_REAPPLICATION_DAYS}{" "}+ days.+ </>+ );if (tipContent) {return (diff --git a/packages/email/src/templates/program-application-rejected.tsx b/packages/email/src/templates/program-application-rejected.tsxindex 7fad4cee84..2052532f72 100644--- a/packages/email/src/templates/program-application-rejected.tsx+++ b/packages/email/src/templates/program-application-rejected.tsx@@ -1,4 +1,8 @@-import { DUB_WORDMARK, PARTNERS_DOMAIN } from "@dub/utils";+import {+ DUB_WORDMARK,+ PARTNERS_DOMAIN,+ STANDARD_REAPPLICATION_DAYS,+} from "@dub/utils";import {Body,Container,@@ -96,7 +100,7 @@ export default function ProgramApplicationRejected({{reapplicationTimeframe === "instant"? " You can submit a new application whenever you're ready.": reapplicationTimeframe === "standard"- ? " You will be able to re-apply in 30 days."+ ? ` You will be able to re-apply in ${STANDARD_REAPPLICATION_DAYS} days.`: null}</Text></>diff --git a/packages/utils/src/constants/misc.ts b/packages/utils/src/constants/misc.tsindex 9462323185..5afe323cc4 100644--- a/packages/utils/src/constants/misc.ts+++ b/packages/utils/src/constants/misc.ts@@ -38,3 +38,6 @@ export const INFINITY_NUMBER = 1000000000;export const DUPLICATE_IDENTITY_DECLINE_REASON ="This identity has already been verified on another account.";++// Days a partner must wait before re-applying after a "standard" program application rejection+export const STANDARD_REAPPLICATION_DAYS = 30;