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.

Drop legacy social fields from /api/program-applications response

Kiran K2f6123892048
diff --git a/apps/web/app/(ee)/api/program-applications/route.ts b/apps/web/app/(ee)/api/program-applications/route.ts
index c6aae5c646..82c014953b 100644
--- a/apps/web/app/(ee)/api/program-applications/route.ts
+++ b/apps/web/app/(ee)/api/program-applications/route.ts
@@ -3,7 +3,7 @@ import { withWorkspace } from "@/lib/auth";
import { listProgramApplications } from "@/lib/program-applications/list-program-applications";
import {
getPartnerApplicationsQuerySchema,
- PartnerApplicationSchema,
+ ProgramApplicationSchema,
} from "@/lib/zod/schemas/program-application";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
@@ -27,7 +27,7 @@ export const GET = withWorkspace(
pageSize,
});
- const response = z.array(PartnerApplicationSchema).parse(applications);
+ const response = z.array(ProgramApplicationSchema).parse(applications);
return NextResponse.json(response);
},
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 ff669e4b59..e3225378b1 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
@@ -7,7 +7,7 @@ import { mutatePrefix } from "@/lib/swr/mutate";
import useGroups from "@/lib/swr/use-groups";
import usePartner from "@/lib/swr/use-partner";
import useWorkspace from "@/lib/swr/use-workspace";
-import { PartnerApplicationProps } from "@/lib/types";
+import { ProgramApplicationProps } from "@/lib/types";
import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";
import { useBulkApprovePartnersModal } from "@/ui/modals/bulk-approve-partners-modal";
import { useBulkRejectPartnersModal } from "@/ui/modals/bulk-reject-partners-modal";
@@ -43,11 +43,11 @@ import { useEffect, useMemo, useState } from "react";
import { useProgramApplicationsFilters } from "@/lib/program-applications/hooks/use-program-applications-filters";
type ApplicationPlatform = NonNullable<
- PartnerApplicationProps["partner"]["platforms"]
+ ProgramApplicationProps["partner"]["platforms"]
>[number];
-type ApplicationRow = PartnerApplicationProps["partner"] & {
- createdAt: PartnerApplicationProps["createdAt"];
+type ApplicationRow = ProgramApplicationProps["partner"] & {
+ createdAt: ProgramApplicationProps["createdAt"];
applicationId: string;
platformsByType: ReturnType<
typeof buildSocialPlatformLookup<ApplicationPlatform>
@@ -604,10 +604,19 @@ function useCurrentPartner({
{ keepPreviousData: true },
);
+ const matchingFetchedPartner =
+ fetchedPartner?.id === partnerId ? fetchedPartner : null;
+
+ const currentPartner = useMemo(
+ () =>
+ listedPartner
+ ? { ...matchingFetchedPartner, ...listedPartner }
+ : matchingFetchedPartner,
+ [listedPartner, matchingFetchedPartner],
+ );
+
return {
- currentPartner:
- (fetchedPartner?.id === partnerId ? fetchedPartner : null) ??
- listedPartner,
+ currentPartner,
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.tsx
index d25b538d36..6f1e90f46b 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
@@ -9,7 +9,7 @@ import { mutatePrefix } from "@/lib/swr/mutate";
import useGroups from "@/lib/swr/use-groups";
import usePartner from "@/lib/swr/use-partner";
import useWorkspace from "@/lib/swr/use-workspace";
-import { PartnerApplicationProps } from "@/lib/types";
+import { ProgramApplicationProps } from "@/lib/types";
import { useConfirmModal } from "@/ui/modals/confirm-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerApplicationSheet } from "@/ui/partners/partner-application-sheet";
@@ -40,11 +40,11 @@ import { useEffect, useMemo, useState } from "react";
import { toast } from "sonner";
type ApplicationPlatform = NonNullable<
- PartnerApplicationProps["partner"]["platforms"]
+ ProgramApplicationProps["partner"]["platforms"]
>[number];
-type ApplicationRow = PartnerApplicationProps["partner"] & {
- createdAt: PartnerApplicationProps["createdAt"];
+type ApplicationRow = ProgramApplicationProps["partner"] & {
+ createdAt: ProgramApplicationProps["createdAt"];
applicationId: string;
platformsByType: ReturnType<
typeof buildSocialPlatformLookup<ApplicationPlatform>
@@ -517,10 +517,19 @@ function useCurrentPartner({
{ keepPreviousData: true },
);
+ const matchingFetchedPartner =
+ fetchedPartner?.id === partnerId ? fetchedPartner : null;
+
+ const currentPartner = useMemo(
+ () =>
+ listedPartner
+ ? { ...matchingFetchedPartner, ...listedPartner }
+ : matchingFetchedPartner,
+ [listedPartner, matchingFetchedPartner],
+ );
+
return {
- currentPartner:
- (fetchedPartner?.id === partnerId ? fetchedPartner : null) ??
- listedPartner,
+ currentPartner,
isLoading: Boolean(partnerId) && !listedPartner && isLoading,
};
}
diff --git a/apps/web/lib/openapi/partners/list-program-applications.ts b/apps/web/lib/openapi/partners/list-program-applications.ts
index 5a461d9740..5dd1773395 100644
--- a/apps/web/lib/openapi/partners/list-program-applications.ts
+++ b/apps/web/lib/openapi/partners/list-program-applications.ts
@@ -1,7 +1,7 @@
import { openApiErrorResponses } from "@/lib/openapi/responses";
import {
getPartnerApplicationsQuerySchema,
- PartnerApplicationSchema,
+ ProgramApplicationSchema,
} from "@/lib/zod/schemas/program-application";
import { ZodOpenApiOperationObject } from "zod-openapi";
import * as z from "zod/v4";
@@ -20,7 +20,7 @@ export const listProgramApplications: ZodOpenApiOperationObject = {
description: "The list of pending program applications.",
content: {
"application/json": {
- schema: z.array(PartnerApplicationSchema),
+ schema: z.array(ProgramApplicationSchema),
},
},
},
diff --git a/apps/web/lib/program-applications/hooks/use-program-applications.ts b/apps/web/lib/program-applications/hooks/use-program-applications.ts
index 61b96d3324..bdf4b42fe8 100644
--- a/apps/web/lib/program-applications/hooks/use-program-applications.ts
+++ b/apps/web/lib/program-applications/hooks/use-program-applications.ts
@@ -3,7 +3,7 @@ import { fetcher } from "@dub/utils";
import useSWR from "swr";
import * as z from "zod/v4";
import useWorkspace from "../../swr/use-workspace";
-import { PartnerApplicationProps } from "../../types";
+import { ProgramApplicationProps } from "../../types";
import { getPartnerApplicationsQuerySchema } from "../../zod/schemas/program-application";
export function useProgramApplications({
@@ -33,7 +33,7 @@ export function useProgramApplications({
data: applications,
error,
isValidating,
- } = useSWR<PartnerApplicationProps[]>(
+ } = useSWR<ProgramApplicationProps[]>(
enabled !== false && defaultProgramId
? `/api/program-applications${queryString}`
: null,
diff --git a/apps/web/lib/program-applications/list-program-applications.ts b/apps/web/lib/program-applications/list-program-applications.ts
index ce7f2a255c..a05ea8035d 100644
--- a/apps/web/lib/program-applications/list-program-applications.ts
+++ b/apps/web/lib/program-applications/list-program-applications.ts
@@ -18,14 +18,9 @@ const programApplicationInclude = {
platforms: true,
},
},
- enrollment: {
- select: {
- status: true,
- },
- },
} satisfies Prisma.ProgramApplicationInclude;
-type ProgramApplicationWithEnrollment = Prisma.ProgramApplicationGetPayload<{
+type ProgramApplicationWithPartner = Prisma.ProgramApplicationGetPayload<{
include: typeof programApplicationInclude;
}>;
@@ -62,7 +57,7 @@ export async function listProgramApplications({
);
}
-function transformApplication(application: ProgramApplicationWithEnrollment) {
+function transformApplication(application: ProgramApplicationWithPartner) {
const partner = application.partner;
if (!partner) {
@@ -118,12 +113,6 @@ function transformApplication(application: ProgramApplicationWithEnrollment) {
country: application.country,
groupId: application.groupId,
status: application.status,
- website: application.website,
- youtube: application.youtube,
- twitter: application.twitter,
- linkedin: application.linkedin,
- instagram: application.instagram,
- tiktok: application.tiktok,
platforms,
},
};
diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.ts
index 8b953820ee..0810f24833 100644
--- a/apps/web/lib/types.ts
+++ b/apps/web/lib/types.ts
@@ -157,7 +157,10 @@ import {
payoutsCountQuerySchema,
payoutsQuerySchema,
} from "./zod/schemas/payouts";
-import { PartnerApplicationSchema } from "./zod/schemas/program-application";
+import {
+ PartnerApplicationSchema,
+ ProgramApplicationSchema,
+} from "./zod/schemas/program-application";
import {
programApplicationFormDataWithValuesSchema,
programApplicationFormFieldWithValuesSchema,
@@ -547,6 +550,8 @@ export type EnrolledPartnerProps = z.infer<typeof EnrolledPartnerSchema> & {
export type PartnerApplicationProps = z.infer<typeof PartnerApplicationSchema>;
+export type ProgramApplicationProps = z.infer<typeof ProgramApplicationSchema>;
+
export type NetworkPartnerProps = z.infer<typeof NetworkPartnerSchema>;
export type AdminNetworkPartner = z.infer<typeof adminNetworkPartnerSchema>;
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index 80389a52f5..9d986fc808 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -10,6 +10,7 @@ import {
} from "./partners";
import { ProgramEnrollmentSchema } from "./programs";
+// @deprecated Use ProgramApplicationSchema instead. Kept for GET /api/partners/applications and webhook payloads for backward compatibility.
export const PartnerApplicationSchema = z.object({
id: z.string(),
createdAt: z.coerce.date(),
@@ -56,6 +57,18 @@ export const PartnerApplicationSchema = z.object({
.nullable(),
});
+// Used by GET /api/program-applications. Omits the legacy flat social fields; use `partner.platforms` instead.
+export const ProgramApplicationSchema = PartnerApplicationSchema.extend({
+ partner: PartnerApplicationSchema.shape.partner.omit({
+ website: true,
+ youtube: true,
+ twitter: true,
+ linkedin: true,
+ instagram: true,
+ tiktok: true,
+ }),
+});
+
export const partnerApplicationWebhookSchema = PartnerApplicationSchema;
const ProgramApplicationStatuses = [
diff --git a/apps/web/ui/partners/partner-application-sheet.tsx b/apps/web/ui/partners/partner-application-sheet.tsx
index a2b2c37d67..f051a2906a 100644
--- a/apps/web/ui/partners/partner-application-sheet.tsx
+++ b/apps/web/ui/partners/partner-application-sheet.tsx
@@ -3,7 +3,7 @@ import useWorkspace from "@/lib/swr/use-workspace";
import {
EnrolledPartnerExtendedProps,
EnrolledPartnerProps,
- PartnerApplicationProps,
+ ProgramApplicationProps,
} from "@/lib/types";
import { useApprovePartnerApplicationModal } from "@/ui/modals/approve-partner-application-modal";
import { useRejectPartnerApplicationModal } from "@/ui/modals/reject-partner-application-modal";
@@ -28,7 +28,7 @@ import { PartnerComments } from "./partner-comments";
import { PartnerInfoCards } from "./partner-info-cards";
import { PartnerSheetTabs } from "./partner-sheet-tabs";
-type ListedApplicationPartner = PartnerApplicationProps["partner"] & {
+type ListedApplicationPartner = ProgramApplicationProps["partner"] & {
createdAt: Date;
applicationId: string;
};