The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
fix rejected-applications cron, styles update delete account modal
Steven Tey1678a63c123b
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 2a9190d262..2a3cc104ea 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@@ -2,6 +2,7 @@ import { handleAndReturnErrorResponse } from "@/lib/api/errors";import { verifyQstashSignature } from "@/lib/cron/verify-qstash";import { prisma } from "@dub/prisma";import { log } from "@dub/utils";+import { subDays } from "date-fns";import { NextResponse } from "next/server";export const dynamic = "force-dynamic";@@ -18,23 +19,45 @@ export async function POST(req: Request) {rawBody,});- // rejected programEnrollments more than 30 days ago- const rejectedProgramEnrollments =- await prisma.programEnrollment.deleteMany({- where: {- status: "rejected",- updatedAt: {- lt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 30),+ while (true) {+ // rejected programEnrollments more than 30 days ago+ const rejectedProgramEnrollments =+ await prisma.programEnrollment.findMany({+ where: {+ status: "rejected",+ updatedAt: {+ lt: subDays(new Date(), 30),+ },+ // only delete if there are no commissions or messages+ commissions: {+ none: {},+ },+ messages: {+ none: {},+ },},- commissions: {- none: {}, // only delete if there are no commissions+ take: 250,+ });++ if (rejectedProgramEnrollments.length === 0) {+ console.log(+ "No more rejected programEnrollments to delete, skipping...",+ );+ break;+ }++ const deletedRes = await prisma.programEnrollment.deleteMany({+ where: {+ id: {+ in: rejectedProgramEnrollments.map(({ id }) => id),},},});- console.log(- `Deleted ${rejectedProgramEnrollments.count} rejected programEnrollments (older than 30 days)`,- );+ console.log(+ `Deleted ${deletedRes.count} rejected programEnrollments that are older than 30 days`,+ );+ }return NextResponse.json({ status: "OK" });} catch (error) {diff --git a/apps/web/ui/account/delete-account.tsx b/apps/web/ui/account/delete-account.tsxindex c45779b7bd..2516ad7fc6 100644--- a/apps/web/ui/account/delete-account.tsx+++ b/apps/web/ui/account/delete-account.tsx@@ -7,27 +7,29 @@ export default function DeleteAccountSection() {useDeleteAccountModal();return (- <div className="rounded-xl border border-red-200 bg-white">+ <><DeleteAccountModal />- <div className="flex flex-col space-y-1 p-6">- <h2 className="text-base font-semibold">Delete Account</h2>- <p className="text-sm text-neutral-500">- Permanently delete your {process.env.NEXT_PUBLIC_APP_NAME} account,- all of your workspaces, links and their respective stats. This action- cannot be undone - please proceed with caution.- </p>- </div>- <div className="border-b border-red-200" />+ <div className="overflow-hidden rounded-xl border border-red-200 bg-white">+ <div className="flex flex-col space-y-1 p-6">+ <h2 className="text-base font-semibold">Delete Account</h2>+ <p className="text-sm text-neutral-500">+ Permanently delete your {process.env.NEXT_PUBLIC_APP_NAME} account,+ all of your workspaces, links and their respective stats. This+ action cannot be undone - please proceed with caution.+ </p>+ </div>+ <div className="border-b border-red-200" />- <div className="flex items-center justify-start bg-red-50 px-6 py-3 sm:justify-end">- <div>- <Button- text="Delete Account"- variant="danger"- onClick={() => setShowDeleteAccountModal(true)}- />+ <div className="flex items-center justify-start bg-red-50 px-6 py-3 sm:justify-end">+ <div>+ <Button+ text="Delete Account"+ variant="danger"+ onClick={() => setShowDeleteAccountModal(true)}+ />+ </div></div></div>- </div>+ </>);}diff --git a/apps/web/ui/modals/delete-account-modal.tsx b/apps/web/ui/modals/delete-account-modal.tsxindex d8e74e8580..7e71c51603 100644--- a/apps/web/ui/modals/delete-account-modal.tsx+++ b/apps/web/ui/modals/delete-account-modal.tsx@@ -1,4 +1,5 @@-import { Avatar, Button, Modal } from "@dub/ui";+import { Avatar, Button, Modal, useMediaQuery } from "@dub/ui";+import { cn } from "@dub/utils";import { useSession } from "next-auth/react";import { useRouter } from "next/navigation";import {@@ -20,29 +21,38 @@ function DeleteAccountModal({const router = useRouter();const { data: session, update } = useSession();const [deleting, setDeleting] = useState(false);+ const [verification, setVerification] = useState("");++ const confirmationText = "confirm delete account";+ const isVerified = verification === confirmationText;++ const { isMobile } = useMediaQuery();async function deleteAccount() {- setDeleting(true);- await fetch(`/api/user`, {- method: "DELETE",- headers: {- "Content-Type": "application/json",- },- }).then(async (res) => {- if (res.status === 200) {- update();- // delay to allow for the route change to complete- await new Promise((resolve) =>- setTimeout(() => {- router.push("/register");- resolve(null);- }, 200),- );- } else {- setDeleting(false);- const error = await res.text();- throw error;- }+ return new Promise((resolve, reject) => {+ setDeleting(true);+ fetch(`/api/user`, {+ method: "DELETE",+ headers: {+ "Content-Type": "application/json",+ },+ }).then(async (res) => {+ if (res.status === 200) {+ update();+ // delay to allow for the route change to complete+ await new Promise((resolve) =>+ setTimeout(() => {+ router.push("/register");+ resolve(null);+ }, 200),+ );+ resolve(null);+ } else {+ setDeleting(false);+ const error = await res.text();+ reject(error);+ }+ });});}@@ -50,11 +60,11 @@ function DeleteAccountModal({<ModalshowModal={showDeleteAccountModal}setShowModal={setShowDeleteAccountModal}+ className="max-w-md">- <div className="flex flex-col items-center justify-center space-y-3 border-b border-neutral-200 px-4 py-4 pt-8 sm:px-16">- <Avatar user={session?.user} />+ <div className="space-y-2 border-b border-neutral-200 px-4 py-4 sm:px-6"><h3 className="text-lg font-medium">Delete Account</h3>- <p className="text-center text-sm text-neutral-500">+ <p className="text-sm text-neutral-500">Warning: This will permanently delete your account, all yourworkspaces, and all your short links.</p>@@ -69,37 +79,51 @@ function DeleteAccountModal({error: (err) => err,});}}- className="flex flex-col space-y-6 bg-neutral-50 px-4 py-8 text-left sm:px-16"+ className="flex flex-col space-y-4 bg-neutral-50 px-4 py-4 sm:px-6">+ <div className="relative flex items-center gap-3 rounded-md border border-neutral-300 bg-white px-4 py-2">+ <Avatar user={session?.user} className="size-7" />+ <div className="flex flex-1 flex-col gap-0.5">+ <h3 className="line-clamp-1 text-sm font-medium text-neutral-600">+ {session?.user?.name || session?.user?.email}+ </h3>+ <p className="text-xs font-medium text-neutral-500">+ {session?.user?.email}+ </p>+ </div>+ </div>+<div><labelhtmlFor="verification"className="block text-sm text-neutral-700">To verify, type{" "}- <span className="font-semibold text-black">- confirm delete account- </span>{" "}- below+ <span className="font-semibold">{confirmationText}</span> below</label><div className="relative mt-1 rounded-md shadow-sm"><inputtype="text"name="verification"id="verification"- pattern="confirm delete account"+ pattern={confirmationText}required- autoFocus={false}+ autoFocus={!isMobile}autoComplete="off"- className="block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"+ value={verification}+ onChange={(e) => setVerification(e.target.value)}+ className={cn(+ "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-300 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",+ )}/></div></div><Button- text="Confirm delete account"+ text="Delete"variant="danger"loading={deleting}+ disabled={!isVerified}/></form></Modal>@@ -116,13 +140,13 @@ export function useDeleteAccountModal() {setShowDeleteAccountModal={setShowDeleteAccountModal}/>);- }, [showDeleteAccountModal, setShowDeleteAccountModal]);+ }, [showDeleteAccountModal]);return useMemo(() => ({setShowDeleteAccountModal,DeleteAccountModal: DeleteAccountModalCallback,}),- [setShowDeleteAccountModal, DeleteAccountModalCallback],+ [DeleteAccountModalCallback],);}