The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
filter bounty submissions by partnerId, add ignoreParams to useBountySubmissionsCount
Steven Tey04b761bd446b
diff --git a/apps/web/app/(ee)/api/bounties/count/submissions/route.ts b/apps/web/app/(ee)/api/bounties/count/submissions/route.tsindex aefafc998b..3e892c6757 100644--- a/apps/web/app/(ee)/api/bounties/count/submissions/route.ts+++ b/apps/web/app/(ee)/api/bounties/count/submissions/route.ts@@ -7,6 +7,8 @@ import { z } from "zod";const bountiesSubmissionsCountQuerySchema = z.object({bountyId: z.string().optional(),+ groupId: z.string().optional(),+ partnerId: z.string().optional(),});const statuses = Object.values(BountySubmissionStatus);@@ -15,7 +17,7 @@ const statuses = Object.values(BountySubmissionStatus);export const GET = withWorkspace(async ({ workspace, searchParams }) => {const programId = getDefaultProgramIdOrThrow(workspace);- const { bountyId } =+ const { bountyId, groupId, partnerId } =bountiesSubmissionsCountQuerySchema.parse(searchParams);const count = await prisma.bountySubmission.groupBy({@@ -23,6 +25,14 @@ export const GET = withWorkspace(where: {programId,bountyId,+ ...(groupId && {+ programEnrollment: {+ groupId,+ },+ }),+ ...(partnerId && {+ partnerId,+ }),},_count: true,});diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-info.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-info.tsxindex a44c494b09..37ba8467c2 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-info.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-info.tsx@@ -24,6 +24,7 @@ export function BountyInfo() {const { submissionsCount } = useBountySubmissionsCount<SubmissionsCountByStatus[]>({+ ignoreParams: true,enabled: Boolean(bounty),});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.tsxindex 436a5281dc..441bc19c52 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@@ -3,13 +3,17 @@ import {useBountySubmissionsCount,} 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 } from "@/lib/types";+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 { Users6 } from "@dub/ui/icons";-import { cn, nFormatter } from "@dub/utils";-import { useCallback, useMemo } from "react";+import { Users, Users6 } from "@dub/ui/icons";+import { cn, nFormatter, OG_AVATAR_URL } from "@dub/utils";+import { useCallback, useMemo, useState } from "react";+import { useDebounce } from "use-debounce";import { BOUNTY_SUBMISSION_STATUS_BADGES } from "./bounty-submission-status-badges";export function useBountySubmissionFilters({@@ -25,8 +29,36 @@ export function useBountySubmissionFilters({const { submissionsCount } =useBountySubmissionsCount<SubmissionsCountByStatus[]>();+ const [selectedFilter, setSelectedFilter] = useState<string | null>(null);+ const [search, setSearch] = useState("");+ const [debouncedSearch] = useDebounce(search, 500);++ const { partners, partnersAsync } = usePartnerFilterOptions(+ selectedFilter === "partnerId" ? debouncedSearch : "",+ );+const filters = useMemo(() => [+ {+ key: "partnerId",+ icon: Users,+ label: "Partner",+ shouldFilter: !partnersAsync,+ options:+ partners?.map(({ id, name, image }) => {+ return {+ value: id,+ label: name,+ icon: (+ <img+ src={image || `${OG_AVATAR_URL}${name}`}+ alt={`${name} image`}+ className="size-4 rounded-full"+ />+ ),+ };+ }) ?? null,+ },{key: "groupId",icon: Users6,@@ -53,40 +85,43 @@ export function useBountySubmissionFilters({label: "Status",options: submissionsCount? submissionsCount.map(({ status, count }) => {- {- const {- label,- icon: Icon,- iconClassName,- } = BOUNTY_SUBMISSION_STATUS_BADGES[status];- return {- value: status,- label,- icon: (- <Icon- className={cn("size-4 bg-transparent", iconClassName)}- />- ),- right: nFormatter(count, {- full: true,- }),- };- }+ const {+ label,+ icon: Icon,+ iconClassName,+ } = BOUNTY_SUBMISSION_STATUS_BADGES[status];+ return {+ value: status,+ label,+ icon: (+ <Icon+ className={cn("size-4 bg-transparent", iconClassName)}+ />+ ),+ right: nFormatter(count, {+ full: true,+ }),+ };}): null,},],- [groups, bounty, submissionsCount, slug],+ [groups, bounty, submissionsCount, slug, partners, partnersAsync],);const activeFilters = useMemo(() => {- const { status, groupId } = searchParamsObj;+ const { status, groupId, partnerId } = searchParamsObj;return [...(status ? [{ key: "status", value: status }] : []),...(groupId ? [{ key: "groupId", value: groupId }] : []),+ ...(partnerId ? [{ key: "partnerId", value: partnerId }] : []),];- }, [searchParamsObj.status, searchParamsObj.groupId]);+ }, [+ searchParamsObj.status,+ searchParamsObj.groupId,+ searchParamsObj.partnerId,+ ]);const onSelect = useCallback((key: string, value: any) =>@@ -110,7 +145,7 @@ export function useBountySubmissionFilters({const onRemoveAll = useCallback(() =>queryParams({- del: ["status", "groupId"],+ del: ["status", "groupId", "partnerId"],}),[queryParams],);@@ -127,5 +162,51 @@ export function useBountySubmissionFilters({onRemove,onRemoveAll,isFiltered,+ setSearch,+ setSelectedFilter,};}++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 : "" },+ });++ const { partners: selectedPartners } = usePartners({+ query: {+ partnerIds: searchParamsObj.partnerId+ ? [searchParamsObj.partnerId]+ : undefined,+ },+ enabled: partnersAsync,+ });++ const result = useMemo(() => {+ return partnersLoading ||+ // Consider partners loading if we can't find the currently filtered partner+ (searchParamsObj.partnerId &&+ ![...(selectedPartners ?? []), ...(partners ?? [])].some(+ (p) => p.id === searchParamsObj.partnerId,+ ))+ ? null+ : ([+ ...(partners ?? []),+ // Add selected partner to list if not already in partners+ ...(selectedPartners+ ?.filter((st) => !partners?.some((t) => t.id === st.id))+ ?.map((st) => ({ ...st, hideDuringSearch: true })) ?? []),+ ] as (EnrolledPartnerProps & { hideDuringSearch?: boolean })[]);+ }, [partnersLoading, partners, selectedPartners, searchParamsObj.partnerId]);++ return { partners: result, partnersAsync };+}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-action-button.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-action-button.tsxindex 87b0832728..32977cf40a 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-action-button.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-action-button.tsx@@ -34,6 +34,7 @@ export function BountyActionButton({const { submissionsCount } = useBountySubmissionsCount<SubmissionsCountByStatus[]>({+ ignoreParams: true,enabled: Boolean(bounty),});const totalSubmissions = useMemo(() => {diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-card.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-card.tsxindex 54dc7886db..ac8e13b30e 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-card.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-card.tsx@@ -184,9 +184,7 @@ export function BountyCardSkeleton() {return (<div className="border-border-subtle rounded-xl border bg-white p-2"><div className="flex flex-col gap-3.5">- <div className="relative flex h-[124px] items-center justify-center rounded-lg bg-neutral-100 py-3">- <div className="h-full w-full animate-pulse rounded bg-neutral-200" />- </div>+ <div className="relative flex h-[124px] animate-pulse items-center justify-center rounded-lg bg-neutral-200" /><div className="flex flex-col gap-1.5 px-2 pb-1.5"><div className="h-5 w-48 animate-pulse rounded bg-neutral-200" /><div className="flex h-5 items-center gap-2">diff --git a/apps/web/lib/api/bounties/get-bounty-submissions.ts b/apps/web/lib/api/bounties/get-bounty-submissions.tsindex 20509cf629..d8f4eff8ef 100644--- a/apps/web/lib/api/bounties/get-bounty-submissions.ts+++ b/apps/web/lib/api/bounties/get-bounty-submissions.ts@@ -8,12 +8,13 @@ interface GetBountySubmissionsParams extends BountySubmissionsQueryFilters {// Get list of submissions for a given bountyexport async function getBountySubmissions({bountyId,+ status,groupId,+ partnerId,sortOrder,sortBy,page,pageSize,- status,}: GetBountySubmissionsParams) {const submissions = await prisma.bountySubmission.findMany({where: {@@ -26,6 +27,9 @@ export async function getBountySubmissions({groupId,},}),+ ...(partnerId && {+ partnerId,+ }),},include: {user: true,diff --git a/apps/web/lib/swr/use-bounty-submissions-count.ts b/apps/web/lib/swr/use-bounty-submissions-count.tsindex c1fa10322b..a3e1e92f95 100644--- a/apps/web/lib/swr/use-bounty-submissions-count.ts+++ b/apps/web/lib/swr/use-bounty-submissions-count.ts@@ -11,8 +11,10 @@ export interface SubmissionsCountByStatus {}export function useBountySubmissionsCount<T>({+ ignoreParams,enabled = true,}: {+ ignoreParams?: boolean;enabled?: boolean;} = {}) {const { bountyId } = useParams();@@ -22,10 +24,13 @@ export function useBountySubmissionsCount<T>({const { data: submissionsCount, error } = useSWR<T>(enabled &&workspaceId &&- `/api/bounties/count/submissions${getQueryString({- workspaceId,- ...(bountyId ? { bountyId } : {}),- })}`,+ `/api/bounties/count/submissions${getQueryString(+ {+ workspaceId,+ ...(bountyId ? { bountyId } : {}),+ },+ ignoreParams ? { include: [] } : undefined,+ )}`,fetcher,{keepPreviousData: true,diff --git a/apps/web/lib/zod/schemas/bounties.ts b/apps/web/lib/zod/schemas/bounties.tsindex db6028aaff..61926ec798 100644--- a/apps/web/lib/zod/schemas/bounties.ts+++ b/apps/web/lib/zod/schemas/bounties.ts@@ -160,9 +160,10 @@ export const rejectBountySubmissionSchema = z.object({export const getBountySubmissionsQuerySchema = z.object({- sortBy: z.enum(["completedAt", "performanceCount"]).default("completedAt"),- sortOrder: z.enum(["asc", "desc"]).default("asc"),status: z.nativeEnum(BountySubmissionStatus).optional(),groupId: z.string().optional(),+ partnerId: z.string().optional(),+ sortBy: z.enum(["completedAt", "performanceCount"]).default("completedAt"),+ sortOrder: z.enum(["asc", "desc"]).default("asc"),}).merge(getPaginationQuerySchema({ pageSize: 100 }));diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsxindex 8acbf44537..28090912b5 100644--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx@@ -565,6 +565,7 @@ export function AppSidebarNav({const { submissionsCount } = useBountySubmissionsCount<SubmissionsCountByStatus[]>({+ ignoreParams: true,enabled: Boolean(currentArea === "program" && defaultProgramId),});