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.

Optimize partner filter loading and search handling

Rafie8f2d50a6dff
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.tsx
index 4f91701d8a..1708bb5bdb 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
@@ -133,11 +133,10 @@ export function PartnersTable() {
const { id: workspaceId, slug: workspaceSlug } = useWorkspace();
const { program } = useProgram();
- const status = (
+ const status =
searchParams.get("status") || searchParams.get("search")
? undefined
- : ProgramEnrollmentStatus.approved
- ) as ProgramEnrollmentStatus;
+ : ProgramEnrollmentStatus.approved;
const sortBy =
searchParams.get("sortBy") ||
@@ -535,12 +534,13 @@ function PartnersFilters({
}: {
sortBy: string;
sortOrder: "asc" | "desc";
- status: ProgramEnrollmentStatus;
+ status: ProgramEnrollmentStatus | undefined;
}) {
const { queryParams, searchParams } = useRouterStuff();
const { partnersCount: inviteCount } = usePartnersCount<number>({
status: ProgramEnrollmentStatus.invited,
+ ignoreParams: true,
});
const {
@@ -551,7 +551,13 @@ function PartnersFilters({
onRemoveFilter,
onRemoveAll,
onToggleOperator,
- } = usePartnerFilters({ sortBy, sortOrder, status });
+ setSelectedFilter,
+ setSearch,
+ } = usePartnerFilters({
+ sortBy,
+ sortOrder,
+ ...(status && { status }),
+ });
const showPendingInvitesButton =
inviteCount > 0 &&
@@ -568,6 +574,8 @@ function PartnersFilters({
onSelect={onSelect}
onRemove={onRemove}
onRemoveFilter={onRemoveFilter}
+ onSearchChange={setSearch}
+ onSelectedFilterChange={setSelectedFilter}
/>
{showPendingInvitesButton ? (
<Button
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 c40f6008b2..51537bda51 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
@@ -169,7 +169,9 @@ export function usePartnerFilters(
const { id: workspaceId, slug } = useWorkspace();
const status = (searchParamsObj.status ||
extraSearchParams.status ||
- "approved") as ProgramEnrollmentStatus;
+ (searchParamsObj.search ? undefined : "approved")) as
+ | ProgramEnrollmentStatus
+ | undefined;
const cohortParams = useMemo(
() => ({
@@ -184,9 +186,21 @@ export function usePartnerFilters(
const [search, setSearch] = useState("");
const [debouncedSearch] = useDebounce(search, 500);
+ // Load grouped counts only while their options are visible or already active
+ const isFilterOptionsEnabled = (key: PartnerFilterKey) =>
+ enabledFilters.includes(key) &&
+ (selectedFilter === key || Boolean(searchParamsObj[key]));
+ const partnerTagOptionsEnabled = isFilterOptionsEnabled("partnerTagId");
+ const countryOptionsEnabled = isFilterOptionsEnabled("country");
+ const statusOptionsEnabled = isFilterOptionsEnabled("status");
+ const groupOptionsEnabled = isFilterOptionsEnabled("groupId");
+ const referredByOptionsEnabled = isFilterOptionsEnabled(
+ "referredByPartnerId",
+ );
+
const { partnerTags, partnerTagsAsync } = usePartnerTagFilterOptions({
search: selectedFilter === "partnerTagId" ? debouncedSearch : "",
- enabled: enabledFilters.includes("partnerTagId"),
+ enabled: partnerTagOptionsEnabled,
status,
cohortParams,
});
@@ -203,7 +217,7 @@ export function usePartnerFilters(
groupBy: "country",
status,
...cohortParams,
- enabled: enabledFilters.includes("country"),
+ enabled: countryOptionsEnabled,
});
const { partnersCount: statusCount } = usePartnersCount<
@@ -216,7 +230,7 @@ export function usePartnerFilters(
groupBy: "status",
status,
...cohortParams,
- enabled: enabledFilters.includes("status"),
+ enabled: statusOptionsEnabled,
});
const { partnersCount: groupsCount } = usePartnersCount<
@@ -229,7 +243,7 @@ export function usePartnerFilters(
groupBy: "groupId",
status,
...cohortParams,
- enabled: enabledFilters.includes("groupId"),
+ enabled: groupOptionsEnabled,
});
const { partnersCount: referredByCount } = usePartnersCount<
@@ -242,12 +256,12 @@ export function usePartnerFilters(
groupBy: "referredByPartnerId",
status,
...cohortParams,
- enabled: enabledFilters.includes("referredByPartnerId"),
+ enabled: referredByOptionsEnabled,
});
const { referredByPartners } = useReferredByPartnerFilterOptions({
referredByCount,
- enabled: enabledFilters.includes("referredByPartnerId"),
+ enabled: referredByOptionsEnabled,
});
const filters = useMemo(
@@ -327,7 +341,7 @@ export function usePartnerFilters(
),
right: nFormatter(_count || 0, { full: true }),
};
- }) ?? [],
+ }) ?? null,
},
]
: []),
@@ -344,7 +358,7 @@ export function usePartnerFilters(
value: country,
label: COUNTRIES[country],
right: nFormatter(_count, { full: true }),
- })) ?? [],
+ })) ?? null,
getOptionIcon: (value: string) => (
<CountryFlag countryCode={value} />
),
@@ -683,7 +697,7 @@ function usePartnerTagFilterOptions({
}: {
search: string;
enabled?: boolean;
- status: ProgramEnrollmentStatus;
+ status?: ProgramEnrollmentStatus;
cohortParams: {
groupId?: string;
country?: string;