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.

Partners number stat filter (#3625)

Pedro Ladeiraac4912f09dfd
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
index ebc8e07306..8bcde47d58 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
@@ -4,17 +4,96 @@ import useWorkspace from "@/lib/swr/use-workspace";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
import { ProgramEnrollmentStatus } from "@dub/prisma/client";
-import { useRouterStuff } from "@dub/ui";
-import { CircleDotted, FlagWavy, Users6 } from "@dub/ui/icons";
-import { cn, COUNTRIES, nFormatter } from "@dub/utils";
+import { encodeRangeToken, parseRangeToken, useRouterStuff } from "@dub/ui";
+import {
+ CircleDotted,
+ CursorRays,
+ FlagWavy,
+ InvoiceDollar,
+ MarketingTarget,
+ MoneyBills2,
+ UserPlus,
+ Users6,
+} from "@dub/ui/icons";
+import { cn, COUNTRIES, currencyFormatter, nFormatter } from "@dub/utils";
import { useMemo } from "react";
+const PARTNER_METRIC_RANGE = [
+ {
+ filterKey: "totalClicks",
+ minParam: "totalClicksMin",
+ maxParam: "totalClicksMax",
+ metric: "totalClicks" as const,
+ label: "Clicks",
+ icon: CursorRays,
+ },
+ {
+ filterKey: "totalLeads",
+ minParam: "totalLeadsMin",
+ maxParam: "totalLeadsMax",
+ metric: "totalLeads" as const,
+ label: "Leads",
+ icon: UserPlus,
+ },
+ {
+ filterKey: "totalConversions",
+ minParam: "totalConversionsMin",
+ maxParam: "totalConversionsMax",
+ metric: "totalConversions" as const,
+ label: "Conversions",
+ icon: MarketingTarget,
+ },
+ {
+ filterKey: "totalSaleAmount",
+ minParam: "totalSaleAmountMin",
+ maxParam: "totalSaleAmountMax",
+ metric: "totalSaleAmount" as const,
+ label: "Revenue",
+ icon: InvoiceDollar,
+ formatRangeBound: (n: number) => currencyFormatter(n),
+ parseRangeInput: (raw: string) => {
+ const n = Number.parseFloat(raw.replace(/[^0-9.-]/g, ""));
+ if (!Number.isFinite(n)) {
+ return Number.NaN;
+ }
+ return Math.round(n * 100);
+ },
+ },
+ {
+ filterKey: "totalCommissions",
+ minParam: "totalCommissionsMin",
+ maxParam: "totalCommissionsMax",
+ metric: "totalCommissions" as const,
+ label: "Commissions",
+ icon: MoneyBills2,
+ formatRangeBound: (n: number) => currencyFormatter(n),
+ parseRangeInput: (raw: string) => {
+ const n = Number.parseFloat(raw.replace(/[^0-9.-]/g, ""));
+ if (!Number.isFinite(n)) {
+ return Number.NaN;
+ }
+ return Math.round(n * 100);
+ },
+ },
+] as const;
+
+export type PartnerFilterKey =
+ | "groupId"
+ | "status"
+ | "country"
+ | (typeof PARTNER_METRIC_RANGE)[number]["filterKey"];
+
export function usePartnerFilters(
extraSearchParams: Record<string, string>,
- enabledFilters: ("groupId" | "status" | "country")[] = [
+ enabledFilters: PartnerFilterKey[] = [
"groupId",
"status",
"country",
+ "totalClicks",
+ "totalLeads",
+ "totalConversions",
+ "totalSaleAmount",
+ "totalCommissions",
],
) {
const { searchParamsObj, queryParams } = useRouterStuff();
@@ -25,6 +104,15 @@ export function usePartnerFilters(
const { groups } = useGroups();
+ const cohortParams = useMemo(
+ () => ({
+ ...(searchParamsObj.groupId && { groupId: searchParamsObj.groupId }),
+ ...(searchParamsObj.country && { country: searchParamsObj.country }),
+ ...(searchParamsObj.search && { search: searchParamsObj.search }),
+ }),
+ [searchParamsObj.groupId, searchParamsObj.country, searchParamsObj.search],
+ );
+
const { partnersCount: countriesCount } = usePartnersCount<
| {
country: string;
@@ -34,6 +122,7 @@ export function usePartnerFilters(
>({
groupBy: "country",
status,
+ ...cohortParams,
enabled: enabledFilters.includes("country"),
});
@@ -44,7 +133,9 @@ export function usePartnerFilters(
}[]
| undefined
>({
- groupBy: "status", // here we include all statuses to get the groupBy count
+ groupBy: "status",
+ status,
+ ...cohortParams,
enabled: enabledFilters.includes("status"),
});
@@ -57,6 +148,7 @@ export function usePartnerFilters(
>({
groupBy: "groupId",
status,
+ ...cohortParams,
enabled: enabledFilters.includes("groupId"),
});
@@ -128,14 +220,17 @@ export function usePartnerFilters(
key: "country",
icon: FlagWavy,
label: "Location",
- getOptionIcon: (value) => (
+ separatorAfter: PARTNER_METRIC_RANGE.some((m) =>
+ enabledFilters.includes(m.filterKey),
+ ),
+ getOptionIcon: (value: string) => (
<img
alt={value}
src={`https://hatscripts.github.io/circle-flags/flags/${value.toLowerCase()}.svg`}
className="size-4 shrink-0"
/>
),
- getOptionLabel: (value) => COUNTRIES[value],
+ getOptionLabel: (value: string) => COUNTRIES[value],
options:
countriesCount
?.filter(({ country }) => COUNTRIES[country])
@@ -147,62 +242,187 @@ export function usePartnerFilters(
},
]
: []),
+ ...PARTNER_METRIC_RANGE.filter((m) =>
+ enabledFilters.includes(m.filterKey),
+ ).map((m) => {
+ const formatRangeBound =
+ "formatRangeBound" in m && m.formatRangeBound
+ ? m.formatRangeBound
+ : (n: number) => nFormatter(n, { full: true });
+ const parseRangeInput =
+ "parseRangeInput" in m && m.parseRangeInput
+ ? m.parseRangeInput
+ : (raw: string) => {
+ const n = Number.parseInt(raw.replace(/[^\d-]/g, ""), 10);
+ return Number.isFinite(n) ? n : Number.NaN;
+ };
+ return {
+ key: m.filterKey,
+ icon: m.icon,
+ label: m.label,
+ type: "range" as const,
+ options: null,
+ ...(m.metric === "totalCommissions"
+ ? {
+ rangeDisplayScale: 100,
+ rangeNumberStep: 0.01,
+ }
+ : {}),
+ formatRangeBound,
+ parseRangeInput,
+ formatRangePillLabel: (token: string) => {
+ const { min, max } = parseRangeToken(token);
+ if (min != null && max != null) {
+ return `${formatRangeBound(min)} – ${formatRangeBound(max)}`;
+ }
+ if (min != null) {
+ return `${formatRangeBound(min)} – No max`;
+ }
+ if (max != null) {
+ return `No min – ${formatRangeBound(max)}`;
+ }
+ return token;
+ },
+ };
+ }),
],
- [groupsCount, groups, statusCount, countriesCount],
+ [groupsCount, groups, statusCount, countriesCount, slug, enabledFilters],
);
const activeFilters = useMemo(() => {
- const { groupId, status, country } = searchParamsObj;
+ const { groupId, status: statusParam, country } = searchParamsObj;
return [
...(enabledFilters.includes("groupId") && groupId
? [{ key: "groupId", value: groupId }]
: []),
- ...(enabledFilters.includes("status") && status
- ? [{ key: "status", value: status }]
+ ...(enabledFilters.includes("status") && statusParam
+ ? [{ key: "status", value: statusParam }]
: []),
...(enabledFilters.includes("country") && country
? [{ key: "country", value: country }]
: []),
+ ...PARTNER_METRIC_RANGE.filter((m) =>
+ enabledFilters.includes(m.filterKey),
+ ).flatMap((m) => {
+ const minRaw = searchParamsObj[m.minParam];
+ const maxRaw = searchParamsObj[m.maxParam];
+ const min =
+ minRaw !== undefined && minRaw !== "" ? Number(minRaw) : undefined;
+ const max =
+ maxRaw !== undefined && maxRaw !== "" ? Number(maxRaw) : undefined;
+ const minOk = min !== undefined && Number.isFinite(min);
+ const maxOk = max !== undefined && Number.isFinite(max);
+ if (!minOk && !maxOk) {
+ return [];
+ }
+ return [
+ {
+ key: m.filterKey,
+ value: encodeRangeToken(
+ minOk ? min : undefined,
+ maxOk ? max : undefined,
+ ),
+ },
+ ];
+ }),
];
- }, [searchParamsObj]);
+ }, [searchParamsObj, enabledFilters]);
+
+ const onSelect = (key: string, value: unknown) => {
+ const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === key);
+ if (metric) {
+ const { min, max } = parseRangeToken(String(value));
+ queryParams({
+ set: {
+ ...(min != null ? { [metric.minParam]: String(min) } : {}),
+ ...(max != null ? { [metric.maxParam]: String(max) } : {}),
+ },
+ del: [
+ ...(min == null ? [metric.minParam] : []),
+ ...(max == null ? [metric.maxParam] : []),
+ "page",
+ ],
+ });
+ return;
+ }
- const onSelect = (key: string, value: any) =>
queryParams({
- set: {
- [key]: value,
- },
+ set: { [key]: value as string },
del: "page",
});
+ };
+
+ const onRemove = (key: string, _value?: unknown) => {
+ const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === key);
+ if (metric) {
+ queryParams({
+ del: [metric.minParam, metric.maxParam, "page"],
+ });
+ return;
+ }
- const onRemove = (key: string) =>
queryParams({
del: [key, "page"],
});
+ };
+
+ const onRemoveFilter = (key: string) => {
+ onRemove(key);
+ };
const onRemoveAll = () =>
queryParams({
- del: ["status", "country", "groupId", "search"],
+ del: [
+ "status",
+ "country",
+ "groupId",
+ "search",
+ "totalClicksMin",
+ "totalClicksMax",
+ "totalLeadsMin",
+ "totalLeadsMax",
+ "totalConversionsMin",
+ "totalConversionsMax",
+ "totalSaleAmountMin",
+ "totalSaleAmountMax",
+ "totalCommissionsMin",
+ "totalCommissionsMax",
+ "page",
+ ],
});
- const searchQuery = useMemo(
- () =>
- new URLSearchParams({
- ...Object.fromEntries(
- activeFilters.map(({ key, value }) => [key, value]),
- ),
- ...(searchParamsObj.search && { search: searchParamsObj.search }),
- workspaceId: workspaceId || "",
- ...extraSearchParams,
- }).toString(),
- [activeFilters, workspaceId, extraSearchParams],
- );
+ const searchQuery = useMemo(() => {
+ const acc: Record<string, string> = {
+ workspaceId: workspaceId || "",
+ ...extraSearchParams,
+ };
+ if (searchParamsObj.search) {
+ acc.search = searchParamsObj.search;
+ }
+ for (const { key, value } of activeFilters) {
+ const metric = PARTNER_METRIC_RANGE.find((m) => m.filterKey === key);
+ if (metric) {
+ const { min, max } = parseRangeToken(String(value));
+ if (min != null) {
+ acc[metric.minParam] = String(min);
+ }
+ if (max != null) {
+ acc[metric.maxParam] = String(max);
+ }
+ } else {
+ acc[key] = String(value);
+ }
+ }
+ return new URLSearchParams(acc).toString();
+ }, [activeFilters, workspaceId, extraSearchParams, searchParamsObj.search]);
return {
filters,
activeFilters,
onSelect,
onRemove,
+ onRemoveFilter,
onRemoveAll,
searchQuery,
};
diff --git a/apps/web/lib/api/partners/get-partners-count.ts b/apps/web/lib/api/partners/get-partners-count.ts
index 0924f6c6f2..6d7e2c7489 100644
--- a/apps/web/lib/api/partners/get-partners-count.ts
+++ b/apps/web/lib/api/partners/get-partners-count.ts
@@ -1,7 +1,12 @@
import { partnersCountQuerySchema } from "@/lib/zod/schemas/partners";
-import { prisma, sanitizeFullTextSearch } from "@dub/prisma";
+import { prisma } from "@dub/prisma";
import { Prisma, ProgramEnrollmentStatus } from "@dub/prisma/client";
import * as z from "zod/v4";
+import {
+ buildMetricRangeWhere,
+ buildPartnerEmailSearchWhere,
+ buildProgramEnrollmentWhereForList,
+} from "./program-enrollment-query";
type PartnersCountFilters = z.infer<typeof partnersCountQuerySchema> & {
programId: string;
@@ -10,34 +15,21 @@ type PartnersCountFilters = z.infer<typeof partnersCountQuerySchema> & {
export async function getPartnersCount<T>(
filters: PartnersCountFilters,
): Promise<T> {
- const {
- groupBy,
- status,
- country,
- search,
- email,
- partnerIds,
- groupId,
- programId,
- } = filters;
+ const { groupBy, programId, ...enrollmentFilters } = filters;
+ const enrollmentBase = { ...enrollmentFilters, programId };
+
+ const { status, country, search, email, partnerIds, groupId } =
+ enrollmentFilters;
const commonWhere: Prisma.PartnerWhereInput = {
- ...(email
- ? { email }
- : search
- ? search.includes("@")
- ? { email: search }
- : {
- email: { search: sanitizeFullTextSearch(search) },
- name: { search: sanitizeFullTextSearch(search) },
- companyName: { search: sanitizeFullTextSearch(search) },
- }
- : {}),
+ ...buildPartnerEmailSearchWhere({ email, search }),
...(partnerIds && {
id: { in: partnerIds },
}),
};
+ const enrollmentMetricWhere = buildMetricRangeWhere(enrollmentBase);
+
// Get partner count by country
if (groupBy === "country") {
const partners = await prisma.partner.groupBy({
@@ -50,6 +42,7 @@ export async function getPartnersCount<T>(
groupId,
}),
status,
+ ...enrollmentMetricWhere,
},
},
...commonWhere,
@@ -80,6 +73,7 @@ export async function getPartnersCount<T>(
}),
...commonWhere,
},
+ ...enrollmentMetricWhere,
},
_count: true,
orderBy: {
@@ -96,7 +90,7 @@ export async function getPartnersCount<T>(
// Add missing statuses with count 0
missingStatuses.forEach((status) => {
- partners.push({ _count: 0, status });
+ partners.push({ _count: 0, status: status });
});
return partners as T;
@@ -115,6 +109,7 @@ export async function getPartnersCount<T>(
...commonWhere,
},
status,
+ ...enrollmentMetricWhere,
},
_count: true,
orderBy: {
@@ -129,19 +124,7 @@ export async function getPartnersCount<T>(
// Get absolute count of partners
const count = await prisma.programEnrollment.count({
- where: {
- programId,
- status,
- ...(groupId && {
- groupId,
- }),
- partner: {
- ...(country && {
- country,
- }),
- ...commonWhere,
- },
- },
+ where: buildProgramEnrollmentWhereForList(enrollmentBase),
});
return count as T;
diff --git a/apps/web/lib/api/partners/get-partners.ts b/apps/web/lib/api/partners/get-partners.ts
index 04cd6bfb00..7d2cb7484e 100644
--- a/apps/web/lib/api/partners/get-partners.ts
+++ b/apps/web/lib/api/partners/get-partners.ts
@@ -1,7 +1,8 @@
import { getPartnersQuerySchemaExtended } from "@/lib/zod/schemas/partners";
-import { prisma, sanitizeFullTextSearch } from "@dub/prisma";
+import { prisma } from "@dub/prisma";
import { toCentsNumber } from "@dub/utils";
import * as z from "zod/v4";
+import { buildProgramEnrollmentWhereForList } from "./program-enrollment-query";
type PartnerFilters = z.infer<typeof getPartnersQuerySchemaExtended> & {
programId: string;
@@ -9,50 +10,20 @@ type PartnerFilters = z.infer<typeof getPartnersQuerySchemaExtended> & {
export async function getPartners(filters: PartnerFilters) {
const {
- status,
- country,
- search,
- email,
- tenantId,
- partnerIds,
page = 1,
pageSize,
sortBy,
sortOrder,
programId,
- groupId,
+ includePartnerPlatforms: _includePartnerPlatforms,
+ ...enrollmentRest
} = filters;
const partners = await prisma.programEnrollment.findMany({
- where: {
- tenantId,
+ where: buildProgramEnrollmentWhereForList({
+ ...enrollmentRest,
programId,
- ...(partnerIds && {
- partnerId: {
- in: partnerIds,
- },
- }),
- status,
- groupId,
- ...(country || search || email
- ? {
- partner: {
- country,
- ...(email
- ? { email }
- : search
- ? search.includes("@")
- ? { email: search }
- : {
- email: { search: sanitizeFullTextSearch(search) },
- name: { search: sanitizeFullTextSearch(search) },
- companyName: { search: sanitizeFullTextSearch(search) },
- }
- : {}),
- },
- }
- : {}),
- },
+ }),
include: {
partner: {
include: {
diff --git a/apps/web/lib/api/partners/program-enrollment-query.ts b/apps/web/lib/api/partners/program-enrollment-query.ts
new file mode 100644
index 0000000000..ef78eb51b2
--- /dev/null
+++ b/apps/web/lib/api/partners/program-enrollment-query.ts
@@ -0,0 +1,168 @@
+import { getPartnersQuerySchemaExtended } from "@/lib/zod/schemas/partners";
+import { sanitizeFullTextSearch } from "@dub/prisma";
+import { Prisma } from "@dub/prisma/client";
+import * as z from "zod/v4";
+
+/**
+ * Email / search filters on `Partner` (exact email, or full-text on email/name/company).
+ */
+export function buildPartnerEmailSearchWhere({
+ email,
+ search,
+}: {
+ email?: string | null;
+ search?: string | null;
+}): Prisma.PartnerWhereInput {
+ if (email) {
+ return { email };
+ }
+ if (search) {
+ if (search.includes("@")) {
+ return { email: search };
+ }
+ const q = sanitizeFullTextSearch(search);
+ return {
+ OR: [
+ { email: { search: q } },
+ { name: { search: q } },
+ { companyName: { search: q } },
+ ],
+ };
+ }
+ return {};
+}
+
+export type PartnerEnrollmentQueryFilters = Omit<
+ z.infer<typeof getPartnersQuerySchemaExtended>,
+ "sortBy" | "sortOrder" | "page" | "pageSize" | "includePartnerPlatforms"
+> & { programId: string };
+
+function normalizeBounds(
+ min?: number | null,
+ max?: number | null,
+): { min?: number; max?: number } {
+ if (min == null && max == null) {
+ return {};
+ }
+ if (min != null && max != null && min > max) {
+ return { min: max, max: min };
+ }
+ return { ...(min != null ? { min } : {}), ...(max != null ? { max } : {}) };
+}
+
+/** Metric range filters for program enrollment list/count queries. */
+export function buildMetricRangeWhere(
+ filters: PartnerEnrollmentQueryFilters,
+): Prisma.ProgramEnrollmentWhereInput {
+ const and: Prisma.ProgramEnrollmentWhereInput[] = [];
+
+ {
+ const b = normalizeBounds(filters.totalClicksMin, filters.totalClicksMax);
+ if (b.min != null || b.max != null) {
+ and.push({
+ totalClicks: {
+ ...(b.min != null && { gte: b.min }),
+ ...(b.max != null && { lte: b.max }),
+ },
+ });
+ }
+ }
+
+ {
+ const b = normalizeBounds(filters.totalLeadsMin, filters.totalLeadsMax);
+ if (b.min != null || b.max != null) {
+ and.push({
+ totalLeads: {
+ ...(b.min != null && { gte: b.min }),
+ ...(b.max != null && { lte: b.max }),
+ },
+ });
+ }
+ }
+
+ {
+ const b = normalizeBounds(
+ filters.totalConversionsMin,
+ filters.totalConversionsMax,
+ );
+ if (b.min != null || b.max != null) {
+ and.push({
+ totalConversions: {
+ ...(b.min != null && { gte: b.min }),
+ ...(b.max != null && { lte: b.max }),
+ },
+ });
+ }
+ }
+
+ {
+ const b = normalizeBounds(
+ filters.totalSaleAmountMin,
+ filters.totalSaleAmountMax,
+ );
+ if (b.min != null || b.max != null) {
+ and.push({
+ totalSaleAmount: {
+ ...(b.min != null && { gte: b.min }),
+ ...(b.max != null && { lte: b.max }),
+ },
+ });
+ }
+ }
+
+ {
+ const b = normalizeBounds(
+ filters.totalCommissionsMin,
+ filters.totalCommissionsMax,
+ );
+ if (b.min != null || b.max != null) {
+ and.push({
+ totalCommissions: {
+ ...(b.min != null && { gte: BigInt(Math.trunc(b.min)) }),
+ ...(b.max != null && { lte: BigInt(Math.trunc(b.max)) }),
+ },
+ });
+ }
+ }
+
+ return and.length ? { AND: and } : {};
+}
+
+/** Matches GET /api/partners enrollment filter shape + metric ranges. */
+export function buildProgramEnrollmentWhereForList(
+ filters: PartnerEnrollmentQueryFilters,
+): Prisma.ProgramEnrollmentWhereInput {
+ const {
+ programId,
+ status,
+ groupId,
+ country,
+ tenantId,
+ partnerIds,
+ search,
+ email,
+ } = filters;
+
+ const metricWhere = buildMetricRangeWhere(filters);
+
+ return {
+ tenantId,
+ programId,
+ ...(partnerIds && {
+ partnerId: {
+ in: partnerIds,
+ },
+ }),
+ status,
+ groupId,
+ ...(country || search || email
+ ? {
+ partner: {
+ country,
+ ...buildPartnerEmailSearchWhere({ email, search }),
+ },
+ }
+ : {}),
+ ...metricWhere,
+ };
+}
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 928b1f8202..3b6fd97f8d 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -120,6 +120,11 @@ export const exportApplicationsColumnsDefault = [
export const getPartnersQuerySchema = z
.object({
+ groupId: z
+ .string()
+ .optional()
+ .describe("A filter on the list based on the partner's `groupId` field.")
+ .meta({ example: "grp_123" }),
status: z
.enum(ProgramEnrollmentStatus)
.optional()
@@ -185,8 +190,68 @@ export const getPartnersQuerySchemaExtended = getPartnersQuerySchema.extend({
.union([z.string(), z.array(z.string())])
.transform((v) => (Array.isArray(v) ? v : v.split(",")))
.optional(),
- groupId: z.string().optional(),
includePartnerPlatforms: booleanQuerySchema.optional(),
+ // metric range query fields (TODO: Add to public API once we finalize the syntax)
+ totalClicksMin: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Minimum total clicks (inclusive)."),
+ totalClicksMax: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Maximum total clicks (inclusive)."),
+ totalLeadsMin: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Minimum total leads (inclusive)."),
+ totalLeadsMax: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Maximum total leads (inclusive)."),
+ totalConversionsMin: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Minimum total conversions (inclusive)."),
+ totalConversionsMax: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Maximum total conversions (inclusive)."),
+ totalSaleAmountMin: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Minimum total sale amount (inclusive) in USD cents."),
+ totalSaleAmountMax: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Maximum total sale amount (inclusive) in USD cents."),
+ totalCommissionsMin: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Minimum total commissions (inclusive) in USD cents."),
+ totalCommissionsMax: z.coerce
+ .number()
+ .int()
+ .nonnegative()
+ .optional()
+ .describe("Maximum total commissions (inclusive) in USD cents."),
});
export const partnersExportQuerySchema = getPartnersQuerySchemaExtended
diff --git a/packages/ui/src/filter/filter-list.tsx b/packages/ui/src/filter/filter-list.tsx
index 7da56c93b5..70a8233e19 100644
--- a/packages/ui/src/filter/filter-list.tsx
+++ b/packages/ui/src/filter/filter-list.tsx
@@ -8,12 +8,14 @@ import { AnimatedSizeContainer } from "../animated-size-container";
import { useKeyboardShortcut } from "../hooks";
import { Check } from "../icons";
import { Popover } from "../popover";
+import { FilterRangePanel } from "./filter-range-panel";
import {
ActiveFilterInput,
Filter,
FilterOperator,
FilterOption,
normalizeActiveFilter,
+ parseRangeToken,
} from "./types";
type FilterListProps = {
@@ -64,7 +66,11 @@ export function FilterList({
<AnimatedSizeContainer
height
className="w-full"
- transition={{ type: "tween", duration: 0.3 }}
+ transition={{
+ type: "tween",
+ duration: 0.2,
+ ease: [0.23, 1, 0.32, 1],
+ }}
>
<div
className={cn(
@@ -241,7 +247,13 @@ export function FilterList({
{normalizedFilters.length !== 0 && (
<button
type="button"
- className="group mt-px flex items-center gap-2 whitespace-nowrap rounded-lg border border-transparent px-3 py-2 text-sm text-neutral-500 ring-inset ring-neutral-500 transition-colors hover:border-neutral-200 hover:bg-white hover:text-black focus:outline-none"
+ className={cn(
+ "group mt-px flex items-center gap-2 whitespace-nowrap rounded-lg border border-transparent px-3 py-2 text-sm text-neutral-500 ring-inset ring-neutral-500",
+ "transition-[color,border-color,background-color,transform] duration-150 ease-out motion-reduce:transition-none",
+ "hover:border-neutral-200 hover:bg-white hover:text-black [@media(hover:none)]:hover:border-transparent [@media(hover:none)]:hover:bg-transparent",
+ "active:scale-[0.98] motion-reduce:active:scale-100",
+ "focus:outline-none",
+ )}
onClick={onRemoveAll}
>
Clear Filters
@@ -287,6 +299,7 @@ function OperatorFilterPill({
const [initialSelectedValues, setInitialSelectedValues] = useState<
Set<FilterOption["value"]>
>(new Set());
+ const [rangeEditOpen, setRangeEditOpen] = useState(false);
const openValueDropdown = useCallback(() => {
setInitialSelectedValues(new Set(values));
@@ -307,6 +320,125 @@ function OperatorFilterPill({
[filterKey, values, onSelect, onRemove, isAdvancedFilter, filter.multiple],
);
+ if (filter.type === "range") {
+ const token = String(values[0] ?? "|");
+ const fmt =
+ filter.formatRangeBound ?? ((n: number) => String(Math.trunc(n)));
+ const { min, max } = parseRangeToken(token);
+ const rangeFullyApplied = min != null && max != null;
+ const rangeHasAppliedValue = min != null || max != null;
+ const rangeLabel =
+ filter.formatRangePillLabel?.(token) ??
+ (min != null && max != null
+ ? `${fmt(min)} – ${fmt(max)}`
+ : min != null
+ ? `${fmt(min)} – No max`
+ : max != null
+ ? `No min – ${fmt(max)}`
+ : token);
+
+ return (
+ <motion.div
+ initial={{ opacity: 0, y: 4 }}
+ animate={{ opacity: 1, y: 0 }}
+ className="flex min-h-9 items-stretch divide-x divide-neutral-200 overflow-hidden rounded-md border border-neutral-200 bg-white text-sm text-black"
+ >
+ <div className="flex items-center gap-2.5 px-3 py-2">
+ <span className="shrink-0 text-neutral-500">
+ {isReactNode(filter.icon) ? (
+ filter.icon
+ ) : (
+ <filter.icon className="size-4" />
+ )}
+ </span>
+
+ <span className="text-sm font-medium text-neutral-900">
+ {filter.label}
+ </span>
+ </div>
+
+ <div className="flex items-center px-3 py-2 text-sm text-neutral-500">
+ is
+ </div>
+
+ <Popover
+ openPopover={rangeEditOpen}
+ setOpenPopover={setRangeEditOpen}
+ align="start"
+ onEscapeKeyDown={(e) => {
+ if (rangeFullyApplied) {
+ e.preventDefault();
+ setRangeEditOpen(false);
+ }
+ }}
+ content={
+ <AnimatedSizeContainer width height className="rounded-[inherit]">
+ <FilterRangePanel
+ key={filterKey}
+ filter={filter}
+ activeToken={token}
+ onBack={() => setRangeEditOpen(false)}
+ onClear={
+ rangeHasAppliedValue
+ ? () =>
+ onRemoveFilter
+ ? onRemoveFilter(filterKey)
+ : onRemove(filterKey, token)
+ : undefined
+ }
+ onCloseOuter={
+ rangeFullyApplied ? () => setRangeEditOpen(false) : undefined
+ }
+ onApply={(t) => {
+ if (t === "|") {
+ if (onRemoveFilter) {
+ onRemoveFilter(filterKey);
+ } else {
+ onRemove(filterKey, token);
+ }
+ } else {
+ onSelect?.(filterKey, t);
+ }
+ }}
+ />
+ </AnimatedSizeContainer>
+ }
+ >
+ <button
+ type="button"
+ className={cn(
+ "flex min-w-0 flex-1 items-center px-3 py-2 text-left text-sm font-medium tracking-tight text-neutral-900",
+ "transition-[background-color,transform] duration-150 ease-out motion-reduce:transition-none",
+ "hover:bg-neutral-50 active:scale-[0.99] motion-reduce:active:scale-100 [@media(hover:none)]:hover:bg-transparent",
+ )}
+ >
+ <span className="truncate">{rangeLabel}</span>
+ </button>
+ </Popover>
+
+ <button
+ type="button"
+ className={cn(
+ "h-full rounded-r-md p-2 text-neutral-500 ring-inset ring-neutral-500",
+ "transition-[color,background-color,transform] duration-150 ease-out motion-reduce:transition-none",
+ "hover:bg-neutral-100 hover:text-neutral-800 [@media(hover:none)]:hover:bg-transparent",
+ "active:scale-[0.97] motion-reduce:active:scale-100",
+ "focus:outline-none focus-visible:ring-1",
+ )}
+ onClick={() => {
+ if (onRemoveFilter) {
+ onRemoveFilter(filterKey);
+ } else {
+ values.forEach((v) => onRemove(filterKey, v));
+ }
+ }}
+ >
+ <X className="h-3.5 w-3.5" />
+ </button>
+ </motion.div>
+ );
+ }
+
return (
<motion.div
initial={{ opacity: 0, y: 4 }}
@@ -335,7 +467,10 @@ function OperatorFilterPill({
<button
type="button"
className={cn(
- "flex w-full items-center rounded-md px-3 py-2 text-left text-sm transition-colors hover:bg-neutral-100",
+ "flex w-full items-center rounded-md px-3 py-2 text-left text-sm",
+ "transition-[background-color,transform] duration-100 ease-out motion-reduce:transition-none",
+ "hover:bg-neutral-100 [@media(hover:none)]:hover:bg-transparent",
+ "active:scale-[0.99] motion-reduce:active:scale-100",
!operator.includes("NOT") && "bg-neutral-50",
)}
onClick={() => {
@@ -350,7 +485,10 @@ function OperatorFilterPill({
<button
type="button"
className={cn(
- "flex w-full items-center rounded-md px-3 py-2 text-left text-sm transition-colors hover:bg-neutral-100",
+ "flex w-full items-center rounded-md px-3 py-2 text-left text-sm",
+ "transition-[background-color,transform] duration-100 ease-out motion-reduce:transition-none",
+ "hover:bg-neutral-100 [@media(hover:none)]:hover:bg-transparent",
+ "active:scale-[0.99] motion-reduce:active:scale-100",
operator.includes("NOT") && "bg-neutral-50",
)}
onClick={() => {
@@ -368,7 +506,12 @@ function OperatorFilterPill({
>
<button
type="button"
- className="px-3 py-2 text-neutral-500 transition-colors hover:bg-neutral-50 hover:text-neutral-700"
+ className={cn(
+ "px-3 py-2 text-neutral-500",
+ "transition-[color,background-color,transform] duration-150 ease-out motion-reduce:transition-none",
+ "hover:bg-neutral-50 hover:text-neutral-700 [@media(hover:none)]:hover:bg-transparent",
+ "active:scale-[0.98] motion-reduce:active:scale-100",
+ )}
>
{getOperatorLabel(operator)}
</button>
@@ -446,6 +589,8 @@ function OperatorFilterPill({
key={option.value}
className={cn(
"flex cursor-pointer items-center gap-3 whitespace-nowrap rounded-md px-3 py-2 text-left text-sm",
+ "transition-[background-color] duration-100 ease-out motion-reduce:transition-none",
+ "active:scale-[0.99] motion-reduce:active:scale-100",
"data-[selected=true]:bg-neutral-100",
)}
onSelect={() => {
@@ -524,7 +669,8 @@ function OperatorFilterPill({
disabled={filter.options?.length === 0}
className={cn(
"flex items-center",
- filter.options?.length && "transition-colors hover:bg-neutral-50",
+ filter.options?.length &&
+ "transition-[background-color,transform] duration-150 ease-out hover:bg-neutral-50 active:scale-[0.99] motion-reduce:transition-none motion-reduce:active:scale-100 [@media(hover:none)]:hover:bg-transparent",
)}
>
{!filter.options ? (
@@ -539,7 +685,13 @@ function OperatorFilterPill({
<button
type="button"
- className="h-full rounded-r-md p-2 text-neutral-500 ring-inset ring-neutral-500 hover:bg-neutral-100 hover:text-neutral-800 focus:outline-none focus-visible:ring-1"
+ className={cn(
+ "h-full rounded-r-md p-2 text-neutral-500 ring-inset ring-neutral-500",
+ "transition-[color,background-color,transform] duration-150 ease-out motion-reduce:transition-none",
+ "hover:bg-neutral-100 hover:text-neutral-800 [@media(hover:none)]:hover:bg-transparent",
+ "active:scale-[0.97] motion-reduce:active:scale-100",
+ "focus:outline-none focus-visible:ring-1",
+ )}
onClick={() => {
if (onRemoveFilter) {
onRemoveFilter(filterKey);
diff --git a/packages/ui/src/filter/filter-range-panel.tsx b/packages/ui/src/filter/filter-range-panel.tsx
new file mode 100644
index 0000000000..84d15ed81e
--- /dev/null
+++ b/packages/ui/src/filter/filter-range-panel.tsx
@@ -0,0 +1,444 @@
+"use client";
+
+import { cn } from "@dub/utils";
+import { ChevronLeft } from "lucide-react";
+import {
+ useCallback,
+ useEffect,
+ useRef,
+ useState,
+ type MutableRefObject,
+ type Ref,
+} from "react";
+import { FilterScroll } from "./filter-scroll";
+import { encodeRangeToken, parseRangeToken, type Filter } from "./types";
+
+type RangeBound = "min" | "max";
+
+function normalizeRangeBounds(
+ min?: number,
+ max?: number,
+): { min?: number; max?: number } {
+ if (min == null && max == null) {
+ return {};
+ }
+ if (min != null && max != null && min > max) {
+ return { min: max, max: min };
+ }
+ return { ...(min != null ? { min } : {}), ...(max != null ? { max } : {}) };
+}
+
+function storageToDraft(
+ storage: number | undefined,
+ displayScale: number,
+): string {
+ if (storage == null) {
+ return "";
+ }
+ if (displayScale === 1) {
+ return String(Math.trunc(storage));
+ }
+ const display = storage / displayScale;
+ return String(Number(display.toFixed(2)));
+}
+
+/** Keep only characters valid for the range field (selection APIs need `type="text"`, not `type="number"`). */
+function sanitizeNumericDraft(raw: string, displayScale: number): string {
+ if (raw === "") {
+ return "";
+ }
+ if (displayScale === 1) {
+ return raw.replace(/\D/g, "");
+ }
+ let s = raw.replace(/[^0-9.]/g, "");
+ const firstDot = s.indexOf(".");
+ if (firstDot !== -1) {
+ s = s.slice(0, firstDot + 1) + s.slice(firstDot + 1).replace(/\./g, "");
+ }
+ return s;
+}
+
+function FilterRangeHeader({
+ label,
+ onBack,
+ onClear,
+}: {
+ label: string;
+ onBack: () => void;
+ onClear?: () => void;
+}) {
+ return (
+ <div className="flex items-center justify-between px-2 pt-2">
+ <div className="flex items-center gap-1">
+ <button
+ type="button"
+ className={cn(
+ "flex size-6 shrink-0 items-center justify-center rounded-md p-2 text-neutral-500",
+ "transition-[transform,color,background-color] duration-150 ease-out motion-reduce:transition-none",
+ "hover:bg-neutral-900/5",
+ "active:scale-[0.97] motion-reduce:active:scale-100",
+ )}
+ onClick={() => onBack()}
+ aria-label="Back"
+ >
+ <ChevronLeft className="size-3 shrink-0" />
+ </button>
+
+ <span className="text-sm font-medium text-neutral-900">{label}</span>
+ </div>
+
+ {onClear && (
+ <button
+ type="button"
+ className="text-content-emphasis hover:border-border-subtle flex h-7 items-center justify-center rounded-lg border border-transparent px-2.5 py-2 text-sm font-medium transition-colors"
+ onClick={onClear}
+ aria-label="Clear"
+ >
+ Clear
+ </button>
+ )}
+ </div>
+ );
+}
+
+function RangeEndControl({
+ bound,
+ value,
+ unboundedLabel,
+ parseInput,
+ displayScale,
+ step,
+ onCommit,
+ inputRef,
+ onEmptyMinBackspace,
+ onFocusNextField,
+ onFocusPreviousField,
+ onEscapeCloseFilter,
+}: {
+ bound: RangeBound;
+ value: number | undefined;
+ unboundedLabel: string;
+ parseInput: (raw: string) => number;
+ displayScale: number;
+ step: number | string;
+ onCommit: (next: number | undefined) => void;
+ inputRef?: Ref<HTMLInputElement | null>;
+ onEmptyMinBackspace?: () => void;
+ onFocusNextField?: () => void;
+ onFocusPreviousField?: () => void;
+ onEscapeCloseFilter?: () => void;
+}) {
+ const [draft, setDraft] = useState(() => storageToDraft(value, displayScale));
+
+ const setInputRef = useCallback(
+ (node: HTMLInputElement | null) => {
+ if (!inputRef) {
+ return;
+ }
+ if (typeof inputRef === "function") {
+ inputRef(node);
+ } else {
+ (inputRef as MutableRefObject<HTMLInputElement | null>).current = node;
+ }
+ },
+ [inputRef],
+ );
+
+ useEffect(() => {
+ setDraft(storageToDraft(value, displayScale));
+ }, [value, displayScale]);
+
+ const commitDraft = useCallback(() => {
+ const raw = draft.trim();
+ if (raw === "") {
+ onCommit(undefined);
+ return;
+ }
+ const n = parseInput(raw);
+ if (!Number.isFinite(n)) {
+ setDraft(storageToDraft(value, displayScale));
+ return;
+ }
+ onCommit(n);
+ }, [draft, onCommit, parseInput, value, displayScale]);
+
+ const parsedStep = typeof step === "string" ? Number.parseFloat(step) : step;
+ const stepNum =
+ Number.isFinite(parsedStep) && parsedStep > 0 ? parsedStep : 1;
+
+ return (
+ <div
+ className={cn(
+ "border-subtle flex h-10 min-w-0 flex-1 items-stretch overflow-hidden rounded-lg border bg-white",
+ "transition-[border-color,box-shadow] duration-150 ease-out motion-reduce:transition-none",
+ "focus-within:border-neutral-500 focus-within:ring-4 focus-within:ring-neutral-200",
+ )}
+ >
+ <input
+ ref={setInputRef}
+ type="text"
+ inputMode={displayScale === 1 ? "numeric" : "decimal"}
+ autoComplete="off"
+ aria-label={bound === "min" ? "Minimum value" : "Maximum value"}
+ placeholder={unboundedLabel}
+ id={`filter-range-input-${bound}`}
+ className="min-w-0 flex-1 border-0 bg-transparent px-3 py-1 text-sm text-neutral-900 outline-none placeholder:text-neutral-400 focus:ring-0"
+ value={draft}
+ onChange={(e) => {
+ setDraft(sanitizeNumericDraft(e.target.value, displayScale));
+ }}
+ onKeyDown={(e) => {
+ e.stopPropagation();
+
+ if (e.key === "Backspace" && onEmptyMinBackspace && draft === "") {
+ e.preventDefault();
+ onEmptyMinBackspace();
+ return;
+ }
+
+ if (e.key === "ArrowUp" || e.key === "ArrowDown") {
+ e.preventDefault();
+ const raw = draft.trim();
+ const displayVal =
+ raw === ""
+ ? 0
+ : displayScale === 1
+ ? Number.parseInt(raw, 10)
+ : Number.parseFloat(raw);
+ if (!Number.isFinite(displayVal)) {
+ return;
+ }
+ const delta = e.key === "ArrowUp" ? stepNum : -stepNum;
+ const nextDisplay = Math.max(0, displayVal + delta);
+ const nextDraft =
+ displayScale === 1
+ ? String(Math.round(nextDisplay))
+ : String(Number(nextDisplay.toFixed(2)));
+ setDraft(nextDraft);
+ return;
+ }
+
+ const inputEl = e.currentTarget;
+ const rangeStart = inputEl.selectionStart;
+ const rangeEnd = inputEl.selectionEnd;
+ const hasCaret =
+ rangeStart !== null && rangeEnd !== null && rangeStart === rangeEnd;
+
+ // Only move between fields when we know caret position (`?? 0` would fake "at start" when APIs return null).
+ if (hasCaret) {
+ if (
+ bound === "min" &&
+ e.key === "ArrowRight" &&
+ onFocusNextField &&
+ rangeStart === draft.length
+ ) {
+ e.preventDefault();
+ onFocusNextField();
+ return;
+ }
+
+ if (
+ bound === "max" &&
+ (e.key === "ArrowLeft" || e.key === "Backspace") &&
+ onFocusPreviousField &&
+ rangeStart === 0
+ ) {
+ e.preventDefault();
+ onFocusPreviousField();
+ return;
+ }
+ }
+
+ if (e.key === "Escape" && onEscapeCloseFilter) {
+ e.preventDefault();
+ onEscapeCloseFilter();
+ return;
+ }
+
+ if (e.key === "Enter") {
+ e.preventDefault();
+ commitDraft();
+ }
+ }}
+ onBlur={() => {
+ commitDraft();
+ }}
+ />
+ </div>
+ );
+}
+
+function FilterRangeContent({
+ filter,
+ activeToken,
+ onApply,
+ onNavigateBack,
+ onCloseFilter,
+}: {
+ filter: Filter;
+ activeToken: string | undefined;
+ onApply: (token: string) => void;
+ onNavigateBack: () => void;
+ /** When the applied range has both min and max, Escape closes the outer filter instead of going back. */
+ onCloseFilter?: () => void;
+}) {
+ const { min, max } = parseRangeToken(activeToken);
+ const rangeFullyApplied = min != null && max != null;
+ const parse =
+ filter.parseRangeInput ??
+ ((raw: string) => {
+ const n = Number.parseInt(raw.replace(/[^\d-]/g, ""), 10);
+ return Number.isFinite(n) ? n : Number.NaN;
+ });
+
+ const displayScale = filter.rangeDisplayScale ?? 1;
+ const step = filter.rangeNumberStep ?? (displayScale === 1 ? 1 : 0.01);
+
+ const commitBoth = useCallback(
+ (nextMin?: number, nextMax?: number) => {
+ const { min: a, max: b } = normalizeRangeBounds(nextMin, nextMax);
+ onApply(encodeRangeToken(a, b));
+ },
+ [onApply],
+ );
+
+ const commitMin = useCallback(
+ (next: number | undefined) => {
+ const { min: a, max: b } = normalizeRangeBounds(next, max);
+ commitBoth(a, b);
+ },
+ [max, commitBoth],
+ );
+
+ const commitMax = useCallback(
+ (next: number | undefined) => {
+ const { min: a, max: b } = normalizeRangeBounds(min, next);
+ commitBoth(a, b);
+ },
+ [min, commitBoth],
+ );
+
+ const minInputRef = useRef<HTMLInputElement>(null);
+ const maxInputRef = useRef<HTMLInputElement>(null);
+
+ const focusMinAtEnd = useCallback(() => {
+ const el = minInputRef.current;
+ if (!el) {
+ return;
+ }
+ el.focus();
+ const len = el.value.length;
+ queueMicrotask(() => {
+ el.setSelectionRange(len, len);
+ });
+ }, []);
+
+ const focusMaxAtStart = useCallback(() => {
+ const el = maxInputRef.current;
+ if (!el) {
+ return;
+ }
+ el.focus();
+ queueMicrotask(() => {
+ el.setSelectionRange(0, 0);
+ });
+ }, []);
+
+ useEffect(() => {
+ const id = requestAnimationFrame(() => {
+ minInputRef.current?.focus();
+ });
+ return () => cancelAnimationFrame(id);
+ }, []);
+
+ return (
+ <div
+ className="flex w-full min-w-[282px] max-w-[282px] flex-col gap-3 p-2"
+ onKeyDownCapture={(e) => {
+ if (e.key !== "Backspace" && e.key !== "Delete") {
+ return;
+ }
+ const t = e.target as HTMLElement;
+ if (t.closest("input, textarea, [contenteditable=true]")) {
+ return;
+ }
+ e.preventDefault();
+ onNavigateBack();
+ }}
+ >
+ <div className="flex items-end gap-2">
+ <div className="min-w-0 flex-1">
+ <RangeEndControl
+ bound="min"
+ value={min}
+ unboundedLabel="No min"
+ parseInput={parse}
+ displayScale={displayScale}
+ step={step}
+ onCommit={commitMin}
+ inputRef={minInputRef}
+ onEmptyMinBackspace={onNavigateBack}
+ onFocusNextField={focusMaxAtStart}
+ onEscapeCloseFilter={rangeFullyApplied ? onCloseFilter : undefined}
+ />
+ </div>
+
+ <span className="shrink-0 pb-2.5 text-xs text-neutral-500">to</span>
+
+ <div className="min-w-0 flex-1">
+ <RangeEndControl
+ bound="max"
+ value={max}
+ unboundedLabel="No max"
+ parseInput={parse}
+ displayScale={displayScale}
+ step={step}
+ onCommit={commitMax}
+ inputRef={maxInputRef}
+ onFocusPreviousField={focusMinAtEnd}
+ onEscapeCloseFilter={rangeFullyApplied ? onCloseFilter : undefined}
+ />
+ </div>
+ </div>
+ </div>
+ );
+}
+
+export type FilterRangePanelProps = {
+ filter: Filter;
+ activeToken: string | undefined;
+ onApply: (token: string) => void;
+ onBack: () => void;
+ onClear?: () => void;
+ onCloseOuter?: () => void;
+ scrollRef?: Ref<HTMLDivElement | null>;
+};
+
+export function FilterRangePanel({
+ filter,
+ activeToken,
+ onApply,
+ onBack,
+ onClear,
+ onCloseOuter,
+ scrollRef,
+}: FilterRangePanelProps) {
+ return (
+ <>
+ <FilterRangeHeader
+ label={filter.label}
+ onBack={onBack}
+ onClear={onClear}
+ />
+ <FilterScroll ref={scrollRef}>
+ <FilterRangeContent
+ filter={filter}
+ activeToken={activeToken}
+ onApply={onApply}
+ onNavigateBack={onBack}
+ onCloseFilter={onCloseOuter}
+ />
+ </FilterScroll>
+ </>
+ );
+}
diff --git a/packages/ui/src/filter/filter-scroll.tsx b/packages/ui/src/filter/filter-scroll.tsx
new file mode 100644
index 0000000000..51911ca8a7
--- /dev/null
+++ b/packages/ui/src/filter/filter-scroll.tsx
@@ -0,0 +1,50 @@
+"use client";
+
+import {
+ forwardRef,
+ MutableRefObject,
+ PropsWithChildren,
+ RefCallback,
+ useCallback,
+ useRef,
+} from "react";
+import { useScrollProgress } from "../hooks/use-scroll-progress";
+
+export const FilterScroll = forwardRef<
+ HTMLDivElement | null,
+ PropsWithChildren
+>(({ children }, forwardedRef) => {
+ const ref = useRef<HTMLDivElement | null>(null);
+ const { scrollProgress, updateScrollProgress } = useScrollProgress(ref);
+
+ const setRef: RefCallback<HTMLDivElement> = useCallback(
+ (node) => {
+ ref.current = node;
+ if (typeof forwardedRef === "function") {
+ forwardedRef(node);
+ } else if (forwardedRef) {
+ (forwardedRef as MutableRefObject<HTMLDivElement | null>).current =
+ node;
+ }
+ },
+ [forwardedRef],
+ );
+
+ return (
+ <>
+ <div
+ className="scrollbar-hide max-h-[50vh] w-screen overflow-y-scroll sm:w-auto"
+ ref={setRef}
+ onScroll={updateScrollProgress}
+ >
+ {children}
+ </div>
+ <div
+ className="pointer-events-none absolute bottom-0 left-0 hidden h-16 w-full bg-gradient-to-t from-white sm:block"
+ style={{ opacity: 1 - Math.pow(scrollProgress, 2) }}
+ />
+ </>
+ );
+});
+
+FilterScroll.displayName = "FilterScroll";
diff --git a/packages/ui/src/filter/filter-select.tsx b/packages/ui/src/filter/filter-select.tsx
index 67a0007729..7a27923038 100644
--- a/packages/ui/src/filter/filter-select.tsx
+++ b/packages/ui/src/filter/filter-select.tsx
@@ -5,24 +5,25 @@ import {
Fragment,
PropsWithChildren,
ReactNode,
- forwardRef,
isValidElement,
useCallback,
useEffect,
- useImperativeHandle,
+ useMemo,
useRef,
useState,
} from "react";
import { AnimatedSizeContainer } from "../animated-size-container";
import { useKeyboardShortcut, useMediaQuery } from "../hooks";
-import { useScrollProgress } from "../hooks/use-scroll-progress";
import { Check, LoadingSpinner, Magic } from "../icons";
import { Popover } from "../popover";
+import { FilterRangePanel } from "./filter-range-panel";
+import { FilterScroll } from "./filter-scroll";
import {
ActiveFilterInput,
Filter,
FilterOption,
normalizeActiveFilter,
+ parseRangeToken,
} from "./types";
type FilterSelectProps = {
@@ -32,6 +33,8 @@ type FilterSelectProps = {
value: FilterOption["value"] | FilterOption["value"][],
) => void;
onRemove: (key: string, value: FilterOption["value"]) => void;
+ /** Clears an entire filter (e.g. numeric range with two URL params). */
+ onRemoveFilter?: (key: string) => void;
onOpenFilter?: (key: string) => void;
onSearchChange?: (search: string) => void;
onSelectedFilterChange?: (key: string | null) => void;
@@ -47,6 +50,7 @@ export function FilterSelect({
filters,
onSelect,
onRemove,
+ onRemoveFilter,
onOpenFilter,
onSearchChange,
onSelectedFilterChange,
@@ -96,6 +100,25 @@ export function FilterSelect({
? filters.find(({ key }) => key === selectedFilterKey)
: null;
+ const activeRangeTokenForSelected = useMemo(() => {
+ if (!selectedFilter || selectedFilter.type !== "range" || !activeFilters) {
+ return undefined;
+ }
+ const raw = activeFilters.find((f) => f.key === selectedFilter.key);
+ if (!raw) {
+ return undefined;
+ }
+ return normalizeActiveFilter(raw).values[0] as string | undefined;
+ }, [activeFilters, selectedFilter]);
+
+ const rangeFilterHasAppliedValue = useMemo(() => {
+ if (!selectedFilter || selectedFilter.type !== "range") {
+ return false;
+ }
+ const { min, max } = parseRangeToken(activeRangeTokenForSelected);
+ return min != null || max != null;
+ }, [selectedFilter, activeRangeTokenForSelected]);
+
const openFilter = useCallback(
(key: Filter["key"]) => {
// Maintain dimensions for loading options
@@ -178,12 +201,22 @@ export function FilterSelect({
openPopover={isOpen}
setOpenPopover={setIsOpen}
onEscapeKeyDown={(e) => {
+ if (selectedFilter?.type === "range") {
+ const { min, max } = parseRangeToken(activeRangeTokenForSelected);
+ if (min != null && max != null) {
+ e.preventDefault();
+ setIsOpen(false);
+ return;
+ }
+ }
if (selectedFilterKey) {
- console.log("Escape key pressed in Popover");
e.preventDefault();
e.stopPropagation();
goBackOrClose();
+ return;
}
+ e.preventDefault();
+ setIsOpen(false);
}}
content={
<AnimatedSizeContainer
@@ -192,143 +225,181 @@ export function FilterSelect({
className="rounded-[inherit]"
style={{ transform: "translateZ(0)" }} // Fixes overflow on some browsers
>
- <Command
- loop
- shouldFilter={
- !selectedFilter || selectedFilter.shouldFilter !== false
- }
- >
- <div className="flex items-center overflow-hidden rounded-t-lg border-b border-neutral-200">
- <CommandInput
- placeholder={`${selectedFilter?.label || "Filter"}...`}
- value={search}
- onValueChange={setSearch}
- onKeyDown={(e) => {
- if (
- e.key === "Escape" ||
- (e.key === "Backspace" && !search)
- ) {
+ {selectedFilter?.type === "range" ? (
+ <FilterRangePanel
+ key={selectedFilterKey}
+ filter={selectedFilter}
+ activeToken={activeRangeTokenForSelected}
+ scrollRef={listContainer}
+ onBack={() => reset()}
+ onClear={
+ rangeFilterHasAppliedValue && selectedFilterKey
+ ? () =>
+ onRemoveFilter
+ ? onRemoveFilter(selectedFilterKey)
+ : onRemove(
+ selectedFilterKey,
+ activeRangeTokenForSelected ?? "|",
+ )
+ : undefined
+ }
+ onCloseOuter={() => setIsOpen(false)}
+ onApply={(token) => {
+ if (token === "|") {
+ onRemoveFilter
+ ? onRemoveFilter(selectedFilter.key)
+ : onRemove(
+ selectedFilter.key,
+ activeRangeTokenForSelected ?? "|",
+ );
+ } else {
+ onSelect(selectedFilter.key, token);
+ }
+ }}
+ />
+ ) : (
+ <Command
+ loop
+ shouldFilter={
+ !selectedFilter || selectedFilter.shouldFilter !== false
+ }
+ >
+ <div className="flex items-center overflow-hidden rounded-t-lg border-b border-neutral-200">
+ <CommandInput
+ placeholder={`${selectedFilter?.label || "Filter"}...`}
+ value={search}
+ onValueChange={setSearch}
+ onKeyDown={(e) => {
+ if (
+ e.key === "Escape" ||
+ ((e.key === "Backspace" || e.key === "Delete") && !search)
+ ) {
+ e.preventDefault();
+ e.stopPropagation();
+ goBackOrClose();
+ }
+ }}
+ onEmptySubmit={(e) => {
e.preventDefault();
e.stopPropagation();
- goBackOrClose();
- }
- }}
- onEmptySubmit={(e) => {
- e.preventDefault();
- e.stopPropagation();
- if (askAI) {
- onSelect(
- "ai",
- // Prepend search with selected filter label for more context
- selectedFilter
- ? `${selectedFilter.label} ${search}`
- : search,
- );
- setIsOpen(false);
- } else selectOption(search);
- }}
- />
- {!selectedFilter && (
- <kbd className="mr-2 hidden shrink-0 rounded border border-neutral-200 bg-neutral-100 px-2 py-0.5 text-xs font-light text-neutral-500 md:block">
- F
- </kbd>
- )}
- </div>
- <FilterScroll key={selectedFilterKey} ref={listContainer}>
- <Command.List
- className={cn(
- "flex w-full flex-col gap-1 p-1",
- selectedFilter ? "min-w-[100px]" : "min-w-[180px]",
+ if (askAI) {
+ onSelect(
+ "ai",
+ // Prepend search with selected filter label for more context
+ selectedFilter
+ ? `${selectedFilter.label} ${search}`
+ : search,
+ );
+ setIsOpen(false);
+ } else selectOption(search);
+ }}
+ />
+ {!selectedFilter && (
+ <kbd className="mr-2 hidden shrink-0 rounded border border-neutral-200 bg-neutral-100 px-2 py-0.5 text-xs font-light text-neutral-500 md:block">
+ F
+ </kbd>
)}
- >
- {!selectedFilter
- ? // Top-level filters
- filters
- .filter((filter) => !filter.hideInFilterDropdown)
- .map((filter) => (
- <Fragment key={filter.key}>
- <FilterButton
- filter={filter}
- onSelect={() => openFilter(filter.key)}
- />
- {filter.separatorAfter && (
- <Command.Separator className="-mx-1 my-1 border-b border-neutral-200" />
- )}
- </Fragment>
- ))
- : // Filter options
- selectedFilter.options
- ?.filter((option) => !search || !option.hideDuringSearch)
- ?.map((option) => {
- const isSingleSelect =
- selectedFilter?.singleSelect ||
- (!isAdvancedFilter && !selectedFilter?.multiple);
- const isSelected = isOptionSelected(option.value);
-
- return (
- <FilterButton
- key={option.value}
- filter={selectedFilter}
- option={option}
- showCheckbox={
- !isSingleSelect &&
- (isAdvancedFilter || selectedFilter?.multiple)
- }
- isChecked={isSelected}
- right={
- isSingleSelect ? (
- isSelected ? (
- <Check className="h-4 w-4" />
+ </div>
+ <FilterScroll key={selectedFilterKey} ref={listContainer}>
+ <Command.List
+ className={cn(
+ "flex w-full flex-col gap-1 p-1",
+ selectedFilter ? "min-w-[100px]" : "min-w-[180px]",
+ )}
+ >
+ {!selectedFilter
+ ? // Top-level filters
+ filters
+ .filter((filter) => !filter.hideInFilterDropdown)
+ .map((filter) => (
+ <Fragment key={filter.key}>
+ <FilterButton
+ filter={filter}
+ onSelect={() => openFilter(filter.key)}
+ />
+ {filter.separatorAfter && (
+ <Command.Separator className="-mx-1 my-1 border-b border-neutral-200" />
+ )}
+ </Fragment>
+ ))
+ : // Filter options
+ selectedFilter.options
+ ?.filter(
+ (option) => !search || !option.hideDuringSearch,
+ )
+ ?.map((option) => {
+ const isSingleSelect =
+ selectedFilter?.singleSelect ||
+ (!isAdvancedFilter && !selectedFilter?.multiple);
+ const isSelected = isOptionSelected(option.value);
+
+ return (
+ <FilterButton
+ key={option.value}
+ filter={selectedFilter}
+ option={option}
+ showCheckbox={
+ !isSingleSelect &&
+ (isAdvancedFilter || selectedFilter?.multiple)
+ }
+ isChecked={isSelected}
+ right={
+ isSingleSelect ? (
+ isSelected ? (
+ <Check className="h-4 w-4" />
+ ) : (
+ option.right
+ )
) : (
option.right
)
- ) : (
- option.right
- )
- }
- onSelect={() => selectOption(option.value)}
- />
- );
- }) ?? (
- // Filter options loading state
- <Command.Loading>
- <div
- className="-m-1 flex items-center justify-center"
- style={listDimensions.current}
- >
- <LoadingSpinner />
- </div>
- </Command.Loading>
- )}
-
- {/* Only render CommandEmpty if not loading */}
- {(!selectedFilter || selectedFilter.options) && (
- <CommandEmpty
- search={search}
- selectedFilter={selectedFilter}
- onSelect={() => selectOption(search)}
- askAI={askAI}
- >
- {emptyState
- ? isEmptyStateObject(emptyState)
- ? emptyState?.[selectedFilterKey ?? "default"] ??
- "No matching options"
- : emptyState
- : "No matching options"}
- </CommandEmpty>
- )}
- </Command.List>
- </FilterScroll>
- </Command>
+ }
+ onSelect={() => selectOption(option.value)}
+ />
+ );
+ }) ?? (
+ // Filter options loading state
+ <Command.Loading>
+ <div
+ className="-m-1 flex items-center justify-center"
+ style={listDimensions.current}
+ >
+ <LoadingSpinner />
+ </div>
+ </Command.Loading>
+ )}
+
+ {/* Only render CommandEmpty if not loading */}
+ {(!selectedFilter || selectedFilter.options) && (
+ <CommandEmpty
+ search={search}
+ selectedFilter={selectedFilter}
+ onSelect={() => selectOption(search)}
+ askAI={askAI}
+ >
+ {emptyState
+ ? isEmptyStateObject(emptyState)
+ ? emptyState?.[selectedFilterKey ?? "default"] ??
+ "No matching options"
+ : emptyState
+ : "No matching options"}
+ </CommandEmpty>
+ )}
+ </Command.List>
+ </FilterScroll>
+ </Command>
+ )}
</AnimatedSizeContainer>
}
>
<button
type="button"
className={cn(
- "group flex h-10 cursor-pointer appearance-none items-center gap-x-2 truncate rounded-md border px-3 text-sm outline-none transition-all",
+ "group flex h-10 cursor-pointer appearance-none items-center gap-x-2 truncate rounded-md border px-3 text-sm outline-none",
+ "transition-[color,border-color,box-shadow] duration-150 ease-out motion-reduce:transition-none",
"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",
+ "active:scale-[0.98] motion-reduce:active:scale-100",
className,
)}
>
@@ -342,7 +413,7 @@ export function FilterSelect({
</div>
) : (
<ChevronDown
- className={`size-4 shrink-0 text-neutral-400 transition-transform duration-75 group-data-[state=open]:rotate-180`}
+ className={`size-4 shrink-0 text-neutral-400 transition-transform duration-100 ease-out group-data-[state=open]:rotate-180 motion-reduce:transition-none`}
/>
)}
</button>
@@ -384,32 +455,6 @@ const CommandInput = (
);
};
-const FilterScroll = forwardRef(
- ({ children }: PropsWithChildren, forwardedRef) => {
- const ref = useRef<HTMLDivElement>(null);
- useImperativeHandle(forwardedRef, () => ref.current);
-
- const { scrollProgress, updateScrollProgress } = useScrollProgress(ref);
-
- return (
- <>
- <div
- className="scrollbar-hide max-h-[50vh] w-screen overflow-y-scroll sm:w-auto"
- ref={ref}
- onScroll={updateScrollProgress}
- >
- {children}
- </div>
- {/* Bottom scroll fade */}
- <div
- className="pointer-events-none absolute bottom-0 left-0 hidden h-16 w-full bg-gradient-to-t from-white sm:block"
- style={{ opacity: 1 - Math.pow(scrollProgress, 2) }}
- ></div>
- </>
- );
- },
-);
-
function FilterButton({
filter,
option,
@@ -440,6 +485,8 @@ function FilterButton({
<Command.Item
className={cn(
"flex cursor-pointer items-center gap-3 whitespace-nowrap rounded-md px-3 py-2 text-left text-sm",
+ "transition-colors duration-100 ease-out motion-reduce:transition-none",
+ "active:scale-[0.99] motion-reduce:active:scale-100",
"data-[selected=true]:bg-neutral-100",
)}
value={label + option?.value}
diff --git a/packages/ui/src/filter/index.ts b/packages/ui/src/filter/index.ts
index d407cd63c9..968e820274 100644
--- a/packages/ui/src/filter/index.ts
+++ b/packages/ui/src/filter/index.ts
@@ -3,4 +3,5 @@ import { FilterSelect } from "./filter-select";
const Filter = { Select: FilterSelect, List: FilterList };
+export { encodeRangeToken, parseRangeToken } from "./types";
export { Filter };
diff --git a/packages/ui/src/filter/types.ts b/packages/ui/src/filter/types.ts
index 2d09789133..e9f161320a 100644
--- a/packages/ui/src/filter/types.ts
+++ b/packages/ui/src/filter/types.ts
@@ -15,6 +15,23 @@ export type Filter = {
label: string;
labelPlural?: string; // Plural form of the label (optional, defaults to pluralize(label))
options: FilterOption[] | null;
+ /** When set to `range`, `FilterSelect` renders min/max controls instead of option list. */
+ type?: "default" | "range";
+ /** Format a bound in storage units (e.g. cents) for display. */
+ formatRangeBound?: (n: number) => string;
+ /** Parse typed input into storage units. Return NaN if invalid. */
+ parseRangeInput?: (raw: string) => number;
+ /**
+ * For `type: "range"`: divide stored values by this for the number input (e.g. `100` when storage is cents).
+ * Defaults to `1` (storage shown as-is).
+ */
+ rangeDisplayScale?: number;
+ /**
+ * `step` on the min/max number inputs. Defaults to `1` when `rangeDisplayScale` is 1, else `0.01`.
+ */
+ rangeNumberStep?: number;
+ /** Full pill label for active range token (used by `Filter.List`). */
+ formatRangePillLabel?: (token: string) => string;
hideInFilterDropdown?: boolean; // Hide in Filter.Select dropdown
shouldFilter?: boolean; // Disable filtering for this filter
separatorAfter?: boolean; // Add a separator after the filter in Filter.Select dropdown
@@ -102,3 +119,31 @@ export function normalizeActiveFilter(filter: ActiveFilterInput): ActiveFilter {
values: [],
};
}
+
+export function parseRangeToken(token: string | undefined | null): {
+ min?: number;
+ max?: number;
+} {
+ if (token == null || token === "|") {
+ return {};
+ }
+ const [a, b] = token.split("|");
+ const min = a === "" ? undefined : Number(a);
+ const max = b === "" ? undefined : Number(b);
+ return {
+ ...(Number.isFinite(min) ? { min } : {}),
+ ...(Number.isFinite(max) ? { max } : {}),
+ };
+}
+
+export function encodeRangeToken(
+ min?: number | null,
+ max?: number | null,
+): string {
+ const l = min == null || !Number.isFinite(min) ? "" : String(Math.trunc(min));
+ const r = max == null || !Number.isFinite(max) ? "" : String(Math.trunc(max));
+ if (!l && !r) {
+ return "|";
+ }
+ return `${l}|${r}`;
+}