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.

fix usePartnerFilterOptions

Steven Tey94a5d68c0202
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.tsx
index 50781654b1..67d1fe7c57 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
@@ -85,8 +85,15 @@ export function BountySubmissionsTable() {
const { submissionsCount } =
useBountySubmissionsCount<SubmissionsCountByStatus[]>();
- const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =
- useBountySubmissionFilters({ bounty });
+ const {
+ filters,
+ activeFilters,
+ onSelect,
+ onRemove,
+ onRemoveAll,
+ setSearch,
+ setSelectedFilter,
+ } = useBountySubmissionFilters({ bounty });
const {
error,
@@ -388,6 +395,8 @@ export function BountySubmissionsTable() {
activeFilters={activeFilters}
onSelect={onSelect}
onRemove={onRemove}
+ onSearchChange={setSearch}
+ onSelectedFilterChange={setSelectedFilter}
/>
<AnimatedSizeContainer height>
<div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/use-bounty-submission-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/use-bounty-submission-filters.tsx
index c83adf92dd..166615a607 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/use-bounty-submission-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/use-bounty-submission-filters.tsx
@@ -4,10 +4,8 @@ import {
} from "@/lib/swr/use-bounty-submissions-count";
import useGroups from "@/lib/swr/use-groups";
import usePartners from "@/lib/swr/use-partners";
-import usePartnersCount from "@/lib/swr/use-partners-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { BountyProps, EnrolledPartnerProps } from "@/lib/types";
-import { PARTNERS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/partners";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { CircleDotted, useRouterStuff } from "@dub/ui";
import { Users, Users6 } from "@dub/ui/icons";
@@ -33,7 +31,7 @@ export function useBountySubmissionFilters({
const [search, setSearch] = useState("");
const [debouncedSearch] = useDebounce(search, 500);
- const { partners, partnersAsync } = usePartnerFilterOptions(
+ const { partners } = usePartnerFilterOptions(
selectedFilter === "partnerId" ? debouncedSearch : "",
);
@@ -43,7 +41,7 @@ export function useBountySubmissionFilters({
key: "partnerId",
icon: Users,
label: "Partner",
- shouldFilter: !partnersAsync,
+ shouldFilter: false,
options:
partners?.map(({ id, name, image }) => {
return {
@@ -106,7 +104,7 @@ export function useBountySubmissionFilters({
: null,
},
],
- [groups, bounty, submissionsCount, slug, partners, partnersAsync],
+ [groups, bounty, submissionsCount, slug, partners],
);
const activeFilters = useMemo(() => {
@@ -170,16 +168,8 @@ export function useBountySubmissionFilters({
function usePartnerFilterOptions(search: string) {
const { searchParamsObj } = useRouterStuff();
- const { partnersCount } = usePartnersCount<number>({
- ignoreParams: true,
- });
-
- const partnersAsync = Boolean(
- partnersCount && partnersCount > PARTNERS_MAX_PAGE_SIZE,
- );
-
const { partners, loading: partnersLoading } = usePartners({
- query: { search: partnersAsync ? search : "" },
+ query: { search },
});
const { partners: selectedPartners } = usePartners({
@@ -188,7 +178,6 @@ function usePartnerFilterOptions(search: string) {
? [searchParamsObj.partnerId]
: undefined,
},
- enabled: partnersAsync,
});
const result = useMemo(() => {
@@ -208,5 +197,5 @@ function usePartnerFilterOptions(search: string) {
] as (EnrolledPartnerProps & { hideDuringSearch?: boolean })[]);
}, [partnersLoading, partners, selectedPartners, searchParamsObj.partnerId]);
- return { partners: result, partnersAsync };
+ return { partners: result };
}
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.tsx
index 5315571685..0137029287 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
@@ -1,8 +1,6 @@
import usePartners from "@/lib/swr/use-partners";
-import usePartnersCount from "@/lib/swr/use-partners-count";
import usePayoutsCount from "@/lib/swr/use-payouts-count";
import { EnrolledPartnerProps, PayoutsCount } from "@/lib/types";
-import { PARTNERS_MAX_PAGE_SIZE } from "@/lib/zod/schemas/partners";
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
import { useRouterStuff } from "@dub/ui";
import { CircleDotted, InvoiceDollar, Users } from "@dub/ui/icons";
@@ -21,7 +19,7 @@ export function usePayoutFilters() {
const [search, setSearch] = useState("");
const [debouncedSearch] = useDebounce(search, 500);
- const { partners, partnersAsync } = usePartnerFilterOptions(
+ const { partners } = usePartnerFilterOptions(
selectedFilter === "partnerId" ? debouncedSearch : "",
);
@@ -31,7 +29,7 @@ export function usePayoutFilters() {
key: "partnerId",
icon: Users,
label: "Partner",
- shouldFilter: !partnersAsync,
+ shouldFilter: false,
options:
partners?.map(({ id, name, image }) => {
return {
@@ -79,7 +77,7 @@ export function usePayoutFilters() {
options: [],
},
],
- [payoutsCount, partners, partnersAsync],
+ [payoutsCount, partners],
);
const activeFilters = useMemo(() => {
@@ -139,16 +137,8 @@ export function usePayoutFilters() {
function usePartnerFilterOptions(search: string) {
const { searchParamsObj } = useRouterStuff();
- const { partnersCount } = usePartnersCount<number>({
- ignoreParams: true,
- });
-
- const partnersAsync = Boolean(
- partnersCount && partnersCount > PARTNERS_MAX_PAGE_SIZE,
- );
-
const { partners, loading: partnersLoading } = usePartners({
- query: { search: partnersAsync ? search : "" },
+ query: { search },
});
const { partners: selectedPartners } = usePartners({
@@ -157,7 +147,6 @@ function usePartnerFilterOptions(search: string) {
? [searchParamsObj.partnerId]
: undefined,
},
- enabled: partnersAsync,
});
const result = useMemo(() => {
@@ -177,5 +166,5 @@ function usePartnerFilterOptions(search: string) {
] as (EnrolledPartnerProps & { hideDuringSearch?: boolean })[]);
}, [partnersLoading, partners, selectedPartners, searchParamsObj.partnerId]);
- return { partners: result, partnersAsync };
+ return { partners: result };
}