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.

Give application filters their own group and country counts.

Kiran K4e8c31086131
diff --git a/apps/web/app/(ee)/api/program-applications/count/route.ts b/apps/web/app/(ee)/api/program-applications/count/route.ts
index 67e577192b..8f6b48310f 100644
--- a/apps/web/app/(ee)/api/program-applications/count/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/count/route.ts
@@ -1,28 +1,24 @@
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { withWorkspace } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { buildProgramApplicationWhere } from "@/lib/program-applications/program-application-where";
+import { countProgramApplications } from "@/lib/program-applications/count-program-applications";
import { getProgramApplicationsCountQuerySchema } from "@/lib/zod/schemas/program-application";
import { NextResponse } from "next/server";
// GET /api/program-applications/count - get the count of applications for a program
export const GET = withWorkspace(
async ({ workspace, searchParams }) => {
- const { country, groupId, status, search } =
+ const { country, groupId, status, search, groupBy } =
getProgramApplicationsCountQuerySchema.parse(searchParams);
const programId = getDefaultProgramIdOrThrow(workspace);
- const where = buildProgramApplicationWhere({
+ const count = await countProgramApplications({
programId,
groupId,
country,
status,
search,
- });
-
- const count = await prisma.programApplication.count({
- where,
+ groupBy,
});
return NextResponse.json(count);
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.tsx
index 8581076866..96341379ad 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
@@ -1,11 +1,11 @@
"use client";
+import { useProgramApplications } from "@/lib/program-applications/hooks/use-program-applications";
+import { useProgramApplicationsCount } from "@/lib/program-applications/hooks/use-program-applications-count";
import { buildSocialPlatformLookup } from "@/lib/social-utils";
import { mutatePrefix } from "@/lib/swr/mutate";
import useGroups from "@/lib/swr/use-groups";
import usePartner from "@/lib/swr/use-partner";
-import { useProgramApplications } from "@/lib/swr/use-program-applications";
-import { useProgramApplicationsCount } from "@/lib/swr/use-program-applications-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { PartnerApplicationProps } from "@/lib/types";
import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";
@@ -40,7 +40,7 @@ import { Row } from "@tanstack/react-table";
import { Command } from "cmdk";
import Link from "next/link";
import { useEffect, useMemo, useState } from "react";
-import { usePartnerFilters } from "../use-partner-filters";
+import { useProgramApplicationsFilters } from "@/lib/program-applications/hooks/use-program-applications-filters";
type ApplicationPlatform = NonNullable<
PartnerApplicationProps["partner"]["platforms"]
@@ -102,10 +102,10 @@ export function ProgramPartnersApplicationsPageClient() {
onToggleOperator,
setSelectedFilter,
setSearch,
- } = usePartnerFilters({ sortBy, sortOrder, status: "pending" }, [
- "groupId",
- "country",
- ]);
+ } = useProgramApplicationsFilters({
+ status: "pending",
+ enabledFilters: ["groupId", "country"],
+ });
const { applicationsCount, error: countError } =
useProgramApplicationsCount<number>({
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.tsx
index a3fba9f601..c417f9a98a 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
@@ -1,12 +1,12 @@
"use client";
import { approvePartnerApplicationAction } from "@/lib/actions/partners/approve-partner-application";
+import { useProgramApplications } from "@/lib/program-applications/hooks/use-program-applications";
+import { useProgramApplicationsCount } from "@/lib/program-applications/hooks/use-program-applications-count";
import { buildSocialPlatformLookup } from "@/lib/social-utils";
import { mutatePrefix } from "@/lib/swr/mutate";
import useGroups from "@/lib/swr/use-groups";
import usePartner from "@/lib/swr/use-partner";
-import { useProgramApplications } from "@/lib/swr/use-program-applications";
-import { useProgramApplicationsCount } from "@/lib/swr/use-program-applications-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { PartnerApplicationProps } from "@/lib/types";
import { useConfirmModal } from "@/ui/modals/confirm-modal";
@@ -37,7 +37,7 @@ import { Command } from "cmdk";
import { useAction } from "next-safe-action/hooks";
import { useEffect, useMemo, useState } from "react";
import { toast } from "sonner";
-import { usePartnerFilters } from "../../use-partner-filters";
+import { useProgramApplicationsFilters } from "@/lib/program-applications/hooks/use-program-applications-filters";
type ApplicationPlatform = NonNullable<
PartnerApplicationProps["partner"]["platforms"]
@@ -90,7 +90,10 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
onToggleOperator,
setSelectedFilter,
setSearch,
- } = usePartnerFilters({ sortBy, sortOrder, status: "rejected" }, ["country"]);
+ } = useProgramApplicationsFilters({
+ status: "rejected",
+ enabledFilters: ["country"],
+ });
const { applicationsCount, error: countError } =
useProgramApplicationsCount<number>({
diff --git a/apps/web/lib/openapi/partners/index.ts b/apps/web/lib/openapi/partners/index.ts
index 01ceaf9def..10b2998776 100644
--- a/apps/web/lib/openapi/partners/index.ts
+++ b/apps/web/lib/openapi/partners/index.ts
@@ -4,8 +4,8 @@ import { banPartner } from "./ban-partner";
import { createPartner } from "./create-partner";
import { createPartnerLink } from "./create-partner-link";
import { deactivatePartner } from "./deactivate-partner";
+import { listPartnerApplications } from "./list-partner-applications";
import { listPartners } from "./list-partners";
-import { listProgramApplications } from "./list-program-applications";
import { rejectPartner } from "./reject-partner";
import { retrievePartnerAnalytics } from "./retrieve-analytics";
import { retrievePartnerLinks } from "./retrieve-partner-links";
@@ -17,7 +17,7 @@ export const partnersPaths: ZodOpenApiPathsObject = {
get: listPartners,
},
"/program-applications": {
- get: listProgramApplications,
+ get: listPartnerApplications,
},
"/partners/links": {
post: createPartnerLink,
diff --git a/apps/web/lib/program-applications/count-program-applications.ts b/apps/web/lib/program-applications/count-program-applications.ts
new file mode 100644
index 0000000000..6931713249
--- /dev/null
+++ b/apps/web/lib/program-applications/count-program-applications.ts
@@ -0,0 +1,57 @@
+import { prisma } from "@/lib/prisma";
+import { getProgramApplicationsCountQuerySchema } from "@/lib/zod/schemas/program-application";
+import * as z from "zod/v4";
+import { buildProgramApplicationWhere } from "./program-application-where";
+
+type CountProgramApplicationsParams = z.infer<
+ typeof getProgramApplicationsCountQuerySchema
+> & {
+ programId: string;
+};
+
+export async function countProgramApplications({
+ programId,
+ groupId,
+ country,
+ status,
+ search,
+ groupBy,
+}: CountProgramApplicationsParams) {
+ const where = buildProgramApplicationWhere({
+ programId,
+ groupId: groupBy === "groupId" ? undefined : groupId,
+ country: groupBy === "country" ? undefined : country,
+ status,
+ search,
+ });
+
+ if (groupBy === "country") {
+ return prisma.programApplication.groupBy({
+ by: ["country"],
+ where,
+ _count: true,
+ orderBy: {
+ _count: {
+ country: "desc",
+ },
+ },
+ });
+ }
+
+ if (groupBy === "groupId") {
+ return prisma.programApplication.groupBy({
+ by: ["groupId"],
+ where,
+ _count: true,
+ orderBy: {
+ _count: {
+ groupId: "desc",
+ },
+ },
+ });
+ }
+
+ return prisma.programApplication.count({
+ where,
+ });
+}
diff --git a/apps/web/lib/swr/use-program-applications-count.ts b/apps/web/lib/program-applications/hooks/use-program-applications-count.ts
similarity index 89%
rename from apps/web/lib/swr/use-program-applications-count.ts
rename to apps/web/lib/program-applications/hooks/use-program-applications-count.ts
index 33b600681b..467ad1865c 100644
--- a/apps/web/lib/swr/use-program-applications-count.ts
+++ b/apps/web/lib/program-applications/hooks/use-program-applications-count.ts
@@ -2,8 +2,8 @@ import { useRouterStuff } from "@dub/ui";
import { fetcher } from "@dub/utils";
import useSWR from "swr";
import * as z from "zod/v4";
-import { getProgramApplicationsCountQuerySchema } from "../zod/schemas/program-application";
-import useWorkspace from "./use-workspace";
+import useWorkspace from "../../swr/use-workspace";
+import { getProgramApplicationsCountQuerySchema } from "../../zod/schemas/program-application";
export function useProgramApplicationsCount<T>({
ignoreParams,
diff --git a/apps/web/lib/program-applications/hooks/use-program-applications-filters.tsx b/apps/web/lib/program-applications/hooks/use-program-applications-filters.tsx
new file mode 100644
index 0000000000..2bcc2454e0
--- /dev/null
+++ b/apps/web/lib/program-applications/hooks/use-program-applications-filters.tsx
@@ -0,0 +1,250 @@
+import { useProgramApplicationsCount } from "@/lib/program-applications/hooks/use-program-applications-count";
+import useGroups from "@/lib/swr/use-groups";
+import { getProgramApplicationsCountQuerySchema } from "@/lib/zod/schemas/program-application";
+import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
+import { CountryFlag } from "@/ui/shared/country-flag";
+import { useRouterStuff } from "@dub/ui";
+import { FlagWavy, Users6 } from "@dub/ui/icons";
+import {
+ buildFilterValue,
+ COUNTRIES,
+ nFormatter,
+ parseFilterValue,
+ type ParsedFilter,
+} from "@dub/utils";
+import { useCallback, useMemo, useState } from "react";
+import * as z from "zod/v4";
+
+const FILTER_KEYS = ["groupId", "country"] as const;
+
+type ProgramApplicationFilterKey = (typeof FILTER_KEYS)[number];
+
+type ProgramApplicationFilterStatus = z.infer<
+ typeof getProgramApplicationsCountQuerySchema
+>["status"];
+
+type GroupedCount<TKey extends ProgramApplicationFilterKey> =
+ | Array<{ [K in TKey]: string | null } & { _count: number }>
+ | undefined;
+
+function isFilterKey(key: string): key is ProgramApplicationFilterKey {
+ return FILTER_KEYS.some((filterKey) => filterKey === key);
+}
+
+function buildMultiValueParam(
+ parsed: ParsedFilter | undefined,
+ values: string[],
+): string {
+ return buildFilterValue({
+ operator: parsed?.operator ?? (values.length > 1 ? "IS_ONE_OF" : "IS"),
+ sqlOperator: parsed?.sqlOperator ?? "IN",
+ values,
+ });
+}
+
+export function useProgramApplicationsFilters({
+ status,
+ enabledFilters,
+}: {
+ status: ProgramApplicationFilterStatus;
+ enabledFilters: ProgramApplicationFilterKey[];
+}) {
+ const { searchParamsObj, queryParams } = useRouterStuff();
+ const [selectedFilter, setSelectedFilter] = useState<string | null>(null);
+ const [, setSearch] = useState("");
+
+ const isFilterOptionsEnabled = (key: ProgramApplicationFilterKey) =>
+ enabledFilters.includes(key) &&
+ (selectedFilter === key || Boolean(searchParamsObj[key]));
+
+ const { groups } = useGroups();
+
+ const { applicationsCount: countriesCount } = useProgramApplicationsCount<
+ GroupedCount<"country">
+ >({
+ groupBy: "country",
+ status,
+ enabled: isFilterOptionsEnabled("country"),
+ });
+
+ const { applicationsCount: groupsCount } = useProgramApplicationsCount<
+ GroupedCount<"groupId">
+ >({
+ groupBy: "groupId",
+ status,
+ enabled: isFilterOptionsEnabled("groupId"),
+ });
+
+ const filters = useMemo(
+ () => [
+ ...(enabledFilters.includes("groupId")
+ ? [
+ {
+ key: "groupId",
+ icon: Users6,
+ label: "Group",
+ options:
+ groupsCount && groups
+ ? groupsCount
+ .filter(({ groupId }) =>
+ groups.find(({ id }) => id === groupId),
+ )
+ .map(({ groupId, _count }) => {
+ const groupData = groups.find(
+ ({ id }) => id === groupId,
+ )!; // coerce cause we already filtered above
+
+ return {
+ value: groupId,
+ label: groupData.name,
+ icon: <GroupColorCircle group={groupData} />,
+ right: nFormatter(_count || 0, { full: true }),
+ };
+ })
+ .filter((group) => group !== null)
+ : null,
+ },
+ ]
+ : []),
+ ...(enabledFilters.includes("country")
+ ? [
+ {
+ key: "country",
+ icon: FlagWavy,
+ label: "Location",
+ options:
+ countriesCount?.flatMap(({ country, _count }) => {
+ if (!country || !COUNTRIES[country]) {
+ return [];
+ }
+
+ return [
+ {
+ value: country,
+ label: COUNTRIES[country],
+ right: nFormatter(_count, { full: true }),
+ },
+ ];
+ }) ?? null,
+ getOptionIcon: (value: string) => (
+ <CountryFlag countryCode={value} />
+ ),
+ getOptionLabel: (value: string) => COUNTRIES[value],
+ },
+ ]
+ : []),
+ ],
+ [enabledFilters, groupsCount, groups, countriesCount],
+ );
+
+ const groupIdParsed = useMemo(
+ () => parseFilterValue(searchParamsObj.groupId),
+ [searchParamsObj.groupId],
+ );
+ const countryParsed = useMemo(
+ () => parseFilterValue(searchParamsObj.country),
+ [searchParamsObj.country],
+ );
+
+ const parsedByKey = useMemo(
+ () => ({
+ groupId: groupIdParsed,
+ country: countryParsed,
+ }),
+ [groupIdParsed, countryParsed],
+ );
+
+ const activeFilters = useMemo(() => {
+ return FILTER_KEYS.flatMap((key) => {
+ if (!enabledFilters.includes(key)) return [];
+ const parsed = parsedByKey[key];
+ if (!parsed) return [];
+ return [{ key, values: parsed.values, operator: parsed.operator }];
+ });
+ }, [enabledFilters, parsedByKey]);
+
+ const onSelect = useCallback(
+ (key: string, value: unknown) => {
+ if (!isFilterKey(key)) return;
+
+ const parsed = parsedByKey[key];
+ const currentValues = parsed?.values ?? [];
+ const next = String(value);
+ const newValues = currentValues.includes(next)
+ ? currentValues
+ : [...currentValues, next];
+
+ queryParams({
+ set: { [key]: buildMultiValueParam(parsed, newValues) },
+ del: "page",
+ });
+ },
+ [queryParams, parsedByKey],
+ );
+
+ const onRemove = useCallback(
+ (key: string, value?: unknown) => {
+ if (!isFilterKey(key) || !value) {
+ return queryParams({ del: [key, "page"] });
+ }
+
+ const parsed = parsedByKey[key];
+ const newValues = (parsed?.values ?? []).filter((v) => v !== value);
+
+ if (newValues.length === 0) {
+ return queryParams({ del: [key, "page"] });
+ }
+
+ queryParams({
+ set: { [key]: buildMultiValueParam(parsed, newValues) },
+ del: "page",
+ });
+ },
+ [queryParams, parsedByKey],
+ );
+
+ const onRemoveFilter = useCallback(
+ (key: string) => {
+ onRemove(key);
+ },
+ [onRemove],
+ );
+
+ const onToggleOperator = useCallback(
+ (key: string) => {
+ if (!isFilterKey(key)) return;
+
+ const raw = searchParamsObj[key];
+ if (!raw) return;
+
+ const isNegated = raw.startsWith("-");
+ const cleanValue = isNegated ? raw.slice(1) : raw;
+
+ queryParams({
+ set: { [key]: isNegated ? cleanValue : `-${cleanValue}` },
+ del: "page",
+ });
+ },
+ [queryParams, searchParamsObj],
+ );
+
+ const onRemoveAll = useCallback(
+ () =>
+ queryParams({
+ del: ["country", "groupId", "search", "page"],
+ }),
+ [queryParams],
+ );
+
+ return {
+ filters,
+ activeFilters,
+ onSelect,
+ onRemove,
+ onRemoveFilter,
+ onRemoveAll,
+ onToggleOperator,
+ setSelectedFilter,
+ setSearch,
+ };
+}
diff --git a/apps/web/lib/swr/use-program-applications.ts b/apps/web/lib/program-applications/hooks/use-program-applications.ts
similarity index 86%
rename from apps/web/lib/swr/use-program-applications.ts
rename to apps/web/lib/program-applications/hooks/use-program-applications.ts
index 1a65908942..61b96d3324 100644
--- a/apps/web/lib/swr/use-program-applications.ts
+++ b/apps/web/lib/program-applications/hooks/use-program-applications.ts
@@ -2,9 +2,9 @@ import { useRouterStuff } from "@dub/ui";
import { fetcher } from "@dub/utils";
import useSWR from "swr";
import * as z from "zod/v4";
-import { PartnerApplicationProps } from "../types";
-import { getPartnerApplicationsQuerySchema } from "../zod/schemas/program-application";
-import useWorkspace from "./use-workspace";
+import useWorkspace from "../../swr/use-workspace";
+import { PartnerApplicationProps } from "../../types";
+import { getPartnerApplicationsQuerySchema } from "../../zod/schemas/program-application";
export function useProgramApplications({
ignoreParams,
diff --git a/apps/web/lib/program-applications/program-application-where.ts b/apps/web/lib/program-applications/program-application-where.ts
index 6669c786d9..bbf6adf41b 100644
--- a/apps/web/lib/program-applications/program-application-where.ts
+++ b/apps/web/lib/program-applications/program-application-where.ts
@@ -17,8 +17,9 @@ function applicationFieldFilter(
: { in: parsed.values };
}
-type ProgramApplicationWhereParams = z.infer<
- typeof getProgramApplicationsCountQuerySchema
+type ProgramApplicationWhereParams = Omit<
+ z.infer<typeof getProgramApplicationsCountQuerySchema>,
+ "groupBy"
> & {
programId: string;
};
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index 712d4a6ea3..ca40404001 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -80,8 +80,12 @@ export const getPartnerApplicationsQuerySchema = getPartnersQuerySchema
});
export const getProgramApplicationsCountQuerySchema =
- getPartnerApplicationsQuerySchema.omit({
- sortOrder: true,
- page: true,
- pageSize: true,
- });
+ getPartnerApplicationsQuerySchema
+ .omit({
+ sortOrder: true,
+ page: true,
+ pageSize: true,
+ })
+ .extend({
+ groupBy: z.enum(["country", "groupId"]).optional(),
+ });
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index e5442a197a..c1c20f29c3 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -3,6 +3,7 @@
import { clientAccessCheck } from "@/lib/client-access-check";
import { usePartnerMessagesCount } from "@/lib/messages/hooks/use-partner-messages-count";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { useProgramApplicationsCount } from "@/lib/program-applications/hooks/use-program-applications-count";
import { SUBMITTED_LEADS_ENABLED_PROGRAM_IDS } from "@/lib/submitted-leads/constants";
import {
SubmissionsCountByStatus,
@@ -11,7 +12,6 @@ import {
import { useFraudGroupCount } from "@/lib/swr/use-fraud-groups-count";
import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
-import { useProgramApplicationsCount } from "@/lib/swr/use-program-applications-count";
import { useProgramSubmittedLeadsCount } from "@/lib/swr/use-program-submitted-leads-count";
import useWorkspace from "@/lib/swr/use-workspace";
import { useKeyboardShortcut, useRouterStuff } from "@dub/ui";