The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Optimize Filter UI (reduce rerendering) (#3633)
Steven Tey531baf0e2c6d
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsxindex 45fbea7eb4..764527a32e 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx@@ -46,9 +46,6 @@ export function PayoutTable() {const { payouts, error, loading } = usePartnerPayouts();const { payoutsCount } = usePartnerPayoutsCount<number>();- const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =- usePayoutFilters();-const [detailsSheetState, setDetailsSheetState] = useState<| { open: false; payout: PartnerPayoutResponse | null }| { open: true; payout: PartnerPayoutResponse }@@ -234,26 +231,7 @@ export function PayoutTable() {/>)}<div className="flex flex-col gap-3">- <div className="flex flex-col gap-3">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- />- <AnimatedSizeContainer height>- {activeFilters.length > 0 && (- <Filter.List- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onRemoveAll={onRemoveAll}- />- )}- </AnimatedSizeContainer>- </div>+ <PartnerPayoutFilters />{payouts?.length !== 0 ? (<Table {...table} />) : (@@ -273,6 +251,34 @@ export function PayoutTable() {);}+function PartnerPayoutFilters() {+ const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =+ usePayoutFilters();++ return (+ <div className="flex flex-col gap-3">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ />+ <AnimatedSizeContainer height>+ {activeFilters.length > 0 && (+ <Filter.List+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onRemoveAll={onRemoveAll}+ />+ )}+ </AnimatedSizeContainer>+ </div>+ );+}+function AmountRowItem({ payout }: { payout: PartnerPayoutResponse }) {const display = currencyFormatter(payout.amount);diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/use-payout-filters.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/use-payout-filters.tsxindex a1adbb0dbf..00a9250d6c 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/use-payout-filters.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/use-payout-filters.tsx@@ -101,14 +101,11 @@ export function usePayoutFilters() {[queryParams],);- const isFiltered = useMemo(() => activeFilters.length > 0, [activeFilters]);-return {filters,activeFilters,onSelect,onRemove,onRemoveAll,- isFiltered,};}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submissions-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submissions-table.tsxindex bf0896581d..56d80980f5 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submissions-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submissions-table.tsx@@ -105,16 +105,6 @@ export function BountySubmissionsTable() {const { submissionsCount } =useBountySubmissionsCount<SubmissionsCountByStatus[]>();- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- setSearch,- setSelectedFilter,- } = useBountySubmissionFilters({ bounty });-const {error,isLoading,@@ -452,59 +442,13 @@ export function BountySubmissionsTable() {<div className="flex flex-col gap-6"><div>- <div className="flex w-full items-center justify-between gap-4">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onSearchChange={setSearch}- onSelectedFilterChange={setSelectedFilter}- />- {bountyInfo?.hasSocialMetrics && (submissions?.length ?? 0) > 0 && (- <div className="flex shrink-0 items-center gap-3">- {bounty?.socialMetricsLastSyncedAt ? (- <span className="whitespace-nowrap text-xs font-medium text-neutral-500">- Last sync{" "}- {timeAgo(bounty.socialMetricsLastSyncedAt, {- withAgo: true,- })}- </span>- ) : null}- <Button- variant="secondary"- text="Refresh stats"- loading={isRefreshingStats}- onClick={refreshStats}- className="h-8 rounded-lg px-3"- />- </div>- )}- </div>- <AnimatedSizeContainer height>- <div>- {activeFilters.length > 0 && (- <div className="pt-3">- <Filter.List- filters={[- ...filters,- {- key: "payoutId",- icon: MoneyBill2,- label: "Payout",- options: [],- },- ]}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onRemoveAll={onRemoveAll}- />- </div>- )}- </div>- </AnimatedSizeContainer>+ <BountySubmissionFilters+ bounty={bounty}+ bountyInfo={bountyInfo}+ submissionsLength={submissions?.length ?? 0}+ isRefreshingStats={isRefreshingStats}+ refreshStats={refreshStats}+ /></div>{submissions?.length !== 0 || isLoading ? (<Table {...tableProps} table={table} />@@ -524,3 +468,85 @@ export function BountySubmissionsTable() {</>);}++function BountySubmissionFilters({+ bounty,+ bountyInfo,+ submissionsLength,+ isRefreshingStats,+ refreshStats,+}: {+ bounty: ReturnType<typeof useBounty>["bounty"];+ bountyInfo: ReturnType<typeof resolveBountyDetails>;+ submissionsLength: number;+ isRefreshingStats: boolean;+ refreshStats: () => void;+}) {+ const {+ filters,+ activeFilters,+ onSelect,+ onRemove,+ onRemoveAll,+ setSearch,+ setSelectedFilter,+ } = useBountySubmissionFilters({ bounty: bounty ?? undefined });++ return (+ <>+ <div className="flex w-full items-center justify-between gap-4">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onSearchChange={setSearch}+ onSelectedFilterChange={setSelectedFilter}+ />+ {bountyInfo?.hasSocialMetrics && submissionsLength > 0 && (+ <div className="flex shrink-0 items-center gap-3">+ {bounty?.socialMetricsLastSyncedAt ? (+ <span className="whitespace-nowrap text-xs font-medium text-neutral-500">+ Last sync{" "}+ {timeAgo(bounty.socialMetricsLastSyncedAt, {+ withAgo: true,+ })}+ </span>+ ) : null}+ <Button+ variant="secondary"+ text="Refresh stats"+ loading={isRefreshingStats}+ onClick={refreshStats}+ className="h-8 rounded-lg px-3"+ />+ </div>+ )}+ </div>+ <AnimatedSizeContainer height>+ <div>+ {activeFilters.length > 0 && (+ <div className="pt-3">+ <Filter.List+ filters={[+ ...filters,+ {+ key: "payoutId",+ icon: MoneyBill2,+ label: "Payout",+ options: [],+ },+ ]}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onRemoveAll={onRemoveAll}+ />+ </div>+ )}+ </div>+ </AnimatedSizeContainer>+ </>+ );+}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/campaigns-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/campaigns-table.tsxindex 687d8a905a..42c11f4016 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/campaigns-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/campaigns-table.tsx@@ -44,16 +44,10 @@ export function CampaignsTable() {const router = useRouter();const { id: workspaceId, slug } = useWorkspace();const { pagination, setPagination } = usePagination();- const { getQueryString } = useRouterStuff();-- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- isFiltered,- } = useCampaignsFilters();+ const { getQueryString, searchParamsObj } = useRouterStuff();+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),+ );const {data: campaigns,@@ -150,33 +144,7 @@ export function CampaignsTable() {return (<div className="flex flex-col gap-4"><div>- <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- />- <SearchBoxPersisted- placeholder="Search by name"- inputClassName="md:w-[19rem]"- />- </div>- <AnimatedSizeContainer height>- <div>- {activeFilters.length > 0 && (- <div className="pt-3">- <Filter.List- filters={filters}- activeFilters={activeFilters}- onRemove={onRemove}- onRemoveAll={onRemoveAll}- />- </div>- )}- </div>- </AnimatedSizeContainer>+ <CampaignFilters /></div>{campaigns?.length !== 0 ? (@@ -207,6 +175,43 @@ export function CampaignsTable() {);}+function CampaignFilters() {+ const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =+ useCampaignsFilters();++ return (+ <>+ <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ />+ <SearchBoxPersisted+ placeholder="Search by name"+ inputClassName="md:w-[19rem]"+ />+ </div>+ <AnimatedSizeContainer height>+ <div>+ {activeFilters.length > 0 && (+ <div className="pt-3">+ <Filter.List+ filters={filters}+ activeFilters={activeFilters}+ onRemove={onRemove}+ onRemoveAll={onRemoveAll}+ />+ </div>+ )}+ </div>+ </AnimatedSizeContainer>+ </>+ );+}+function RowMenuButton({row: { original: campaign },}: {diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsxindex 7b97aaf7c8..7f6015e1ff 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx@@ -66,17 +66,6 @@ const commissionsColumns = {};export function CommissionsTable() {- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- isFiltered,- setSearch,- setSelectedFilter,- } = useCommissionFilters();-const workspace = useWorkspace();const { id: workspaceId, slug } = workspace;const router = useRouter();@@ -89,6 +78,9 @@ export function CommissionsTable() {sortBy: string;sortOrder: "asc" | "desc";};+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),+ );const {data: commissions,@@ -384,46 +376,7 @@ export function CommissionsTable() {return (<div className="flex flex-col gap-3">- <div>- <div className="flex flex-col gap-3 md:flex-row md:items-center">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onSearchChange={setSearch}- onSelectedFilterChange={setSelectedFilter}- />- <SimpleDateRangePicker- className="w-full sm:min-w-[200px] md:w-fit"- defaultInterval="all"- />- </div>- <AnimatedSizeContainer height>- <div>- {activeFilters.length > 0 && (- <div className="pt-3">- <Filter.List- filters={[- ...filters,- {- key: "payoutId",- icon: MoneyBill2,- label: "Payout",- options: [],- },- ]}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onRemoveAll={onRemoveAll}- />- </div>- )}- </div>- </AnimatedSizeContainer>- </div>+ <CommissionsFilters />{commissions?.length !== 0 || isLoading ? (<Table {...table} />) : (@@ -445,3 +398,58 @@ export function CommissionsTable() {</div>);}++function CommissionsFilters() {+ const {+ filters,+ activeFilters,+ onSelect,+ onRemove,+ onRemoveAll,+ setSearch,+ setSelectedFilter,+ } = useCommissionFilters();++ return (+ <div>+ <div className="flex flex-col gap-3 md:flex-row md:items-center">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onSearchChange={setSearch}+ onSelectedFilterChange={setSelectedFilter}+ />+ <SimpleDateRangePicker+ className="w-full sm:min-w-[200px] md:w-fit"+ defaultInterval="all"+ />+ </div>+ <AnimatedSizeContainer height>+ <div>+ {activeFilters.length > 0 && (+ <div className="pt-3">+ <Filter.List+ filters={[+ ...filters,+ {+ key: "payoutId",+ icon: MoneyBill2,+ label: "Payout",+ options: [],+ },+ ]}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onRemoveAll={onRemoveAll}+ />+ </div>+ )}+ </div>+ </AnimatedSizeContainer>+ </div>+ );+}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsxindex d11da96189..c99b8e909a 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/use-commission-filters.tsx@@ -168,18 +168,12 @@ export function useCommissionFilters() {[queryParams],);- const isFiltered = useMemo(- () => activeFilters.length > 0 || searchParamsObj.search,- [activeFilters, searchParamsObj.search],- );-return {filters,activeFilters,onSelect,onRemove,onRemoveAll,- isFiltered,setSearch,setSelectedFilter,};diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-group-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-group-table.tsxindex 368ac5c904..0b768d22c0 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-group-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/fraud-group-table.tsx@@ -42,18 +42,6 @@ export function FraudGroupTable() {const sortBy = searchParams.get("sortBy") || "createdAt";const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- setSearch,- setSelectedFilter,- } = useFraudGroupFilters({- status: "pending",- });-const { fraudGroups, loading, error } = useFraudGroups({query: {status: "pending",@@ -358,32 +346,9 @@ export function FraudGroupTable() {<div><FraudDisclaimerBanner />- <div className="mt-3 flex flex-col gap-3 md:flex-row md:items-center md:justify-between">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onSearchChange={setSearch}- onSelectedFilterChange={setSelectedFilter}- />+ <div className="mt-3">+ <PendingFraudFilters /></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>{fraudGroups?.length !== 0 ? (@@ -407,6 +372,51 @@ export function FraudGroupTable() {);}+function PendingFraudFilters() {+ const {+ filters,+ activeFilters,+ onSelect,+ onRemove,+ onRemoveAll,+ setSearch,+ setSelectedFilter,+ } = useFraudGroupFilters({+ status: "pending",+ });++ return (+ <>+ <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onSearchChange={setSearch}+ onSelectedFilterChange={setSelectedFilter}+ />+ </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>+ </>+ );+}+function RowMenuButton({ row }: { row: Row<FraudGroupProps> }) {const fraudGroup = row.original;const partner = fraudGroup.partner;diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolved/resolved-fraud-group-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolved/resolved-fraud-group-table.tsxindex e559659324..f60db14e55 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolved/resolved-fraud-group-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/fraud/resolved/resolved-fraud-group-table.tsx@@ -25,24 +25,14 @@ import { useEffect, useMemo, useState } from "react";import { useFraudGroupFilters } from "../use-fraud-group-filters";export function ResolvedFraudGroupTable() {- const { queryParams, searchParams } = useRouterStuff();+ const { queryParams, searchParams, searchParamsObj } = useRouterStuff();const { pagination, setPagination } = usePagination();const sortBy = searchParams.get("sortBy") || "resolvedAt";const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";-- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- isFiltered,- setSearch,- setSelectedFilter,- } = useFraudGroupFilters({- status: "resolved",- });+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),+ );const { fraudGroups, loading, error } = useFraudGroups({query: {@@ -259,32 +249,7 @@ export function ResolvedFraudGroupTable() {/>)}<div>- <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onSearchChange={setSearch}- onSelectedFilterChange={setSelectedFilter}- />- </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>+ <ResolvedFraudFilters /></div>{fraudGroups?.length !== 0 ? (@@ -309,6 +274,51 @@ export function ResolvedFraudGroupTable() {);}+function ResolvedFraudFilters() {+ const {+ filters,+ activeFilters,+ onSelect,+ onRemove,+ onRemoveAll,+ setSearch,+ setSelectedFilter,+ } = useFraudGroupFilters({+ status: "resolved",+ });++ return (+ <>+ <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onSearchChange={setSearch}+ onSelectedFilterChange={setSelectedFilter}+ />+ </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>+ </>+ );+}+// Gets the current fraud event from the loaded array if available, or a separate fetch if notfunction useCurrentFraudGroup({fraudGroups,diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsxindex 9ad8bb7fe8..f61c61c09f 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx@@ -55,7 +55,8 @@ export function GroupsTable() {const { id: workspaceId, slug, defaultProgramId } = useWorkspace();const { program } = useProgram();const { pagination, setPagination } = usePagination();- const { queryParams, searchParams, getQueryString } = useRouterStuff();+ const { queryParams, searchParams, searchParamsObj, getQueryString } =+ useRouterStuff();const sortBy =searchParams.get("sortBy") ||@@ -87,7 +88,9 @@ export function GroupsTable() {error: countError,} = useGroupsCount();- const isFiltered = !!searchParams.get("search");+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),+ );const currentDefaultGroup = groups?.find((g) => g.slug === DEFAULT_PARTNER_GROUP.slug,diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsxindex d31d3532d2..d0cfaa7096 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx@@ -62,23 +62,21 @@ const applicationsColumns = {export function ProgramPartnersApplicationsPageClient() {const { id: workspaceId } = useWorkspace();- const { queryParams, searchParams, getQueryString } = useRouterStuff();+ const { queryParams, searchParams, searchParamsObj, getQueryString } =+ useRouterStuff();- const search = searchParams.get("search");const sortBy = searchParams.get("sortBy") || "createdAt";const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- isFiltered,- } = usePartnerFilters({ sortBy, sortOrder, status: "pending" }, [- "groupId",- "country",- ]);+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),+ );++ const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =+ usePartnerFilters({ sortBy, sortOrder, status: "pending" }, [+ "groupId",+ "country",+ ]);const { partnersCount, error: countError } = usePartnersCount<number>({status: "pending",@@ -492,7 +490,7 @@ export function ProgramPartnersApplicationsPageClient() {) : (<AnimatedEmptyStatetitle="No applications found"- description={`No applications found${isFiltered || search ? " for the selected filters" : " for this program"}.`}+ description={`No applications found${isFiltered ? " for the selected filters" : " for this program"}.`}cardContent={() => (<><Users className="size-4 text-neutral-700" />diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsxindex 90d1ea4dac..886d607f14 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx@@ -63,20 +63,14 @@ const applicationsColumns = {export function ProgramPartnersRejectedApplicationsPageClient() {const { id: workspaceId } = useWorkspace();- const { queryParams, searchParams, getQueryString } = useRouterStuff();+ const { queryParams, searchParams, searchParamsObj, getQueryString } =+ useRouterStuff();- const search = searchParams.get("search");const sortBy = searchParams.get("sortBy") || "createdAt";const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- isFiltered,- } = usePartnerFilters({ sortBy, sortOrder, status: "rejected" }, ["country"]);+ const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =+ usePartnerFilters({ sortBy, sortOrder, status: "rejected" }, ["country"]);const { partnersCount, error: countError } = usePartnersCount<number>({status: "rejected",@@ -126,6 +120,10 @@ export function ProgramPartnersRejectedApplicationsPageClient() {| { open: true; partnerId: string }>({ open: false, partnerId: null });+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),+ );+useEffect(() => {const partnerId = searchParams.get("partnerId");if (partnerId) setDetailsSheetState({ open: true, partnerId });@@ -435,7 +433,7 @@ export function ProgramPartnersRejectedApplicationsPageClient() {) : (<AnimatedEmptyStatetitle="No rejected applications found"- description={`No rejected applications found${isFiltered || search ? " for the selected filters" : " for this program"}.`}+ description={`No rejected applications found${isFiltered ? " for the selected filters" : " for this program"}.`}cardContent={() => (<><Users className="size-4 text-neutral-700" />diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsxindex 46532bcd26..08aef1c385 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx@@ -113,7 +113,8 @@ const getPartnerUrl = ({export function PartnersTable() {const router = useRouter();- const { queryParams, searchParams, getQueryString } = useRouterStuff();+ const { queryParams, searchParams, searchParamsObj, getQueryString } =+ useRouterStuff();const { id: workspaceId, slug: workspaceSlug } = useWorkspace();const { program } = useProgram();@@ -129,19 +130,14 @@ export function PartnersTable() {(program?.primaryRewardEvent === "lead" ? "totalLeads" : "totalSaleAmount");const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- isFiltered,- } = usePartnerFilters({ sortBy, sortOrder, status });-const { partnersCount, error: countError } = usePartnersCount<number>({...(status ? { status } : {}),});+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),+ );+const {data: partners,error,@@ -567,36 +563,7 @@ export function PartnersTable() {<BulkArchivePartnersModal /><BulkDeactivatePartnersModal /><BulkBanPartnersModal />- <div>- <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- />- <SearchBoxPersisted- placeholder="Search by name, email, or company"- inputClassName="md:w-80"- />- </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>+ <PartnersFilters sortBy={sortBy} sortOrder={sortOrder} status={status} />{partners?.length !== 0 ? (<Table {...tableProps} table={table} />) : (@@ -619,6 +586,52 @@ export function PartnersTable() {);}+function PartnersFilters({+ sortBy,+ sortOrder,+ status,+}: {+ sortBy: string;+ sortOrder: "asc" | "desc";+ status: ProgramEnrollmentStatus;+}) {+ const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =+ usePartnerFilters({ sortBy, sortOrder, status });++ return (+ <div>+ <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ />+ <SearchBoxPersisted+ placeholder="Search by name, email, or company"+ inputClassName="md:w-80"+ />+ </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>+ );+}+function BulkActionsMenu({table,onArchivePartners,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.tsxindex bc10796de0..ebc8e07306 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@@ -198,8 +198,6 @@ export function usePartnerFilters([activeFilters, workspaceId, extraSearchParams],);- const isFiltered = activeFilters.length > 0 || searchParamsObj.search;-return {filters,activeFilters,@@ -207,6 +205,5 @@ export function usePartnerFilters(onRemove,onRemoveAll,searchQuery,- isFiltered,};}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsxindex 68622135d5..0f17b88911 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-table.tsx@@ -29,244 +29,245 @@ import { formatPeriod } from "@dub/utils/src/functions/datetime";import { fetcher } from "@dub/utils/src/functions/fetcher";import { PayoutPaidCell } from "app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-paid-cell";import { useParams, useRouter } from "next/navigation";-import { memo, useMemo } from "react";+import { useMemo } from "react";import useSWR from "swr";import { usePayoutFilters } from "./use-payout-filters";export function PayoutTable() {- const filters = usePayoutFilters();- return <PayoutTableInner {...filters} />;-}+ const router = useRouter();+ const { queryParams, searchParams, searchParamsObj, getQueryString } =+ useRouterStuff();-const PayoutTableInner = memo(- ({- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- isFiltered,- setSearch,- setSelectedFilter,- }: ReturnType<typeof usePayoutFilters>) => {- const {- id: workspaceId,- slug: workspaceSlug,- plan,- defaultProgramId,- } = useWorkspace();- const router = useRouter();- const { queryParams, searchParams, getQueryString } = useRouterStuff();+ const {+ id: workspaceId,+ slug: workspaceSlug,+ plan,+ defaultProgramId,+ } = useWorkspace();- const sortBy = searchParams.get("sortBy") || "amount";- const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";+ const sortBy = searchParams.get("sortBy") || "amount";+ const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";- const { payoutsCount, error: countError } = usePayoutsCount<number>();+ const { payoutsCount, error: countError } = usePayoutsCount<number>();- const {- data: payouts,- error,- isLoading,- } = useSWR<PayoutResponse[]>(- defaultProgramId- ? `/api/payouts${getQueryString(- { workspaceId },- {- exclude: ["payoutId", "selectedPayoutId", "excludedPayoutIds"],- },- )}`- : undefined,- fetcher,- {- keepPreviousData: true,- },- );+ const {+ data: payouts,+ error,+ isLoading,+ } = useSWR<PayoutResponse[]>(+ defaultProgramId+ ? `/api/payouts${getQueryString(+ { workspaceId },+ {+ exclude: ["payoutId", "selectedPayoutId", "excludedPayoutIds"],+ },+ )}`+ : undefined,+ fetcher,+ {+ keepPreviousData: true,+ },+ );- const { pagination, setPagination } = usePagination();+ const { pagination, setPagination } = usePagination();- const { canManageFraudEvents } = getPlanCapabilities(plan);+ const { canManageFraudEvents } = getPlanCapabilities(plan);- const { fraudGroupCount } = useFraudGroupCount<FraudGroupCountByPartner[]>({- query: {- groupBy: "partnerId",- status: "pending",- },- ignoreParams: true,- });+ const { fraudGroupCount } = useFraudGroupCount<FraudGroupCountByPartner[]>({+ query: {+ groupBy: "partnerId",+ status: "pending",+ },+ ignoreParams: true,+ });- // Memoized map of partner IDs with pending fraud events- const fraudGroupCountMap = useMemo(() => {- if (!fraudGroupCount) {- return new Set<string>();- }+ // Memoized map of partner IDs with pending fraud events+ const fraudGroupCountMap = useMemo(() => {+ if (!fraudGroupCount) {+ return new Set<string>();+ }- return new Set(fraudGroupCount.map(({ partnerId }) => partnerId));- }, [fraudGroupCount]);+ return new Set(fraudGroupCount.map(({ partnerId }) => partnerId));+ }, [fraudGroupCount]);- const table = useTable({- data: payouts || [],- loading: isLoading,- error: error || countError ? "Failed to load payouts" : undefined,- columns: [- {- id: "periodEnd",- header: "Period",- accessorFn: (d) => formatPeriod(d),- },- {- header: "Partner",- cell: ({ row }) => {- return <PartnerRowItem partner={row.original.partner} />;- },+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),+ );++ const table = useTable({+ data: payouts || [],+ loading: isLoading,+ error: error || countError ? "Failed to load payouts" : undefined,+ columns: [+ {+ id: "periodEnd",+ header: "Period",+ accessorFn: (d) => formatPeriod(d),+ },+ {+ header: "Partner",+ cell: ({ row }) => {+ return <PartnerRowItem partner={row.original.partner} />;},- {- header: "Status",- cell: ({ row }) => {- const hasPendingFraudEvents =- canManageFraudEvents &&- fraudGroupCountMap.has(row.original.partner.id);+ },+ {+ header: "Status",+ cell: ({ row }) => {+ const hasPendingFraudEvents =+ canManageFraudEvents &&+ fraudGroupCountMap.has(row.original.partner.id);- const status =- hasPendingFraudEvents && row.original.status === "pending"- ? "hold"- : row.original.status;+ const status =+ hasPendingFraudEvents && row.original.status === "pending"+ ? "hold"+ : row.original.status;- const badge = PayoutStatusBadges[status];+ const badge = PayoutStatusBadges[status];- return badge ? (- <StatusBadge icon={badge.icon} variant={badge.variant}>- <DynamicTooltipWrapper- tooltipProps={- row.original.status === "failed" &&- row.original.failureReason- ? {- content: row.original.failureReason,- }- : undefined- }- >- {badge.label}- </DynamicTooltipWrapper>- </StatusBadge>- ) : (- "-"- );- },- },- {- id: "initiatedAt",- header: "Paid",- cell: ({ row }) => (- <PayoutPaidCell- initiatedAt={row.original.initiatedAt}- paidAt={row.original.paidAt}- user={row.original.user}- />- ),- },- {- id: "amount",- header: "Amount",- cell: ({ row }) => (- <AmountRowItem- payout={row.original}- hasPendingFraudEvents={- canManageFraudEvents &&- fraudGroupCountMap.has(row.original.partner.id)- }- />- ),+ return badge ? (+ <StatusBadge icon={badge.icon} variant={badge.variant}>+ <DynamicTooltipWrapper+ tooltipProps={+ row.original.status === "failed" && row.original.failureReason+ ? {+ content: row.original.failureReason,+ }+ : undefined+ }+ >+ {badge.label}+ </DynamicTooltipWrapper>+ </StatusBadge>+ ) : (+ "-"+ );},- ],- pagination,- onPaginationChange: setPagination,- sortableColumns: ["amount", "initiatedAt"],- sortBy,- sortOrder,- onSortChange: ({ sortBy, sortOrder }) =>- queryParams({- set: {- ...(sortBy && { sortBy }),- ...(sortOrder && { sortOrder }),- },- del: "page",- scroll: false,- }),- onRowClick: (row, e) => {- const url = `/${workspaceSlug}/program/payouts/${row.original.id}`;- if (e.metaKey || e.ctrlKey) window.open(url, "_blank");- else router.push(url);},- onRowAuxClick: (row) =>- window.open(- `/${workspaceSlug}/program/payouts/${row.original.id}`,- "_blank",+ {+ id: "initiatedAt",+ header: "Paid",+ cell: ({ row }) => (+ <PayoutPaidCell+ initiatedAt={row.original.initiatedAt}+ paidAt={row.original.paidAt}+ user={row.original.user}+ />+ ),+ },+ {+ id: "amount",+ header: "Amount",+ cell: ({ row }) => (+ <AmountRowItem+ payout={row.original}+ hasPendingFraudEvents={+ canManageFraudEvents &&+ fraudGroupCountMap.has(row.original.partner.id)+ }+ />),- rowProps: (row) => ({- onPointerEnter: () =>- router.prefetch(- `/${workspaceSlug}/program/payouts/${row.original.id}`,- ),+ },+ ],+ pagination,+ onPaginationChange: setPagination,+ sortableColumns: ["amount", "initiatedAt"],+ sortBy,+ sortOrder,+ onSortChange: ({ sortBy, sortOrder }) =>+ queryParams({+ set: {+ ...(sortBy && { sortBy }),+ ...(sortOrder && { sortOrder }),+ },+ del: "page",+ scroll: false,}),- columnPinning: { right: ["menu"] },- thClassName: "border-l-0",- tdClassName: "border-l-0",- resourceName: (p) => `payout${p ? "s" : ""}`,- rowCount: payoutsCount || 0,- });+ onRowClick: (row, e) => {+ const url = `/${workspaceSlug}/program/payouts/${row.original.id}`;+ if (e.metaKey || e.ctrlKey) window.open(url, "_blank");+ else router.push(url);+ },+ onRowAuxClick: (row) =>+ window.open(+ `/${workspaceSlug}/program/payouts/${row.original.id}`,+ "_blank",+ ),+ rowProps: (row) => ({+ onPointerEnter: () =>+ router.prefetch(`/${workspaceSlug}/program/payouts/${row.original.id}`),+ }),+ columnPinning: { right: ["menu"] },+ thClassName: "border-l-0",+ tdClassName: "border-l-0",+ resourceName: (p) => `payout${p ? "s" : ""}`,+ rowCount: payoutsCount || 0,+ });- return (- <>- <div className="flex flex-col gap-3">- <div>- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onSearchChange={setSearch}- onSelectedFilterChange={setSelectedFilter}- />- <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>- {payouts?.length !== 0 ? (- <Table {...table} />- ) : (- <AnimatedEmptyState- title="No payouts found"- description={- isFiltered- ? "No payouts found for the selected filters."- : "No payouts have been initiated for this program yet."- }- cardContent={() => (- <>- <MoneyBill2 className="size-4 text-neutral-700" />- <div className="h-2.5 w-24 min-w-0 rounded-sm bg-neutral-200" />- </>- )}- />+ return (+ <div className="flex flex-col gap-3">+ <PayoutFilters />+ {payouts?.length !== 0 ? (+ <Table {...table} />+ ) : (+ <AnimatedEmptyState+ title="No payouts found"+ description={+ isFiltered+ ? "No payouts found for the selected filters."+ : "No payouts have been initiated for this program yet."+ }+ cardContent={() => (+ <>+ <MoneyBill2 className="size-4 text-neutral-700" />+ <div className="h-2.5 w-24 min-w-0 rounded-sm bg-neutral-200" />+ </>+ )}+ />+ )}+ </div>+ );+}++function PayoutFilters() {+ const {+ filters,+ activeFilters,+ onSelect,+ onRemove,+ onRemoveAll,+ setSearch,+ setSelectedFilter,+ } = usePayoutFilters();++ return (+ <div>+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onSearchChange={setSearch}+ onSelectedFilterChange={setSelectedFilter}+ />+ <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>+ );+}function AmountRowItem({payout,diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsxindex a0977eecb1..ed0d8863c0 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/use-payout-filters.tsx@@ -117,15 +117,12 @@ export function usePayoutFilters() {[queryParams],);- const isFiltered = useMemo(() => activeFilters.length > 0, [activeFilters]);-return {filters,activeFilters,onSelect,onRemove,onRemoveAll,- isFiltered,setSearch,setSelectedFilter,};diff --git a/apps/web/ui/customers/customers-table/customers-table.tsx b/apps/web/ui/customers/customers-table/customers-table.tsxindex d22eac0f6c..34437b72cc 100644--- a/apps/web/ui/customers/customers-table/customers-table.tsx+++ b/apps/web/ui/customers/customers-table/customers-table.tsx@@ -67,23 +67,14 @@ export function CustomersTable({const { canManageCustomers } = getPlanCapabilities(plan);const router = useRouter();- const { queryParams, searchParams, getQueryString } = useRouterStuff();+ const { queryParams, searchParams, searchParamsObj, getQueryString } =+ useRouterStuff();const sortBy = searchParams.get("sortBy") || "createdAt";const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- isFiltered,- setSearch,- setSelectedFilter,- } = useCustomerFilters(- { sortBy, sortOrder },- { enabled: canManageCustomers },+ const isFiltered = Object.keys(searchParamsObj).some(+ (key) => !["sortBy", "sortOrder", "page"].includes(key),);const { data: customersCount, error: countError } = useCustomersCount({@@ -409,38 +400,11 @@ export function CustomersTable({return (<div className="flex flex-col gap-3">- <div>- <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onSearchChange={setSearch}- onSelectedFilterChange={setSelectedFilter}- />- <SearchBoxPersisted- placeholder="Search by email or name"- inputClassName="md:w-[16rem]"- />- </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>+ <CustomersFilters+ sortBy={sortBy}+ sortOrder={sortOrder}+ enabled={canManageCustomers}+ />{!canManageCustomers || customers?.length !== 0 ? (<Table{...tableProps}@@ -523,6 +487,61 @@ export function CustomersTable({);}+function CustomersFilters({+ sortBy,+ sortOrder,+ enabled,+}: {+ sortBy: string;+ sortOrder: "asc" | "desc";+ enabled: boolean;+}) {+ const {+ filters,+ activeFilters,+ onSelect,+ onRemove,+ onRemoveAll,+ setSearch,+ setSelectedFilter,+ } = useCustomerFilters({ sortBy, sortOrder }, { enabled });++ return (+ <div>+ <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onSearchChange={setSearch}+ onSelectedFilterChange={setSelectedFilter}+ />+ <SearchBoxPersisted+ placeholder="Search by email or name"+ inputClassName="md:w-[16rem]"+ />+ </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>+ );+}+function RowMenuButton({ row }: { row: Row<CustomerProps> }) {const [isOpen, setIsOpen] = useState(false);diff --git a/apps/web/ui/customers/customers-table/use-customer-filters.tsx b/apps/web/ui/customers/customers-table/use-customer-filters.tsxindex 2bd3584899..99636e72d0 100644--- a/apps/web/ui/customers/customers-table/use-customer-filters.tsx+++ b/apps/web/ui/customers/customers-table/use-customer-filters.tsx@@ -196,11 +196,6 @@ export function useCustomerFilters([activeFilters, workspaceId, extraSearchParams],);- const isFiltered = useMemo(- () => activeFilters.length > 0 || searchParamsObj.search,- [activeFilters, searchParamsObj.search],- );-return {filters,activeFilters,@@ -208,7 +203,6 @@ export function useCustomerFilters(onRemove,onRemoveAll,searchQuery,- isFiltered,setSearch,setSelectedFilter,};diff --git a/apps/web/ui/referrals/partner-referral-table.tsx b/apps/web/ui/referrals/partner-referral-table.tsxindex 2314ecbcd3..4298f87926 100644--- a/apps/web/ui/referrals/partner-referral-table.tsx+++ b/apps/web/ui/referrals/partner-referral-table.tsx@@ -44,16 +44,6 @@ export function PartnerReferralTable() {open: !!referralIdFromUrl,});- const {- filters,- activeFilters,- onSelect,- onRemove,- onRemoveAll,- setSearch,- setSelectedFilter,- } = useProgramReferralsFilters({});-const { data: referralsCount, error: countError } =useProgramReferralsCount();@@ -269,36 +259,7 @@ export function PartnerReferralTable() {/>)}<div>- <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">- <Filter.Select- className="w-full md:w-fit"- filters={filters}- activeFilters={activeFilters}- onSelect={onSelect}- onRemove={onRemove}- onSearchChange={setSearch}- onSelectedFilterChange={setSelectedFilter}- />- <SearchBoxPersisted- placeholder="Search by email or name"- inputClassName="md:w-[16rem]"- />- </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>+ <PartnerReferralFilters /></div>{referrals?.length !== 0 ? (<Table {...tableProps} table={table} />@@ -317,3 +278,50 @@ export function PartnerReferralTable() {</div>);}++function PartnerReferralFilters() {+ const {+ filters,+ activeFilters,+ onSelect,+ onRemove,+ onRemoveAll,+ setSearch,+ setSelectedFilter,+ } = useProgramReferralsFilters({});++ return (+ <>+ <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">+ <Filter.Select+ className="w-full md:w-fit"+ filters={filters}+ activeFilters={activeFilters}+ onSelect={onSelect}+ onRemove={onRemove}+ onSearchChange={setSearch}+ onSelectedFilterChange={setSelectedFilter}+ />+ <SearchBoxPersisted+ placeholder="Search by email or name"+ inputClassName="md:w-[16rem]"+ />+ </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>+ </>+ );+}