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.

keep partner link titles off workspace analytics

Pedro Ladeiraa03bb887371f
diff --git a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
index c8970da248..32e2a45125 100644
--- a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts
@@ -15,8 +15,8 @@ import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
import { generateRandomName } from "@/lib/names";
import { prisma } from "@/lib/prisma";
import {
+ parsePartnerProfileEventLink,
partnerProfileEventsQuerySchema,
- PartnerProfileLinkSchema,
} from "@/lib/zod/schemas/partner-profile";
import { sendEmail } from "@dub/email";
import ExportReady from "@dub/email/templates/export-ready";
@@ -150,7 +150,9 @@ export async function POST(req: Request) {
return {
...eventRest,
click: clickRest,
- link: event?.link ? PartnerProfileLinkSchema.parse(event.link) : null,
+ link: event?.link
+ ? parsePartnerProfileEventLink(event.link, links)
+ : null,
...(customer && {
customer: z
.object({
diff --git a/apps/web/app/(ee)/api/embed/referrals/analytics/route.ts b/apps/web/app/(ee)/api/embed/referrals/analytics/route.ts
index 2dea1d3212..f714aea95d 100644
--- a/apps/web/app/(ee)/api/embed/referrals/analytics/route.ts
+++ b/apps/web/app/(ee)/api/embed/referrals/analytics/route.ts
@@ -26,6 +26,7 @@ export const GET = withReferralsEmbedToken(
...parsedQuery,
workspaceId: program.workspaceId,
linkId: parseFilterValue(links.map((link) => link.id)),
+ includePartnerLinkTitle: true,
dataAvailableFrom: program.startedAt ?? program.createdAt,
});
diff --git a/apps/web/app/(ee)/api/embed/referrals/events/route.ts b/apps/web/app/(ee)/api/embed/referrals/events/route.ts
index 85b601018d..f18314a9e3 100644
--- a/apps/web/app/(ee)/api/embed/referrals/events/route.ts
+++ b/apps/web/app/(ee)/api/embed/referrals/events/route.ts
@@ -3,8 +3,8 @@ import { obfuscateCustomerEmail } from "@/lib/api/partner-profile/obfuscate-cust
import { withReferralsEmbedToken } from "@/lib/embed/referrals/auth";
import { generateRandomName } from "@/lib/names";
import {
+ parsePartnerProfileEventLink,
partnerProfileEventsQuerySchema,
- PartnerProfileLinkSchema,
} from "@/lib/zod/schemas/partner-profile";
import { parseFilterValue } from "@dub/utils";
import { NextResponse } from "next/server";
@@ -47,7 +47,9 @@ export const GET = withReferralsEmbedToken(
return {
...eventRest,
click: clickRest,
- link: event?.link ? PartnerProfileLinkSchema.parse(event.link) : null,
+ link: event?.link
+ ? parsePartnerProfileEventLink(event.link, links)
+ : null,
...(customer && {
customer: z
.object({
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
index 012f12d60c..89b9bec645 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
@@ -118,12 +118,14 @@ export const GET = withPartnerProfile(
skipEndpoints: PARTNER_PROFILE_SKIP_ENDPOINTS,
skipTopLinksForSingleLink: hasExactlyOneLinkIdFilter(parsedParams.linkId),
formatRows: formatPartnerAnalyticsForExport,
- getAnalyticsParams: () =>
- parsedParams.linkId
+ getAnalyticsParams: () => ({
+ includePartnerLinkTitle: true,
+ ...(parsedParams.linkId
? { linkId: parsedParams.linkId }
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId: partner.id }
- : { linkId: parseFilterValue(links.map((link) => link.id)) },
+ : { linkId: parseFilterValue(links.map((link) => link.id)) }),
+ }),
getDataAvailableFrom: () => dataAvailableFrom,
});
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
index bd4945c79e..16c9ac6820 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
@@ -94,6 +94,7 @@ export const GET = withPartnerProfile(
: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
? { partnerId: partner.id }
: { linkId: parseFilterValue(links.map((link) => link.id)) }),
+ includePartnerLinkTitle: true,
dataAvailableFrom: program.startedAt ?? program.createdAt,
});
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
index c004073f05..39fa62ddab 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.ts
@@ -18,7 +18,7 @@ import {
import { qstash } from "@/lib/cron";
import { generateRandomName } from "@/lib/names";
import {
- PartnerProfileLinkSchema,
+ parsePartnerProfileEventLink,
partnerProfileEventsQuerySchema,
} from "@/lib/zod/schemas/partner-profile";
import {
@@ -211,7 +211,9 @@ export const GET = withPartnerProfile(
return {
...eventRest,
click: clickRest,
- link: event?.link ? PartnerProfileLinkSchema.parse(event.link) : null,
+ link: event?.link
+ ? parsePartnerProfileEventLink(event.link, links)
+ : null,
...(customer && {
customer: z
.object({
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
index d19ec2cdad..8fd7713e36 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
@@ -11,7 +11,7 @@ import {
} from "@/lib/constants/partner-profile";
import { generateRandomName } from "@/lib/names";
import {
- PartnerProfileLinkSchema,
+ parsePartnerProfileEventLink,
partnerProfileEventsQuerySchema,
} from "@/lib/zod/schemas/partner-profile";
import { parseFilterValue, serializeError, toCentsNumber } from "@dub/utils";
@@ -133,7 +133,9 @@ export const GET = withPartnerProfile(
return {
...eventRest,
click: clickRest,
- link: event?.link ? PartnerProfileLinkSchema.parse(event.link) : null,
+ link: event?.link
+ ? parsePartnerProfileEventLink(event.link, links)
+ : null,
...(customer && {
customer: z
.object({
diff --git a/apps/web/lib/analytics/get-analytics.ts b/apps/web/lib/analytics/get-analytics.ts
index 51f176a736..6de90cf9e9 100644
--- a/apps/web/lib/analytics/get-analytics.ts
+++ b/apps/web/lib/analytics/get-analytics.ts
@@ -41,7 +41,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
isDeprecatedClicksEndpoint = false,
dataAvailableFrom,
query,
- partnerId,
+ includePartnerLinkTitle = false,
} = params;
const normalizedLinkId = ensureParsedFilter(linkId);
@@ -218,7 +218,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
key: true,
url: true,
title: true,
- ...(partnerId ? { partnerLinkTitle: true as const } : {}),
+ ...(includePartnerLinkTitle ? { partnerLinkTitle: true as const } : {}),
comments: true,
folderId: true,
partnerId: true,
@@ -250,7 +250,7 @@ export const getAnalytics = async (params: AnalyticsFilters) => {
...item,
});
- if (partnerId && "partnerLinkTitle" in link) {
+ if (includePartnerLinkTitle && "partnerLinkTitle" in link) {
return {
...parsed,
partnerLinkTitle: link.partnerLinkTitle,
diff --git a/apps/web/lib/analytics/types.ts b/apps/web/lib/analytics/types.ts
index 04e304b2ce..3c97734de8 100644
--- a/apps/web/lib/analytics/types.ts
+++ b/apps/web/lib/analytics/types.ts
@@ -52,6 +52,8 @@ export type AnalyticsFilters = Partial<
// Accept plain string (from partner-profile/cron routes) or ParsedFilter (from API schema)
partnerId?: string | ParsedFilter;
linkId?: string | ParsedFilter;
+ // Partner-profile callers only. Not part of the public analytics query schema.
+ includePartnerLinkTitle?: boolean;
};
// Structural fields from eventsQuerySchema that should remain required
diff --git a/apps/web/lib/zod/schemas/partner-profile.ts b/apps/web/lib/zod/schemas/partner-profile.ts
index 5a3cb0e44f..f447a92046 100644
--- a/apps/web/lib/zod/schemas/partner-profile.ts
+++ b/apps/web/lib/zod/schemas/partner-profile.ts
@@ -229,6 +229,23 @@ export const PartnerProfileLinkSchema = LinkSchema.pick({
discountCodeDisabledAt: z.coerce.date().nullable().default(null),
});
+export function parsePartnerProfileEventLink<T extends { id: string }>(
+ eventLink: T,
+ links: {
+ id: string;
+ partnerLinkTitle?: string | null;
+ partnerLinkComments?: string | null;
+ }[],
+) {
+ const source = links.find((link) => link.id === eventLink.id);
+
+ return PartnerProfileLinkSchema.parse({
+ ...eventLink,
+ partnerLinkTitle: source?.partnerLinkTitle ?? null,
+ partnerLinkComments: source?.partnerLinkComments ?? null,
+ });
+}
+
export const PartnerProfileCustomerSchema = CustomerEnrichedSchema.pick({
id: true,
email: true,
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 7bb7b0ca54..141b54b9cf 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -563,6 +563,7 @@ export const EnrolledPartnerSchema = PartnerSchema.pick({
customerDataSharingEnabledAt: true,
groupMoveDisabledAt: true,
riskMonitoringDisabledAt: true,
+ partnerPreferences: true,
}).shape,
)
.extend({