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.

rearrange, update naming

Steven Tey46adeb713b66
diff --git a/apps/web/app/(ee)/api/network/programs/[programSlug]/route.ts b/apps/web/app/(ee)/api/network/programs/[programSlug]/route.ts
index f0e0289097..d24cfb2e5f 100644
--- a/apps/web/app/(ee)/api/network/programs/[programSlug]/route.ts
+++ b/apps/web/app/(ee)/api/network/programs/[programSlug]/route.ts
@@ -1,19 +1,14 @@
-import { DubApiError } from "@/lib/api/errors";
import { withPartnerProfile } from "@/lib/auth/partner";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { programLanderSchema } from "@/lib/zod/schemas/program-lander";
import { NetworkProgramExtendedSchema } from "@/lib/zod/schemas/program-network";
import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
-import { checkProgramNetworkRequirements } from "../check-program-network-requirements";
+import { throwIfPartnerCannotViewMarketplace } from "../../../../../../lib/network/throw-if-partner-cannot-view-marketplace";
// GET /api/network/programs/[programSlug] - get a program in the network by slug
export const GET = withPartnerProfile(async ({ partner, params }) => {
- if (!(await checkProgramNetworkRequirements({ partner })))
- throw new DubApiError({
- code: "forbidden",
- message: "Program network is not available for this partner.",
- });
+ await throwIfPartnerCannotViewMarketplace({ partner });
const { programSlug } = params;
diff --git a/apps/web/app/(ee)/api/network/programs/check-program-network-requirements.ts b/apps/web/app/(ee)/api/network/programs/check-program-network-requirements.ts
deleted file mode 100644
index b36f1f8907..0000000000
--- a/apps/web/app/(ee)/api/network/programs/check-program-network-requirements.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { LARGE_PROGRAM_IDS } from "@/lib/constants/partner-profile";
-import { PartnerProps } from "@/lib/types";
-import { prisma } from "@dub/prisma";
-
-export async function checkProgramNetworkRequirements({
- partner,
-}: {
- partner: Pick<PartnerProps, "id">;
-}) {
- const data = await prisma.partner.findUnique({
- where: {
- id: partner.id,
- programs: {
- some: {
- programId: {
- notIn: LARGE_PROGRAM_IDS,
- },
- status: "approved",
- totalCommissions: {
- gte: 10_00,
- },
- },
- none: {
- status: "banned",
- },
- },
- },
- });
-
- return data !== null;
-}
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 c24c2a7d30..1ef0913966 100644
--- a/apps/web/app/(ee)/api/network/programs/count/route.ts
+++ b/apps/web/app/(ee)/api/network/programs/count/route.ts
@@ -1,11 +1,10 @@
-import { DubApiError } from "@/lib/api/errors";
import { withPartnerProfile } from "@/lib/auth/partner";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { getNetworkProgramsCountQuerySchema } from "@/lib/zod/schemas/program-network";
import { prisma } from "@dub/prisma";
import { Prisma } from "@dub/prisma/client";
import { NextResponse } from "next/server";
-import { checkProgramNetworkRequirements } from "../check-program-network-requirements";
+import { throwIfPartnerCannotViewMarketplace } from "../../../../../../lib/network/throw-if-partner-cannot-view-marketplace";
const rewardTypeMap = {
sale: Prisma.sql`pg.saleRewardId IS NOT NULL`,
@@ -16,11 +15,7 @@ const rewardTypeMap = {
// GET /api/network/programs/count - get the number of available programs in the network
export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
- if (!(await checkProgramNetworkRequirements({ partner })))
- throw new DubApiError({
- code: "forbidden",
- message: "Program network is not available for this partner.",
- });
+ 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 bcf7dbb4dc..0b96bf6bda 100644
--- a/apps/web/app/(ee)/api/network/programs/route.ts
+++ b/apps/web/app/(ee)/api/network/programs/route.ts
@@ -1,5 +1,5 @@
-import { DubApiError } from "@/lib/api/errors";
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,
@@ -8,15 +8,10 @@ import {
import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
import { z } from "zod";
-import { checkProgramNetworkRequirements } from "./check-program-network-requirements";
// GET /api/network/programs - get all available programs in the network
export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
- if (!(await checkProgramNetworkRequirements({ partner })))
- throw new DubApiError({
- code: "forbidden",
- message: "Program network is not available for this partner.",
- });
+ await throwIfPartnerCannotViewMarketplace({ partner });
const {
search,
@@ -55,6 +50,8 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
{ name: { contains: search } },
{ slug: { contains: search } },
{ domain: { contains: search } },
+ { url: { contains: search } },
+ // { description: { contains: search } },
],
}),
...(category && {
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 a808df67ff..955a15ecf7 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
@@ -2,7 +2,7 @@ import { EXCLUDED_PROGRAM_IDS } from "@/lib/constants/partner-profile";
import {
getDiscoverabilityRequirements,
partnerHasEarnedCommissions,
-} from "@/lib/partners/get-discoverability-requirements";
+} from "@/lib/network/get-discoverability-requirements";
import usePartnerProfile from "@/lib/swr/use-partner-profile";
import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
import { useMemo } from "react";
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 0aa2661287..3eef411e90 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,6 +1,6 @@
"use client";
-import { partnerCanViewMarketplace } from "@/lib/partners/get-discoverability-requirements";
+import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
import useProgramEnrollments from "@/lib/swr/use-program-enrollments";
import { redirect } from "next/navigation";
import { PropsWithChildren } from "react";
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/page-client.tsx
index 1560ade454..c46b2cb412 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/page-client.tsx
@@ -22,9 +22,7 @@ import { useProgramNetworkFilters } from "./use-program-network-filters";
export function ProgramMarketplacePageClient() {
const { getQueryString } = useRouterStuff();
- const { data: programsCount, error: countError } = useNetworkProgramsCount(
- {},
- );
+ const { data: programsCount, error: countError } = useNetworkProgramsCount();
const {
data: programs,
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-card.tsx
index 8ab9c53229..6b75314807 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/program-card.tsx
@@ -77,7 +77,7 @@ export function ProgramCard({ program }: { program?: NetworkProgramProps }) {
<div className="h-6 w-32 animate-pulse rounded bg-neutral-200" />
)}
- <div className="text-content-subtle mt-1 text-sm">
+ <div className="text-content-subtle mt-1 line-clamp-2 text-sm">
{/* Domain */}
{program ? (
`${program.name} is a program in the Dub Partner Network. Join the network to start partnering with them.`
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx
index 12bf05b47e..c84c938e59 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/marketplace/use-program-network-filters.tsx
@@ -1,4 +1,4 @@
-import { categoriesMap } from "@/lib/partners/categories";
+import { PROGRAM_CATEGORIES_MAP } from "@/lib/network/program-categories";
import useNetworkProgramsCount from "@/lib/swr/use-network-programs-count";
import { REWARD_EVENTS } from "@/ui/partners/constants";
import { ProgramNetworkStatusBadges } from "@/ui/partners/partner-status-badges";
@@ -73,13 +73,13 @@ export function useProgramNetworkFilters() {
{
key: "category",
icon: Suitcase,
- label: "Industry",
+ label: "Category",
getOptionIcon: (value) => {
- const Icon = categoriesMap[value]?.icon || Suitcase;
+ const Icon = PROGRAM_CATEGORIES_MAP[value]?.icon || Suitcase;
return <Icon className="size-4" />;
},
getOptionLabel: (value) =>
- categoriesMap[value]?.label || value.replace("_", " "),
+ PROGRAM_CATEGORIES_MAP[value]?.label || value.replace("_", " "),
options:
categoriesCount?.map(({ category, _count }) => ({
value: category,
diff --git a/apps/web/app/api/user/referrals-token/route.ts b/apps/web/app/api/user/referrals-token/route.ts
index 143f9778c8..9f90954d54 100644
--- a/apps/web/app/api/user/referrals-token/route.ts
+++ b/apps/web/app/api/user/referrals-token/route.ts
@@ -1,6 +1,6 @@
import { withSession } from "@/lib/auth";
import { dub } from "@/lib/dub";
-import { partnerCanViewMarketplace } from "@/lib/partners/get-discoverability-requirements";
+import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
import { prisma } from "@dub/prisma";
import { NextResponse } from "next/server";
diff --git a/apps/web/lib/actions/partners/update-partner-profile.ts b/apps/web/lib/actions/partners/update-partner-profile.ts
index 54762fdf07..16a5dfe0fa 100644
--- a/apps/web/lib/actions/partners/update-partner-profile.ts
+++ b/apps/web/lib/actions/partners/update-partner-profile.ts
@@ -3,7 +3,7 @@
import { confirmEmailChange } from "@/lib/auth/confirm-email-change";
import { throwIfNoPermission } from "@/lib/auth/partner-users/throw-if-no-permission";
import { qstash } from "@/lib/cron";
-import { getDiscoverabilityRequirements } from "@/lib/partners/get-discoverability-requirements";
+import { getDiscoverabilityRequirements } from "@/lib/network/get-discoverability-requirements";
import { storage } from "@/lib/storage";
import { stripe } from "@/lib/stripe";
import { partnerProfileChangeHistoryLogSchema } from "@/lib/zod/schemas/partner-profile";
diff --git a/apps/web/lib/constants/partner-profile.ts b/apps/web/lib/constants/partner-profile.ts
index 7cde2da789..51405e516b 100644
--- a/apps/web/lib/constants/partner-profile.ts
+++ b/apps/web/lib/constants/partner-profile.ts
@@ -12,3 +12,4 @@ export const EXCLUDED_PROGRAM_IDS = [
"prog_1K0QHV7MP3PR05CJSCF5VN93X",
"prog_1JWVR53QX1NM7NDEK62E3J19H",
];
+export const PARTNER_NETWORK_MIN_COMMISSIONS_CENTS = 10_00; // $10
diff --git a/apps/web/lib/partners/get-discoverability-requirements.ts b/apps/web/lib/network/get-discoverability-requirements.ts
similarity index 87%
rename from apps/web/lib/partners/get-discoverability-requirements.ts
rename to apps/web/lib/network/get-discoverability-requirements.ts
index b9271b308b..d3b07a1043 100644
--- a/apps/web/lib/partners/get-discoverability-requirements.ts
+++ b/apps/web/lib/network/get-discoverability-requirements.ts
@@ -1,12 +1,13 @@
import { currencyFormatter } from "@dub/utils";
-import { EXCLUDED_PROGRAM_IDS } from "../constants/partner-profile";
-import { EnrolledPartnerProps, PartnerProps } from "../types";
+import {
+ EXCLUDED_PROGRAM_IDS,
+ PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
+} from "../constants/partner-profile";
import {
ONLINE_PRESENCE_FIELDS,
PartnerOnlinePresenceFields,
-} from "./online-presence";
-
-const PARTNER_DISCOVERY_MIN_COMMISSIONS = 10_00;
+} from "../partners/online-presence";
+import { EnrolledPartnerProps, PartnerProps } from "../types";
export const partnerHasEarnedCommissions = (
programEnrollments: Pick<
@@ -19,7 +20,7 @@ export const partnerHasEarnedCommissions = (
(pe) =>
!EXCLUDED_PROGRAM_IDS.includes(pe.programId) &&
pe.status === "approved" &&
- pe.totalCommissions >= PARTNER_DISCOVERY_MIN_COMMISSIONS,
+ pe.totalCommissions >= PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
).length >= 1
);
};
@@ -96,7 +97,7 @@ export function getDiscoverabilityRequirements({
completed: partnerIsNotBanned(programEnrollments),
},
{
- label: `Earn ${currencyFormatter(PARTNER_DISCOVERY_MIN_COMMISSIONS, { trailingZeroDisplay: "stripIfInteger" })} in commissions`,
+ label: `Earn ${currencyFormatter(PARTNER_NETWORK_MIN_COMMISSIONS_CENTS, { trailingZeroDisplay: "stripIfInteger" })} in commissions`,
completed: partnerHasEarnedCommissions(programEnrollments),
},
];
diff --git a/apps/web/lib/partners/categories.ts b/apps/web/lib/network/program-categories.ts
similarity index 87%
rename from apps/web/lib/partners/categories.ts
rename to apps/web/lib/network/program-categories.ts
index 00409e4926..7461efb560 100644
--- a/apps/web/lib/partners/categories.ts
+++ b/apps/web/lib/network/program-categories.ts
@@ -14,7 +14,7 @@ import {
User,
} from "@dub/ui/icons";
-export const categories: {
+export const PROGRAM_CATEGORIES: {
id: Category;
icon: Icon;
label: string;
@@ -76,6 +76,8 @@ export const categories: {
},
];
-export const categoriesMap: Partial<
+export const PROGRAM_CATEGORIES_MAP: Partial<
Record<Category, { icon: Icon; label: string }>
-> = Object.fromEntries(categories.map((category) => [category.id, category]));
+> = Object.fromEntries(
+ PROGRAM_CATEGORIES.map((category) => [category.id, category]),
+);
diff --git a/apps/web/lib/network/throw-if-partner-cannot-view-marketplace.ts b/apps/web/lib/network/throw-if-partner-cannot-view-marketplace.ts
new file mode 100644
index 0000000000..c142c2747e
--- /dev/null
+++ b/apps/web/lib/network/throw-if-partner-cannot-view-marketplace.ts
@@ -0,0 +1,41 @@
+import { DubApiError } from "@/lib/api/errors";
+import {
+ EXCLUDED_PROGRAM_IDS,
+ PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
+} from "@/lib/constants/partner-profile";
+import { PartnerProps } from "@/lib/types";
+import { prisma } from "@dub/prisma";
+
+// similar logic to partnerCanViewMarketplace but throws an error instead of returning a boolean
+export async function throwIfPartnerCannotViewMarketplace({
+ partner,
+}: {
+ partner: Pick<PartnerProps, "id">;
+}) {
+ const data = await prisma.partner.findUnique({
+ where: {
+ id: partner.id,
+ programs: {
+ some: {
+ programId: {
+ notIn: EXCLUDED_PROGRAM_IDS,
+ },
+ status: "approved",
+ totalCommissions: {
+ gte: PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
+ },
+ },
+ none: {
+ status: "banned",
+ },
+ },
+ },
+ });
+
+ if (!data) {
+ throw new DubApiError({
+ code: "forbidden",
+ message: "Program marketplace is not available for this partner.",
+ });
+ }
+}
diff --git a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
index 06a3e0db4e..02a71f5c05 100644
--- a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
@@ -1,6 +1,6 @@
"use client";
-import { partnerCanViewMarketplace } from "@/lib/partners/get-discoverability-requirements";
+import { partnerCanViewMarketplace } from "@/lib/network/get-discoverability-requirements";
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";
diff --git a/apps/web/ui/partners/program-category-select.tsx b/apps/web/ui/partners/program-category-select.tsx
index 34df5cb34c..6df63eb58b 100644
--- a/apps/web/ui/partners/program-category-select.tsx
+++ b/apps/web/ui/partners/program-category-select.tsx
@@ -1,5 +1,8 @@
import { MAX_PROGRAM_CATEGORIES } from "@/lib/constants/program";
-import { categories, categoriesMap } from "@/lib/partners/categories";
+import {
+ PROGRAM_CATEGORIES,
+ PROGRAM_CATEGORIES_MAP,
+} from "@/lib/network/program-categories";
import { Combobox, ComboboxProps } from "@dub/ui";
import { Category } from "@prisma/client";
@@ -15,13 +18,13 @@ export function ProgramCategorySelect({
<Combobox
multiple
maxSelected={MAX_PROGRAM_CATEGORIES}
- options={categories.map(({ id, label, icon }) => ({
+ options={PROGRAM_CATEGORIES.map(({ id, label, icon }) => ({
value: id,
label,
icon,
}))}
selected={selected.map((category) => {
- const { label, icon } = categoriesMap[category] ?? {
+ const { label, icon } = PROGRAM_CATEGORIES_MAP[category] ?? {
label: category.replaceAll("_", " "),
icon: undefined,
};
diff --git a/apps/web/ui/partners/program-network/program-category.tsx b/apps/web/ui/partners/program-network/program-category.tsx
index d2403e5b15..52cc3545d4 100644
--- a/apps/web/ui/partners/program-network/program-category.tsx
+++ b/apps/web/ui/partners/program-network/program-category.tsx
@@ -1,4 +1,4 @@
-import { categoriesMap } from "@/lib/partners/categories";
+import { PROGRAM_CATEGORIES_MAP } from "@/lib/network/program-categories";
import { Category } from "@dub/prisma/client";
import { CircleInfo } from "@dub/ui";
import { cn } from "@dub/utils";
@@ -12,7 +12,7 @@ export const ProgramCategory = ({
onClick?: () => void;
className?: string;
}) => {
- const categoryData = categoriesMap[category];
+ const categoryData = PROGRAM_CATEGORIES_MAP[category];
const { icon: Icon, label } = categoryData ?? {
icon: CircleInfo,
label: category.replace("_", " "),