Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

revert to draft

Steven Teyd401eb20a31f
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx
index fda6d6602b..3931c0e012 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/network-partner-application-sheet.tsx
@@ -18,8 +18,8 @@ import {
StatusBadge,
Trophy,
useKeyboardShortcut,
- useRouterStuff,
User,
+ useRouterStuff,
Users,
} from "@dub/ui";
import { cn, COUNTRIES, currencyFormatter, OG_AVATAR_URL } from "@dub/utils";
@@ -30,6 +30,24 @@ import { NetworkPartnerChangeHistory } from "./network-partner-change-history";
type NetworkPartnerSheetTabId = "about" | "programs" | "duplicates";
+function isDirectDraftToApprovedNetworkApproval(
+ partner: AdminNetworkPartner,
+): boolean {
+ if (partner.networkStatus !== "approved") {
+ return false;
+ }
+
+ const networkLogs = (partner.changeHistoryLog ?? []).filter(
+ (entry) => entry.field === "networkStatus",
+ );
+
+ return (
+ networkLogs.length === 1 &&
+ networkLogs[0].from === "draft" &&
+ networkLogs[0].to === "approved"
+ );
+}
+
export function NetworkPartnerApplicationSheet({
isOpen,
setIsOpen,
@@ -45,13 +63,16 @@ export function NetworkPartnerApplicationSheet({
onNext?: () => void;
onReview: (
partner: AdminNetworkPartner,
- status: "approved" | "rejected",
+ status: "approved" | "rejected" | "draft",
) => Promise<void>;
}) {
const [currentTabId, setCurrentTabId] =
useState<NetworkPartnerSheetTabId>("about");
const { queryParams } = useRouterStuff();
+ const showRevertToDraftInsteadOfReject =
+ isDirectDraftToApprovedNetworkApproval(partner);
+
const PartnerDetails = (
<div className="rounded-lg border border-neutral-200 bg-neutral-100 p-3">
<div className="flex items-center gap-4">
@@ -95,6 +116,21 @@ export function NetworkPartnerApplicationSheet({
confirmShortcutOptions: { sheet: true, modal: true },
});
+ const {
+ setShowConfirmModal: setShowRevertToDraftConfirm,
+ confirmModal: revertToDraftModal,
+ } = useConfirmModal({
+ title: "Revert network profile to draft",
+ description: PartnerDetails,
+ confirmText: "Revert to draft",
+ confirmVariant: "danger",
+ onConfirm: async () => {
+ await onReview(partner, "draft");
+ },
+ confirmShortcut: "r",
+ confirmShortcutOptions: { sheet: true, modal: true },
+ });
+
useKeyboardShortcut(
"ArrowRight",
() => {
@@ -122,7 +158,14 @@ export function NetworkPartnerApplicationSheet({
useKeyboardShortcut("r", () => setShowRejectConfirm(true), {
sheet: true,
- enabled: !["rejected", "trusted"].includes(partner.networkStatus),
+ enabled:
+ !showRevertToDraftInsteadOfReject &&
+ !["rejected", "trusted"].includes(partner.networkStatus),
+ });
+
+ useKeyboardShortcut("r", () => setShowRevertToDraftConfirm(true), {
+ sheet: true,
+ enabled: showRevertToDraftInsteadOfReject,
});
return (
@@ -136,6 +179,7 @@ export function NetworkPartnerApplicationSheet({
>
{approveModal}
{rejectModal}
+ {revertToDraftModal}
<div className="flex size-full flex-col">
<div className="flex h-16 shrink-0 items-center justify-between border-b border-neutral-200 px-6 py-4">
@@ -220,19 +264,30 @@ export function NetworkPartnerApplicationSheet({
<div className="shrink-0 border-t border-neutral-200 p-5">
<div className="flex justify-end gap-2">
- <Button
- type="button"
- variant="secondary"
- text="Reject"
- className="w-fit shrink-0"
- shortcut="R"
- onClick={() => setShowRejectConfirm(true)}
- disabledTooltip={
- ["rejected", "trusted"].includes(partner.networkStatus)
- ? `Cannot reject a ${partner.networkStatus} partner.`
- : undefined
- }
- />
+ {showRevertToDraftInsteadOfReject ? (
+ <Button
+ type="button"
+ variant="secondary"
+ text="Revert to draft"
+ className="w-fit shrink-0"
+ shortcut="R"
+ onClick={() => setShowRevertToDraftConfirm(true)}
+ />
+ ) : (
+ <Button
+ type="button"
+ variant="secondary"
+ text="Reject"
+ className="w-fit shrink-0"
+ shortcut="R"
+ onClick={() => setShowRejectConfirm(true)}
+ disabledTooltip={
+ ["rejected", "trusted"].includes(partner.networkStatus)
+ ? `Cannot reject a ${partner.networkStatus} partner.`
+ : undefined
+ }
+ />
+ )}
<Button
type="button"
variant="primary"
@@ -282,7 +337,12 @@ function NetworkPartnerSheetTabs({
id: "programs",
label: "Programs",
icon: Trophy,
- badge: programsCount > 99 ? "99+" : programsCount,
+ badge:
+ programsCount === 0
+ ? undefined
+ : programsCount > 99
+ ? "99+"
+ : programsCount,
},
...(duplicatesCount > 0
? [
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/page.tsx
index d1caec1875..89166867f0 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/page.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/network/page.tsx
@@ -206,7 +206,7 @@ export default function NetworkApplicationsPage() {
const handleReviewPartner = async (
partner: AdminNetworkPartner,
- status: "approved" | "rejected",
+ status: "approved" | "rejected" | "draft",
) => {
const currentIndex = partners.findIndex(({ id }) => id === partner.id);
const fallbackPartnerId =
@@ -233,7 +233,9 @@ export default function NetworkApplicationsPage() {
toast.success(
status === "approved"
? "Partner approved for the network."
- : "Partner rejected from the network.",
+ : status === "draft"
+ ? "Network profile reverted to draft."
+ : "Partner rejected from the network.",
);
await mutate();
diff --git a/apps/web/app/(ee)/api/admin/partners/[partnerId]/network-status/route.ts b/apps/web/app/(ee)/api/admin/partners/[partnerId]/network-status/route.ts
index 900ce0a50c..166ce046b5 100644
--- a/apps/web/app/(ee)/api/admin/partners/[partnerId]/network-status/route.ts
+++ b/apps/web/app/(ee)/api/admin/partners/[partnerId]/network-status/route.ts
@@ -9,14 +9,16 @@ import { NextResponse } from "next/server";
import * as z from "zod/v4";
const updateAdminNetworkStatusSchema = z.object({
- status: z.enum(["approved", "rejected"]),
+ status: z.enum(["approved", "rejected", "draft"]),
});
// PATCH /api/admin/partners/[partnerId]/network-status
export const PATCH = withAdmin(
async ({ params, req }) => {
const { partnerId } = params;
- const { status } = updateAdminNetworkStatusSchema.parse(await req.json());
+ const { status: updatedStatus } = updateAdminNetworkStatusSchema.parse(
+ await req.json(),
+ );
const existingPartner = await prisma.partner.findUnique({
where: {
@@ -35,39 +37,49 @@ export const PATCH = withAdmin(
return new Response("Partner not found.", { status: 404 });
}
- if (existingPartner.networkStatus === status) {
+ if (existingPartner.networkStatus === updatedStatus) {
return new Response("Partner is already in this status.", {
status: 400,
});
}
- if (existingPartner.networkStatus === "trusted" && status === "approved") {
+ if (
+ existingPartner.networkStatus === "trusted" &&
+ updatedStatus === "approved"
+ ) {
return new Response("Trusted partners cannot be approved.", {
status: 400,
});
}
- const partnerChangeHistoryLog = existingPartner.changeHistoryLog
+ let partnerChangeHistoryLog = existingPartner.changeHistoryLog
? partnerProfileChangeHistoryLogSchema.parse(
existingPartner.changeHistoryLog,
)
: [];
- partnerChangeHistoryLog.push({
- field: "networkStatus",
- from: existingPartner.networkStatus,
- to: status,
- changedAt: new Date(),
- });
+ if (updatedStatus === "draft") {
+ // if reverting back to draft, remove any pre-existing networkStatus change logs
+ partnerChangeHistoryLog = partnerChangeHistoryLog.filter(
+ (log) => log.field !== "networkStatus",
+ );
+ } else {
+ partnerChangeHistoryLog.push({
+ field: "networkStatus",
+ from: existingPartner.networkStatus,
+ to: updatedStatus,
+ changedAt: new Date(),
+ });
+ }
const updatedPartner = await prisma.partner.update({
where: {
id: partnerId,
},
data: {
- networkStatus: status,
+ networkStatus: updatedStatus,
changeHistoryLog: partnerChangeHistoryLog,
- reviewedAt: new Date(),
+ reviewedAt: updatedStatus === "draft" ? null : new Date(),
},
select: {
id: true,
@@ -77,18 +89,20 @@ export const PATCH = withAdmin(
if (
existingPartner.email &&
- (status === "approved" || status === "rejected")
+ // only send notification emails if partner actually submitted their profile
+ existingPartner.networkStatus === "submitted" &&
+ (updatedStatus === "approved" || updatedStatus === "rejected")
) {
waitUntil(
sendEmail({
to: existingPartner.email,
subject:
- status === "approved"
+ updatedStatus === "approved"
? "Your Dub Partner Network application was approved"
: "Dub Partner Network application update",
variant: "notifications",
react:
- status === "approved"
+ updatedStatus === "approved"
? NetworkPartnerApplicationApproved({
name: existingPartner.name,
email: existingPartner.email,