The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Merge remote-tracking branch 'origin/main' into partner-link-titles
Rafi71bdf81e9452
diff --cc apps/web/app/(ee)/api/cron/export/events/partner/route.tsindex 5142465bcc,81009d3936..350244f49c--- a/apps/web/app/(ee)/api/cron/export/events/partner/route.ts+++ b/apps/web/app/(ee)/api/cron/export/events/partner/route.ts@@@ -13,10 -13,11 +13,11 @@@ import { generateRandomString } from "@import { MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING } from "@/lib/constants/partner-profile";import { verifyQstashSignature } from "@/lib/cron/verify-qstash";import { generateRandomName } from "@/lib/names";+ import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";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";@@@ -70,10 -76,24 +76,30 @@@ export async function POST(req: RequestpartnerId,programId,include: {- program: true,+ program: {+ select: {+ name: true,+ workspaceId: true,+ startedAt: true,+ createdAt: true,+ },+ },links: {- include: {- partnerLinkDetails: true,+ select: {+ id: true,+ domain: true,+ key: true,++ partnerLinkDetails: {++ select: {++ title: true,++ comments: true,++ },++ },+ },+ },+ partnerGroup: {+ select: {+ revenueDataSharingDisabledAt: true,},},},diff --cc apps/web/app/(ee)/api/embed/referrals/events/route.tsindex f14b1775f9,9e4f99eebe..398c42503e--- a/apps/web/app/(ee)/api/embed/referrals/events/route.ts+++ b/apps/web/app/(ee)/api/embed/referrals/events/route.ts@@@ -44,10 -47,9 +47,10 @@@ export const GET = withReferralsEmbedToconst { ip, click, customer, ...eventRest } = event;const { ip: _, ...clickRest } = click;- return {+ const mapped = {...eventRest,click: clickRest,+ // the embed token comes from the workspace, so no private partner link detailslink: event?.link ? PartnerProfileLinkSchema.parse(event.link) : null,...(customer && {customer: zdiff --cc apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.tsindex 89b9bec645,88cc1e64a9..65fdbe7d21--- 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@@@ -117,10 -137,15 +137,16 @@@ export const GET = withPartnerProfileuseComposite: true,skipEndpoints: PARTNER_PROFILE_SKIP_ENDPOINTS,skipTopLinksForSingleLink: hasExactlyOneLinkIdFilter(parsedParams.linkId),- formatRows: formatPartnerAnalyticsForExport,+ formatRows: (rows) => {+ const formatted = formatPartnerAnalyticsForExport(rows);++ return isPartnerRevenueHidden(partnerGroup)+ ? nullifyAnalyticsSaleAmounts(formatted)+ : formatted;+ },- getAnalyticsParams: () =>- parsedParams.linkId+ getAnalyticsParams: () => ({+ includePartnerLinkTitle: true,+ ...(parsedParams.linkId? { linkId: parsedParams.linkId }: links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING? { partnerId: partner.id }diff --cc apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/route.tsindex b1e344258e,cbb8753de8..018e968786--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/route.ts@@@ -9,11 -9,11 +9,12 @@@ importLARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS,} from "@/lib/constants/partner-profile";import { generateRandomName } from "@/lib/names";+ import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";import { prisma, sanitizeFullTextSearch } from "@/lib/prisma";import {- PartnerProfileCustomerSchema,getPartnerCustomersQuerySchema,+ mapPartnerLinkDetails,+ PartnerProfileCustomerSchema,} from "@/lib/zod/schemas/partner-profile";import { toCentsNumber } from "@dub/utils";import { CommissionType } from "@prisma/client";@@@ -108,32 -119,27 +124,29 @@@ export const GET = withPartnerProfile// Map customers with their dataconst customersWithData = customers.map((customer) => {+ const transformed = transformCustomer({+ ...customer,+ firstSaleAt: customer.commissions[0]?.createdAt ?? null,+ email: customer.email+ ? customerDataSharingEnabledAt+ ? customer.email+ : obfuscateCustomerEmail(customer.email)+ : customer.name || generateRandomName(),+ });+return PartnerProfileCustomerSchema.extend({...(customerDataSharingEnabledAt && { name: z.string().nullish() }),- })- .omit({- ...(CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(program.id) && {- saleAmount: true,- }),- })- .parse({- ...transformCustomer({- ...customer,- firstSaleAt: customer.commissions[0]?.createdAt ?? null,- email: customer.email- ? customerDataSharingEnabledAt- ? customer.email- : obfuscateCustomerEmail(customer.email)- : customer.name || generateRandomName(),- }),- activity: {- ...customer,- events: [],- link: customer.link- ? mapPartnerLinkDetails(customer.link)- : customer.link,- },- });+ }).parse({+ ...transformed,+ ...(ltvExcluded && { saleAmount: null }),+ activity: {+ ...customer,+ events: [],- link: customer.link,++ link: customer.link++ ? mapPartnerLinkDetails(customer.link)++ : customer.link,+ },+ });});return NextResponse.json(customersWithData);diff --cc apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/export/route.tsindex 2a7c294e98,8e4350ddca..12c78d0b77--- 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@@@ -17,8 -17,9 +17,9 @@@ import} from "@/lib/constants/partner-profile";import { qstash } from "@/lib/cron";import { generateRandomName } from "@/lib/names";+ import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";import {- PartnerProfileLinkSchema,+ parsePartnerProfileEventLink,partnerProfileEventsQuerySchema,} from "@/lib/zod/schemas/partner-profile";import {@@@ -35,19 -36,38 +36,44 @@@ const MAX_EVENTS_TO_EXPORT = 1000// GET /api/partner-profile/programs/[programId]/events/export – get export data for partner profile eventsexport const GET = withPartnerProfile(async ({ partner, params, searchParams, session }) => {- const { program, links, totalCommissions, customerDataSharingEnabledAt } =- await getProgramEnrollmentOrThrow({- partnerId: partner.id,- programId: params.programId,- include: {- program: true,- links: {- include: {- partnerLinkDetails: true,+ const {+ program,+ links,+ totalCommissions,+ customerDataSharingEnabledAt,+ partnerGroup,+ } = await getProgramEnrollmentOrThrow({+ partnerId: partner.id,+ programId: params.programId,+ include: {+ program: {+ select: {+ id: true,+ workspaceId: true,+ startedAt: true,+ createdAt: true,+ },+ },+ links: {+ select: {+ id: true,+ domain: true,+ key: true,++ partnerLinkDetails: {++ select: {++ title: true,++ comments: true,++ },+ },},},- });+ partnerGroup: {+ select: {+ revenueDataSharingDisabledAt: true,+ },+ },+ },+ });if (LARGE_PROGRAM_IDS.includes(program.id) &&diff --cc apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.tsindex c2345f4ace,7569134c05..425e1fe6fc--- 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@@@ -10,8 -10,10 +10,10 @@@ importMAX_PARTNER_LINKS_FOR_LOCAL_FILTERING,} from "@/lib/constants/partner-profile";import { generateRandomName } from "@/lib/names";+ import { nullifyPartnerEventRevenue } from "@/lib/partners/hide-partner-revenue";+ import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";import {- PartnerProfileLinkSchema,+ parsePartnerProfileEventLink,partnerProfileEventsQuerySchema,} from "@/lib/zod/schemas/partner-profile";import { parseFilterValue, toCentsNumber } from "@dub/utils";@@@ -21,19 -23,38 +23,44 @@@ import * as z from "zod/v4"// GET /api/partner-profile/programs/[programId]/events – get events for a program enrollment linkexport const GET = withPartnerProfile(async ({ partner, params, searchParams }) => {- const { program, links, totalCommissions, customerDataSharingEnabledAt } =- await getProgramEnrollmentOrThrow({- partnerId: partner.id,- programId: params.programId,- include: {- program: true,- links: {- include: {- partnerLinkDetails: true,+ const {+ program,+ links,+ totalCommissions,+ customerDataSharingEnabledAt,+ partnerGroup,+ } = await getProgramEnrollmentOrThrow({+ partnerId: partner.id,+ programId: params.programId,+ include: {+ program: {+ select: {+ id: true,+ workspaceId: true,+ startedAt: true,+ createdAt: true,+ },+ },+ links: {+ select: {+ id: true,+ domain: true,+ key: true,++ partnerLinkDetails: {++ select: {++ title: true,++ comments: true,++ },+ },},},- });+ partnerGroup: {+ select: {+ revenueDataSharingDisabledAt: true,+ },+ },+ },+ });if (LARGE_PROGRAM_IDS.includes(program.id) &&@@@ -119,12 -142,10 +148,12 @@@const { ip, click, customer, ...eventRest } = event;const { ip: _, ...clickRest } = click;- return {+ const mapped = {...eventRest,click: clickRest,- link: event?.link ? PartnerProfileLinkSchema.parse(event.link) : null,+ link: event?.link+ ? parsePartnerProfileEventLink(event.link, links)+ : null,...(customer && {customer: z.object({diff --cc apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.tsindex de9e261201,6b0b514d29..0f077628cf--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts@@@ -5,12 -5,11 +5,13 @@@ import { getProgramEnrollmentOrThrow }import { parseRequestBody } from "@/lib/api/utils";import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";import { withPartnerProfile } from "@/lib/auth/partner";+ import { hidePartnerSaleAmount } from "@/lib/partners/hide-partner-revenue";import { prisma } from "@/lib/prisma";import { NewLinkProps } from "@/lib/types";-import { PartnerProfileLinkSchema } from "@/lib/zod/schemas/partner-profile";-import { createPartnerLinkSchema } from "@/lib/zod/schemas/partners";+import {+ PartnerProfileLinkSchema,+ updatePartnerProfileLinkSchema,+} from "@/lib/zod/schemas/partner-profile";import { getPrettyUrl, toCentsNumber } from "@dub/utils";import { NextResponse } from "next/server";@@@ -175,11 -160,9 +176,16 @@@ export const PATCH = withPartnerProfile});return NextResponse.json(- PartnerProfileLinkSchema.parse({- ...partnerLink,- partnerLinkTitle: nextPartnerLinkTitle,- partnerLinkComments: nextPartnerLinkComments,- }),+ PartnerProfileLinkSchema.parse(- hidePartnerSaleAmount(partnerLink, group),++ hidePartnerSaleAmount(++ {++ ...partnerLink,++ partnerLinkTitle: nextPartnerLinkTitle,++ partnerLinkComments: nextPartnerLinkComments,++ },++ group,++ ),+ ),);},);diff --cc apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/route.tsindex 696aa5916a,264872530e..ca32db98b2--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/route.ts@@@ -5,14 -5,14 +5,15 @@@ import { getProgramEnrollmentOrThrow }import { parseRequestBody } from "@/lib/api/utils";import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";import { withPartnerProfile } from "@/lib/auth/partner";+ import { hidePartnerSaleAmount } from "@/lib/partners/hide-partner-revenue";import { prisma } from "@/lib/prisma";import { getResolvedPartnerLinkRewards } from "@/lib/rewards/get-resolved-partner-link-rewards";-import { PartnerProfileLinkSchema } from "@/lib/zod/schemas/partner-profile";import {- createPartnerLinkSchema,- INACTIVE_ENROLLMENT_STATUSES,-} from "@/lib/zod/schemas/partners";+ createPartnerProfileLinkSchema,+ mapPartnerLinkDetails,+ PartnerProfileLinkSchema,+} from "@/lib/zod/schemas/partner-profile";+import { INACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";import { NextResponse } from "next/server";import * as z from "zod/v4";@@@ -36,9 -37,13 +38,14 @@@ export const GET = withPartnerProfile(asaleReward: true,customReward: true,discount: true,+ partnerGroup: {+ select: {+ revenueDataSharingDisabledAt: true,+ },+ },links: {include: {+ partnerLinkDetails: true,linkReward: {include: {clickReward: true,@@@ -67,12 -72,15 +74,15 @@@enrollmentDiscount: discount,});- return {- ...mapPartnerLinkDetails(link),- ...resolvedRewards,- discountCode: discountCode?.code,- discountCodeDisabledAt: discountCode?.disabledAt ?? null,- };+ return hidePartnerSaleAmount(+ {- ...link,++ ...mapPartnerLinkDetails(link),+ ...resolvedRewards,+ discountCode: discountCode?.code,+ discountCodeDisabledAt: discountCode?.disabledAt ?? null,+ },+ group,+ );});return NextResponse.json(z.array(PartnerProfileLinkSchema).parse(result));@@@ -183,11 -191,9 +193,16 @@@ export const POST = withPartnerProfileconst partnerLink = await createLink(linkWithUtm);return NextResponse.json(- PartnerProfileLinkSchema.parse({- ...partnerLink,- partnerLinkTitle: partnerLinkTitle ?? null,- partnerLinkComments: partnerLinkComments ?? null,- }),+ PartnerProfileLinkSchema.parse(- hidePartnerSaleAmount(partnerLink, group),++ hidePartnerSaleAmount(++ {++ ...partnerLink,++ partnerLinkTitle: partnerLinkTitle ?? null,++ partnerLinkComments: partnerLinkComments ?? null,++ },++ group,++ ),+ ),{status: 201,},diff --cc apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/page.tsxindex 320a596a66,5c62105883..4d18db3eb1--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/page.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/page.tsx@@@ -4,9 -4,9 +4,10 @@@ importCUSTOMER_LTV_EXCLUDED_PROGRAM_IDS,PARTNER_CUSTOMERS_MAX_PAGE_SIZE,} from "@/lib/constants/partner-profile";+ import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";import usePartnerCustomers from "@/lib/swr/use-partner-customers";import usePartnerCustomersCount from "@/lib/swr/use-partner-customers-count";+import { usePartnerLinksDisplay } from "@/lib/swr/use-partner-links-display";import useProgramEnrollment from "@/lib/swr/use-program-enrollment";import { CustomerRowItem } from "@/ui/customers/customer-row-item";import { PartnerCustomersMenuPopover } from "@/ui/customers/partner-customers-menu-popover";@@@ -253,7 -245,7 +249,7 @@@ export default function PartnerProgramCheader: () => <EditColumnsButton table={table} />,},].filter((c) => c.id === "menu" || customersColumns.all.includes(c.id)),- [programSlug, displayProperties],- [programSlug, ltvExcluded],++ [programSlug, ltvExcluded, displayProperties],);const { table, ...tableProps } = useTable({diff --cc apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsxindex dad7ef7aa1,c7e17a6770..ac55f64f66--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx@@@ -1,8 -1,8 +1,9 @@@import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";import { constructPartnerLink } from "@/lib/partners/construct-partner-link";+ import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";import { QueryLinkStructureHelpText } from "@/lib/partners/query-link-structure-help-text";import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";+import { PartnerLinksDisplayContext } from "@/lib/swr/use-partner-links-display";import useProgramEnrollment from "@/lib/swr/use-program-enrollment";import { PartnerProfileLinkProps } from "@/lib/types";import { CommentsBadge } from "@/ui/links/comments-badge";diff --cc apps/web/lib/api/partner-profile/get-earnings-for-partner.tsindex 41bfe1bfa1,44b03efbed..5acbb04711--- a/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts+++ b/apps/web/lib/api/partner-profile/get-earnings-for-partner.ts@@@ -183,16 -184,8 +189,16 @@@ export async function getEarningsForParconst customerEmail =e.customer?.email || e.customer?.name || generateRandomName();- return {+ const earning = {...e,+ link: e.link+ ? {+ id: e.link.id,+ shortLink: e.link.shortLink,+ url: e.link.url,+ partnerLinkTitle: e.link.partnerLinkDetails?.title ?? null,+ }+ : e.link,customer: e.customer? {...e.customer,diff --cc apps/web/lib/zod/schemas/partner-profile.tsindex cb0f5962a2,0dc249b99a..2f8770b208--- a/apps/web/lib/zod/schemas/partner-profile.ts+++ b/apps/web/lib/zod/schemas/partner-profile.ts@@@ -31,10 -31,14 +31,14 @@@ import { DiscountSchema } from "./discoimport { LinkSchema } from "./links";import { booleanQuerySchema, getPaginationQuerySchema } from "./misc";import { payoutsQuerySchema } from "./payouts";- import { ProgramEnrollmentSchema, ProgramSchema } from "./programs";+ import {+ ProgramEnrollmentSchema,+ ProgramPartnerLinkSchema,+ ProgramSchema,+ } from "./programs";import { RewardSchema } from "./rewards";import { submittedLeadFormDataSchema } from "./submitted-lead-form";-import { centsSchema } from "./utils";+import { centsSchema, parseUrlSchema } from "./utils";export const PartnerEarningsSchema = CommissionSchema.omit({userId: true,@@@ -223,9 -198,9 +228,10 @@@ export const PartnerProfileLinkSchemaleads: true,sales: true,saleAmount: true,- comments: true,}).extend({+ saleAmount: centsSchema.nullable(),+ partnerLinkTitle: z.string().nullish().default(null),+ partnerLinkComments: z.string().nullish().default(null),createdAt: z.string().or(z.date()),partnerGroupDefaultLinkId: z.string().nullish(),clickReward: RewardSchema.nullable().default(null),diff --cc apps/web/ui/analytics/events/events-table.tsxindex 7a87666a60,c8095e0cc7..20e22f2fa1--- a/apps/web/ui/analytics/events/events-table.tsx+++ b/apps/web/ui/analytics/events/events-table.tsx@@@ -718,7 -708,7 +724,7 @@@ export default function EventsTable(minSize: col.minSize || 100,maxSize: col.maxSize || 1000,})),- [tab, product, partnerPage, shortLinkTitle],- [tab, product, partnerPage, hidePartnerRevenue],++ [tab, product, partnerPage, hidePartnerRevenue, shortLinkTitle],);const { pagination, setPagination } = usePagination();diff --cc apps/web/ui/partners/earnings/earnings-table.tsxindex 597b46aa96,54b311665e..6b85a08d1a--- a/apps/web/ui/partners/earnings/earnings-table.tsx+++ b/apps/web/ui/partners/earnings/earnings-table.tsx@@@ -1,7 -1,7 +1,8 @@@"use client";import { formatCommissionDescriptionTooltip } from "@/lib/commissions/format-commission-description-tooltip";+ import { isPartnerRevenueHidden } from "@/lib/partners/is-partner-revenue-hidden";+import { usePartnerLinksDisplay } from "@/lib/swr/use-partner-links-display";import usePartnerProfile from "@/lib/swr/use-partner-profile";import {usePartnerProfileEarnings,