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.

improve Plain callback, admin tab Suspense

Steven Tey3c43712cbcfe
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/layout.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/layout.tsx
index 28ccc7c425..4bdd06bd20 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/layout.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/layout.tsx
@@ -1,4 +1,5 @@
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { LoadingSpinner } from "@dub/ui";
import { Suspense } from "react";
import { PartnersNavTabs } from "./partners-nav-tabs";
@@ -10,13 +11,19 @@ export default function AdminPartnersLayout({
return (
<PageWidthWrapper className="pb-12 pt-4">
<div className="border-border-subtle overflow-hidden rounded-xl border bg-neutral-100">
- <Suspense>
- <PartnersNavTabs />
- <div className="border-border-subtle -mx-px -mb-px space-y-4 rounded-xl border bg-white p-4">
- {children}
- </div>
- </Suspense>
+ <PartnersNavTabs />
+ <div className="border-border-subtle -mx-px -mb-px space-y-4 rounded-xl border bg-white p-4">
+ <Suspense fallback={<PartnersPageFallback />}>{children}</Suspense>
+ </div>
</div>
</PageWidthWrapper>
);
}
+
+function PartnersPageFallback() {
+ return (
+ <div className="flex h-96 items-center justify-center">
+ <LoadingSpinner />
+ </div>
+ );
+}
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 0e0e898ef2..9ab5ce7304 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
@@ -50,7 +50,11 @@ function getDateColumnForNetworkStatus(networkStatus?: string) {
};
}
- if (networkStatus === "approved" || networkStatus === "rejected") {
+ if (
+ networkStatus === "approved" ||
+ networkStatus === "rejected" ||
+ networkStatus === "banned"
+ ) {
return {
id: "reviewedAt" as const,
header: capitalize(networkStatus) as string,
diff --git a/apps/web/app/(ee)/api/admin/partners/network/route.ts b/apps/web/app/(ee)/api/admin/partners/network/route.ts
index 1a278a22df..584d425edd 100644
--- a/apps/web/app/(ee)/api/admin/partners/network/route.ts
+++ b/apps/web/app/(ee)/api/admin/partners/network/route.ts
@@ -22,7 +22,9 @@ export const GET = withAdmin(async ({ searchParams }) => {
sortByParam ??
(networkStatus === "submitted"
? "submittedAt"
- : networkStatus === "approved" || networkStatus === "rejected"
+ : networkStatus === "approved" ||
+ networkStatus === "rejected" ||
+ networkStatus === "banned"
? "reviewedAt"
: "createdAt");
diff --git a/apps/web/app/(ee)/api/embed/referrals/tremendous/verify-otp/route.ts b/apps/web/app/(ee)/api/embed/referrals/tremendous/verify-otp/route.ts
index 1816fd3d06..2221073905 100644
--- a/apps/web/app/(ee)/api/embed/referrals/tremendous/verify-otp/route.ts
+++ b/apps/web/app/(ee)/api/embed/referrals/tremendous/verify-otp/route.ts
@@ -84,7 +84,7 @@ export const POST = withReferralsEmbedToken(
throw new DubApiError({
code: "forbidden",
message:
- "Your account is banned from the Dub Partner Network, so you can't connect a payout method.",
+ "Your partner account is banned, so you can't connect a payout method.",
});
}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/network-ban-banner.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/network-ban-banner.tsx
index ba21449eeb..c6940799fa 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/network-ban-banner.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/network-ban-banner.tsx
@@ -18,8 +18,8 @@ export function NetworkBanBanner() {
You&rsquo;re banned from the Dub Partner Network.
</span>
<span className="hidden sm:inline">
- Your account is banned from the Dub Partner Network. Payouts and new
- program applications are disabled.
+ Your partner account is banned. Payouts and new program applications
+ are disabled.
</span>
</p>
</div>
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/partner-main-nav.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/partner-main-nav.tsx
index f818843ed6..a1993470f4 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/partner-main-nav.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/partner-main-nav.tsx
@@ -5,7 +5,7 @@ import { MainNav } from "@/ui/layout/main-nav";
import { HelpButton } from "@/ui/layout/sidebar/help-button";
import { PartnersSidebarNav } from "@/ui/layout/sidebar/partners-sidebar-nav";
import { ReactNode } from "react";
-import { NetworkBanBanner } from "./network-ban-banner";
+// import { NetworkBanBanner } from "./network-ban-banner";
export function PartnerMainNav({ children }: { children: ReactNode }) {
const { partner } = usePartnerProfile();
@@ -13,7 +13,7 @@ export function PartnerMainNav({ children }: { children: ReactNode }) {
return (
<>
- {isBannedFromNetwork && <NetworkBanBanner />}
+ {/* {isBannedFromNetwork && <NetworkBanBanner />} */}
<MainNav
toolContent={<HelpButton />}
sidebar={PartnersSidebarNav}
diff --git a/apps/web/app/api/callback/plain/partner/route.ts b/apps/web/app/api/callback/plain/partner/route.ts
index 750d70876b..8d0eaa1218 100644
--- a/apps/web/app/api/callback/plain/partner/route.ts
+++ b/apps/web/app/api/callback/plain/partner/route.ts
@@ -7,6 +7,10 @@ import {
formatDate,
formatDateTimeSmart,
} from "@dub/utils";
+import {
+ PartnerNetworkStatus,
+ ProgramEnrollmentStatus,
+} from "@prisma/client";
import { uiComponent } from "@team-plain/typescript-sdk";
import { NextRequest, NextResponse } from "next/server";
import {
@@ -18,6 +22,32 @@ import {
plainUsageSection,
} from "../utils";
+const NETWORK_STATUS_BADGE: Record<
+ PartnerNetworkStatus,
+ { label: string; color: "GREY" | "GREEN" | "YELLOW" | "RED" | "BLUE" }
+> = {
+ draft: { label: "Draft", color: "GREY" },
+ submitted: { label: "Submitted", color: "YELLOW" },
+ approved: { label: "Approved", color: "GREEN" },
+ rejected: { label: "Rejected", color: "RED" },
+ trusted: { label: "Trusted", color: "BLUE" },
+ banned: { label: "Banned", color: "RED" },
+};
+
+const ENROLLMENT_STATUS_BADGE: Record<
+ ProgramEnrollmentStatus,
+ { label: string; color: "GREY" | "GREEN" | "YELLOW" | "RED" | "BLUE" }
+> = {
+ pending: { label: "Pending", color: "YELLOW" },
+ approved: { label: "Approved", color: "GREEN" },
+ rejected: { label: "Rejected", color: "RED" },
+ invited: { label: "Invited", color: "BLUE" },
+ declined: { label: "Declined", color: "GREY" },
+ deactivated: { label: "Deactivated", color: "GREY" },
+ banned: { label: "Banned", color: "RED" },
+ archived: { label: "Archived", color: "GREY" },
+};
+
export async function POST(req: NextRequest) {
// authenticate webhook X-Plain-Webhook-Secret
const token = req.headers.get("X-Plain-Webhook-Secret");
@@ -71,6 +101,7 @@ export async function POST(req: NextRequest) {
},
},
createdAt: true,
+ status: true,
totalCommissions: true,
},
where: {
@@ -107,6 +138,7 @@ export async function POST(req: NextRequest) {
stripeConnectId,
paypalEmail,
payoutsEnabledAt,
+ networkStatus,
} = partnerProfile;
await plain.addCustomerToCustomerGroups({
@@ -156,6 +188,20 @@ export async function POST(req: NextRequest) {
],
}),
plainSpacer,
+ uiComponent.row({
+ mainContent: [
+ uiComponent.text({
+ text: "Network Status",
+ }),
+ ],
+ asideContent: [
+ uiComponent.badge({
+ label: NETWORK_STATUS_BADGE[networkStatus].label,
+ color: NETWORK_STATUS_BADGE[networkStatus].color,
+ }),
+ ],
+ }),
+ plainSpacer,
uiComponent.row({
mainContent: [
uiComponent.text({
@@ -261,12 +307,12 @@ export async function POST(req: NextRequest) {
? [
plainDivider,
...partnerProfile.programs.flatMap(
- ({ program, createdAt, totalCommissions }) => [
+ ({ program, createdAt, status, totalCommissions }) => [
plainUsageSection({
usage: currencyFormatter(totalCommissions),
label: program.name,
- sublabel: `Partner since ${formatDate(createdAt)}`,
- color: "GREEN",
+ sublabel: `${ENROLLMENT_STATUS_BADGE[status].label} · Partner since ${formatDate(createdAt)}`,
+ color: ENROLLMENT_STATUS_BADGE[status].color,
}),
uiComponent.spacer({
size: "M",
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index d90f6e6bec..18ccd393f0 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -54,7 +54,7 @@ import { actionClient } from "../safe-action";
export type PartnerData = { name: string; country?: string };
const NETWORK_BAN_ERROR =
- "Your account is banned from the Dub Partner Network, so you can't apply to programs. Please contact [email protected] if you think this is a mistake.";
+ "Your partner account is banned, so you can't apply to programs.";
interface Response {
programApplicationId: string;
diff --git a/apps/web/ui/partners/partner-network/network-status-badges.ts b/apps/web/ui/partners/partner-network/network-status-badges.ts
index cbff54fc1c..48e5c2d871 100644
--- a/apps/web/ui/partners/partner-network/network-status-badges.ts
+++ b/apps/web/ui/partners/partner-network/network-status-badges.ts
@@ -44,7 +44,7 @@ export const NetworkStatusBadges = {
banned: {
partnerTooltip: {
content:
- "Your account is banned from the Dub Partner Network. You are not eligible to apply to this program.",
+ "Your partner account is banned. You are not eligible to apply to this program.",
cta: "Banned",
},
label: "Banned",