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.

Allow allow partners to view the marketplace

Marcus Farrellcc840dc97386
diff --git a/apps/web/app/(ee)/api/network/programs/count/route.ts b/apps/web/app/(ee)/api/network/programs/count/route.ts
index 5822be6ab8..5568f776dd 100644
--- a/apps/web/app/(ee)/api/network/programs/count/route.ts
+++ b/apps/web/app/(ee)/api/network/programs/count/route.ts
@@ -1,5 +1,4 @@
import { withPartnerProfile } from "@/lib/auth/partner";
-import { throwIfPartnerCannotViewMarketplace } from "@/lib/network/throw-if-partner-cannot-view-marketplace";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { getNetworkProgramsCountQuerySchema } from "@/lib/zod/schemas/program-network";
import { prisma } from "@dub/prisma";
@@ -15,8 +14,6 @@ const rewardTypeMap = {
// GET /api/network/programs/count - get the number of available programs in the network
export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
- await throwIfPartnerCannotViewMarketplace({ partner });
-
const { groupBy, category, rewardType, status, featured, search } =
getNetworkProgramsCountQuerySchema.parse(searchParams);
diff --git a/apps/web/app/(ee)/api/network/programs/route.ts b/apps/web/app/(ee)/api/network/programs/route.ts
index acf3033c4d..dadc30462d 100644
--- a/apps/web/app/(ee)/api/network/programs/route.ts
+++ b/apps/web/app/(ee)/api/network/programs/route.ts
@@ -1,5 +1,4 @@
import { withPartnerProfile } from "@/lib/auth/partner";
-import { throwIfPartnerCannotViewMarketplace } from "@/lib/network/throw-if-partner-cannot-view-marketplace";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import {
NetworkProgramSchema,
@@ -11,8 +10,6 @@ import * as z from "zod/v4";
// GET /api/network/programs - get all available programs in the network
export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
- await throwIfPartnerCannotViewMarketplace({ partner });
-
const {
search,
featured,
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/use-partner-discovery-requirements.ts b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/use-partner-discovery-requirements.ts
index 955a15ecf7..430a0b1844 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/use-partner-discovery-requirements.ts
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/use-partner-discovery-requirements.ts
@@ -1,7 +1,5 @@
-import { EXCLUDED_PROGRAM_IDS } from "@/lib/constants/partner-profile";
import {
- getDiscoverabilityRequirements,
- partnerHasEarnedCommissions,
+ getPartnerProfileChecklistProgress,
} from "@/lib/network/get-discoverability-requirements";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
@@ -14,23 +12,15 @@ export function usePartnerDiscoveryRequirements() {
return useMemo(() => {
if (!partner || !programEnrollments) return undefined;
- const enrollmentProgramIds = new Set(
- programEnrollments.map((e) => e.programId),
- );
- const hasExcludedProgram = EXCLUDED_PROGRAM_IDS.some((id) =>
- enrollmentProgramIds.has(id),
- );
+ const checklistProgress = getPartnerProfileChecklistProgress({
+ partner,
+ programEnrollments,
+ });
- if (
- hasExcludedProgram &&
- !partnerHasEarnedCommissions(programEnrollments)
- ) {
+ if (!checklistProgress.isApplicable) {
return undefined;
}
- return getDiscoverabilityRequirements({
- partner,
- programEnrollments,
- });
+ return checklistProgress.tasks;
}, [partner, programEnrollments]);
}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/header-controls.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/header-controls.tsx
index 3eb0f8dc57..f7af3d198f 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/header-controls.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/[programSlug]/header-controls.tsx
@@ -1,15 +1,18 @@
"use client";
import { acceptProgramInviteAction } from "@/lib/actions/partners/accept-program-invite";
+import { getPartnerProfileChecklistProgress } from "@/lib/network/get-discoverability-requirements";
import { mutatePrefix } from "@/lib/swr/mutate";
+import usePartnerProfile from "@/lib/swr/use-partner-profile";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
import { NetworkProgramProps } from "@/lib/types";
import { useProgramApplicationSheet } from "@/ui/partners/program-application-sheet";
-import { Button, useKeyboardShortcut } from "@dub/ui";
+import { Button, ProgressCircle, useKeyboardShortcut } from "@dub/ui";
import { useAction } from "next-safe-action/hooks";
import Link from "next/link";
import { useParams, useRouter } from "next/navigation";
+import { ReactNode } from "react";
import { toast } from "sonner";
export function MarketplaceProgramHeaderControls({
@@ -47,15 +50,53 @@ function ApplyButton({ program }: { program: NetworkProgramProps }) {
onSuccess: () => mutatePrefix("/api/network/programs"),
});
+ const { partner } = usePartnerProfile();
+ const { programEnrollments } = useProgramEnrollments();
const { programEnrollment } = useProgramEnrollment();
- const disabledTooltip =
+ const checklistProgress =
+ partner && programEnrollments
+ ? getPartnerProfileChecklistProgress({
+ partner,
+ programEnrollments,
+ })
+ : undefined;
+
+ const disabledTooltip: ReactNode =
programEnrollment?.status === "banned"
? "You are banned from this program"
: programEnrollment?.status === "pending"
? "Your application is under review"
: programEnrollment?.status === "rejected"
? "Your application was rejected"
+ : checklistProgress && !checklistProgress.isComplete
+ ? (
+ <div className="max-w-xs p-4">
+ <div className="text-content-default text-sm leading-5">
+ Complete your{" "}
+ <Link
+ href="/profile"
+ className="underline underline-offset-2"
+ >
+ partner profile
+ </Link>{" "}
+ to apply
+ </div>
+ <div className="bg-bg-subtle mt-3 flex items-center justify-center gap-2 rounded-lg px-2.5 py-1.5">
+ <ProgressCircle
+ progress={
+ checklistProgress.completedCount /
+ checklistProgress.totalCount
+ }
+ className="text-green-500"
+ />
+ <span className="text-content-default text-sm font-medium">
+ {checklistProgress.completedCount} of{" "}
+ {checklistProgress.totalCount} tasks completed
+ </span>
+ </div>
+ </div>
+ )
: undefined;
useKeyboardShortcut("a", () => setIsApplicationSheetOpen(true), {
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/layout.tsx
index 90270f9eea..de6b550241 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/layout.tsx
@@ -1,20 +1,7 @@
"use client";
-import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
-import usePartnerProfile from "@/lib/swr/use-partner-profile";
-import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
-import { redirect } from "next/navigation";
import { PropsWithChildren } from "react";
export default function MarketplaceLayout({ children }: PropsWithChildren) {
- const { partner } = usePartnerProfile();
- const { programEnrollments, isLoading } = useProgramEnrollments();
- if (
- !isLoading &&
- programEnrollments &&
- !partnerCanViewMarketplace({ partner, programEnrollments })
- )
- redirect("/programs");
-
return children;
}
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index c6f4485d5a..390033d45c 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -6,7 +6,7 @@ import { notifyPartnerApplication } from "@/lib/api/partners/notify-partner-appl
import { getIP } from "@/lib/api/utils/get-ip";
import { getSession } from "@/lib/auth";
import { qstash } from "@/lib/cron";
-import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
+import { getPartnerProfileChecklistProgress } from "@/lib/network/get-discoverability-requirements";
import {
formatApplicationFormData,
formatWebsiteAndSocialsFields,
@@ -165,20 +165,26 @@ export const createProgramApplicationAction = actionClient
},
include: {
programs: true,
+ platforms: true,
},
})
: null;
- // if the application form is not published and
- // the partner is not logged in OR is logged in but cannot view the marketplace, throw an error
- if (
- !group.applicationFormPublishedAt &&
- (!existingPartner ||
- !partnerCanViewMarketplace({
+ const checklistProgress = existingPartner
+ ? getPartnerProfileChecklistProgress({
partner: existingPartner,
programEnrollments: existingPartner.programs,
- }))
- ) {
+ })
+ : null;
+
+ // if an existing partner has an incomplete profile, prompt them to complete it
+ if (existingPartner && !checklistProgress?.isComplete) {
+ throw new Error("Complete your partner profile to apply");
+ }
+
+ // if the application form is not published and
+ // the partner is not logged in, throw an error
+ if (!group.applicationFormPublishedAt && !existingPartner) {
throw new Error("This program is no longer accepting applications.");
}
diff --git a/apps/web/lib/network/get-discoverability-requirements.ts b/apps/web/lib/network/get-discoverability-requirements.ts
index 2ecbdd8af2..5960538e6d 100644
--- a/apps/web/lib/network/get-discoverability-requirements.ts
+++ b/apps/web/lib/network/get-discoverability-requirements.ts
@@ -47,7 +47,13 @@ export const partnerCanViewMarketplace = ({
);
};
-export function getDiscoverabilityRequirements({
+export type DiscoverabilityRequirement = {
+ label: string;
+ href?: string;
+ completed: boolean;
+};
+
+export function getPartnerProfileChecklistProgress({
partner,
programEnrollments,
}: {
@@ -64,6 +70,51 @@ export function getDiscoverabilityRequirements({
"programId" | "status" | "totalCommissions"
>[];
}) {
+ const tasks = getDiscoverabilityRequirements({
+ partner,
+ programEnrollments,
+ });
+
+ const completedCount = tasks.filter(({ completed }) => completed).length;
+ const totalCount = tasks.length;
+
+ const enrollmentProgramIds = new Set(
+ programEnrollments.map((enrollment) => enrollment.programId),
+ );
+ const hasExcludedProgram = EXCLUDED_PROGRAM_IDS.some((id) =>
+ enrollmentProgramIds.has(id),
+ );
+
+ const isApplicable = !(
+ hasExcludedProgram && !partnerHasEarnedCommissions(programEnrollments)
+ );
+
+ return {
+ tasks,
+ completedCount,
+ totalCount,
+ isApplicable,
+ isComplete: !isApplicable || completedCount === totalCount,
+ };
+}
+
+export function getDiscoverabilityRequirements({
+ partner,
+ programEnrollments,
+}: {
+ partner: Pick<
+ PartnerProps,
+ | "description"
+ | "monthlyTraffic"
+ | "preferredEarningStructures"
+ | "salesChannels"
+ | "platforms"
+ >;
+ programEnrollments: Pick<
+ EnrolledPartnerProps,
+ "programId" | "status" | "totalCommissions"
+ >[];
+}): DiscoverabilityRequirement[] {
return [
{
label: "Add basic profile info",
diff --git a/apps/web/tests/misc/partner-profile-checklist-progress.test.ts b/apps/web/tests/misc/partner-profile-checklist-progress.test.ts
new file mode 100644
index 0000000000..327d17b057
--- /dev/null
+++ b/apps/web/tests/misc/partner-profile-checklist-progress.test.ts
@@ -0,0 +1,84 @@
+import {
+ EXCLUDED_PROGRAM_IDS,
+ PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
+} from "@/lib/constants/partner-profile";
+import { getPartnerProfileChecklistProgress } from "@/lib/network/get-discoverability-requirements";
+import { describe, expect, it } from "vitest";
+
+type ChecklistInput = Parameters<typeof getPartnerProfileChecklistProgress>[0];
+
+const basePartner: ChecklistInput["partner"] = {
+ description: null,
+ monthlyTraffic: null,
+ preferredEarningStructures: [],
+ salesChannels: [],
+ platforms: [],
+};
+
+describe("getPartnerProfileChecklistProgress", () => {
+ it("returns incomplete progress for an incomplete profile", () => {
+ const result = getPartnerProfileChecklistProgress({
+ partner: basePartner,
+ programEnrollments: [],
+ });
+
+ expect(result.isApplicable).toBe(true);
+ expect(result.isComplete).toBe(false);
+ expect(result.completedCount).toBeLessThan(result.totalCount);
+ expect(result.totalCount).toBe(8);
+ });
+
+ it("returns complete progress when all checklist tasks are complete", () => {
+ const result = getPartnerProfileChecklistProgress({
+ partner: {
+ ...basePartner,
+ description: "Creator profile",
+ monthlyTraffic: "OneHundredThousandPlus",
+ preferredEarningStructures: ["Per_Sale"],
+ salesChannels: ["Blogs"],
+ platforms: [
+ {
+ type: "website",
+ identifier: "https://example.com",
+ verifiedAt: null,
+ platformId: null,
+ subscribers: BigInt(0),
+ posts: BigInt(0),
+ views: BigInt(0),
+ },
+ ],
+ },
+ programEnrollments: [
+ {
+ programId: "prog_non_excluded",
+ status: "approved",
+ totalCommissions: PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
+ },
+ ],
+ });
+
+ expect(result.isApplicable).toBe(true);
+ expect(result.isComplete).toBe(true);
+ expect(result.completedCount).toBe(result.totalCount);
+ expect(result.totalCount).toBe(8);
+ });
+
+ it("handles the excluded-program edge case consistently", () => {
+ expect(EXCLUDED_PROGRAM_IDS.length).toBeGreaterThan(0);
+
+ const result = getPartnerProfileChecklistProgress({
+ partner: basePartner,
+ programEnrollments: [
+ {
+ programId: EXCLUDED_PROGRAM_IDS[0],
+ status: "approved",
+ totalCommissions: 0,
+ },
+ ],
+ });
+
+ expect(result.isApplicable).toBe(false);
+ expect(result.isComplete).toBe(true);
+ expect(result.totalCount).toBe(8);
+ });
+});
diff --git a/apps/web/ui/layout/sidebar/partner-program-dropdown.tsx b/apps/web/ui/layout/sidebar/partner-program-dropdown.tsx
index 8c5b9656ae..c53018ea6b 100644
--- a/apps/web/ui/layout/sidebar/partner-program-dropdown.tsx
+++ b/apps/web/ui/layout/sidebar/partner-program-dropdown.tsx
@@ -1,6 +1,5 @@
"use client";
-import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
import { ProgramProps } from "@/lib/types";
@@ -44,10 +43,6 @@ export function PartnerProgramDropdown() {
: undefined;
}, [programSlug, programEnrollments]);
- const canViewMarketplace =
- programEnrollments &&
- partnerCanViewMarketplace({ partner, programEnrollments });
-
const [openPopover, setOpenPopover] = useState(false);
if (!partner || (programSlug && !programEnrollments)) {
@@ -91,21 +86,19 @@ export function PartnerProgramDropdown() {
All programs
</span>
</Link>
- {canViewMarketplace && (
- <Link
- href="/programs/marketplace"
- className={cn(
- "flex items-center gap-x-2.5 rounded-md px-2.5 py-2 text-base transition-all duration-75 hover:bg-neutral-200/50 active:bg-neutral-200/80 sm:text-sm",
- "outline-none focus-visible:ring-2 focus-visible:ring-black/50",
- )}
- onClick={() => setOpenPopover(false)}
- >
- <Shop className="size-5 text-neutral-500 sm:size-4" />
- <span className="text-content-default block truncate">
- Marketplace
- </span>
- </Link>
- )}
+ <Link
+ href="/programs/marketplace"
+ className={cn(
+ "flex items-center gap-x-2.5 rounded-md px-2.5 py-2 text-base transition-all duration-75 hover:bg-neutral-200/50 active:bg-neutral-200/80 sm:text-sm",
+ "outline-none focus-visible:ring-2 focus-visible:ring-black/50",
+ )}
+ onClick={() => setOpenPopover(false)}
+ >
+ <Shop className="size-5 text-neutral-500 sm:size-4" />
+ <span className="text-content-default block truncate">
+ Marketplace
+ </span>
+ </Link>
</div>
</div>
</div>
diff --git a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
index 6e7c90912a..b788e4bbb6 100644
--- a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
@@ -1,10 +1,7 @@
"use client";
-import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
-import usePartnerProfile from "@/lib/swr/use-partner-profile";
import usePartnerProgramBounties from "@/lib/swr/use-partner-program-bounties";
import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
import useProgramEnrollmentsCount from "@/lib/swr/use-program-enrollments-count";
import { useProgramMessagesCount } from "@/lib/swr/use-program-messages-count";
import { ProgramMarketplaceCard } from "@/ui/partners/program-marketplace/program-marketplace-card";
@@ -45,7 +42,6 @@ type SidebarNavData = {
unreadMessagesCount?: number;
programBountiesCount?: number;
showDetailedAnalytics?: boolean;
- showMarketplace?: boolean;
};
const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({
@@ -88,7 +84,7 @@ const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({
const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
// Top-level
- programs: ({ invitationsCount, showMarketplace }) => ({
+ programs: ({ invitationsCount }) => ({
title: (
<div className="mb-3">
<PartnerProgramDropdown />
@@ -109,16 +105,12 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
(k) => !pathname.startsWith(`${href}/${k}`),
),
},
- ...(showMarketplace
- ? [
- {
- name: "Marketplace",
- icon: Shop,
- href: "/programs/marketplace" as `/${string}`,
- badge: "New",
- },
- ]
- : []),
+ {
+ name: "Marketplace",
+ icon: Shop,
+ href: "/programs/marketplace" as `/${string}`,
+ badge: "New",
+ },
{
name: "Invitations",
icon: UserCheck,
@@ -293,8 +285,6 @@ export function PartnersSidebarNav({
const pathname = usePathname();
const { getQueryString } = useRouterStuff();
- const { partner } = usePartnerProfile();
-
const isEnrolledProgramPage =
pathname.startsWith(`/programs/${programSlug}`) &&
!["/apply", "/invite"].some((p) => pathname.endsWith(p));
@@ -315,7 +305,6 @@ export function PartnersSidebarNav({
: "programs";
}, [pathname, programSlug, isEnrolledProgramPage]);
- const { programEnrollments } = useProgramEnrollments();
const { count: invitationsCount } = useProgramEnrollmentsCount({
status: "invited",
});
@@ -357,10 +346,6 @@ export function PartnersSidebarNav({
unreadMessagesCount,
programBountiesCount: bountiesCount.active,
showDetailedAnalytics,
- showMarketplace: partnerCanViewMarketplace({
- partner,
- programEnrollments: programEnrollments || [],
- }),
}}
toolContent={toolContent}
newsContent={newsContent}
diff --git a/apps/web/ui/partners/program-marketplace/program-marketplace-banner.tsx b/apps/web/ui/partners/program-marketplace/program-marketplace-banner.tsx
index e0c801ac87..e280b0763c 100644
--- a/apps/web/ui/partners/program-marketplace/program-marketplace-banner.tsx
+++ b/apps/web/ui/partners/program-marketplace/program-marketplace-banner.tsx
@@ -1,8 +1,6 @@
"use client";
-import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
-import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
import { useProgramMarketplacePromo } from "@/ui/partners/program-marketplace/use-program-marketplace-promo";
import { X } from "@/ui/shared/icons";
import { Button, Grid, buttonVariants } from "@dub/ui";
@@ -13,15 +11,11 @@ import { ProgramMarketplaceLogos } from "./program-marketplace-logos";
export function ProgramMarketplaceBanner() {
const { partner } = usePartnerProfile();
- const { programEnrollments } = useProgramEnrollments();
const { status, setStatus } = useProgramMarketplacePromo();
return (
<AnimatePresence>
- {partner &&
- programEnrollments &&
- partnerCanViewMarketplace({ partner, programEnrollments }) &&
- status === "banner" && (
+ {partner && status === "banner" && (
<motion.div
initial={{ opacity: 0, height: 0 }}
animate={{ opacity: 1, height: "auto" }}
diff --git a/apps/web/ui/partners/program-marketplace/program-marketplace-card.tsx b/apps/web/ui/partners/program-marketplace/program-marketplace-card.tsx
index 58dd86522a..a649b4f136 100644
--- a/apps/web/ui/partners/program-marketplace/program-marketplace-card.tsx
+++ b/apps/web/ui/partners/program-marketplace/program-marketplace-card.tsx
@@ -1,8 +1,6 @@
"use client";
-import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
-import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
import { useProgramMarketplacePromo } from "@/ui/partners/program-marketplace/use-program-marketplace-promo";
import { Grid, buttonVariants } from "@dub/ui";
import { cn } from "@dub/utils";
@@ -15,16 +13,10 @@ export function ProgramMarketplaceCard() {
const pathname = usePathname();
const { partner } = usePartnerProfile();
- const { programEnrollments } = useProgramEnrollments();
const { status } = useProgramMarketplacePromo();
- if (
- !partner ||
- !programEnrollments ||
- !partnerCanViewMarketplace({ partner, programEnrollments }) ||
- status !== "card"
- )
+ if (!partner || status !== "card")
return null;
return (