The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Search applications by partner and derive status from the application.
Kiran K3eb250f84bad
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 96341379ad..ff669e4b59 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@@ -143,6 +143,7 @@ export function ProgramPartnersApplicationsPageClient() {const { currentPartner, isLoading: isCurrentPartnerLoading } =useCurrentPartner({+ partners,partnerId: detailsSheetState.partnerId,});@@ -587,14 +588,26 @@ function RowMenuButton({}/** Gets the current partner from the loaded partners array if available, or a separate fetch if not */-function useCurrentPartner({ partnerId }: { partnerId: string | null }) {- const { partner, loading: isLoading } = usePartner(+function useCurrentPartner({+ partners,+ partnerId,+}: {+ partners?: ApplicationRow[];+ partnerId: string | null;+}) {+ const listedPartner = partnerId+ ? (partners?.find(({ id }) => id === partnerId) ?? null)+ : null;++ const { partner: fetchedPartner, loading: isLoading } = usePartner({ partnerId },{ keepPreviousData: true },);return {- currentPartner: partner?.id === partnerId ? partner : null,- isLoading: Boolean(partnerId) && isLoading,+ currentPartner:+ (fetchedPartner?.id === partnerId ? fetchedPartner : null) ??+ listedPartner,+ isLoading: Boolean(partnerId) && !listedPartner && isLoading,};}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 c417f9a98a..d25b538d36 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@@ -3,6 +3,7 @@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 { useProgramApplicationsFilters } from "@/lib/program-applications/hooks/use-program-applications-filters";import { buildSocialPlatformLookup } from "@/lib/social-utils";import { mutatePrefix } from "@/lib/swr/mutate";import useGroups from "@/lib/swr/use-groups";@@ -37,7 +38,6 @@ import { Command } from "cmdk";import { useAction } from "next-safe-action/hooks";import { useEffect, useMemo, useState } from "react";import { toast } from "sonner";-import { useProgramApplicationsFilters } from "@/lib/program-applications/hooks/use-program-applications-filters";type ApplicationPlatform = NonNullable<PartnerApplicationProps["partner"]["platforms"]@@ -135,6 +135,7 @@ export function ProgramPartnersRejectedApplicationsPageClient() {const { currentPartner, isLoading: isCurrentPartnerLoading } =useCurrentPartner({+ partners,partnerId: detailsSheetState.partnerId,});@@ -500,14 +501,26 @@ function PartnerRowMenuButton({);}-function useCurrentPartner({ partnerId }: { partnerId: string | null }) {- const { partner, loading: isLoading } = usePartner(+function useCurrentPartner({+ partners,+ partnerId,+}: {+ partners?: ApplicationRow[];+ partnerId: string | null;+}) {+ const listedPartner = partnerId+ ? partners?.find(({ id }) => id === partnerId) ?? null+ : null;++ const { partner: fetchedPartner, loading: isLoading } = usePartner({ partnerId },{ keepPreviousData: true },);return {- currentPartner: partner?.id === partnerId ? partner : null,- isLoading: Boolean(partnerId) && isLoading,+ currentPartner:+ (fetchedPartner?.id === partnerId ? fetchedPartner : null) ??+ listedPartner,+ isLoading: Boolean(partnerId) && !listedPartner && isLoading,};}diff --git a/apps/web/lib/program-applications/program-application-where.ts b/apps/web/lib/program-applications/program-application-where.tsindex bbf6adf41b..97a5db9ca3 100644--- a/apps/web/lib/program-applications/program-application-where.ts+++ b/apps/web/lib/program-applications/program-application-where.ts@@ -1,3 +1,5 @@+import { isExactPartnerIdQuery } from "@/lib/api/partners/program-enrollment-query";+import { sanitizeFullTextSearch } from "@/lib/prisma";import { getProgramApplicationsCountQuerySchema } from "@/lib/zod/schemas/program-application";import { parseFilterValue } from "@dub/utils";import { Prisma, ProgramEnrollmentStatus } from "@prisma/client";@@ -24,6 +26,47 @@ type ProgramApplicationWhereParams = Omit<programId: string;};+function applicationStatusWhere(+ status: ProgramApplicationWhereParams["status"],+): Prisma.ProgramApplicationWhereInput {+ return {+ rejectionReason:+ status === ProgramEnrollmentStatus.rejected ? { not: null } : null,+ };+}++function buildSearchWhere(query: string): Prisma.ProgramApplicationWhereInput {+ if (isExactPartnerIdQuery(query)) {+ return {+ enrollment: {+ partner: {+ id: query,+ },+ },+ };+ }++ const fullTextQuery = sanitizeFullTextSearch(query);++ return {+ OR: [+ { name: { contains: query } },+ { email: { contains: query } },+ ...(fullTextQuery+ ? [+ {+ enrollment: {+ partner: {+ companyName: { search: fullTextQuery },+ },+ },+ },+ ]+ : []),+ ],+ };+}+export function buildProgramApplicationWhere({programId,groupId,@@ -37,13 +80,9 @@ export function buildProgramApplicationWhere({return {programId,- enrollment: {- status,- },+ ...applicationStatusWhere(status),...(groupIdFilter && { groupId: groupIdFilter }),...(countryFilter && { country: countryFilter }),- ...(query && {- OR: [{ name: { contains: query } }, { email: { contains: query } }],- }),+ ...(query ? buildSearchWhere(query) : {}),};}diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.tsindex ca40404001..79a37ae9c9 100644--- a/apps/web/lib/zod/schemas/program-application.ts+++ b/apps/web/lib/zod/schemas/program-application.ts@@ -64,15 +64,20 @@ export const getPartnerApplicationsQuerySchema = getPartnersQuerySchema.pick({country: true,groupId: true,- search: true,sortOrder: true,}).extend({+ search: z+ .string()+ .optional()+ .describe(+ "Filter applications by name, email, or company name. Partial matches are supported. An exact partner ID is also matched.",+ ),status: z.enum(ProgramApplicationStatuses).default(ProgramEnrollmentStatus.pending).describe(- "Filter applications by enrollment status. One of `pending` or `rejected`. Defaults to `pending`.",+ "Filter applications by status. One of `pending` or `rejected`. Defaults to `pending`.",),...getPaginationQuerySchema({pageSize: PARTNERS_MAX_PAGE_SIZE,diff --git a/apps/web/ui/partners/partner-application-sheet.tsx b/apps/web/ui/partners/partner-application-sheet.tsxindex 950a866feb..a2b2c3213b 100644--- a/apps/web/ui/partners/partner-application-sheet.tsx+++ b/apps/web/ui/partners/partner-application-sheet.tsx@@ -1,6 +1,10 @@import { mutatePrefix } from "@/lib/swr/mutate";import useWorkspace from "@/lib/swr/use-workspace";-import { EnrolledPartnerProps } from "@/lib/types";+import {+ EnrolledPartnerExtendedProps,+ EnrolledPartnerProps,+ PartnerApplicationProps,+} from "@/lib/types";import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";import { useRejectPartnerApplicationModal } from "@/ui/modals/reject-partner-application-modal";import { X } from "@/ui/shared/icons";@@ -21,19 +25,25 @@ import { PartnerComments } from "./partner-comments";import { PartnerInfoCards } from "./partner-info-cards";import { PartnerSheetTabs } from "./partner-sheet-tabs";+type ListedApplicationPartner = PartnerApplicationProps["partner"] & {+ createdAt: Date;+ applicationId: string;+};+type PartnerApplicationSheetProps = {- partner: EnrolledPartnerProps;+ partner: EnrolledPartnerProps | ListedApplicationPartner;onNext?: () => void;onPrevious?: () => void;setIsOpen: Dispatch<SetStateAction<boolean>>;};function PartnerApplicationSheetContent({- partner,+ partner: sheetPartner,onPrevious,onNext,setIsOpen,}: PartnerApplicationSheetProps) {+ const partner = sheetPartner as EnrolledPartnerExtendedProps;const { slug: workspaceSlug } = useWorkspace();const [currentTabId, setCurrentTabId] = useState<string>("about");