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.

add sortBy

Steven Teybf9ef0a363db
diff --git a/apps/web/app/(ee)/api/network/partners/route.ts b/apps/web/app/(ee)/api/network/partners/route.ts
index 6d98af17fd..35b623d7b2 100644
--- a/apps/web/app/(ee)/api/network/partners/route.ts
+++ b/apps/web/app/(ee)/api/network/partners/route.ts
@@ -51,8 +51,8 @@ export const GET = withWorkspace(
pageSize,
country,
starred,
+ sortBy,
platform,
- subscribers,
} = getNetworkPartnersQuerySchema.parse(searchParams);
if (status !== "discover") {
@@ -60,7 +60,6 @@ export const GET = withWorkspace(
partnerIds,
country,
platform,
- subscribers,
});
const partners = await prisma.discoveredPartner.findMany({
@@ -126,8 +125,8 @@ export const GET = withWorkspace(
page,
pageSize,
starred: starred ?? undefined,
+ sortBy,
platform: platform ?? undefined,
- subscribers: subscribers ?? undefined,
similarPrograms,
});
console.timeEnd("calculatePartnerRanking");
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 5fd4f54dbd..c2733ee459 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
@@ -34,6 +34,7 @@ import { toast } from "sonner";
import useSWR from "swr";
import { NetworkEmptyState } from "./network-empty-state";
import { NetworkPartnerCard } from "./network-partner-card";
+import { PartnerNetworkSort } from "./partner-network-sort";
import { usePartnerNetworkFilters } from "./use-partner-network-filters";
const tabs = [
@@ -201,7 +202,7 @@ export function ProgramPartnerNetworkPageClient({
onClick={() => {
queryParams({
set: { tab: tab.id },
- del: ["page", "starred"],
+ del: ["page", "starred", "sortBy"],
});
}}
>
@@ -223,58 +224,64 @@ export function ProgramPartnerNetworkPageClient({
{status === "discover" && (
<div className="mt-[17px]">
- <div className="flex flex-col items-center gap-4 md:flex-row">
- <Filter.Select
- className="h-10 w-full shrink-0 rounded-lg md:w-fit"
- filters={filters}
- activeFilters={activeFilters}
- onSelect={onSelect}
- onRemove={onRemove}
- />
- <div className="flex items-center gap-4">
- <ToggleGroup
- className="h-10 w-full rounded-lg border-neutral-200 bg-neutral-50 p-0 md:w-fit"
- optionClassName="rounded-lg px-3 py-2.5"
- indicatorClassName="rounded-lg bg-white border-none shadow-[0_0_0_1px_rgba(0,0,0,0.02),0_1px_3px_0_rgba(0,0,0,0.08)]"
- options={PLATFORM_TOGGLE_OPTIONS.map(
- ({ value, icon: Icon }) => ({
- value,
- label: <Icon className="size-4" />,
- }),
- )}
- selected={selectedPlatform}
- selectAction={(option) => {
- if (option === "all") {
- queryParams({
- del: ["platform", "page"],
- });
- } else {
+ <div className="flex items-center justify-between">
+ <div className="flex flex-col items-center gap-4 md:flex-row">
+ <Filter.Select
+ className="h-10 w-full shrink-0 rounded-lg md:w-fit"
+ filters={filters}
+ activeFilters={activeFilters}
+ onSelect={onSelect}
+ onRemove={onRemove}
+ />
+ <div className="flex items-center gap-4">
+ <ToggleGroup
+ className="h-10 w-full rounded-lg border-neutral-200 bg-neutral-50 p-0 md:w-fit"
+ optionClassName="rounded-lg px-3 py-2.5"
+ indicatorClassName="rounded-lg bg-white border-none shadow-[0_0_0_1px_rgba(0,0,0,0.02),0_1px_3px_0_rgba(0,0,0,0.08)]"
+ options={PLATFORM_TOGGLE_OPTIONS.map(
+ ({ value, icon: Icon }) => ({
+ value,
+ label: <Icon className="size-4" />,
+ }),
+ )}
+ selected={selectedPlatform}
+ selectAction={(option) => {
+ if (option === "all") {
+ queryParams({
+ del: ["platform", "page"],
+ });
+ } else {
+ queryParams({
+ set: { platform: option },
+ del: "page",
+ });
+ }
+ }}
+ />
+ <Button
+ type="button"
+ variant="secondary"
+ onClick={() => {
queryParams({
- set: { platform: option },
- del: "page",
+ set: !isStarred ? { starred: "true" } : undefined,
+ del: ["page", ...(!isStarred ? [] : ["starred"])],
});
+ }}
+ icon={
+ isStarred ? (
+ <StarFill className="size-4 text-amber-500" />
+ ) : (
+ <Star className="text-content-subtle size-4" />
+ )
}
- }}
- />
- <Button
- type="button"
- variant="secondary"
- onClick={() => {
- queryParams({
- set: !isStarred ? { starred: "true" } : undefined,
- del: ["page", ...(!isStarred ? [] : ["starred"])],
- });
- }}
- icon={
- isStarred ? (
- <StarFill className="size-4 text-amber-500" />
- ) : (
- <Star className="text-content-subtle size-4" />
- )
- }
- className="size-10 shrink-0 rounded-lg"
- />
+ className="size-10 shrink-0 rounded-lg"
+ />
+ </div>
</div>
+ <PartnerNetworkSort
+ selectedPlatform={selectedPlatform}
+ className="md:ml-auto"
+ />
</div>
<AnimatedSizeContainer height>
{activeFilters.length > 0 && (
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/partner-network-sort.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/partner-network-sort.tsx
new file mode 100644
index 0000000000..74ac2030c1
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/network/partner-network-sort.tsx
@@ -0,0 +1,106 @@
+import { PlatformType } from "@dub/prisma/client";
+import { IconMenu, Popover, Tick, useRouterStuff } from "@dub/ui";
+import { ChartActivity2, Megaphone } from "@dub/ui/icons";
+import { cn } from "@dub/utils";
+import { ChevronDown } from "lucide-react";
+import { useEffect, useMemo, useState } from "react";
+
+function getPlatformSortLabel(platform: PlatformType) {
+ switch (platform) {
+ case "website":
+ return "Domain Ranking";
+ case "youtube":
+ return "Subscribers";
+ default:
+ return "Followers";
+ }
+}
+
+export function PartnerNetworkSort({
+ selectedPlatform,
+ className,
+}: {
+ selectedPlatform: PlatformType | "all";
+ className?: string;
+}) {
+ const { queryParams, searchParams } = useRouterStuff();
+ const [openPopover, setOpenPopover] = useState(false);
+
+ const sortBy = searchParams.get("sortBy") || "relevance";
+
+ useEffect(() => {
+ if (selectedPlatform === "all" && sortBy === "subscribers") {
+ queryParams({ del: ["sortBy"] });
+ }
+ }, [selectedPlatform, sortBy, queryParams]);
+
+ const sortOptions = useMemo(() => {
+ const options = [
+ {
+ value: "relevance",
+ label: "Relevance",
+ icon: ChartActivity2,
+ },
+ ];
+
+ if (selectedPlatform !== "all") {
+ options.push({
+ value: "subscribers",
+ label: getPlatformSortLabel(selectedPlatform),
+ icon: Megaphone,
+ });
+ }
+
+ return options;
+ }, [selectedPlatform]);
+
+ const selectedSort =
+ sortOptions.find((option) => option.value === sortBy) ?? sortOptions[0];
+
+ return (
+ <Popover
+ content={
+ <div className="w-full p-2 md:w-52">
+ {sortOptions.map(({ label, value, icon: Icon }) => (
+ <button
+ key={value}
+ type="button"
+ onClick={() => {
+ queryParams({
+ set: value === "relevance" ? undefined : { sortBy: value },
+ del: ["page", ...(value === "relevance" ? ["sortBy"] : [])],
+ });
+ setOpenPopover(false);
+ }}
+ className="flex w-full items-center justify-between space-x-2 rounded-md px-1 py-2 hover:bg-neutral-100 active:bg-neutral-200"
+ >
+ <IconMenu text={label} icon={<Icon className="size-4" />} />
+ {value === selectedSort.value && (
+ <Tick className="size-4" aria-hidden="true" />
+ )}
+ </button>
+ ))}
+ </div>
+ }
+ openPopover={openPopover}
+ setOpenPopover={setOpenPopover}
+ >
+ <button
+ type="button"
+ onClick={() => setOpenPopover(!openPopover)}
+ className={cn(
+ "group flex h-10 w-full cursor-pointer appearance-none items-center gap-x-2 truncate rounded-lg border px-3 text-sm outline-none transition-all md:w-auto",
+ "border-neutral-200 bg-white text-neutral-900 placeholder-neutral-400",
+ "focus-visible:border-neutral-500 data-[state=open]:border-neutral-500 data-[state=open]:ring-4 data-[state=open]:ring-neutral-200",
+ className,
+ )}
+ >
+ <span className="text-content-emphasis flex-1 overflow-hidden text-ellipsis whitespace-nowrap text-left">
+ Sort by{" "}
+ <strong className="font-semibold">{selectedSort.label}</strong>
+ </span>
+ <ChevronDown className="size-4 flex-shrink-0 text-neutral-400 transition-transform duration-75 group-data-[state=open]:rotate-180" />
+ </button>
+ </Popover>
+ );
+}
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 88175e61f6..e104d620de 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
@@ -102,7 +102,7 @@ export function usePartnerNetworkFilters({
const onRemoveAll = useCallback(
() =>
queryParams({
- del: ["country", "starred", "platform"],
+ del: ["country", "starred", "platform", "sortBy"],
}),
[queryParams],
);
diff --git a/apps/web/lib/api/network/calculate-partner-ranking.ts b/apps/web/lib/api/network/calculate-partner-ranking.ts
index fb21e1fed3..2f23ab4084 100644
--- a/apps/web/lib/api/network/calculate-partner-ranking.ts
+++ b/apps/web/lib/api/network/calculate-partner-ranking.ts
@@ -1,6 +1,6 @@
import { getNetworkPartnersQuerySchema } from "@/lib/zod/schemas/partner-network";
import { prisma } from "@dub/prisma";
-import { Prisma } from "@dub/prisma/client";
+import { PlatformType, Prisma } from "@dub/prisma/client";
import { ACME_PROGRAM_ID } from "@dub/utils";
import * as z from "zod/v4";
@@ -37,11 +37,38 @@ export interface PartnerRankingParams extends PartnerRankingFilters {
* - 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
*/
+function buildOrderByClause({
+ starred,
+ sortBy,
+ platform,
+}: {
+ starred?: boolean | null;
+ sortBy?: "relevance" | "subscribers";
+ platform?: PlatformType;
+}) {
+ if (starred === true) {
+ return Prisma.sql`dp.starredAt ASC`;
+ }
+
+ if (sortBy === "subscribers" && platform) {
+ return Prisma.sql`(
+ SELECT COALESCE(MAX(pp_sort.subscribers), 0)
+ FROM PartnerPlatform pp_sort
+ WHERE pp_sort.partnerId = p.id
+ AND pp_sort.type = ${platform}
+ AND pp_sort.verifiedAt IS NOT NULL
+ ) DESC, p.id ASC`;
+ }
+
+ return Prisma.sql`finalScore DESC, p.id ASC`;
+}
+
export async function calculatePartnerRanking({
programId,
partnerIds,
country,
starred,
+ sortBy = "relevance",
platform,
subscribers,
page = 1,
@@ -120,10 +147,7 @@ export async function calculatePartnerRanking({
WHERE pp.partnerId = p.id
)`;
- const orderByClause =
- starred === true
- ? Prisma.sql`dp.starredAt ASC`
- : Prisma.sql`finalScore DESC, p.id ASC`;
+ const orderByClause = buildOrderByClause({ starred, sortBy, platform });
const offset = (page - 1) * pageSize;
diff --git a/apps/web/lib/api/network/partner-network-listing-where.ts b/apps/web/lib/api/network/partner-network-listing-where.ts
index ed71bc122c..bbb9b96469 100644
--- a/apps/web/lib/api/network/partner-network-listing-where.ts
+++ b/apps/web/lib/api/network/partner-network-listing-where.ts
@@ -5,7 +5,6 @@ export type PartnerNetworkListingParams = {
partnerIds?: string[];
country?: string;
platform?: PlatformType;
- subscribers?: "<5000" | "5000-25000" | "25000-100000" | "100000+" | undefined;
};
export type PartnerNetworkListingParts = {
@@ -15,26 +14,13 @@ export type PartnerNetworkListingParts = {
function listingPlatformSomeFromParams({
platform,
- subscribers,
-}: Pick<PartnerNetworkListingParams, "platform" | "subscribers">):
+}: Pick<PartnerNetworkListingParams, "platform">):
| Prisma.PartnerPlatformWhereInput
| undefined {
- return platform || subscribers
+ return platform
? {
verifiedAt: { not: null },
...(platform && { type: platform }),
- ...(subscribers === "<5000" && {
- subscribers: { lt: 5000 },
- }),
- ...(subscribers === "5000-25000" && {
- subscribers: { gte: 5000, lt: 25000 },
- }),
- ...(subscribers === "25000-100000" && {
- subscribers: { gte: 25000, lt: 100000 },
- }),
- ...(subscribers === "100000+" && {
- subscribers: { gte: 100000 },
- }),
}
: undefined;
}
diff --git a/apps/web/lib/zod/schemas/partner-network.ts b/apps/web/lib/zod/schemas/partner-network.ts
index 3a83d5fc6d..ba6c8e4704 100644
--- a/apps/web/lib/zod/schemas/partner-network.ts
+++ b/apps/web/lib/zod/schemas/partner-network.ts
@@ -41,10 +41,8 @@ export const getNetworkPartnersQuerySchema = z
status: NetworkPartnersStatusSchema.default("discover"),
country: z.string().optional(),
starred: booleanQuerySchema.nullish(),
+ sortBy: z.enum(["relevance", "subscribers"]).default("relevance"),
platform: z.enum(PlatformType).optional(),
- subscribers: z
- .enum(["<5000", "5000-25000", "25000-100000", "100000+"])
- .optional(),
partnerIds: z
.union([z.string(), z.array(z.string())])
.transform((v) => (Array.isArray(v) ? v : v.split(",")))