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.

Dismissed network partners (#3721)

Pedro Ladeira428fe74fd5d2
diff --git a/apps/web/app/(ee)/api/network/partners/count/route.ts b/apps/web/app/(ee)/api/network/partners/count/route.ts
index 1adcf05614..bac66e22cf 100644
--- a/apps/web/app/(ee)/api/network/partners/count/route.ts
+++ b/apps/web/app/(ee)/api/network/partners/count/route.ts
@@ -116,10 +116,21 @@ export const GET = withWorkspace(
some: { programId, invitedAt: { not: null } },
},
},
+ ignored: {
+ programs: { none: { programId } },
+ discoveredByPrograms: {
+ some: { programId, ignoredAt: { not: null } },
+ },
+ },
} as const;
+ const statusWhereForFacet =
+ status && status in statusWheres
+ ? statusWheres[status as keyof typeof statusWheres]
+ : statusWheres.discover;
+
if (groupBy === "status") {
- const [discover, invited, recruited] = await Promise.all([
+ const [discover, invited, recruited, ignored] = await Promise.all([
!status || status === "discover"
? prisma.partner.count({
where: {
@@ -144,18 +155,27 @@ export const GET = withWorkspace(
},
})
: undefined,
+ !status || status === "ignored"
+ ? prisma.partner.count({
+ where: {
+ ...commonWhere,
+ ...statusWheres.ignored,
+ },
+ })
+ : undefined,
]);
return NextResponse.json({
discover,
invited,
recruited,
+ ignored,
});
} else if (groupBy === "country") {
const countries = await prisma.partner.groupBy({
by: ["country"],
_count: true,
- where: { ...commonWhere, ...statusWheres[status || "discover"] },
+ where: { ...commonWhere, ...statusWhereForFacet },
orderBy: {
_count: {
country: "desc",
@@ -185,7 +205,7 @@ export const GET = withWorkspace(
// Build partner where clause combining all filters
const partnerWhere: Prisma.PartnerWhereInput = {
...commonWhere,
- ...statusWheres[status || "discover"],
+ ...statusWhereForFacet,
platforms: {
some: platformPlatformFilter,
},
@@ -238,7 +258,7 @@ export const GET = withWorkspace(
subscriberRanges.map(async (range) => {
const where: Prisma.PartnerWhereInput = {
...commonWhere,
- ...statusWheres[status || "discover"],
+ ...statusWhereForFacet,
platforms: {
some: {
verifiedAt: { not: null },
diff --git a/apps/web/app/(ee)/api/network/partners/route.ts b/apps/web/app/(ee)/api/network/partners/route.ts
index 0729ba58c0..d78f16d677 100644
--- a/apps/web/app/(ee)/api/network/partners/route.ts
+++ b/apps/web/app/(ee)/api/network/partners/route.ts
@@ -1,4 +1,3 @@
-import { getConversionScore } from "@/lib/actions/partners/get-conversion-score";
import { DubApiError } from "@/lib/api/errors";
import { calculatePartnerRanking } from "@/lib/api/network/calculate-partner-ranking";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
@@ -55,6 +54,51 @@ export const GET = withWorkspace(
subscribers,
} = getNetworkPartnersQuerySchema.parse(searchParams);
+ if (status !== "discover") {
+ const partners = await prisma.discoveredPartner.findMany({
+ where: {
+ programId,
+ ...(status === "ignored" && { ignoredAt: { not: null } }),
+ ...(status === "invited" && { invitedAt: { not: null } }),
+ ...(status === "recruited" && {
+ invitedAt: { not: null },
+ programEnrollment: { status: "approved" },
+ }),
+ },
+ orderBy: {
+ ...(status === "ignored" && { ignoredAt: "desc" }),
+ ...(status === "invited" && { invitedAt: "desc" }),
+ ...(status === "recruited" && {
+ programEnrollment: { createdAt: "desc" },
+ }),
+ },
+ include: {
+ partner: {
+ include: {
+ platforms: true,
+ },
+ },
+ programEnrollment: true,
+ },
+ take: pageSize,
+ skip: (page ?? 1 - 1) * pageSize,
+ });
+
+ return NextResponse.json(
+ partners.map(({ partner, ...rest }) =>
+ NetworkPartnerSchema.parse({
+ ...rest,
+ ...partner,
+ categories: [],
+ recruitedAt:
+ rest.programEnrollment?.status === "approved"
+ ? new Date(rest.programEnrollment.createdAt)
+ : null,
+ }),
+ ),
+ );
+ }
+
const similarPrograms = program.similarPrograms.map((sp) => ({
programId: sp.similarProgramId,
similarityScore: sp.similarityScore,
@@ -79,7 +123,6 @@ export const GET = withWorkspace(
z.array(NetworkPartnerSchema).parse(
partners.map((partner) => ({
...partner,
- conversionScore: getConversionScore(partner.conversionRate || 0),
starredAt: partner.starredAt ? new Date(partner.starredAt) : null,
ignoredAt: partner.ignoredAt ? new Date(partner.ignoredAt) : null,
invitedAt: partner.invitedAt ? new Date(partner.invitedAt) : null,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/ignored/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/ignored/page.tsx
new file mode 100644
index 0000000000..0bed0fb829
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/ignored/page.tsx
@@ -0,0 +1,22 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { InvitesUsage } from "@/ui/partners/partner-network/invites-usage";
+import { ProgramPartnerNetworkPageClient } from "../page-client";
+
+export default async function ProgramPartnerNetworkIgnored(props: {
+ params: Promise<{ slug: string }>;
+}) {
+ const params = await props.params;
+
+ return (
+ <PageContent
+ title="Ignored partners"
+ titleBackHref={`/${params.slug}/program/network`}
+ controls={<InvitesUsage />}
+ >
+ <PageWidthWrapper className="mb-10">
+ <ProgramPartnerNetworkPageClient variant="ignored" />
+ </PageWidthWrapper>
+ </PageContent>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-empty-state.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-empty-state.tsx
index f7f91bee9b..bf7e5d7ce9 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-empty-state.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-empty-state.tsx
@@ -7,27 +7,17 @@ export function NetworkEmptyState({
isFiltered,
isStarred,
onClearAllFilters,
+ variant = "default",
}: {
isFiltered: boolean;
isStarred: boolean;
onClearAllFilters: () => void;
+ variant?: "default" | "ignored";
}) {
return (
<AnimatedEmptyState
title="No partners found"
- description={
- isFiltered || isStarred ? (
- <>
- Press{" "}
- <span className="text-content-default bg-bg-emphasis rounded-md px-1 py-0.5 text-xs font-semibold">
- Esc
- </span>{" "}
- to clear all filters.
- </>
- ) : (
- "There are no partners for you to discover yet."
- )
- }
+ description="Adjust your filters to refine your search results."
className="border-none md:min-h-[400px]"
cardClassName="py-3"
cardCount={2}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-menu.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-menu.tsx
new file mode 100644
index 0000000000..cc87deaa71
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-menu.tsx
@@ -0,0 +1,49 @@
+"use client";
+
+import useProgram from "@/lib/swr/use-program";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { ThreeDots } from "@/ui/shared/icons";
+import { Button, Popover, UserXmark } from "@dub/ui";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+
+export function NetworkMenu() {
+ const router = useRouter();
+ const { slug: workspaceSlug } = useWorkspace();
+ const { program } = useProgram();
+ const [isOpen, setIsOpen] = useState(false);
+
+ return (
+ <Popover
+ openPopover={isOpen}
+ setOpenPopover={setIsOpen}
+ content={
+ <div className="grid w-full gap-px p-2 md:w-56">
+ <button
+ type="button"
+ onClick={() => {
+ router.push(`/${workspaceSlug}/program/network/ignored`);
+ setIsOpen(false);
+ }}
+ className="w-full rounded-md p-2 hover:bg-neutral-100 active:bg-neutral-200"
+ >
+ <div className="flex items-center gap-2 text-left">
+ <UserXmark className="size-4 shrink-0" />
+ <span className="text-sm font-medium">View ignored partners</span>
+ </div>
+ </button>
+ </div>
+ }
+ align="end"
+ >
+ <Button
+ type="button"
+ aria-label="Open partner network menu"
+ className="w-fit whitespace-nowrap px-2"
+ variant="secondary"
+ disabled={!program}
+ icon={<ThreeDots className="size-4 shrink-0" />}
+ />
+ </Popover>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-partner-card.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-partner-card.tsx
new file mode 100644
index 0000000000..754e4c421b
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/network-partner-card.tsx
@@ -0,0 +1,349 @@
+"use client";
+
+import { PARTNER_PLATFORM_FIELDS } from "@/lib/partners/partner-platforms";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { NetworkPartnerProps } from "@/lib/types";
+import { PartnerAvatar } from "@/ui/partners/partner-avatar";
+import { PartnerStarButton } from "@/ui/partners/partner-star-button";
+import { TrustedPartnerBadge } from "@/ui/partners/trusted-partner-badge";
+import {
+ BadgeCheck2Fill,
+ Tooltip,
+ UserPlus,
+ useResizeObserver,
+ useRouterStuff,
+} from "@dub/ui";
+import type { Icon } from "@dub/ui/icons";
+import { EnvelopeArrowRight, Globe } from "@dub/ui/icons";
+import {
+ COUNTRIES,
+ cn,
+ formatDate,
+ isClickOnInteractiveChild,
+ timeAgo,
+} from "@dub/utils";
+import Link from "next/link";
+import { useEffect, useMemo, useRef, useState } from "react";
+
+export function NetworkPartnerCard({
+ partner,
+ onToggleStarred,
+}: {
+ partner?: NetworkPartnerProps;
+ onToggleStarred?: (starred: boolean) => void;
+}) {
+ const { slug: workspaceSlug } = useWorkspace();
+ const { queryParams } = useRouterStuff();
+
+ const basicFields = useMemo(
+ () => [
+ {
+ id: "country",
+ icon: partner?.country ? (
+ <img
+ alt={`Flag of ${COUNTRIES[partner.country]}`}
+ src={`https://flag.vercel.app/m/${partner.country}.svg`}
+ className="size-3.5 rounded-full"
+ />
+ ) : (
+ <Globe className="size-3.5 shrink-0" />
+ ),
+ text: partner
+ ? partner.country
+ ? COUNTRIES[partner.country]
+ : "Planet Earth"
+ : undefined,
+ },
+ {
+ id: "joinedAt",
+ icon: <UserPlus className="size-3.5 shrink-0" />,
+ text: partner
+ ? `Joined ${formatDate(partner.createdAt, { month: "short" })}`
+ : undefined,
+ },
+ ],
+ [partner],
+ );
+
+ const partnerPlatformsData = useMemo(
+ () =>
+ partner
+ ? PARTNER_PLATFORM_FIELDS.map((field) => ({
+ label: field.label,
+ icon: field.icon,
+ ...field.data(partner.platforms),
+ })).filter((field) => field.value && field.href)
+ : null,
+ [partner],
+ );
+
+ const categoriesData = useMemo(() => {
+ if (!partner) return undefined;
+ if (partner.categories.length) {
+ return partner.categories.map((category) => ({
+ label: category.replace(/_/g, " "),
+ }));
+ }
+ return [];
+ }, [partner]);
+
+ return (
+ <div
+ className={cn(
+ partner?.id &&
+ "hover:drop-shadow-card-hover cursor-pointer transition-[filter]",
+ )}
+ onClick={(e) => {
+ if (!partner?.id || isClickOnInteractiveChild(e)) return;
+ if (partner.recruitedAt || partner.invitedAt) {
+ window.open(
+ `/${workspaceSlug}/program/partners/${partner.id}`,
+ "_blank",
+ );
+ } else {
+ queryParams({ set: { partnerId: partner.id }, scroll: false });
+ }
+ }}
+ >
+ {(partner?.invitedAt || partner?.recruitedAt) && (
+ <div className="bg-bg-subtle border-border-subtle -mb-3 flex items-center justify-center gap-2 rounded-t-xl border-x border-t p-2 pb-5">
+ {partner.recruitedAt ? (
+ <UserPlus className="text-content-default size-4 shrink-0" />
+ ) : (
+ <EnvelopeArrowRight className="text-content-default size-4 shrink-0" />
+ )}
+
+ <span className="text-content-emphasis text-sm font-medium">
+ {partner.recruitedAt
+ ? `Recruited ${timeAgo(partner.recruitedAt, { withAgo: true })}`
+ : `Sent ${timeAgo(partner.invitedAt, { withAgo: true })}`}
+ </span>
+ </div>
+ )}
+ <div className="border-border-subtle rounded-xl border bg-white p-4">
+ <div className="flex justify-between gap-4">
+ {/* Avatar + country icon */}
+ <div className="relative w-fit">
+ {partner ? (
+ <PartnerAvatar
+ partner={partner}
+ className="size-16 border border-neutral-100"
+ />
+ ) : (
+ <div className="size-16 animate-pulse rounded-full bg-neutral-200" />
+ )}
+ {partner?.trustedAt && <TrustedPartnerBadge />}
+ </div>
+
+ {partner && onToggleStarred && (
+ <PartnerStarButton
+ partner={partner}
+ onToggleStarred={onToggleStarred}
+ className="size-6"
+ iconSize="size-3"
+ />
+ )}
+ </div>
+
+ <div className="mt-3.5 flex flex-col gap-3">
+ {/* Name */}
+ {partner ? (
+ <span className="text-content-emphasis text-base font-semibold">
+ {partner.name}
+ </span>
+ ) : (
+ <div className="h-6 w-32 animate-pulse rounded bg-neutral-200" />
+ )}
+
+ {/* Basic details */}
+ <div className="flex flex-col items-start gap-1">
+ {basicFields
+ .filter(({ text }) => text !== null)
+ .map(({ id, icon, text }) => (
+ <div key={id}>
+ <div className="text-content-subtle flex cursor-default items-center gap-2">
+ {text !== undefined ? (
+ <>
+ {icon}
+ <span className="text-xs font-medium">{text}</span>
+ </>
+ ) : (
+ <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />
+ )}
+ </div>
+ </div>
+ ))}
+ </div>
+
+ {/* Platforms */}
+ <div
+ className={cn(
+ "flex flex-wrap items-center gap-1.5",
+ !partner && "animate-pulse",
+ )}
+ >
+ {partnerPlatformsData?.length
+ ? partnerPlatformsData.map(
+ ({ label, icon: Icon, verified, value, href }) => (
+ <Tooltip
+ key={label}
+ content={
+ <Link
+ href={href ?? "#"}
+ target="_blank"
+ rel="noopener noreferrer"
+ className="text-content-default hover:text-content-emphasis flex items-center gap-1 px-2 py-1 text-xs font-medium"
+ >
+ <Icon className="size-3 shrink-0" />
+ <span>{value}</span>
+ {verified && (
+ <BadgeCheck2Fill className="size-3 text-green-600" />
+ )}
+ </Link>
+ }
+ >
+ <Link
+ key={label}
+ href={href ?? "#"}
+ target="_blank"
+ rel="noopener noreferrer"
+ className="border-border-subtle hover:bg-bg-muted relative flex size-6 shrink-0 items-center justify-center rounded-full border"
+ >
+ <Icon className="size-3" />
+ <span className="sr-only">{label}</span>
+
+ {verified && (
+ <BadgeCheck2Fill className="absolute -right-1 -top-1 size-3 text-green-600" />
+ )}
+ </Link>
+ </Tooltip>
+ ),
+ )
+ : [...Array(3)].map((_, idx) => (
+ <div
+ key={idx}
+ className="size-6 rounded-full bg-neutral-100"
+ />
+ ))}
+ </div>
+
+ {/* Categories */}
+ <ListRow items={categoriesData} />
+ </div>
+ </div>
+ </div>
+ );
+}
+
+function ListRow({
+ items,
+ className,
+}: {
+ items?: { icon?: Icon; label: string }[];
+ className?: string;
+}) {
+ const containerRef = useRef<HTMLDivElement>(null);
+
+ const [isReady, setIsReady] = useState(false);
+
+ const [shownItems, setShownItems] = useState<
+ { icon?: Icon; label: string }[] | undefined
+ >(items);
+
+ useEffect(() => {
+ if (isReady) return;
+
+ setIsReady(false);
+ setShownItems(items);
+ }, [items, isReady]);
+
+ useEffect(() => {
+ if (!containerRef.current) return;
+
+ // Determine if we need to show less items
+ if (
+ shownItems?.length &&
+ containerRef.current.scrollWidth > containerRef.current.clientWidth
+ ) {
+ setIsReady(false);
+ setShownItems(shownItems?.slice(0, -1));
+ } else {
+ setIsReady(true);
+ }
+ }, [shownItems]);
+
+ // Show less items if needed after resizing
+ const entry = useResizeObserver(containerRef);
+ useEffect(() => {
+ if (!containerRef.current) return;
+
+ if (containerRef.current.scrollWidth > containerRef.current.clientWidth)
+ setIsReady(false);
+ }, [entry]);
+
+ if (items && items.length === 0) return null;
+ return (
+ <div
+ ref={containerRef}
+ className={cn(
+ "overflow-hidden",
+ items?.length && !isReady && "opacity-0",
+ )}
+ >
+ <div className={cn("flex gap-1", className)}>
+ {items ? (
+ items.length ? (
+ <>
+ {shownItems?.map(({ icon, label }) => (
+ <ListPill key={label} icon={icon} label={label} />
+ ))}
+ {(shownItems?.length ?? 0) < items.length && (
+ <Tooltip
+ content={
+ <div className="flex max-w-sm flex-wrap gap-1 p-2">
+ {items
+ .filter(
+ ({ label }) =>
+ !shownItems?.some(
+ ({ label: shownLabel }) => shownLabel === label,
+ ),
+ )
+ .map(({ icon, label }) => (
+ <ListPill key={label} icon={icon} label={label} />
+ ))}
+ </div>
+ }
+ >
+ <div className="text-content-default flex h-7 select-none items-center rounded-full bg-neutral-100 px-2 text-xs font-medium hover:bg-neutral-200">
+ +{items.length - (shownItems?.length ?? 0)}
+ </div>
+ </Tooltip>
+ )}
+ </>
+ ) : (
+ <div className="flex h-7 w-fit items-center rounded-full border border-dashed border-neutral-300 bg-neutral-50 px-2">
+ <span className="text-content-subtle text-xs opacity-60">
+ Not specified
+ </span>
+ </div>
+ )
+ ) : (
+ [...Array(2)].map((_, idx) => (
+ <div key={idx} className="h-7 w-20 rounded-full bg-neutral-100" />
+ ))
+ )}
+ </div>
+ </div>
+ );
+}
+
+function ListPill({ icon: Icon, label }: { icon?: Icon; label: string }) {
+ return (
+ <div className="flex h-7 items-center gap-1.5 rounded-full bg-neutral-100 px-2">
+ {Icon && <Icon className="text-content-emphasis size-3 shrink-0" />}
+ <span className="text-content-default whitespace-nowrap text-xs font-medium">
+ {label}
+ </span>
+ </div>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx
index 3255f4cbf2..9cd7d4d04b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page-client.tsx
@@ -1,47 +1,26 @@
"use client";
import { updateDiscoveredPartnerAction } from "@/lib/actions/partners/update-discovered-partner";
-import { PARTNER_PLATFORM_FIELDS } from "@/lib/partners/partner-platforms";
import useNetworkPartnersCount from "@/lib/swr/use-network-partners-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { NetworkPartnerProps } from "@/lib/types";
import { PARTNER_NETWORK_MAX_PAGE_SIZE } from "@/lib/zod/schemas/partner-network";
-import { ConversionScoreIcon } from "@/ui/partners/conversion-score-icon";
-import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { ConversionScoreTooltip } from "@/ui/partners/partner-network/conversion-score-tooltip";
import { NetworkPartnerSheet } from "@/ui/partners/partner-network/network-partner-sheet";
-import { PartnerStarButton } from "@/ui/partners/partner-star-button";
-import { TrustedPartnerBadge } from "@/ui/partners/trusted-partner-badge";
import {
AnimatedSizeContainer,
- BadgeCheck2Fill,
- ChartActivity2,
Filter,
PaginationControls,
Switch,
- Tooltip,
- UserPlus,
usePagination,
- useResizeObserver,
useRouterStuff,
} from "@dub/ui";
-import type { Icon } from "@dub/ui/icons";
-import { EnvelopeArrowRight, Globe } from "@dub/ui/icons";
-import {
- COUNTRIES,
- capitalize,
- cn,
- fetcher,
- formatDate,
- isClickOnInteractiveChild,
- timeAgo,
-} from "@dub/utils";
+import { cn, fetcher } from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
-import Link from "next/link";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
import { toast } from "sonner";
import useSWR from "swr";
import { NetworkEmptyState } from "./network-empty-state";
+import { NetworkPartnerCard } from "./network-partner-card";
import { usePartnerNetworkFilters } from "./use-partner-network-filters";
const tabs = [
@@ -59,12 +38,20 @@ const tabs = [
},
] as const;
-export function ProgramPartnerNetworkPageClient() {
+type ProgramPartnerNetworkPageClientProps = {
+ variant?: "default" | "ignored";
+};
+
+export function ProgramPartnerNetworkPageClient({
+ variant = "default",
+}: ProgramPartnerNetworkPageClientProps = {}) {
const { id: workspaceId } = useWorkspace();
const { searchParams, getQueryString, queryParams } = useRouterStuff();
const status =
- tabs.find(({ id }) => id === searchParams.get("tab"))?.id || "discover";
+ variant === "ignored"
+ ? "ignored"
+ : tabs.find(({ id }) => id === searchParams.get("tab"))?.id || "discover";
const { data: partnerCounts, error: countError } = useNetworkPartnersCount();
@@ -81,7 +68,10 @@ export function ProgramPartnerNetworkPageClient() {
status,
},
{
- exclude: ["tab", "partnerId"],
+ exclude:
+ variant === "ignored"
+ ? ["tab", "partnerId", "starred"]
+ : ["tab", "partnerId"],
},
)}`,
fetcher,
@@ -112,6 +102,7 @@ export function ProgramPartnerNetworkPageClient() {
const { currentPartner } = useCurrentPartner({
partners,
partnerId: detailsSheetState.partnerId,
+ partnerListStatus: status,
});
const [previousPartnerId, nextPartnerId] = useMemo(() => {
@@ -157,52 +148,54 @@ export function ProgramPartnerNetworkPageClient() {
}
/>
)}
- <div className="grid grid-cols-3 gap-2">
- {tabs.map((tab) => {
- const isActive = status === tab.id;
-
- return (
- <button
- key={tab.id}
- type="button"
- className={cn(
- "border-border-subtle flex flex-col gap-1 rounded-lg border p-4 text-left transition-colors duration-100",
- isActive
- ? "border-black ring-1 ring-black"
- : "hover:bg-bg-muted",
- )}
- onClick={() => {
- queryParams({
- set: { tab: tab.id },
- del: ["page", "starred"],
- });
- }}
- >
- <span className="text-content-default text-xs font-semibold">
- {tab.label}
- </span>
- {partnerCounts ? (
- <span className="text-content-emphasis text-base font-semibold">
- {(partnerCounts?.[tab.id] || 0).toLocaleString()}
+ {variant !== "ignored" && (
+ <div className="grid grid-cols-3 gap-2">
+ {tabs.map((tab) => {
+ const isActive = status === tab.id;
+
+ return (
+ <button
+ key={tab.id}
+ type="button"
+ className={cn(
+ "border-border-subtle flex flex-col gap-1 rounded-lg border p-4 text-left transition-colors duration-100",
+ isActive
+ ? "border-black ring-1 ring-black"
+ : "hover:bg-bg-muted",
+ )}
+ onClick={() => {
+ queryParams({
+ set: { tab: tab.id },
+ del: ["page", "starred"],
+ });
+ }}
+ >
+ <span className="text-content-default text-xs font-semibold">
+ {tab.label}
</span>
- ) : (
- <div className="h-6 w-12 animate-pulse rounded-md bg-neutral-200" />
- )}
- </button>
- );
- })}
- </div>
+ {partnerCounts ? (
+ <span className="text-content-emphasis text-base font-semibold">
+ {(partnerCounts?.[tab.id] || 0).toLocaleString()}
+ </span>
+ ) : (
+ <div className="h-6 w-12 animate-pulse rounded-md bg-neutral-200" />
+ )}
+ </button>
+ );
+ })}
+ </div>
+ )}
- <div>
- <div className="xs:flex-row xs:items-center flex flex-col gap-4">
- <Filter.Select
- className="h-9 w-full rounded-lg md:w-fit"
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- />
- {status === "discover" && (
+ {status === "discover" && (
+ <div>
+ <div className="xs:flex-row xs:items-center flex flex-col gap-4">
+ <Filter.Select
+ className="h-9 w-full rounded-lg md:w-fit"
+ filters={filters}
+ activeFilters={activeFilters}
+ onSelect={onSelect}
+ onRemove={onRemove}
+ />
<label className="flex items-center gap-2">
<Switch
checked={searchParams.get("starred") == "true"}
@@ -217,24 +210,24 @@ export function ProgramPartnerNetworkPageClient() {
Starred
</span>
</label>
- )}
- </div>
- <AnimatedSizeContainer height>
- <div>
- {activeFilters.length > 0 && (
- <div className="pt-3">
- <Filter.List
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- onRemoveAll={onRemoveAll}
- />
- </div>
- )}
</div>
- </AnimatedSizeContainer>
- </div>
+ <AnimatedSizeContainer height>
+ <div>
+ {activeFilters.length > 0 && (
+ <div className="pt-3">
+ <Filter.List
+ filters={filters}
+ activeFilters={activeFilters}
+ onSelect={onSelect}
+ onRemove={onRemove}
+ onRemoveAll={onRemoveAll}
+ />
+ </div>
+ )}
+ </div>
+ </AnimatedSizeContainer>
+ </div>
+ )}
{error || countError ? (
<div className="text-content-subtle py-12 text-sm">
@@ -250,57 +243,69 @@ export function ProgramPartnerNetworkPageClient() {
>
{partners
? partners?.map((partner) => (
- <PartnerCard
+ <NetworkPartnerCard
key={partner.id}
partner={partner}
- onToggleStarred={(starred) => {
- mutatePartners(
- // @ts-ignore SWR doesn't seem to have proper typing for partial data results w/ `populateCache`
- async () => {
- const result = await updateDiscoveredPartner({
- workspaceId: workspaceId!,
- partnerId: partner.id,
- starred,
- });
- if (!result?.data) {
- toast.error("Failed to star partner");
- throw new Error("Failed to star partner");
+ onToggleStarred={
+ variant === "ignored"
+ ? undefined
+ : (starred) => {
+ mutatePartners(
+ // @ts-ignore SWR doesn't seem to have proper typing for partial data results w/ `populateCache`
+ async () => {
+ const result = await updateDiscoveredPartner({
+ workspaceId: workspaceId!,
+ partnerId: partner.id,
+ starred,
+ });
+ if (!result?.data) {
+ toast.error("Failed to star partner");
+ throw new Error("Failed to star partner");
+ }
+
+ return result.data;
+ },
+ {
+ optimisticData: (data) =>
+ (data || partners).map((p) =>
+ p.id === partner.id
+ ? {
+ ...p,
+ starredAt: starred
+ ? new Date()
+ : null,
+ }
+ : p,
+ ),
+ populateCache: (
+ result: { starredAt: Date | null },
+ data,
+ ) =>
+ (data || partners).map((p) =>
+ p.id === partner.id
+ ? { ...p, starredAt: result.starredAt }
+ : p,
+ ),
+ revalidate: false,
+ },
+ );
}
-
- return result.data;
- },
- {
- optimisticData: (data) =>
- (data || partners).map((p) =>
- p.id === partner.id
- ? {
- ...p,
- starredAt: starred ? new Date() : null,
- }
- : p,
- ),
- populateCache: (
- result: { starredAt: Date | null },
- data,
- ) =>
- (data || partners).map((p) =>
- p.id === partner.id
- ? { ...p, starredAt: result.starredAt }
- : p,
- ),
- revalidate: false,
- },
- );
- }}
+ }
/>
))
- : [...Array(12)].map((_, idx) => <PartnerCard key={idx} />)}
+ : [...Array(12)].map((_, idx) => (
+ <NetworkPartnerCard key={idx} />
+ ))}
</div>
<div className="sticky bottom-0 mt-4 rounded-b-[inherit] border-t border-neutral-200 bg-white px-3.5 py-2">
<PaginationControls
pagination={pagination}
setPagination={setPagination}
- totalCount={partnerCounts?.[status]}
+ totalCount={
+ variant === "ignored"
+ ? partnerCounts?.ignored
+ : partnerCounts?.[status]
+ }
unit={(p) => `partner${p ? "s" : ""}`}
/>
</div>
@@ -308,367 +313,28 @@ export function ProgramPartnerNetworkPageClient() {
) : (
<NetworkEmptyState
isFiltered={activeFilters.length > 0}
- isStarred={searchParams.get("starred") == "true"}
+ isStarred={
+ variant === "ignored"
+ ? false
+ : searchParams.get("starred") == "true"
+ }
onClearAllFilters={onRemoveAll}
+ variant={variant === "ignored" ? "ignored" : "default"}
/>
)}
</div>
);
}
-function PartnerCard({
- partner,
- onToggleStarred,
-}: {
- partner?: NetworkPartnerProps;
- onToggleStarred?: (starred: boolean) => void;
-}) {
- const { slug: workspaceSlug } = useWorkspace();
- const { queryParams } = useRouterStuff();
-
- const basicFields = useMemo(
- () => [
- {
- id: "country",
- icon: partner?.country ? (
- <img
- alt={`Flag of ${COUNTRIES[partner.country]}`}
- src={`https://flag.vercel.app/m/${partner.country}.svg`}
- className="size-3.5 rounded-full"
- />
- ) : (
- <Globe className="size-3.5 shrink-0" />
- ),
- text: partner
- ? partner.country
- ? COUNTRIES[partner.country]
- : "Planet Earth"
- : undefined,
- },
- {
- id: "joinedAt",
- icon: <UserPlus className="size-3.5 shrink-0" />,
- text: partner
- ? `Joined ${formatDate(partner.createdAt, { month: "short" })}`
- : undefined,
- },
- {
- id: "lastConversion",
- icon: <ChartActivity2 className="size-3.5 shrink-0" />,
- text: partner
- ? partner.lastConversionAt
- ? `Last conversion ${timeAgo(partner.lastConversionAt, { withAgo: true })}`
- : "No conversions yet"
- : undefined,
- },
- {
- id: "conversion",
- icon: (
- <ConversionScoreIcon
- score={partner?.conversionScore || null}
- className="size-3.5 shrink-0"
- />
- ),
- text: partner
- ? partner.conversionScore
- ? `${capitalize(partner.conversionScore)} conversion`
- : "Unknown conversion"
- : undefined,
- wrapper: ConversionScoreTooltip,
- },
- ],
- [partner],
- );
-
- const partnerPlatformsData = useMemo(
- () =>
- partner
- ? PARTNER_PLATFORM_FIELDS.map((field) => ({
- label: field.label,
- icon: field.icon,
- ...field.data(partner.platforms),
- })).filter((field) => field.value && field.href)
- : null,
- [partner],
- );
-
- const categoriesData = useMemo(
- () =>
- partner
- ? partner.categories.map((category) => ({
- label: category.replace(/_/g, " "),
- }))
- : undefined,
- [partner],
- );
-
- return (
- <div
- className={cn(
- partner?.id &&
- "hover:drop-shadow-card-hover cursor-pointer transition-[filter]",
- )}
- onClick={(e) => {
- if (!partner?.id || isClickOnInteractiveChild(e)) return;
- if (partner.recruitedAt || partner.invitedAt) {
- window.open(
- `/${workspaceSlug}/program/partners/${partner.id}`,
- "_blank",
- );
- } else {
- queryParams({ set: { partnerId: partner.id }, scroll: false });
- }
- }}
- >
- {(partner?.invitedAt || partner?.recruitedAt) && (
- <div className="bg-bg-subtle border-border-subtle -mb-3 flex items-center justify-center gap-2 rounded-t-xl border-x border-t p-2 pb-5">
- {partner.recruitedAt ? (
- <UserPlus className="text-content-default size-4 shrink-0" />
- ) : (
- <EnvelopeArrowRight className="text-content-default size-4 shrink-0" />
- )}
-
- <span className="text-content-emphasis text-sm font-medium">
- {partner.recruitedAt
- ? `Recruited ${timeAgo(partner.recruitedAt, { withAgo: true })}`
- : `Sent ${timeAgo(partner.invitedAt, { withAgo: true })}`}
- </span>
- </div>
- )}
- <div className="border-border-subtle rounded-xl border bg-white p-4">
- <div className="flex justify-between gap-4">
- {/* Avatar + country icon */}
- <div className="relative w-fit">
- {partner ? (
- <PartnerAvatar
- partner={partner}
- className="size-16 border border-neutral-100"
- />
- ) : (
- <div className="size-16 animate-pulse rounded-full bg-neutral-200" />
- )}
- {partner?.trustedAt && <TrustedPartnerBadge />}
- </div>
-
- {partner && onToggleStarred && (
- <PartnerStarButton
- partner={partner}
- onToggleStarred={onToggleStarred}
- className="size-6"
- iconSize="size-3"
- />
- )}
- </div>
-
- <div className="mt-3.5 flex flex-col gap-3">
- {/* Name */}
- {partner ? (
- <span className="text-content-emphasis text-base font-semibold">
- {partner.name}
- </span>
- ) : (
- <div className="h-6 w-32 animate-pulse rounded bg-neutral-200" />
- )}
-
- {/* Basic details */}
- <div className="flex flex-col items-start gap-1">
- {basicFields
- .filter(({ text }) => text !== null)
- .map(({ id, icon, text, wrapper: Wrapper = "div" }) => (
- <Wrapper key={id}>
- <div className="text-content-subtle flex cursor-default items-center gap-2">
- {text !== undefined ? (
- <>
- {icon}
- <span className="text-xs font-medium">{text}</span>
- </>
- ) : (
- <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />
- )}
- </div>
- </Wrapper>
- ))}
- </div>
-
- {/* Platforms */}
- <div
- className={cn(
- "flex flex-wrap items-center gap-1.5",
- !partner && "animate-pulse",
- )}
- >
- {partnerPlatformsData?.length
- ? partnerPlatformsData.map(
- ({ label, icon: Icon, verified, value, href }) => (
- <Tooltip
- key={label}
- content={
- <Link
- href={href ?? "#"}
- target="_blank"
- rel="noopener noreferrer"
- className="text-content-default hover:text-content-emphasis flex items-center gap-1 px-2 py-1 text-xs font-medium"
- >
- <Icon className="size-3 shrink-0" />
- <span>{value}</span>
- {verified && (
- <BadgeCheck2Fill className="size-3 text-green-600" />
- )}
- </Link>
- }
- >
- <Link
- key={label}
- href={href ?? "#"}
- target="_blank"
- rel="noopener noreferrer"
- className="border-border-subtle hover:bg-bg-muted relative flex size-6 shrink-0 items-center justify-center rounded-full border"
- >
- <Icon className="size-3" />
- <span className="sr-only">{label}</span>
-
- {verified && (
- <BadgeCheck2Fill className="absolute -right-1 -top-1 size-3 text-green-600" />
- )}
- </Link>
- </Tooltip>
- ),
- )
- : [...Array(3)].map((_, idx) => (
- <div
- key={idx}
- className="size-6 rounded-full bg-neutral-100"
- />
- ))}
- </div>
-
- {/* Categories */}
- <ListRow items={categoriesData} />
- </div>
- </div>
- </div>
- );
-}
-
-function ListRow({
- items,
- className,
-}: {
- items?: { icon?: Icon; label: string }[];
- className?: string;
-}) {
- const containerRef = useRef<HTMLDivElement>(null);
-
- const [isReady, setIsReady] = useState(false);
-
- const [shownItems, setShownItems] = useState<
- { icon?: Icon; label: string }[] | undefined
- >(items);
-
- useEffect(() => {
- if (isReady) return;
-
- setIsReady(false);
- setShownItems(items);
- }, [items, isReady]);
-
- useEffect(() => {
- if (!containerRef.current) return;
-
- // Determine if we need to show less items
- if (
- shownItems?.length &&
- containerRef.current.scrollWidth > containerRef.current.clientWidth
- ) {
- setIsReady(false);
- setShownItems(shownItems?.slice(0, -1));
- } else {
- setIsReady(true);
- }
- }, [shownItems]);
-
- // Show less items if needed after resizing
- const entry = useResizeObserver(containerRef);
- useEffect(() => {
- if (!containerRef.current) return;
-
- if (containerRef.current.scrollWidth > containerRef.current.clientWidth)
- setIsReady(false);
- }, [entry]);
-
- return (
- <div
- ref={containerRef}
- className={cn(
- "overflow-hidden",
- items?.length && !isReady && "opacity-0",
- )}
- >
- <div className={cn("flex gap-1", className)}>
- {items ? (
- items.length ? (
- <>
- {shownItems?.map(({ icon, label }) => (
- <ListPill key={label} icon={icon} label={label} />
- ))}
- {(shownItems?.length ?? 0) < items.length && (
- <Tooltip
- content={
- <div className="flex max-w-sm flex-wrap gap-1 p-2">
- {items
- .filter(
- ({ label }) =>
- !shownItems?.some(
- ({ label: shownLabel }) => shownLabel === label,
- ),
- )
- .map(({ icon, label }) => (
- <ListPill key={label} icon={icon} label={label} />
- ))}
- </div>
- }
- >
- <div className="text-content-default flex h-7 select-none items-center rounded-full bg-neutral-100 px-2 text-xs font-medium hover:bg-neutral-200">
- +{items.length - (shownItems?.length ?? 0)}
- </div>
- </Tooltip>
- )}
- </>
- ) : (
- <div className="flex h-7 w-fit items-center rounded-full border border-dashed border-neutral-300 bg-neutral-50 px-2">
- <span className="text-content-subtle text-xs opacity-60">
- Not specified
- </span>
- </div>
- )
- ) : (
- [...Array(2)].map((_, idx) => (
- <div key={idx} className="h-7 w-20 rounded-full bg-neutral-100" />
- ))
- )}
- </div>
- </div>
- );
-}
-
-function ListPill({ icon: Icon, label }: { icon?: Icon; label: string }) {
- return (
- <div className="flex h-7 items-center gap-1.5 rounded-full bg-neutral-100 px-2">
- {Icon && <Icon className="text-content-emphasis size-3 shrink-0" />}
- <span className="text-content-default whitespace-nowrap text-xs font-medium">
- {label}
- </span>
- </div>
- );
-}
-
/** Gets the current partner from the loaded partners array if available, or a separate fetch if not */
function useCurrentPartner({
partners,
partnerId,
+ partnerListStatus,
}: {
partners?: NetworkPartnerProps[];
partnerId: string | null;
+ partnerListStatus: string;
}) {
const { id: workspaceId } = useWorkspace();
@@ -681,7 +347,7 @@ function useCurrentPartner({
const { data: fetchedPartners, isLoading } = useSWR<NetworkPartnerProps>(
fetchPartnerId &&
- `/api/network/partners?workspaceId=${workspaceId}&partnerIds=${fetchPartnerId}`,
+ `/api/network/partners?workspaceId=${workspaceId}&partnerIds=${fetchPartnerId}&status=${partnerListStatus}`,
fetcher,
{
keepPreviousData: true,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page.tsx
index a3e7cae43a..e3d8b4362e 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/page.tsx
@@ -1,11 +1,20 @@
import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import { InvitesUsage } from "@/ui/partners/partner-network/invites-usage";
+import { NetworkMenu } from "./network-menu";
import { ProgramPartnerNetworkPageClient } from "./page-client";
export default function ProgramPartnerNetwork() {
return (
- <PageContent title="Partner Network" controls={<InvitesUsage />}>
+ <PageContent
+ title="Partner Network"
+ controls={
+ <div className="flex items-center gap-2">
+ <InvitesUsage />
+ <NetworkMenu />
+ </div>
+ }
+ >
<PageWidthWrapper className="mb-10">
<ProgramPartnerNetworkPageClient />
</PageWidthWrapper>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/use-partner-network-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/use-partner-network-filters.tsx
index 195e9a83f8..e3cd900d17 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/use-partner-network-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/use-partner-network-filters.tsx
@@ -18,7 +18,7 @@ import { useCallback, useMemo } from "react";
export function usePartnerNetworkFilters({
status,
}: {
- status: "discover" | "invited" | "recruited";
+ status: "discover" | "invited" | "recruited" | "ignored";
}) {
const { searchParamsObj, queryParams } = useRouterStuff();
diff --git a/apps/web/lib/actions/partners/invite-partner-from-network.ts b/apps/web/lib/actions/partners/invite-partner-from-network.ts
index a23b2437ad..beeb43d057 100644
--- a/apps/web/lib/actions/partners/invite-partner-from-network.ts
+++ b/apps/web/lib/actions/partners/invite-partner-from-network.ts
@@ -84,6 +84,7 @@ export const invitePartnerFromNetworkAction = authActionClient
},
update: {
invitedAt: new Date(),
+ ignoredAt: null,
},
});
diff --git a/apps/web/lib/api/network/calculate-partner-ranking.ts b/apps/web/lib/api/network/calculate-partner-ranking.ts
index 9e38795bd0..9202ef407f 100644
--- a/apps/web/lib/api/network/calculate-partner-ranking.ts
+++ b/apps/web/lib/api/network/calculate-partner-ranking.ts
@@ -12,7 +12,7 @@ export interface PartnerRankingParams extends PartnerRankingFilters {
}
/**
- * Partner Ranking Algorithm for Discovery
+ * Partner Ranking Algorithm (only used for the "discover" tab)
* Ranks partners based on performance in similar programs only.
*
* Scoring Breakdown (0-65+ points):
@@ -36,9 +36,6 @@ export interface PartnerRankingParams extends PartnerRankingFilters {
* Displayed Metrics:
* - clickToConversionRate: Average click-to-conversion rate across ALL programs the partner is enrolled in
* - lastConversionAt: Most recent conversion date across ALL programs the partner is enrolled in
- *
- * Note: Ranking is primarily used for the "discover" tab. For "invited" and "recruited"
- * tabs, partners are sorted by date (most recent first).
*/
export async function calculatePartnerRanking({
programId,
@@ -49,13 +46,13 @@ export async function calculatePartnerRanking({
subscribers,
page = 1,
pageSize,
- status = "discover",
similarPrograms = [],
}: PartnerRankingParams) {
const conditions: Prisma.Sql[] = [
Prisma.sql`p.discoverableAt IS NOT NULL`,
- Prisma.sql`(dp.ignoredAt IS NULL OR dp.id IS NULL)`,
Prisma.sql`COALESCE(pe.clickToConversionRate, 0) < 1`,
+ Prisma.sql`(dp.ignoredAt IS NULL OR dp.id IS NULL)`,
+ Prisma.sql`enrolled.id IS NULL`,
];
if (partnerIds && partnerIds.length > 0) {
@@ -108,18 +105,6 @@ export async function calculatePartnerRanking({
);
}
- if (status === "discover") {
- conditions.push(Prisma.sql`enrolled.id IS NULL`);
- } else if (status === "invited") {
- conditions.push(
- Prisma.sql`enrolled.status = 'invited' AND dp.invitedAt IS NOT NULL`,
- );
- } else if (status === "recruited") {
- conditions.push(
- Prisma.sql`enrolled.status = 'approved' AND dp.invitedAt IS NOT NULL`,
- );
- }
-
if (starred === true) {
conditions.push(Prisma.sql`dp.starredAt IS NOT NULL`);
} else if (starred === false) {
@@ -136,13 +121,9 @@ export async function calculatePartnerRanking({
)`;
const orderByClause =
- status === "discover"
- ? starred === true
- ? Prisma.sql`dp.starredAt ASC`
- : Prisma.sql`finalScore DESC, p.id ASC`
- : status === "invited"
- ? Prisma.sql`dp.invitedAt ASC`
- : Prisma.sql`enrolled.createdAt DESC, p.id ASC`;
+ starred === true
+ ? Prisma.sql`dp.starredAt ASC`
+ : Prisma.sql`finalScore DESC, p.id ASC`;
const offset = (page - 1) * pageSize;
diff --git a/apps/web/lib/swr/use-network-partners-count.ts b/apps/web/lib/swr/use-network-partners-count.ts
index f169c44e67..5509d5501e 100644
--- a/apps/web/lib/swr/use-network-partners-count.ts
+++ b/apps/web/lib/swr/use-network-partners-count.ts
@@ -6,7 +6,12 @@ import { getNetworkPartnersCountQuerySchema } from "../zod/schemas/partner-netwo
import useWorkspace from "./use-workspace";
export default function useNetworkPartnersCount<
- T = { discover: number; invited: number; recruited: number },
+ T = {
+ discover: number;
+ invited: number;
+ recruited: number;
+ ignored: number;
+ },
>({
query,
enabled,
diff --git a/apps/web/lib/zod/schemas/partner-network.ts b/apps/web/lib/zod/schemas/partner-network.ts
index bc56c73660..e2964fe4dd 100644
--- a/apps/web/lib/zod/schemas/partner-network.ts
+++ b/apps/web/lib/zod/schemas/partner-network.ts
@@ -32,6 +32,7 @@ export const NetworkPartnersStatusSchema = z.enum([
"discover",
"invited",
"recruited",
+ "ignored",
]);
export const getNetworkPartnersQuerySchema = z
@@ -81,8 +82,6 @@ export const NetworkPartnerSchema = PartnerSchema.pick({
identityVerificationStatus: true,
identityVerifiedAt: true,
}).extend({
- lastConversionAt: z.date().nullable(),
- conversionScore: PartnerConversionScoreSchema,
starredAt: z.date().nullable(),
invitedAt: z.date().nullable(),
ignoredAt: z.date().nullable(),
diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsx
index b12f3aaf27..c136004678 100644
--- a/apps/web/ui/partners/partner-info-cards.tsx
+++ b/apps/web/ui/partners/partner-info-cards.tsx
@@ -24,7 +24,6 @@ import {
import { VerifiedBadge } from "@dub/ui/icons";
import {
COUNTRIES,
- capitalize,
fetcher,
formatDate,
formatDateTimeSmart,
@@ -33,7 +32,6 @@ import {
import Link from "next/link";
import { Fragment, ReactNode, createElement } from "react";
import useSWR from "swr";
-import { ConversionScoreIcon } from "./conversion-score-icon";
import { PartnerApplicationRiskSummary } from "./fraud-risks/partner-application-risk-summary";
import {
PartnerApplicationFraudBanner,
@@ -42,7 +40,6 @@ import {
import { PartnerFraudIndicator } from "./fraud-risks/partner-fraud-indicator";
import { PartnerAvatar } from "./partner-avatar";
import { PartnerInfoGroup } from "./partner-info-group";
-import { ConversionScoreTooltip } from "./partner-network/conversion-score-tooltip";
import { PartnerStarButton } from "./partner-star-button";
import { PartnerStatusBadgeWithTooltip } from "./partner-status-badge-with-tooltip";
import {
@@ -139,6 +136,11 @@ export function PartnerInfoCards({
),
text: partner?.country ? COUNTRIES[partner.country] : "Planet Earth",
},
+ {
+ id: "companyName",
+ icon: <OfficeBuilding className="size-3.5" />,
+ text: partner ? partner.companyName || null : undefined,
+ },
];
if (isEnrolled) {
@@ -163,11 +165,6 @@ export function PartnerInfoCards({
},
]
: []),
- {
- id: "companyName",
- icon: <OfficeBuilding className="size-3.5" />,
- text: partner ? partner.companyName || null : undefined,
- },
{
id: "createdAt",
icon: <CalendarIcon className="size-3.5" />,
@@ -204,53 +201,12 @@ export function PartnerInfoCards({
if (isNetwork) {
basicFields = basicFields.concat([
- {
- id: "conversion",
- icon: (
- <ConversionScoreIcon
- score={partner?.conversionScore || null}
- className="size-3.5 shrink-0"
- />
- ),
- text: partner
- ? partner.conversionScore
- ? `${capitalize(partner.conversionScore)} conversion`
- : "Unknown conversion"
- : undefined,
- wrapper: ConversionScoreTooltip,
- },
- {
- id: "lastConversionAt",
- icon: <ChartActivity2 className="size-3.5" />,
- text: partner
- ? partner.lastConversionAt
- ? `Last conversion ${timeAgo(partner.lastConversionAt, { withAgo: true })}`
- : "No conversions yet"
- : undefined,
- timestamp: partner?.lastConversionAt ?? undefined,
- },
- {
- id: "companyName",
- icon: <OfficeBuilding className="size-3.5" />,
- text: partner ? partner.companyName || null : undefined,
- },
{
id: "joinedAt",
icon: <CalendarIcon className="size-3.5" />,
text: partner ? `Joined ${formatDate(partner.createdAt!)}` : undefined,
timestamp: partner?.createdAt,
},
- ...(partner?.identityVerificationStatus === "approved" &&
- partner?.identityVerifiedAt
- ? [
- {
- id: "identityVerifiedAt",
- icon: <VerifiedBadge className="size-3.5 shrink-0" />,
- text: `Identity verified ${formatDate(partner.identityVerifiedAt, { month: "short" })}`,
- timestamp: partner.identityVerifiedAt,
- },
- ]
- : []),
]);
}
diff --git a/apps/web/ui/partners/partner-network/network-partner-sheet.tsx b/apps/web/ui/partners/partner-network/network-partner-sheet.tsx
index c5c55d0d85..415c5a9481 100644
--- a/apps/web/ui/partners/partner-network/network-partner-sheet.tsx
+++ b/apps/web/ui/partners/partner-network/network-partner-sheet.tsx
@@ -18,6 +18,7 @@ import {
} from "@dub/ui";
import { useAction } from "next-safe-action/hooks";
import Link from "next/link";
+import { usePathname } from "next/navigation";
import { Dispatch, SetStateAction, useState } from "react";
import { toast } from "sonner";
import { PartnerAbout } from "../partner-about";
@@ -198,6 +199,7 @@ function PartnerControls({
}) {
const { id: workspaceId } = useWorkspace();
const { program } = useProgram();
+ const pathname = usePathname();
const { executeAsync, isPending } = useAction(
invitePartnerFromNetworkAction,
@@ -247,9 +249,11 @@ function PartnerControls({
<div className="mr-2">
<InvitesUsage />
</div>
- <div className="flex-shrink-0">
- <PartnerIgnoreButton partner={partner} setIsOpen={setIsOpen} />
- </div>
+ {!pathname.endsWith("/ignored") && (
+ <div className="flex-shrink-0">
+ <PartnerIgnoreButton partner={partner} setIsOpen={setIsOpen} />
+ </div>
+ )}
<Button
type="button"
variant="primary"
diff --git a/packages/prisma/schema/network.prisma b/packages/prisma/schema/network.prisma
index 13a9690d3f..a8ac554f9d 100644
--- a/packages/prisma/schema/network.prisma
+++ b/packages/prisma/schema/network.prisma
@@ -54,6 +54,7 @@ model DiscoveredPartner {
program Program @relation(fields: [programId], references: [id], onDelete: Cascade)
partner Partner @relation(fields: [partnerId], references: [id], onDelete: Cascade)
+ programEnrollment ProgramEnrollment? @relation(fields: [programId, partnerId], references: [programId, partnerId])
@@unique([programId, partnerId])
@@index(partnerId)
diff --git a/packages/prisma/schema/program.prisma b/packages/prisma/schema/program.prisma
index aac2ff0beb..a8d65bc46b 100644
--- a/packages/prisma/schema/program.prisma
+++ b/packages/prisma/schema/program.prisma
@@ -153,6 +153,7 @@ model ProgramEnrollment {
fraudEventGroups FraudEventGroup[]
referrals PartnerReferral[]
fraudAlerts FraudAlert[]
+ discoveredPartner DiscoveredPartner?
// unique constraints
@@unique([partnerId, programId])