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.

additive fields only

Steven Teyf11d70f133b7
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
index 3cffc93cd8..7305595c93 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
@@ -47,19 +47,16 @@ import { useAction } from "next-safe-action/hooks";
import { useEffect, useMemo, useState } from "react";
import { toast } from "sonner";
-const SOCIAL_PLATFORM_FIELDS = [
- "website",
- "youtube",
- "twitter",
- "linkedin",
- "instagram",
- "tiktok",
-] as const;
+type ApplicationPlatform = NonNullable<
+ ProgramApplicationProps["partner"]["platforms"]
+>[number];
type ApplicationRow = ProgramApplicationProps["partner"] & {
createdAt: ProgramApplicationProps["createdAt"];
applicationId: string;
- platformsByType: ReturnType<typeof buildSocialPlatformLookup>;
+ platformsByType: ReturnType<
+ typeof buildSocialPlatformLookup<ApplicationPlatform>
+ >;
};
const applicationsColumns = {
@@ -124,15 +121,7 @@ export function ApplicationsTable({
createdAt: application.createdAt,
applicationId: application.id,
platformsByType: buildSocialPlatformLookup(
- SOCIAL_PLATFORM_FIELDS.flatMap((type) => {
- const identifier = application.partner[type];
-
- if (!identifier) {
- return [];
- }
-
- return [{ type, identifier, verifiedAt: null }];
- }),
+ application.partner.platforms ?? [],
),
})),
[applications],
diff --git a/apps/web/lib/program-applications/list-program-applications.ts b/apps/web/lib/program-applications/list-program-applications.ts
index 3ffb4905b0..41d24fd384 100644
--- a/apps/web/lib/program-applications/list-program-applications.ts
+++ b/apps/web/lib/program-applications/list-program-applications.ts
@@ -1,6 +1,9 @@
import { formatApplicationFormData } from "@/lib/partners/format-application-form-data";
import { prisma } from "@/lib/prisma";
-import { polyfillSocialMediaFields } from "@/lib/social-utils";
+import {
+ buildSocialPlatformLookup,
+ polyfillSocialMediaFields,
+} from "@/lib/social-utils";
import { getProgramApplicationsQuerySchema } from "@/lib/zod/schemas/program-application";
import { Prisma, ProgramApplicationStatus } from "@prisma/client";
import * as z from "zod/v4";
@@ -71,15 +74,50 @@ function transformApplication(application: ProgramApplicationWithPartner) {
}),
);
+ const platformsByType = buildSocialPlatformLookup(partner.platforms);
+
+ const platforms = (
+ [
+ "website",
+ "youtube",
+ "twitter",
+ "linkedin",
+ "instagram",
+ "tiktok",
+ ] as const
+ ).flatMap((type) => {
+ const platform = platformsByType[type];
+ const identifier = application[type] ?? platform?.identifier;
+
+ if (!identifier) {
+ return [];
+ }
+
+ return [
+ {
+ type,
+ identifier,
+ verifiedAt:
+ platform?.identifier === identifier
+ ? platform.verifiedAt ?? null
+ : null,
+ },
+ ];
+ });
+
return {
id: application.id,
createdAt: application.createdAt,
applicationFormData,
partner: {
...partner,
- ...polyfillSocialMediaFields(partner.platforms),
+ name: application.name,
+ email: application.email,
+ country: application.country,
groupId: application.groupId,
status: application.status,
+ ...polyfillSocialMediaFields(platforms),
+ platforms,
},
};
}
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index d9bc2d6919..73d37d8603 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -5,11 +5,12 @@ import {
EnrolledPartnerSchema,
getPartnersQuerySchema,
OldPartnerPlatformsFields,
+ partnerPlatformSchema,
PARTNERS_MAX_PAGE_SIZE,
} from "./partners";
import { ProgramEnrollmentSchema } from "./programs";
-// Response for GET /api/partners/applications, GET /api/program-applications, and webhook payloads.
+// @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(),
@@ -39,7 +40,31 @@ export const PartnerApplicationSchema = z.object({
.nullable(),
});
-export const ProgramApplicationSchema = PartnerApplicationSchema;
+// Used by GET /api/program-applications. Additive over PartnerApplicationSchema; the flat social fields are kept for backward compatibility.
+export const ProgramApplicationSchema = PartnerApplicationSchema.extend({
+ partner: PartnerApplicationSchema.shape.partner
+ .extend(
+ EnrolledPartnerSchema.pick({
+ networkStatus: true,
+ defaultPayoutMethod: true,
+ payoutsEnabledAt: true,
+ }).shape,
+ )
+ .extend({
+ platforms: z
+ .array(
+ partnerPlatformSchema.pick({
+ type: true,
+ identifier: true,
+ verifiedAt: true,
+ }),
+ )
+ .nullish()
+ .describe(
+ "The partner's website and social profiles, including when each was verified.",
+ ),
+ }),
+});
export const partnerApplicationWebhookSchema = PartnerApplicationSchema;
diff --git a/apps/web/playwright/api/program-applications/program-applications.spec.ts b/apps/web/playwright/api/program-applications/program-applications.spec.ts
index a2730a568f..5e572e2f95 100644
--- a/apps/web/playwright/api/program-applications/program-applications.spec.ts
+++ b/apps/web/playwright/api/program-applications/program-applications.spec.ts
@@ -160,6 +160,8 @@ test.describe("program applications", () => {
approvedUs,
] = seeded;
+ // Application-level socials take precedence over the partner's platforms;
+ // verifiedAt is only kept when both identifiers match.
await prisma.programApplication.update({
where: { id: pendingUsWithPlatforms.id },
data: {
@@ -259,6 +261,9 @@ test.describe("program applications", () => {
image: null,
description: null,
country: "GB",
+ networkStatus: "draft",
+ defaultPayoutMethod: null,
+ payoutsEnabledAt: null,
groupId: extraGroup.id,
status: "pending",
website: null,
@@ -267,11 +272,12 @@ test.describe("program applications", () => {
linkedin: null,
instagram: null,
tiktok: null,
+ platforms: [],
},
});
});
- test("GET /program-applications – social fields and applicationFormData", async ({
+ test("GET /program-applications – platforms and applicationFormData", async ({
api,
}) => {
const { status, data } = await listApplications(api, {
@@ -284,10 +290,27 @@ test.describe("program applications", () => {
{ label: "How will you promote us?", value: "Newsletter" },
{ label: "Anything else?", value: null },
]);
+ expect(data[0].partner.platforms).toStrictEqual([
+ {
+ type: "website",
+ identifier: VERIFIED_WEBSITE,
+ verifiedAt: VERIFIED_AT.toISOString(),
+ },
+ {
+ type: "youtube",
+ identifier: "partner_channel",
+ verifiedAt: null,
+ },
+ {
+ type: "twitter",
+ identifier: "application_handle",
+ verifiedAt: null,
+ },
+ ]);
expect(data[0].partner).toMatchObject({
website: VERIFIED_WEBSITE,
youtube: "partner_channel",
- twitter: "partner_handle",
+ twitter: "application_handle",
linkedin: null,
instagram: null,
tiktok: null,