The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Link level rewards (#4516)
Kiran Kd30b07d84078
diff --git a/apps/web/app/(ee)/api/cron/aggregate-clicks/process/route.ts b/apps/web/app/(ee)/api/cron/aggregate-clicks/process/route.tsdeleted file mode 100644index 3580d6731f..0000000000--- a/apps/web/app/(ee)/api/cron/aggregate-clicks/process/route.ts+++ /dev/null@@ -1,353 +0,0 @@-import { createId } from "@/lib/api/create-id";-import { serializeReward } from "@/lib/api/partners/serialize-reward";-import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";-import { getRewardSpendLimitWindow } from "@/lib/api/rewards/reward-spend-limit-window";-import { buildCommissionDescription } from "@/lib/commissions/build-commission-description";-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";-import { withCron } from "@/lib/cron/with-cron";-import { getRewardAmount } from "@/lib/partners/get-reward-amount";-import { prisma } from "@/lib/prisma";-import { getTopLinksByCountries } from "@/lib/tinybird/get-top-links-by-countries";-import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";-import {- APP_DOMAIN_WITH_NGROK,- currencyFormatter,- getPrettyUrl,-} from "@dub/utils";-import { CommissionType, EventType, Prisma, Reward } from "@prisma/client";-import * as z from "zod/v4";-import { logAndRespond } from "../../utils";-import { resolveClickReward } from "../resolve-click-reward-amount";--export const dynamic = "force-dynamic";--const inputSchema = z.object({- clickRewardId: z.string(),- startDate: z.coerce.date(),- endDate: z.coerce.date(),- startingAfter: z.string().optional(),-});--const BATCH_SIZE = 200;--type LinkEarnings = {- clicks: number;- earnings: number;- partnerId: string;-};--// POST /api/cron/aggregate-clicks/process-// Process a batch of links for a given click reward-export const POST = withCron(async ({ rawBody }) => {- const { clickRewardId, startDate, endDate, startingAfter } =- inputSchema.parse(JSON.parse(rawBody));-- const clickReward = await prisma.reward.findUnique({- where: {- id: clickRewardId,- },- });-- if (!clickReward) {- return logAndRespond(`Reward not found for ${clickRewardId}. Skipping...`);- }-- // When soft deleted- if (!clickReward.programId) {- return logAndRespond(- `Reward ${clickRewardId} is not associated with a program. Skipping...`,- );- }-- if (clickReward.event !== EventType.click) {- return logAndRespond(- `Reward ${clickRewardId} is not a click reward. Skipping...`,- );- }-- const links = await prisma.link.findMany({- where: {- programEnrollment: {- status: {- in: COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES,- },- clickRewardId,- },- clicks: {- gt: 0,- },- lastClicked: {- gte: startDate, // links that were clicked on after the start date- },- },- select: {- id: true,- shortLink: true,- programId: true,- partnerId: true,- },- ...(startingAfter && {- skip: 1,- cursor: {- id: startingAfter,- },- }),- orderBy: {- id: "asc",- },- take: BATCH_SIZE,- });-- if (links.length === 0) {- return logAndRespond(- `No more links found for ${clickRewardId}. Skipping...`,- );- }-- const clicksByCountries = await getTopLinksByCountries({- linkIds: links.map(({ id }) => id),- start: startDate,- end: endDate,- });-- // Group clicks by link- const clicksByLinkId = new Map<string, typeof clicksByCountries>();-- for (const click of clicksByCountries) {- const existing = clicksByLinkId.get(click.link_id) || [];- existing.push(click);- clicksByLinkId.set(click.link_id, existing);- }-- // Calculate earnings per link considering geo CPC- const linkEarningsMap = new Map<string, LinkEarnings>();-- for (const { id: linkId, shortLink, programId, partnerId } of links) {- if (!programId || !partnerId) {- console.log(`No click reward for link ${linkId}.`);- continue;- }-- const linkClicksByCountry = clicksByLinkId.get(linkId) || [];-- // Calculate earnings per country for each link- for (const { country, clicks } of linkClicksByCountry) {- const finalReward = resolveClickReward({- reward: clickReward,- country,- });-- const existing = linkEarningsMap.get(linkId) || {- clicks: 0,- earnings: 0,- };-- const amountInCents = getRewardAmount(serializeReward(finalReward));-- linkEarningsMap.set(linkId, {- clicks: existing.clicks + clicks,- earnings: existing.earnings + amountInCents * clicks,- partnerId,- });-- if (clickReward.modifiers) {- console.log(- `Earnings for link ${getPrettyUrl(shortLink)} for ${country}: ${currencyFormatter(amountInCents)} * ${clicks} = ${currencyFormatter(- amountInCents * clicks,- )}`,- );- }- }- }-- // Apply reward spend limit- const uniquePartners = new Set(- Array.from(linkEarningsMap.values(), ({ partnerId }) => partnerId),- );-- const historicalEarningsByPartner = await getHistoricalEarnings({- clickReward,- partnerIds: Array.from(uniquePartners),- aggregationStartDate: startDate,- });-- const aggregationDate = startDate.toISOString().split("T")[0];- const usedSpendLimitByPartner = new Map<string, number>();- let commissionsToCreate: Prisma.CommissionCreateManyInput[] = [];-- // Create commissions for each link- commissionsToCreate = links- .map(({ id: linkId, programId, partnerId }) => {- if (!programId || !partnerId) {- return null;- }-- const linkEarnings = linkEarningsMap.get(linkId);-- if (!linkEarnings) {- return null;- }-- let { clicks, earnings } = linkEarnings;-- if (clicks === 0 || earnings === 0) {- return null;- }-- let cappedEarnings = earnings;-- // Cap earnings to spend limit- if (clickReward.spendLimitAmount && clickReward.spendLimitInterval) {- const usedThisBatch = usedSpendLimitByPartner.get(partnerId) ?? 0;- const historicalEarnings =- historicalEarningsByPartner.get(partnerId) ?? 0;-- const remainingSpendLimit =- clickReward.spendLimitAmount - historicalEarnings - usedThisBatch;-- cappedEarnings = Math.max(0, Math.min(earnings, remainingSpendLimit));-- if (cappedEarnings === 0) {- console.log(`Reached spend limit for partner ${partnerId}.`);- return null;- }-- usedSpendLimitByPartner.set(partnerId, usedThisBatch + cappedEarnings);- }-- // Persist the base click reward description (no per-country clause —- // one commission can mix countries/rates).- const description = buildCommissionDescription({- reward: serializeReward(clickReward),- earnings,- cappedEarnings,- });-- return {- id: createId({ prefix: "cm_" }),- programId,- partnerId,- rewardId: clickReward.id,- linkId,- quantity: clicks,- type: CommissionType.click,- amount: 0,- earnings: cappedEarnings,- description,- createdAt: endDate,- invoiceId: `${linkId}-${aggregationDate}`, // used as a idempotency key- };- })- .filter((c): c is NonNullable<typeof c> => c !== null);-- const { count } = await prisma.commission.createMany({- data: commissionsToCreate,- skipDuplicates: true,- });-- console.log(- `Created ${count} commissions for click reward ${clickRewardId}.`,- );-- if (count > 0) {- console.table(commissionsToCreate);-- // Sync total commissions for each partner that we created commissions for- for (const { partnerId, programId } of commissionsToCreate) {- await syncTotalCommissions({- partnerId,- programId,- });- }-- console.log(- `Synced total commissions count for ${commissionsToCreate.length} partners`,- );- }-- // Schedule next batch if we have more links to process- if (links.length === BATCH_SIZE) {- const nextStartingAfter = links[links.length - 1].id;-- await enqueueBatchJobs([- {- queueName: "aggregate-clicks",- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/aggregate-clicks/process`,- body: {- clickRewardId: clickReward.id,- startDate,- endDate,- startingAfter: nextStartingAfter,- },- },- ]);-- return logAndRespond(- `Enqueued next batch for aggregate clicks cron (startingAfter: ${nextStartingAfter}).`,- );- }-- return logAndRespond("Aggregate clicks job processed successfully.");-});--async function getHistoricalEarnings({- clickReward,- partnerIds,- aggregationStartDate,-}: {- clickReward: Pick<- Reward,- "spendLimitAmount" | "spendLimitInterval" | "programId"- >;- partnerIds: string[];- aggregationStartDate: Date;-}) {- if (- !clickReward.spendLimitAmount ||- !clickReward.spendLimitInterval ||- !clickReward.programId- ) {- return new Map<string, number>();- }-- const { startDate, endDate } = getRewardSpendLimitWindow({- spendLimitInterval: clickReward.spendLimitInterval,- referenceDate: aggregationStartDate,- });-- const commissions = await prisma.commission.groupBy({- by: ["programId", "partnerId"],- where: {- programId: clickReward.programId,- partnerId: {- in: partnerIds,- },- type: CommissionType.click,- status: {- in: ["pending", "processed", "paid"],- },- ...(startDate && endDate- ? {- createdAt: {- gte: startDate,- lte: endDate,- },- }- : {}),- },- _sum: {- earnings: true,- },- });-- const historicalEarningsByPartner = new Map<string, number>();-- for (const commission of commissions) {- historicalEarningsByPartner.set(- commission.partnerId,- commission._sum.earnings ?? 0,- );- }-- return historicalEarningsByPartner;-}diff --git a/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts b/apps/web/app/(ee)/api/cron/aggregate-clicks/route.tsindex a7ea03bc66..5d38cb3829 100644--- a/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts+++ b/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts@@ -1,63 +1,73 @@-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";import { withCron } from "@/lib/cron/with-cron";-import { prisma } from "@/lib/prisma";-import { APP_DOMAIN_WITH_NGROK, chunk } from "@dub/utils";-import { EventType } from "@prisma/client";+import { aggregateClicksJob } from "@/lib/jobs/handlers/aggregate-clicks-job";+import { getClickRewardEnrollments } from "@/lib/rewards/get-click-reward-enrollments";import { logAndRespond } from "../utils";export const dynamic = "force-dynamic";+const BATCH_SIZE = 50;+// This route is used aggregate clicks events on daily basis for Program links and add to the Commission table// Runs every day at 00:00 (0 0 * * *)// POST /api/cron/aggregate-clicksexport const POST = withCron(async () => {- const clickRewards = await prisma.reward.findMany({- where: {- event: EventType.click,- clickEnrollments: {- some: {},- },- programId: {- not: null,- },- },- select: {- id: true,- },- });-- if (clickRewards.length === 0) {- return logAndRespond("No click rewards found. Skipping...");- }-const now = new Date();- // set 'start' to the beginning of the previous day (00:00:00)+ // Set 'start' to the beginning of the previous day (00:00:00)const startDate = new Date(now);startDate.setDate(startDate.getDate() - 1);startDate.setHours(0, 0, 0, 0);- // set 'end' to the end of the previous day (23:59:59)+ // Set 'end' to the end of the previous day (23:59:59)const endDate = new Date(now);endDate.setDate(endDate.getDate() - 1);endDate.setHours(23, 59, 59, 999);- for (const clickRewardsChunk of chunk(clickRewards, 50)) {- await enqueueBatchJobs(- clickRewardsChunk.map((clickReward) => ({- queueName: "aggregate-clicks",- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/aggregate-clicks/process`,- deduplicationId: `aggregate-clicks-${clickReward.id}`,- body: {- clickRewardId: clickReward.id,- startDate,- endDate,- },+ let startingAfterId: string | undefined;+ let enqueued = 0;++ while (true) {+ const programEnrollments = await getClickRewardEnrollments({+ startDate,+ startingAfterId,+ take: BATCH_SIZE,+ });++ if (programEnrollments.length === 0) {+ break;+ }++ const { published } = await aggregateClicksJob.dispatchBatch(+ programEnrollments.map(({ programId, partnerId }) => ({+ partnerId,+ programId,+ startDate,+ endDate,})),+ ({ partnerId }, index) => ({+ label: partnerId,+ deduplicationId: `aggregate-clicks-${programEnrollments[index].id}`,+ flowControl: {+ key: "aggregate-clicks",+ parallelism: 10,+ },+ }),);++ enqueued += published;++ if (programEnrollments.length < BATCH_SIZE) {+ break;+ }++ startingAfterId = programEnrollments[programEnrollments.length - 1].id;+ }++ if (enqueued === 0) {+ return logAndRespond("No program enrollments found. Skipping...");}return logAndRespond(- `Enqueued aggregate clicks jobs for ${clickRewards.length} click rewards.`,+ `Enqueued aggregate clicks jobs for ${enqueued} enrollments.`,);});diff --git a/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts b/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.tsindex f50e81cfa4..f2de40087b 100644--- a/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts+++ b/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts@@ -1,3 +1,4 @@+import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";import { withCron } from "@/lib/cron/with-cron";import { prisma } from "@/lib/prisma";import { subMinutes } from "date-fns";@@ -5,17 +6,38 @@ import { logAndRespond } from "../../utils";export const dynamic = "force-dynamic";-// The rewards/process cron normally hard-deletes once enrollments are cleared, but a newer-// reward change for the same group + event type can bump the version and skip stale jobs-// (e.g. delete then create), leaving the old row behind. This job is a safety net for those orphans.+const STALE_AFTER_MINUTES = 30;++// Safety net for leftover rows after request-path updates:+// - Rewards: rewards/process normally hard-deletes once enrollments are cleared,+// but a newer reward change can skip stale jobs (e.g. delete then create).+// - LinkReward: update-partner-link nulls override IDs instead of deleting the row.+// Discount deletes SetNull LinkReward.discountId the same way.// POST /api/cron/cleanup/orphaned-rewardsexport const POST = withCron(async () => {+ const cutoff = subMinutes(new Date(), STALE_AFTER_MINUTES);++ const [deletedRewardsCount, deletedLinkRewardsCount] = await Promise.all([+ deleteOrphanedRewards(cutoff),+ deleteEmptyLinkRewards(),+ ]);++ if (deletedRewardsCount === 0 && deletedLinkRewardsCount === 0) {+ return logAndRespond("No orphaned rewards or empty link rewards found.");+ }++ return logAndRespond(+ `Finished cleanup (${deletedRewardsCount} rewards, ${deletedLinkRewardsCount} empty link rewards deleted).`,+ );+});++async function deleteOrphanedRewards(cutoff: Date) {const rewards = await prisma.reward.findMany({where: {programId: null,updatedAt: {- lt: subMinutes(new Date(), 30), // only look for rewards older than 30 minutes ago+ lt: cutoff,},},select: {@@ -42,7 +64,7 @@ export const POST = withCron(async () => {});if (rewards.length === 0) {- return logAndRespond("No orphaned rewards found.");+ return 0;}const rewardsToDelete = rewards.filter((reward) => {@@ -65,7 +87,7 @@ export const POST = withCron(async () => {);if (rewardsToDelete.length === 0) {- return logAndRespond("No rewards to delete, skipping...");+ return 0;}const deletedRewards = await prisma.reward.deleteMany({@@ -76,7 +98,29 @@ export const POST = withCron(async () => {},});- return logAndRespond(- `Finished deleting orphaned rewards (${deletedRewards.count} rewards deleted).`,- );-});+ return deletedRewards.count;+}++async function deleteEmptyLinkRewards() {+ let deletedCount = 0;++ while (true) {+ const { count } = await prisma.linkReward.deleteMany({+ where: {+ clickRewardId: null,+ leadRewardId: null,+ saleRewardId: null,+ discountId: null,+ },+ limit: PRISMA_UPDATEMANY_LIMIT,+ });++ if (count === 0) {+ break;+ }++ deletedCount += count;+ }++ return deletedCount;+}diff --git a/apps/web/app/(ee)/api/cron/discount-codes/create/route.ts b/apps/web/app/(ee)/api/cron/discount-codes/create/route.tsindex 444e7e29b8..fa4b8b7161 100644--- a/apps/web/app/(ee)/api/cron/discount-codes/create/route.ts+++ b/apps/web/app/(ee)/api/cron/discount-codes/create/route.ts@@ -26,6 +26,11 @@ export const POST = withCron(async ({ rawBody }) => {id: true,discountCode: true,partnerGroupDefaultLinkId: true,+ linkReward: {+ select: {+ discount: true,+ },+ },programEnrollment: {select: {discount: true,@@ -75,15 +80,23 @@ export const POST = withCron(async ({ rawBody }) => {const {project: workspace,- programEnrollment: { program, partner, discount },+ programEnrollment: { program, partner },} = link;+ const discount = link.linkReward?.discount ?? link.programEnrollment.discount;+if (!discount) {return logAndRespond(`Partner ${partner.id} does not have a discount with program ${program.id}. Skipping...`,);}+ if (!discount.autoProvisionEnabledAt) {+ return logAndRespond(+ `Discount ${discount.id} does not have auto-provision enabled. Skipping...`,+ );+ }+try {await createDiscountCode({workspace,diff --git a/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts b/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.tsindex e1028fa51b..5d98ee0e1f 100644--- a/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts+++ b/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts@@ -1,10 +1,6 @@import { withCron } from "@/lib/cron/with-cron";-import { createDiscountCode } from "@/lib/discounts/create-discount-code";-import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";-import { isDiscountProviderError } from "@/lib/discounts/discount-error";-import { isDiscountEquivalent } from "@/lib/discounts/is-discount-equivalent";+import { remapDiscountCodesForPartnerJob } from "@/lib/jobs/handlers/remap-discount-codes-for-partner-job";import { prisma } from "@/lib/prisma";-import { DiscountCode } from "@prisma/client";import * as z from "zod/v4";import { logAndRespond } from "../../utils";@@ -49,139 +45,30 @@ export const POST = withCron(async ({ rawBody }) => {return logAndRespond("No program enrollments found.");}- const group = await prisma.partnerGroup.findUnique({+ const partnerGroup = await prisma.partnerGroup.findUnique({where: {id: groupId,},- include: {- discount: true,+ select: {+ id: true,},});- if (!group) {+ if (!partnerGroup) {return logAndRespond("Group not found.");}- const discountCodes = programEnrollments.flatMap(- ({ discountCodes }) => discountCodes,+ // Remap existing codes and enqueue missing default-link codes per partner.+ await remapDiscountCodesForPartnerJob.dispatchBatch(+ partnerIds.map((partnerId) => ({+ programId,+ partnerId,+ })),+ ({ partnerId }) => ({+ label: partnerId,+ }),);- // Find the discount codes to update and remove- const discountCodesToUpdate: DiscountCode[] = [];- const discountCodesToRemove: typeof discountCodes = [];-- for (const discountCode of discountCodes) {- const keepDiscountCode = isDiscountEquivalent(- group.discount,- discountCode.discount,- );-- if (keepDiscountCode) {- discountCodesToUpdate.push(discountCode);- } else {- discountCodesToRemove.push(discountCode);- }- }-- // Update the discount codes to use the new discount if they are equivalent- if (discountCodesToUpdate.length > 0) {- console.log(- `Found ${discountCodesToUpdate.length} discount codes equivalent to the new group's discount. Updating them.`,- );-- await prisma.discountCode.updateMany({- where: {- id: {- in: discountCodesToUpdate.map(({ id }) => id),- },- },- data: {- discountId: group.discount?.id,- },- });- }-- // Remove the previous discount codes- if (discountCodesToRemove.length > 0) {- console.log(- `Found ${discountCodesToRemove.length} discount codes not equivalent to the new group's discount. Deleting them.`,- );-- await deleteDiscountCodes(discountCodesToRemove);- }-- if (group.discount?.autoProvisionEnabledAt) {- // Find the partner default links that don't have a discount code yet- const links = await prisma.link.findMany({- where: {- partnerId: {- in: partnerIds,- },- programId,- partnerGroupDefaultLinkId: {- not: null,- },- discountCode: {- is: null,- },- },- select: {- id: true,- programEnrollment: {- select: {- partner: {- select: {- id: true,- name: true,- },- },- },- },- },- });-- if (links.length > 0) {- const workspace = await prisma.project.findUniqueOrThrow({- where: {- defaultProgramId: programId,- },- select: {- id: true,- webhookEnabled: true,- stripeConnectId: true,- shopifyStoreId: true,- },- });-- // Create discount code for the partner default links- for (const link of links) {- try {- await createDiscountCode({- workspace,- partner: link.programEnrollment!.partner,- link,- discount: group.discount,- });- } catch (error) {- if (isDiscountProviderError(error)) {- if (- error.providerCode === "INTEGRATION_NOT_AVAILABLE" ||- error.providerCode === "AUTH_EXPIRED" ||- error.providerCode === "PERMISSIONS_REQUIRED" ||- error.providerCode === "COUPON_NOT_FOUND"- ) {- console.warn(- `${error.message} Skipping remaining discount code creation for remap.`,- );- break;- }- }- throw error;- }- }- }- }-// if the group is deleted, need to check if there are any remaining discount codes, if not, delete the discountif (isGroupDeleted && oldDiscount) {const remainingDiscountCodes = await prisma.discountCode.count({diff --git a/apps/web/app/(ee)/api/discount-codes/route.ts b/apps/web/app/(ee)/api/discount-codes/route.tsindex fd7248181a..c79d0ba8ca 100644--- a/apps/web/app/(ee)/api/discount-codes/route.ts+++ b/apps/web/app/(ee)/api/discount-codes/route.ts@@ -84,6 +84,11 @@ export const POST = withWorkspace(links: {select: {id: true,+ linkReward: {+ select: {+ discount: true,+ },+ },},},discountCodes: {@@ -101,7 +106,7 @@ export const POST = withWorkspace(},});- const { links, discount } = programEnrollment;+ const { links, discount: enrollmentDiscount } = programEnrollment;const link = links.find((link) => link.id === linkId);@@ -112,11 +117,14 @@ export const POST = withWorkspace(});}+ // Prefer the link discount if it exists, otherwise use the enrollment discount+ const discount = link.linkReward?.discount ?? enrollmentDiscount;+if (!discount) {throw new DubApiError({code: "bad_request",message:- "No discount is assigned to this partner group. Please add a discount before proceeding.",+ "No discount is assigned to this partner or link. Please add a discount before proceeding.",});}diff --git 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.tsindex da514026b8..66dde4fd6c 100644--- 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@@ -6,6 +6,7 @@ import { parseRequestBody } from "@/lib/api/utils";import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";import { withPartnerProfile } from "@/lib/auth/partner";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,@@ -16,12 +17,36 @@ import * as z from "zod/v4";// GET /api/partner-profile/programs/[programId]/links - get a partner's links in a programexport const GET = withPartnerProfile(async ({ partner, params }) => {- const { links, discountCodes } = await getProgramEnrollmentOrThrow({+ const {+ links,+ discountCodes,+ clickReward,+ leadReward,+ saleReward,+ customReward,+ discount,+ } = await getProgramEnrollmentOrThrow({partnerId: partner.id,programId: params.programId,include: {- links: true,discountCodes: true,+ clickReward: true,+ leadReward: true,+ saleReward: true,+ customReward: true,+ discount: true,+ links: {+ include: {+ linkReward: {+ include: {+ clickReward: true,+ leadReward: true,+ saleReward: true,+ discount: true,+ },+ },+ },+ },},});@@ -30,11 +55,19 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {discountCodes?.map((discountCode) => [discountCode.linkId, discountCode]),);+ const enrollmentRewards = [clickReward, leadReward, saleReward, customReward];+const result = links.map((link) => {const discountCode = linksByDiscountCode.get(link.id);+ const resolvedRewards = getResolvedPartnerLinkRewards({+ linkReward: link.linkReward,+ enrollmentRewards,+ enrollmentDiscount: discount,+ });return {...link,+ ...resolvedRewards,discountCode: discountCode?.code,discountCodeDisabledAt: discountCode?.disabledAt ?? null,};diff --git a/apps/web/app/(ee)/api/partners/links/[linkId]/route.ts b/apps/web/app/(ee)/api/partners/links/[linkId]/route.tsnew file mode 100644index 0000000000..abe611e6a3--- /dev/null+++ b/apps/web/app/(ee)/api/partners/links/[linkId]/route.ts@@ -0,0 +1,31 @@+import { updatePartnerLink } from "@/lib/api/partners/update-partner-link";+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";+import { parseRequestBody } from "@/lib/api/utils";+import { withWorkspace } from "@/lib/auth";+import { updatePartnerLinkSchema } from "@/lib/zod/schemas/partners";+import { ProgramPartnerLinkSchemaInternal } from "@/lib/zod/schemas/programs";+import { NextResponse } from "next/server";++// PATCH /api/partners/links/[linkId]+export const PATCH = withWorkspace(+ async ({ workspace, req, params, session }) => {+ const programId = getDefaultProgramIdOrThrow(workspace);+ const { linkId } = params;++ const body = updatePartnerLinkSchema.parse(await parseRequestBody(req));++ const response = await updatePartnerLink({+ workspace,+ programId,+ linkId,+ userId: session.user.id,+ ...body,+ });++ return NextResponse.json(ProgramPartnerLinkSchemaInternal.parse(response));+ },+ {+ requiredPlan: ["business", "advanced", "enterprise"],+ requiredPermissions: ["links.write"],+ },+);diff --git a/apps/web/app/(ee)/api/partners/links/route.ts b/apps/web/app/(ee)/api/partners/links/route.tsindex ab71942715..455d74b668 100644--- a/apps/web/app/(ee)/api/partners/links/route.ts+++ b/apps/web/app/(ee)/api/partners/links/route.ts@@ -1,19 +1,31 @@+import { trackLinkRewardOverrideLog } from "@/lib/api/activity-log/track-reward-overrides";import { DubApiError, ErrorCodes } from "@/lib/api/errors";import { createLink, processLink } from "@/lib/api/links";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";+import {+ hasRewardAssignment,+ omitGroupDefaultRewardIds,+ toPartnerLinkRewardIdFields,+} from "@/lib/api/rewards/reward-overrides";+import { throwIfInvalidRewards } from "@/lib/api/rewards/throw-if-invalid-rewards";import { parseRequestBody } from "@/lib/api/utils";import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";import { withWorkspace } from "@/lib/auth";import { throwIfNoPartnerIdOrTenantId } from "@/lib/partners/throw-if-no-partnerid-tenantid";+import { getPlanCapabilities } from "@/lib/plan-capabilities";import { prisma } from "@/lib/prisma";+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";import { sendWorkspaceWebhook } from "@/lib/webhook/publish";import { linkEventSchema } from "@/lib/zod/schemas/links";import {- createPartnerLinkSchema,- retrievePartnerLinksSchema,+ createPartnerLinkSchemaInternal,+ retrievePartnerLinksSchemaInternal,} from "@/lib/zod/schemas/partners";-import { ProgramPartnerLinkSchema } from "@/lib/zod/schemas/programs";+import {+ ProgramPartnerLinkSchema,+ ProgramPartnerLinkSchemaInternal,+} from "@/lib/zod/schemas/programs";import { waitUntil } from "@vercel/functions";import { NextResponse } from "next/server";import * as z from "zod/v4";@@ -23,8 +35,8 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {const programId = getDefaultProgramIdOrThrow(workspace);- const { partnerId, tenantId } =- retrievePartnerLinksSchema.parse(searchParams);+ const { partnerId, tenantId, includeRewards } =+ retrievePartnerLinksSchemaInternal.parse(searchParams);throwIfNoPartnerIdOrTenantId({ partnerId, tenantId });@@ -43,7 +55,11 @@ export const GET = withWorkspace(},},select: {- links: true,+ links: {+ include: {+ linkReward: includeRewards,+ },+ },},});@@ -54,9 +70,19 @@ export const GET = withWorkspace(});}- const { links } = programEnrollment;+ // Not exposing the reward ids to the public API for now+ const links = includeRewards+ ? programEnrollment.links.map((link) => ({+ ...link,+ ...toPartnerLinkRewardIdFields(link.linkReward),+ }))+ : programEnrollment.links;- return NextResponse.json(z.array(ProgramPartnerLinkSchema).parse(links));+ const responseSchema = includeRewards+ ? ProgramPartnerLinkSchemaInternal+ : ProgramPartnerLinkSchema;++ return NextResponse.json(z.array(responseSchema).parse(links));},{requiredPlan: ["business", "advanced", "enterprise"],@@ -69,8 +95,17 @@ export const POST = withWorkspace(async ({ workspace, req, session }) => {const programId = getDefaultProgramIdOrThrow(workspace);- const { partnerId, tenantId, url, key, linkProps } =- createPartnerLinkSchema.parse(await parseRequestBody(req));+ const {+ partnerId,+ tenantId,+ url,+ key,+ linkProps,+ clickRewardId,+ leadRewardId,+ saleRewardId,+ discountId,+ } = createPartnerLinkSchemaInternal.parse(await parseRequestBody(req));const program = await getProgramOrThrow({workspaceId: workspace.id,@@ -157,17 +192,77 @@ export const POST = withWorkspace(partnerName: partner.partner.name,});- const partnerLink = await createLink(linkWithUtm);+ // Validate link-level rewards+ const linkRewardInput = omitGroupDefaultRewardIds({+ rewardIds: {+ clickRewardId,+ leadRewardId,+ saleRewardId,+ discountId,+ },+ groupDefaults: partnerGroup,+ });++ const hasLinkLevelReward = hasRewardAssignment(linkRewardInput);++ if (+ hasLinkLevelReward &&+ !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic+ ) {+ throw new DubApiError({+ code: "forbidden",+ message: PARTNER_LEVEL_REWARDS_PLAN_ERROR,+ });+ }++ await throwIfInvalidRewards({+ programId,+ groupId: partnerGroup.id,+ ...linkRewardInput,+ });++ const partnerLink = await createLink({+ ...linkWithUtm,+ ...(hasLinkLevelReward && { linkReward: linkRewardInput }),+ });waitUntil(- sendWorkspaceWebhook({- trigger: "link.created",- workspace,- data: linkEventSchema.parse(partnerLink),- }),+ Promise.allSettled([+ sendWorkspaceWebhook({+ trigger: "link.created",+ workspace,+ data: linkEventSchema.parse(partnerLink),+ }),++ ...(hasLinkLevelReward+ ? [+ trackLinkRewardOverrideLog({+ workspaceId: workspace.id,+ programId: program.id,+ partnerId: partner.partnerId,+ userId: session.user.id,+ previous: {+ clickRewardId: null,+ leadRewardId: null,+ saleRewardId: null,+ discountId: null,+ },+ next: {+ clickRewardId: linkRewardInput.clickRewardId ?? null,+ leadRewardId: linkRewardInput.leadRewardId ?? null,+ saleRewardId: linkRewardInput.saleRewardId ?? null,+ discountId: linkRewardInput.discountId ?? null,+ },+ link: partnerLink,+ }),+ ]+ : []),+ ]),);- return NextResponse.json(partnerLink, { status: 201 });+ return NextResponse.json(partnerLink, {+ status: 201,+ });},{requiredPlan: ["business", "advanced", "enterprise"],diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.tsindex 1c6d70ac3a..db03c2187d 100644--- a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts@@ -74,6 +74,12 @@ export async function checkoutSessionCompleted({};}+ if (clickEvent.workspace_id !== workspace.id) {+ return {+ response: `Link "${clickEvent.link_id}" for click event "${dubClickId}" does not belong to workspace ${workspace.id}, skipping...`,+ };+ }+const payload = {name: stripeCustomerName,email: stripeCustomerEmail,diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.tsindex cedb449c39..fab9622987 100644--- a/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts@@ -1,10 +1,12 @@import { getWorkspaceUsers } from "@/lib/api/get-workspace-users";-import { qstash } from "@/lib/cron";+import { getPartnersByDiscountIds } from "@/lib/discounts/get-partners-by-discount-ids";+import { invalidateLinksForDiscountsJob } from "@/lib/jobs/handlers/invalidate-links-for-discounts-job";import { prisma } from "@/lib/prisma";import { sendBatchEmail } from "@dub/email";import { VARIANT_TO_FROM_MAP } from "@dub/email/resend/constants";import DiscountDeleted from "@dub/email/templates/discount-deleted";-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";+import { pluck } from "@dub/utils";+import { DiscountProvider } from "@prisma/client";import { waitUntil } from "@vercel/functions";import type Stripe from "stripe";import { WebhookHandlerInput, WebhookHandlerResponse } from "./types";@@ -19,8 +21,9 @@ export async function couponDeleted({>): Promise<WebhookHandlerResponse> {const coupon = event.data.object;const stripeAccountId = event.account as string;+ const programId = workspace.defaultProgramId;- if (!workspace.defaultProgramId) {+ if (!programId) {return {response: `Workspace ${workspace.id} for stripe account ${stripeAccountId} has no programs.`,};@@ -28,62 +31,60 @@ export async function couponDeleted({const discounts = await prisma.discount.findMany({where: {- programId: workspace.defaultProgramId,+ programId,+ provider: DiscountProvider.stripe,OR: [{ couponId: coupon.id }, { couponTestId: coupon.id }],},- include: {- partnerGroup: true,- },});- if (!discounts.length) {+ if (discounts.length === 0) {return {response: `Discount not found for Stripe coupon ${coupon.id}.`,};}- const discountIds = discounts.map((d) => d.id);+ const discountIds = pluck(discounts, "id");+ const partners = await getPartnersByDiscountIds({ discountIds });+ const partnerIds = pluck(partners, "id");await prisma.$transaction(async (tx) => {- if (discountIds.length > 0) {- await tx.partnerGroup.updateMany({- where: {- discountId: {- in: discountIds,- },- },- data: {- discountId: null,+ await tx.partnerGroup.updateMany({+ where: {+ discountId: {+ in: discountIds,},- });+ },+ data: {+ discountId: null,+ },+ });- await tx.programEnrollment.updateMany({- where: {- discountId: {- in: discountIds,- },+ await tx.programEnrollment.updateMany({+ where: {+ discountId: {+ in: discountIds,},- data: {- discountId: null,- },- });+ },+ data: {+ discountId: null,+ },+ });- await tx.discountCode.deleteMany({- where: {- discountId: {- in: discountIds,- },+ await tx.discountCode.deleteMany({+ where: {+ discountId: {+ in: discountIds,},- });+ },+ });- await tx.discount.deleteMany({- where: {- id: {- in: discountIds,- },+ await tx.discount.deleteMany({+ where: {+ id: {+ in: discountIds,},- });- }+ },+ });});waitUntil(@@ -93,19 +94,21 @@ export async function couponDeleted({role: "owner",});- const groupIds = discounts- .map((d) => d.partnerGroup?.id)- .filter(Boolean) as string[];-await Promise.allSettled([- ...groupIds.map((groupId) =>- qstash.publishJSON({- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/links/invalidate-for-discounts`,- body: {- groupId,- },- }),- ),+ ...(partnerIds.length > 0+ ? [+ invalidateLinksForDiscountsJob.dispatch(+ {+ type: "partners",+ programId,+ partnerIds,+ },+ {+ label: coupon.id,+ },+ ),+ ]+ : []),sendBatchEmail(users.map((user) => ({diff --git a/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts b/apps/web/app/(ee)/api/workflows/create-partner-commission/route.tsindex 0d33f5be07..aabca257e9 100644--- a/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts+++ b/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts@@ -84,7 +84,7 @@ const commissionInclude: Prisma.CommissionInclude = {export const { POST } = serve<Input>(async (context) => {const input = context.requestPayload;- const { event, partnerId, programId, bountySubmissionId } = input;+ const { event, partnerId, programId, linkId, bountySubmissionId } = input;const programEnrollment = await getProgramEnrollmentOrThrow({partnerId,@@ -98,6 +98,15 @@ export const { POST } = serve<Input>(},});+ if (linkId) {+ const link = programEnrollment.links.find((link) => link.id === linkId);+ if (!link) {+ return logAndReturn({+ outputLog: `Link "${linkId}" does not belong to partner "${partnerId}" and program "${programId}", skipping commission creation...`,+ });+ }+ }+// Step 1: Create commissionconst { commission, isFirstCommission } = await context.run("create-commission",@@ -273,12 +282,13 @@ async function stepCreateCommission(};}- const rewards = determinePartnerRewards({+ const rewards = await determinePartnerRewards({event,programEnrollment,context,amount,quantity,+ linkId: linkId ?? null,});if (rewards.length > 0) {diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/get-referrals-embed-data.ts b/apps/web/app/(ee)/app.dub.co/embed/referrals/get-referrals-embed-data.tsindex d63d2f929d..7d952b9450 100644--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/get-referrals-embed-data.ts+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/get-referrals-embed-data.ts@@ -4,6 +4,7 @@ import { getBountiesForPartner } from "@/lib/bounty/api/get-bounties-for-partnerimport { referralsEmbedToken } from "@/lib/embed/referrals/token-class";import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";import { prisma } from "@/lib/prisma";+import { getResolvedPartnerLinkRewards } from "@/lib/rewards/get-resolved-partner-link-rewards";import { PartnerGroupAdditionalLink } from "@/lib/types";import { ReferralsEmbedLinkSchema } from "@/lib/zod/schemas/referrals-embed";import { Reward } from "@prisma/client";@@ -52,7 +53,18 @@ export const getReferralsEmbedData = async (token: string) => {resources: true,},},- links: true,+ links: {+ include: {+ linkReward: {+ include: {+ clickReward: true,+ leadReward: true,+ saleReward: true,+ discount: true,+ },+ },+ },+ },partnerGroup: true,clickReward: true,leadReward: true,@@ -121,7 +133,21 @@ export const getReferralsEmbedData = async (token: string) => {defaultPayoutMethod: partner.defaultPayoutMethod,},partnerPlatforms: partner.platforms,- links: z.array(ReferralsEmbedLinkSchema).parse(links),+ links: z.array(ReferralsEmbedLinkSchema).parse(+ links.map((link) => ({+ ...link,+ ...getResolvedPartnerLinkRewards({+ linkReward: link.linkReward,+ enrollmentRewards: [+ clickReward,+ leadReward,+ saleReward,+ customReward,+ ],+ enrollmentDiscount: discount,+ }),+ })),+ ),rewards: [clickReward, leadReward, saleReward, referralReward, customReward].filter((r): r is Reward => r !== null).map((r) => serializeReward(r)),diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx b/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsxindex 7f080e89da..cc0f604e9c 100644--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx@@ -2,6 +2,7 @@import { constructPartnerReferralLink } from "@/lib/partner-referrals/utils";import { constructPartnerLink } from "@/lib/partners/construct-partner-link";+import { getRewardAmount } from "@/lib/partners/get-reward-amount";import { QueryLinkStructureHelpText } from "@/lib/partners/query-link-structure-help-text";import {DiscountProps,@@ -14,10 +15,12 @@ import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";import { programEmbedSchema } from "@/lib/zod/schemas/program-embed";import { programResourcesSchema } from "@/lib/zod/schemas/program-resources";import { LinkIcon } from "@/ui/links/link-icon";+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";+import { formatRewardDescription } from "@/ui/partners/format-reward-description";import { HeroBackground } from "@/ui/partners/hero-background";import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";-import { ProgramRewardList } from "@/ui/partners/program-reward-list";-import { ProgramRewardTerms } from "@/ui/partners/program-reward-terms";+import { ProgramRewardModifiersTooltip } from "@/ui/partners/program-reward-modifiers-tooltip";+import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";import { ThreeDots } from "@/ui/shared/icons";import {Button,@@ -25,6 +28,7 @@ import {Combobox,Copy,Directions,+ Gift,Popover,StatusBadge,TabSelect,@@ -34,8 +38,9 @@ import {} from "@dub/ui";import {cn,- getApexDomain,+ currencyFormatter,getPrettyUrl,+ pluralize,TREMENDOUS_SUPPORTED_COUNTRIES,} from "@dub/utils";import {@@ -49,6 +54,7 @@ import { AnimatePresence } from "motion/react";import {createContext,CSSProperties,+ Fragment,ReactNode,useContext,useEffect,@@ -211,19 +217,6 @@ export function ReferralsEmbedPageClient({partner.defaultPayoutMethod === "tremendous" ||(!partner.defaultPayoutMethod && isTremendousCountrySupported);- const customerRewards = useMemo(- () => rewards.filter((reward) => reward.event !== "referral"),- [rewards],- );-- const referralRewards = useMemo(- () => rewards.filter((reward) => reward.event === "referral"),- [rewards],- );-- const showPartnerReferralSection =- referralRewards.length > 0 && Boolean(partner.username);-const tabs = useMemo(() => [...(showQuickstart ? ["Quickstart"] : []),@@ -309,63 +302,12 @@ export function ReferralsEmbedPageClient({<div className="border-border-default relative flex flex-col overflow-hidden rounded-lg border p-4 md:p-6"><HeroBackground logo={group.logo} color={group.brandColor} embed />- <ReferralLinkDisplay+ <EmbedRewardsSectiontermsHref={termsHref}onSelectTab={setSelectedTab}- hasPartnerReferralReward={showPartnerReferralSection}+ hideEarningsTerms={Boolean(programEmbedData?.hideEarnings)}/>- <div- className={cn(- "sm:max-w-[50%]",- !showPartnerReferralSection && "mt-12",- )}- >- {!showPartnerReferralSection && (- <div className="flex items-end justify-between">- <span className="text-content-emphasis text-base font-semibold leading-none">- Rewards- </span>- {termsHref && (- <a- href={termsHref}- target="_blank"- className="text-content-subtle text-xs font-medium leading-none underline-offset-2 hover:underline"- >- View terms ↗- </a>- )}- </div>- )}- <div- className={cn(- "text-content-emphasis relative text-lg",- showPartnerReferralSection ? "mt-2" : "mt-4",- )}- >- <ProgramRewardList- rewards={customerRewards}- discount={discount}- className="rounded-lg"- />-- <ProgramRewardTerms- minPayoutAmount={- programEmbedData?.hideEarnings ? 0 : program.minPayoutAmount- }- holdingPeriodDays={- programEmbedData?.hideEarnings- ? 0- : group.holdingPeriodDays ?? 0- }- />- </div>- </div>-- {showPartnerReferralSection && (- <PartnerReferralLinkDisplay referralRewards={referralRewards} />- )}-{!programEmbedData?.hidePoweredByBadge && (<div className="mt-4 flex justify-center md:absolute md:bottom-3 md:right-3 md:mt-0"><a@@ -517,221 +459,381 @@ function ReferralsEmbedUnapproved({);}-function ReferralLinkDisplay({- onSelectTab,+function EmbedRewardsSection({termsHref,- hasPartnerReferralReward,+ onSelectTab,+ hideEarningsTerms,}: {- onSelectTab: (tab: string) => void;termsHref: string | undefined;- hasPartnerReferralReward: boolean;+ onSelectTab: (tab: string) => void;+ hideEarningsTerms: boolean;}) {- const { links, group } = useReferralsEmbedData();- const [copied, copyToClipboard] = useCopyToClipboard();-+ const { links, group, rewards, partner, program } = useReferralsEmbedData();const [selectedLinkId, setSelectedLinkId] = useState<string | null>(links[0]?.id ?? null,);- const selectedLink = useMemo(- () => links.find((l) => l.id === selectedLinkId) ?? links[0],- [links, selectedLinkId],+ const selectedLink =+ links.find((link) => link.id === selectedLinkId) ?? links[0] ?? null;++ const referralRewards = rewards.filter(+ (reward) => reward.event === "referral" && getRewardAmount(reward) >= 0,);+ const hasPartnerReferralReward =+ referralRewards.length > 0 && Boolean(partner.username);++ const customerRewards = [+ selectedLink?.clickReward,+ selectedLink?.leadReward,+ selectedLink?.saleReward,+ ...rewards.filter((reward) => reward.event === "custom"),+ ].filter(+ (reward): reward is RewardProps =>+ reward != null && getRewardAmount(reward) >= 0,+ );+ const resolvedDiscount = selectedLink?.discount ?? null;const partnerLink = selectedLink? constructPartnerLink({ group, link: selectedLink })- : undefined;-- const options = useMemo(- () =>- links.map((link) => ({- value: link.id,- label: getPrettyUrl(constructPartnerLink({ group, link })),- icon: (- <LinkIcon url={link.url} domain={link.domain} linkKey={link.key} />- ),- meta: {- destination: link.url ? getApexDomain(link.url) : null,- },- })),- [links, group],- );+ : "";+ const hasPartnerLink = Boolean(partnerLink);- const selectedOption =- options.find((option) => option.value === selectedLink?.id) ?? null;+ const partnerReferralApplyLink = constructPartnerReferralLink({+ partner,+ program,+ });- let actionButton: React.ReactNode = null;+ const linkOptions =+ links.length > 1+ ? links.map((link) => {+ const href = constructPartnerLink({ group, link });++ return {+ value: link.id,+ label: href ? getPrettyUrl(href) : getPrettyUrl(link.shortLink),+ icon: (+ <LinkIcon+ url={link.url}+ domain={link.domain}+ linkKey={link.key}+ />+ ),+ };+ })+ : undefined;- if (partnerLink) {- actionButton = (- <Button- icon={- <div className="relative size-4">- <div- className={cn(- "absolute inset-0 transition-[transform,opacity]",- copied && "translate-y-1 opacity-0",- )}- >- <Copy className="size-4" />- </div>- <div- className={cn(- "absolute inset-0 transition-[transform,opacity]",- !copied && "translate-y-1 opacity-0",- )}- >- <Check className="size-4" />+ const selectedOption =+ linkOptions?.find((option) => option.value === selectedLink?.id) ?? null;++ const customerRewardItems = [+ ...customerRewards.map((reward) => ({+ id: reward.id,+ icon: REWARD_EVENT_ICON[reward.event],+ text: (+ <>+ {formatRewardDescription(reward, { includeEarnPrefix: false })}+ {(!!reward.modifiers?.length ||+ Boolean(reward.tooltipDescription)) && (+ <>+ {" "}+ <ProgramRewardModifiersTooltip reward={reward} />+ </>+ )}+ </>+ ),+ })),+ ...(resolvedDiscount+ ? [+ {+ id: "discount",+ icon: Gift,+ text: formatDiscountDescription(resolvedDiscount),+ },+ ]+ : []),+ ];++ const showPayoutTerms =+ !hideEarningsTerms &&+ (program.minPayoutAmount > 0 || (group.holdingPeriodDays ?? 0) > 0);++ const customerRewardsList =+ customerRewardItems.length > 0 ? (+ <div className="border-border-subtle bg-bg-default relative z-[1] space-y-4 rounded-lg border p-3">+ {customerRewardItems.map((reward) => {+ const RewardIcon = reward.icon;++ return (+ <div key={reward.id} className="flex items-center gap-2">+ <RewardIcon className="text-content-default size-4 shrink-0" />+ <div className="text-content-default min-w-0 text-sm font-medium leading-5 tracking-tight">+ {reward.text}+ </div></div>- </div>- }- text={copied ? "Copied link" : "Copy link"}- className="h-10 w-fit shrink-0 rounded-lg"- onClick={() => copyToClipboard(partnerLink)}- />- );- } else if (links.length === 0) {- actionButton = (- <Button- text="Create a link"- onClick={() => onSelectTab("Links")}- className="h-10 w-fit shrink-0 rounded-lg"- />- );- }+ );+ })}+ </div>+ ) : null;return (- <>- <div className="flex items-center justify-between sm:max-w-[50%]">- <span className="text-content-emphasis text-base font-semibold">- {hasPartnerReferralReward- ? "Customer referral rewards"- : "Referral link"}- </span>- {hasPartnerReferralReward && termsHref && (- <a- href={termsHref}- target="_blank"- className="text-content-subtle text-xs font-medium leading-none underline-offset-2 hover:underline"- >- View terms ↗- </a>+ <div className="relative z-10 flex flex-col gap-8 sm:max-w-[50%]">+ <div className="flex flex-col gap-2">+ <div className="flex items-center justify-between gap-3">+ <h3 className="text-content-emphasis text-base font-semibold tracking-tight">+ {hasPartnerReferralReward+ ? "Customer referral links"+ : "Referral link"}+ </h3>+ {termsHref && (+ <a+ href={termsHref}+ target="_blank"+ className="text-content-subtle shrink-0 text-xs font-medium leading-none underline-offset-2 hover:underline"+ >+ View terms ↗+ </a>+ )}+ </div>++ <EmbedLinkRow+ displayText={+ hasPartnerLink ? getPrettyUrl(partnerLink) : "No referral link"+ }+ copyValue={partnerLink}+ showLinkSelector={Boolean(linkOptions)}+ linkOptions={linkOptions}+ selectedOption={selectedOption}+ onSelectLink={(id) => {+ setSelectedLinkId(id);+ const link = links.find((item) => item.id === id);+ if (!link) return undefined;+ return constructPartnerLink({ group, link });+ }}+ onCreateLink={() => onSelectTab("Links")}+ />++ {hasPartnerLink && group.linkStructure === "query" && selectedLink && (+ <QueryLinkStructureHelpText link={selectedLink} />)}- </div>- <div className="xs:flex-row xs:items-center relative mt-2 flex flex-col gap-2 sm:max-w-[50%]">- {links.length <= 1 ? (- <input- type="text"- readOnly- value={partnerLink ? getPrettyUrl(partnerLink) : "No referral link"}- className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default h-10 min-w-0 grow rounded-lg border px-3 text-sm focus:outline-none focus:ring-0"- />- ) : (- <div className="min-w-0 grow">- <Combobox- selected={selectedOption}- setSelected={(option) => {- if (!option) return;-- setSelectedLinkId(option.value);-- const link = links.find((l) => l.id === option.value);-- if (link) {- copyToClipboard(constructPartnerLink({ group, link }));- }- }}- options={options}- forceDropdown- matchTriggerWidth- placeholder="No referral link"- inputClassName="text-sm h-10"- popoverProps={{- contentClassName: "rounded-lg border border-border-subtle p-1",- }}- trigger={- <button- type="button"- className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default flex h-10 w-full min-w-0 items-center gap-2 rounded-lg border px-3 text-left text-sm outline-none focus:ring-0"- >- <span className="min-w-0 shrink grow truncate">- {partnerLink- ? getPrettyUrl(partnerLink)- : "No referral link"}- </span>- <ChevronDown className="text-content-muted size-4 shrink-0" />- </button>- }- />+ {(customerRewardsList || showPayoutTerms) && (+ <div>+ {customerRewardsList}+ {showPayoutTerms && (+ <EmbedPayoutTerms+ minPayoutAmount={program.minPayoutAmount}+ holdingPeriodDays={group.holdingPeriodDays ?? 0}+ tucked={Boolean(customerRewardsList)}+ />+ )}</div>)}- {actionButton}</div>- {partnerLink && group.linkStructure === "query" && (- <QueryLinkStructureHelpText link={selectedLink} className="mt-1.5" />+ {hasPartnerReferralReward && (+ <div className="flex flex-col gap-2">+ <h3 className="text-content-emphasis text-base font-semibold tracking-tight">+ Partner referral rewards+ </h3>++ <EmbedLinkRow+ displayText={getPrettyUrl(partnerReferralApplyLink)}+ copyValue={partnerReferralApplyLink}+ />++ {referralRewards.length > 0 && (+ <div className="border-border-subtle bg-bg-default space-y-4 rounded-lg border p-3">+ {referralRewards.map((reward) => {+ const RewardIcon = REWARD_EVENT_ICON.referral;++ return (+ <div key={reward.id} className="flex items-start gap-2">+ <div className="flex items-center py-0.5">+ <RewardIcon className="text-content-default size-4 shrink-0" />+ </div>+ <div className="text-content-default min-w-0 text-sm font-medium leading-5 tracking-tight">+ {formatRewardDescription(reward)}+ </div>+ </div>+ );+ })}+ </div>+ )}+ </div>)}- </>+ </div>);}-function PartnerReferralLinkDisplay({- referralRewards,+function EmbedPayoutTerms({+ minPayoutAmount,+ holdingPeriodDays,+ tucked = false,}: {- referralRewards: RewardProps[];+ minPayoutAmount: number;+ holdingPeriodDays: number;+ tucked?: boolean;}) {- const { partner, program } = useReferralsEmbedData();- const [copied, copyToClipboard] = useCopyToClipboard();-- const partnerReferralApplyLink = constructPartnerReferralLink({- partner,- program,- });+ const items = [+ ...(minPayoutAmount > 0+ ? [+ {+ label: "Minimum payout",+ value: currencyFormatter(minPayoutAmount, {+ trailingZeroDisplay: "stripIfInteger",+ }),+ href: "https://dub.co/help/article/commissions-payouts#what-does-minimum-payout-amount-mean",+ },+ ]+ : []),+ ...(holdingPeriodDays > 0+ ? [+ {+ label: "holding period",+ value: `${holdingPeriodDays} ${pluralize("day", holdingPeriodDays)}`,+ href: "https://dub.co/help/article/commissions-payouts#what-does-holding-period-mean",+ },+ ]+ : []),+ ];++ if (items.length === 0) {+ return null;+ }return (- <div className="mt-8 sm:max-w-[50%]">- <span className="text-content-emphasis text-base font-semibold leading-none">- Partner referral rewards- </span>+ <div+ className={cn(+ "border-border-subtle bg-bg-muted text-content-subtle flex flex-wrap items-center gap-1.5 text-xs tracking-tight",+ tucked+ ? "-mt-2 rounded-b-lg rounded-t-none border border-t-0 p-1.5 pl-2.5 pt-3.5"+ : "rounded-lg border px-3 py-2",+ )}+ >+ {items.map((item, index) => (+ <Fragment key={item.label}>+ {index > 0 && (+ <span className="text-content-default font-semibold">•</span>+ )}+ <span className="inline-flex items-center gap-0.5">+ <span className="text-content-default font-semibold">+ {item.value}+ </span>+ <a+ href={item.href}+ target="_blank"+ rel="noopener noreferrer"+ className="font-medium underline decoration-dotted underline-offset-2"+ >+ {item.label}+ </a>+ </span>+ </Fragment>+ ))}+ </div>+ );+}++function EmbedLinkRow({+ displayText,+ copyValue,+ showLinkSelector,+ linkOptions,+ selectedOption,+ onSelectLink,+ onCreateLink,+}: {+ displayText: string;+ copyValue: string;+ showLinkSelector?: boolean;+ linkOptions?: {+ value: string;+ label: string;+ icon: ReactNode;+ }[];+ selectedOption?: {+ value: string;+ label: string;+ icon: ReactNode;+ } | null;+ onSelectLink?: (id: string) => string | void | undefined;+ onCreateLink?: () => void;+}) {+ const [copied, copyToClipboard] = useCopyToClipboard();+ const hasLink = Boolean(copyValue);- <div className="xs:flex-row xs:items-center relative mt-2 flex flex-col gap-2">+ return (+ <div className="flex items-center gap-2">+ {showLinkSelector ? (+ <div className="min-w-0 grow">+ <Combobox+ selected={selectedOption ?? null}+ setSelected={(option) => {+ if (!option) return;+ const valueToCopy = onSelectLink?.(option.value);+ if (typeof valueToCopy === "string" && valueToCopy) {+ copyToClipboard(valueToCopy);+ }+ }}+ options={linkOptions}+ forceDropdown+ matchTriggerWidth+ placeholder="No referral link"+ inputClassName="text-sm h-9"+ popoverProps={{+ contentClassName: "rounded-lg border border-border-subtle p-1",+ }}+ trigger={+ <button+ type="button"+ className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default flex h-9 w-full min-w-0 items-center gap-2 rounded-lg border px-3 text-left text-sm outline-none focus:ring-0"+ >+ <span className="min-w-0 shrink grow truncate font-medium">+ {displayText}+ </span>+ <ChevronDown className="text-content-muted size-3 shrink-0" />+ </button>+ }+ />+ </div>+ ) : (<inputtype="text"readOnly- value={getPrettyUrl(partnerReferralApplyLink)}- className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default h-10 min-w-0 grow rounded-lg border px-3 text-sm focus:outline-none focus:ring-0"+ value={displayText}+ className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default h-9 min-w-0 grow rounded-lg border px-3 text-sm font-medium focus:outline-none focus:ring-0"/>+ )}++ {hasLink ? (<Buttonicon={- <div className="relative size-4">- <div+ <span className="relative size-4">+ <CopyclassName={cn(- "absolute inset-0 transition-[transform,opacity]",+ "absolute inset-0 size-4 transition-[transform,opacity]",copied && "translate-y-1 opacity-0",)}- >- <Copy className="size-4" />- </div>- <div+ />+ <CheckclassName={cn(- "absolute inset-0 transition-[transform,opacity]",+ "absolute inset-0 size-4 transition-[transform,opacity]",!copied && "translate-y-1 opacity-0",)}- >- <Check className="size-4" />- </div>- </div>+ />+ </span>}- text={copied ? "Copied link" : "Copy link"}- className="h-10 w-fit shrink-0 rounded-lg"- onClick={() => copyToClipboard(partnerReferralApplyLink)}+ text={copied ? "Copied" : "Copy"}+ className="h-9 w-fit shrink-0 rounded-lg px-4"+ onClick={() => copyToClipboard(copyValue)}/>- </div>-- <div className="text-content-emphasis relative mt-2 text-lg">- <ProgramRewardList rewards={referralRewards} className="rounded-lg" />- </div>+ ) : onCreateLink ? (+ <Button+ text="Create a link"+ onClick={onCreateLink}+ className="h-9 w-fit shrink-0 rounded-lg px-4"+ />+ ) : null}</div>);}diff --git 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.tsxindex 640a9a6e48..fabd0f521c 100644--- 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@@ -6,6 +6,7 @@ import useProgramEnrollment from "@/lib/swr/use-program-enrollment";import { PartnerProfileLinkProps } from "@/lib/types";import { CommentsBadge } from "@/ui/links/comments-badge";import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";+import { DiscountCodeTooltip } from "@/ui/partners/discounts/discount-code-tooltip";import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";import {ArrowTurnRight2,@@ -17,7 +18,6 @@ import {LinkLogo,LoadingSpinner,StatusBadge,- Tooltip,useInViewport,UserCheck,useRouterStuff,@@ -43,6 +43,12 @@ import {} from "react";import { usePartnerLinksContext } from "./page-client";import { PartnerLinkControls } from "./partner-link-controls";+import {+ PartnerLinkRewardsPanel,+ PartnerLinkRewardsSummary,+ usePartnerLinkRewards,+ usePartnerLinkRewardsState,+} from "./partner-link-rewards";const CHARTS = [{@@ -69,6 +75,15 @@ const CHARTS = [export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {const { programEnrollment } = useProgramEnrollment();const { displayOption } = usePartnerLinksContext();+ const { showRewards, toggleRewards } = usePartnerLinkRewardsState();+ const {+ rewards,+ discount,+ primaryReward,+ primaryText,+ additionalCount,+ hasIncentives,+ } = usePartnerLinkRewards(link);const partnerLink = constructPartnerLink({group: programEnrollment?.group,@@ -92,6 +107,7 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {return (<CardList.Card+ outerClassName="overflow-hidden"innerClassName={cn("px-0 py-0 group/card", isDeactivated && "opacity-80")}><div className="p-4">@@ -110,7 +126,7 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {</div><div className="flex min-w-0 flex-col">- <div className="flex flex-col">+ <div className="flex flex-col gap-0.5"><div className="flex items-center gap-1"><ahref={isDeactivated ? undefined : partnerLink}@@ -135,29 +151,47 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {{link.comments && <CommentsBadge comments={link.comments} />}</div>- {/* The max width implementation here is a bit hacky, we should improve in the future */}- <div className="flex max-w-[100px] items-center gap-1 py-0 pl-1 pr-1.5 sm:w-fit sm:max-w-[400px]">- <ArrowTurnRight2 className="h-3 w-3 shrink-0 text-neutral-400" />- {programEnrollment?.group?.linkStructure === "query" ? (+ {hasIncentives && primaryText ? (+ <PartnerLinkRewardsSummary+ primaryText={primaryText}+ primaryReward={primaryReward}+ additionalCount={additionalCount}+ showRewards={showRewards}+ onToggleRewards={toggleRewards}+ />+ ) : (+ /* The max width implementation here is a bit hacky, we should improve in the future */+ <div className="flex max-w-[100px] items-center gap-1 py-0 pl-1 pr-1.5 sm:w-fit sm:max-w-[400px]">+ <ArrowTurnRight2 className="h-3 w-3 shrink-0 text-neutral-400" />+ {programEnrollment?.group?.linkStructure === "query" ? (+ <QueryLinkStructureHelpText+ link={link}+ className="mt-0.5"+ />+ ) : (+ <a+ href={isDeactivated ? undefined : link.url}+ target="_blank"+ rel="noopener noreferrer"+ className="cursor-alias truncate text-sm text-neutral-500 decoration-dotted transition-colors hover:text-neutral-700 hover:underline hover:underline-offset-2"+ title={getPrettyUrl(link.url)}+ onClick={+ isDeactivated ? (e) => e.preventDefault() : undefined+ }+ >+ {getPrettyUrl(link.url)}+ </a>+ )}+ </div>+ )}++ {hasIncentives &&+ programEnrollment?.group?.linkStructure === "query" && (<QueryLinkStructureHelpTextlink={link}- className="mt-0.5"+ className="mt-0.5 pl-0.5"/>- ) : (- <a- href={isDeactivated ? undefined : link.url}- target="_blank"- rel="noopener noreferrer"- className="cursor-alias truncate text-sm text-neutral-500 decoration-dotted transition-colors hover:text-neutral-700 hover:underline hover:underline-offset-2"- title={getPrettyUrl(link.url)}- onClick={- isDeactivated ? (e) => e.preventDefault() : undefined- }- >- {getPrettyUrl(link.url)}- </a>)}- </div></div></div></div>@@ -179,15 +213,21 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {(link.discountCodeDisabledAt ? (discountCodeSection) : (- <Tooltip content="This program supports discount code tracking. Copy the code to use it in podcasts, videos, etc. [Learn more](https://dub.co/help/article/dual-sided-incentives)">+ <DiscountCodeTooltip discount={link.discount}>{discountCodeSection}- </Tooltip>+ </DiscountCodeTooltip>))}{displayOption === "cards" && <StatsBadge link={link} />}<Controls link={link} /></div></div></div>+ <PartnerLinkRewardsPanel+ rewards={rewards}+ discount={discount}+ showRewards={showRewards}+ additionalCount={additionalCount}+ />{displayOption === "full" && <StatsCharts link={link} />}</CardList.Card>);diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsxnew file mode 100644index 0000000000..75c42744ed--- /dev/null+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx@@ -0,0 +1,181 @@+"use client";++import {+ getPartnerLinkDisplayRewards,+ getPartnerLinkPrimaryIncentive,+} from "@/lib/rewards/resolve-partner-link-rewards";+import useProgramEnrollment from "@/lib/swr/use-program-enrollment";+import { PartnerProfileLinkProps } from "@/lib/types";+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";+import { formatRewardDescription } from "@/ui/partners/format-reward-description";+import { ProgramRewardModifiersTooltip } from "@/ui/partners/program-reward-modifiers-tooltip";+import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";+import { Icon, Tooltip } from "@dub/ui";+import { DiscountCode, Gift } from "@dub/ui/icons";+import { cn } from "@dub/utils";+import { motion } from "motion/react";+import { type ReactNode, useMemo, useState } from "react";++export function usePartnerLinkRewards(link: PartnerProfileLinkProps) {+ const { programEnrollment } = useProgramEnrollment();++ return useMemo(() => {+ const { rewards, discount } = getPartnerLinkDisplayRewards({+ clickReward: link.clickReward,+ leadReward: link.leadReward,+ saleReward: link.saleReward,+ discount: link.discount,+ enrollmentRewards: programEnrollment?.rewards ?? [],+ });++ const { primaryReward, primaryDiscount, additionalCount } =+ getPartnerLinkPrimaryIncentive({ rewards, discount });++ const primaryText = primaryReward+ ? formatRewardDescription(primaryReward, { includeEarnPrefix: false })+ : primaryDiscount+ ? formatDiscountDescription(primaryDiscount)+ : null;++ return {+ rewards,+ discount,+ primaryReward,+ primaryDiscount,+ primaryText,+ additionalCount,+ hasIncentives: rewards.length > 0 || Boolean(discount),+ };+ }, [+ link.clickReward,+ link.leadReward,+ link.saleReward,+ link.discount,+ programEnrollment?.rewards,+ ]);+}++export function usePartnerLinkRewardsState() {+ const [showRewards, setShowRewards] = useState(false);++ return {+ showRewards,+ setShowRewards,+ toggleRewards: () => setShowRewards((value) => !value),+ };+}++export function PartnerLinkRewardsSummary({+ primaryText,+ primaryReward,+ additionalCount,+ showRewards,+ onToggleRewards,+}: {+ primaryText: string;+ primaryReward: ReturnType<typeof usePartnerLinkRewards>["primaryReward"];+ additionalCount: number;+ showRewards: boolean;+ onToggleRewards: () => void;+}) {+ return (+ <div className="flex min-w-0 items-center gap-1.5 pl-0.5">+ <Gift className="size-3.5 shrink-0 text-neutral-500" />+ <p className="truncate text-sm font-medium tracking-tight text-neutral-500">+ {primaryText}+ </p>+ <ProgramRewardModifiersTooltip reward={primaryReward} />+ {additionalCount > 0 && (+ <Tooltip content="View rewards">+ <button+ type="button"+ onClick={onToggleRewards}+ aria-expanded={showRewards}+ className={cn(+ "inline-flex h-4 shrink-0 items-center justify-center rounded-md bg-neutral-100 px-1.5 text-xs font-semibold leading-4 tracking-tight text-neutral-600 transition-colors",+ showRewards && "bg-blue-100 text-blue-700",+ )}+ >+ +{additionalCount}+ </button>+ </Tooltip>+ )}+ </div>+ );+}++export function PartnerLinkRewardsPanel({+ rewards,+ discount,+ showRewards,+ additionalCount,+}: {+ rewards: ReturnType<typeof usePartnerLinkRewards>["rewards"];+ discount: ReturnType<typeof usePartnerLinkRewards>["discount"];+ showRewards: boolean;+ additionalCount: number;+}) {+ if (additionalCount === 0) {+ return null;+ }++ const items: {+ id: string;+ icon: Icon;+ text: ReactNode;+ }[] = [+ ...rewards.map((reward) => ({+ id: reward.id,+ icon: REWARD_EVENT_ICON[reward.event],+ text: (+ <>+ {formatRewardDescription(reward, { includeEarnPrefix: false })}+ {(!!reward.modifiers?.length ||+ Boolean(reward.tooltipDescription)) && (+ <>+ {" "}+ <ProgramRewardModifiersTooltip reward={reward} />+ </>+ )}+ </>+ ),+ })),+ ...(discount+ ? [+ {+ id: "discount",+ icon: DiscountCode,+ text: formatDiscountDescription(discount),+ },+ ]+ : []),+ ];++ return (+ <motion.div+ initial={false}+ animate={{ height: showRewards ? "auto" : 0 }}+ transition={{ duration: 0.2 }}+ className="overflow-hidden"+ >+ <div className="border-t border-neutral-200 px-4 py-2">+ <div className="flex flex-col gap-2 rounded-[10px] border border-neutral-200 bg-white p-3">+ {items.map((item) => {+ const ItemIcon = item.icon;++ return (+ <div key={item.id} className="flex items-center gap-2.5">+ <div className="flex size-7 shrink-0 items-center justify-center rounded-md bg-neutral-100">+ <ItemIcon className="size-4 text-neutral-800" />+ </div>+ <div className="min-w-0 text-sm font-semibold leading-5 tracking-tight text-neutral-700">+ {item.text}+ </div>+ </div>+ );+ })}+ </div>+ </div>+ </motion.div>+ );+}diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsxindex f0850fbd5b..2e24035b29 100644--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx@@ -8,11 +8,16 @@ import { constructPartnerReferralLink } from "@/lib/partner-referrals/utils";import { constructPartnerLink } from "@/lib/partners/construct-partner-link";import { getRewardAmount } from "@/lib/partners/get-reward-amount";import { QueryLinkStructureHelpText } from "@/lib/partners/query-link-structure-help-text";+import { getPartnerLinkDisplayRewards } from "@/lib/rewards/resolve-partner-link-rewards";import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";import { usePartnerEarningsTimeseries } from "@/lib/swr/use-partner-earnings-timeseries";+import usePartnerLinks from "@/lib/swr/use-partner-links";import usePartnerProfile from "@/lib/swr/use-partner-profile";import useProgramEnrollment from "@/lib/swr/use-program-enrollment";+import { GroupProps, PartnerProfileLinkProps } from "@/lib/types";import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";+import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";+import { DiscountCodeTooltip } from "@/ui/partners/discounts/discount-code-tooltip";import { formatDiscountDescription } from "@/ui/partners/format-discount-description";import { formatRewardDescription } from "@/ui/partners/format-reward-description";import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";@@ -22,6 +27,7 @@ import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";import {Button,buttonVariants,+ Combobox,CopyText,Gift,Icon,@@ -53,10 +59,12 @@ import {getApexDomain,getPrettyUrl,nFormatter,+ PARTNERS_DOMAIN,} from "@dub/utils";import NumberFlow, { NumberFlowGroup } from "@number-flow/react";import { LinearGradient } from "@visx/gradient";import { endOfDay, startOfDay } from "date-fns";+import { ChevronDown } from "lucide-react";import { AnimatePresence, motion } from "motion/react";import Link from "next/link";import { useParams } from "next/navigation";@@ -636,37 +644,78 @@ function RewardsTermsList() {);}+function getRewardLinkOptions({+ links,+ group,+}: {+ links: PartnerProfileLinkProps[];+ group?: Pick<GroupProps, "linkStructure"> | null;+}) {+ if (links.length <= 1) {+ return undefined;+ }++ return links.map((link) => {+ const href = constructPartnerLink({ group, link });++ return {+ id: link.id,+ displayText: href ? getPrettyUrl(href) : getPrettyUrl(link.shortLink),+ apexDomain: getApexDomain(link.url),+ };+ });+}++const LINK_SELECTOR_BOX_CLASSNAME =+ "h-10 w-[241px] min-w-0 max-w-full rounded-lg border border-border-default bg-bg-default";+function RewardList() {const { programEnrollment } = useProgramEnrollment();const { partner } = usePartnerProfile();+ const { links: partnerLinks, loading: partnerLinksLoading } =+ usePartnerLinks();+ const [selectedLinkId, setSelectedLinkId] = useState<string | null>(null);if (!programEnrollment) {return null;}- const eligibleRewards = (programEnrollment.rewards ?? []).filter(- (r) => getRewardAmount(r) >= 0,- );+ const knownLinkCount =+ partnerLinks?.length ?? programEnrollment.links?.length;+ const linkSelectorLoading =+ partnerLinksLoading && (knownLinkCount === undefined || knownLinkCount > 1);- const standardRewards = eligibleRewards.filter(- (reward) =>- reward.event === "click" ||- reward.event === "lead" ||- reward.event === "sale" ||- reward.event === "custom",- );+ const links = partnerLinks ?? [];++ const selectedLink =+ links.find((link) => link.id === selectedLinkId) ?? links[0] ?? null;- const referralRewards = eligibleRewards.filter(- (reward) => reward.event === "referral",+ const enrollmentRewards = programEnrollment.rewards ?? [];+ const referralRewards = enrollmentRewards.filter(+ (reward) => reward.event === "referral" && getRewardAmount(reward) >= 0,);+ const { rewards: standardRewards, discount } = selectedLink+ ? getPartnerLinkDisplayRewards({+ clickReward: selectedLink.clickReward,+ leadReward: selectedLink.leadReward,+ saleReward: selectedLink.saleReward,+ discount: selectedLink.discount,+ enrollmentRewards,+ })+ : {+ rewards: enrollmentRewards.filter(+ (reward) =>+ reward.event !== "referral" && getRewardAmount(reward) >= 0,+ ),+ discount: programEnrollment.discount ?? null,+ };- const discount = programEnrollment.discount ?? null;const hasPartnerReferralReward = referralRewards.length > 0;- const defaultProgramLink = programEnrollment.links?.[0];+ const displayLink = selectedLink ?? programEnrollment.links?.[0];const partnerLink = constructPartnerLink({group: programEnrollment.group,- link: defaultProgramLink,+ link: displayLink ?? undefined,});const hasPartnerLink = Boolean(partnerLink);const isDeactivated = programEnrollment.status === "deactivated";@@ -676,6 +725,11 @@ function RewardList() {program: programEnrollment.program,});+ const linkOptions = getRewardLinkOptions({+ links,+ group: programEnrollment.group,+ });+return (<div className="flex flex-col gap-2 rounded-xl bg-neutral-100 p-2"><RewardListItem@@ -716,13 +770,20 @@ function RewardList() {? getPrettyUrl(partnerLink): "No link yet",copyValue: partnerLink,- apexDomain: defaultProgramLink- ? getApexDomain(defaultProgramLink.url)- : null,+ apexDomain: displayLink ? getApexDomain(displayLink.url) : null,}}+ linkOptions={linkOptions}+ linkSelectorLoading={linkSelectorLoading}+ selectedLinkId={selectedLink?.id}+ onSelectLink={setSelectedLinkId}+ discount={discount}+ discountCode={selectedLink?.discountCode}+ discountCodeDisabledAt={selectedLink?.discountCodeDisabledAt}queryLinkHelpTextLink={- hasPartnerLink && programEnrollment.group?.linkStructure === "query"- ? defaultProgramLink+ hasPartnerLink &&+ programEnrollment.group?.linkStructure === "query" &&+ displayLink+ ? displayLink: undefined}/>@@ -757,6 +818,13 @@ function RewardListItem({titleRight,rewards,link,+ linkOptions,+ linkSelectorLoading,+ selectedLinkId,+ onSelectLink,+ discount,+ discountCode,+ discountCodeDisabledAt,queryLinkHelpTextLink,isDeactivated,}: {@@ -773,17 +841,58 @@ function RewardListItem({copyValue: string;apexDomain?: string | null;};- queryLinkHelpTextLink?: {- key: string;- url: string;- shortLink: string;- };+ linkOptions?: {+ id: string;+ displayText: string;+ apexDomain: string | null;+ }[];+ linkSelectorLoading?: boolean;+ selectedLinkId?: string;+ onSelectLink?: (id: string) => void;+ discount?: PartnerProfileLinkProps["discount"];+ discountCode?: PartnerProfileLinkProps["discountCode"];+ discountCodeDisabledAt?: PartnerProfileLinkProps["discountCodeDisabledAt"];+ queryLinkHelpTextLink?: Pick<+ PartnerProfileLinkProps,+ "key" | "url" | "shortLink"+ >;isDeactivated?: boolean;}) {const { programSlug } = useParams<{ programSlug: string }>();const [copied, copyToClipboard] = useCopyToClipboard();const copyDisabled =isDeactivated || !link.copyValue || link.copyValue.length === 0;+ const showLinkSelector =+ Boolean(linkSelectorLoading) ||+ Boolean(linkOptions && linkOptions.length > 1);++ const comboboxOptions = linkOptions?.map((option) => ({+ value: option.id,+ label: option.displayText,+ icon: (+ <LinkLogo+ apexDomain={option.apexDomain}+ className="h-4 w-4 shrink-0 sm:h-4 sm:w-4"+ imageProps={{ width: 16, height: 16 }}+ />+ ),+ }));++ const selectedOption =+ comboboxOptions?.find((option) => option.value === selectedLinkId) ?? null;++ const discountCodeSection = discountCode ? (+ <div className="hidden items-center gap-1.5 rounded-lg border border-neutral-200 py-1 pl-2 pr-1.5 sm:flex">+ <span className="text-sm font-medium leading-5 tracking-tight text-neutral-500">+ Discount code+ </span>+ <DiscountCodeBadge+ code={discountCode}+ disabledAt={discountCodeDisabledAt}+ disabledTooltip={`This discount code was disabled by the program. [Contact the program owner](${PARTNERS_DOMAIN}/messages/${programSlug}) if you need a new code.`}+ />+ </div>+ ) : null;return (<div@@ -801,69 +910,133 @@ function RewardListItem({<div className="overflow-hidden rounded-xl border border-neutral-200 bg-neutral-50"><div className="bg-neutral-50 px-3 py-2.5">- <div className="flex items-center justify-between gap-3">- <div className="flex min-w-0 flex-1 items-center gap-2.5">- <div className="shrink-0 rounded-full border border-neutral-200 bg-white p-1">- <LinkLogo- apexDomain={link.apexDomain}- className="size-4.5 sm:size-4.5 shrink-0 rounded-full"- imageProps={{ width: 18, height: 18 }}- />- </div>-- <CopyText- value={link.copyValue}- className="min-w-0 truncate text-sm font-medium -tracking-wider text-neutral-600"- >- {link.displayText}- </CopyText>- {queryLinkHelpTextLink && (- <>- <span className="hidden text-sm text-neutral-500 sm:block">- →- </span>- <QueryLinkStructureHelpText- link={queryLinkHelpTextLink}- className="hidden sm:block"+ <div className="flex items-center justify-between gap-2">+ {showLinkSelector ? (+ <div className="w-[241px] shrink-0">+ {linkSelectorLoading ? (+ <div+ role="status"+ aria-label="Loading links"+ className={cn(+ LINK_SELECTOR_BOX_CLASSNAME,+ "flex items-center justify-center",+ )}+ >+ <LoadingSpinner className="size-4" />+ </div>+ ) : (+ <Combobox+ selected={selectedOption}+ setSelected={(option) => {+ if (!option) return;+ onSelectLink?.(option.value);+ }}+ options={comboboxOptions}+ forceDropdown+ matchTriggerWidth+ placeholder="No link yet"+ inputClassName="text-sm h-10"+ popoverProps={{+ contentClassName:+ "w-[241px] rounded-lg border border-border-subtle p-1",+ }}+ trigger={+ <button+ type="button"+ className={cn(+ LINK_SELECTOR_BOX_CLASSNAME,+ "text-content-default focus:border-border-emphasis flex items-center gap-2 px-3 text-left text-sm outline-none focus:ring-0",+ )}+ >+ <span className="min-w-0 shrink grow truncate">+ {link.displayText}+ </span>+ <ChevronDown className="text-content-muted size-4 shrink-0" />+ </button>+ }/>- </>- )}- </div>- {isDeactivated ? (- <StatusBadge variant={PartnerStatusBadges.deactivated.variant}>- {PartnerStatusBadges.deactivated.label}- </StatusBadge>- ) : (- <Button- variant="primary"- disabled={copyDisabled}- onClick={() => {- copyToClipboard(link.copyValue);- }}- className={cn(- "h-8 w-auto shrink-0 px-3 transition-opacity",- !copyDisabled && "hover:opacity-90",)}- icon={- <span className="relative size-4">- <Copy- className={cn(- "absolute inset-0 size-4 transition-[transform,opacity]",- copied && "translate-y-1 opacity-0",- )}- />- <Check- className={cn(- "absolute inset-0 size-4 transition-[transform,opacity]",- !copied && "translate-y-1 opacity-0",- )}+ </div>+ ) : (+ <div className="flex min-w-0 flex-1 items-center gap-2.5">+ <div className="shrink-0 rounded-full border border-neutral-200 bg-white p-1">+ <LinkLogo+ apexDomain={link.apexDomain}+ className="size-4.5 sm:size-4.5 shrink-0 rounded-full"+ imageProps={{ width: 18, height: 18 }}+ />+ </div>+ <CopyText+ value={link.copyValue}+ className="min-w-0 truncate text-sm font-medium -tracking-wider text-neutral-600"+ >+ {link.displayText}+ </CopyText>+ {queryLinkHelpTextLink && (+ <>+ <span className="hidden text-sm text-neutral-500 sm:block">+ →+ </span>+ <QueryLinkStructureHelpText+ link={queryLinkHelpTextLink}+ className="hidden sm:block"/>- </span>- }- text={copied ? "Copied" : "Copy"}- />+ </>+ )}+ </div>)}++ <div className="flex shrink-0 items-center gap-2">+ {discountCodeSection &&+ (discountCodeDisabledAt ? (+ discountCodeSection+ ) : (+ <DiscountCodeTooltip discount={discount}>+ {discountCodeSection}+ </DiscountCodeTooltip>+ ))}+ {isDeactivated ? (+ <StatusBadge variant={PartnerStatusBadges.deactivated.variant}>+ {PartnerStatusBadges.deactivated.label}+ </StatusBadge>+ ) : (+ <Button+ variant="primary"+ disabled={copyDisabled}+ onClick={() => {+ copyToClipboard(link.copyValue);+ }}+ className={cn(+ "h-8 w-auto shrink-0 px-3 transition-opacity",+ !copyDisabled && "hover:opacity-90",+ )}+ icon={+ <span className="relative size-4">+ <Copy+ className={cn(+ "absolute inset-0 size-4 transition-[transform,opacity]",+ copied && "translate-y-1 opacity-0",+ )}+ />+ <Check+ className={cn(+ "absolute inset-0 size-4 transition-[transform,opacity]",+ !copied && "translate-y-1 opacity-0",+ )}+ />+ </span>+ }+ text={copied ? "Copied" : "Copy"}+ />+ )}+ </div></div>+ {showLinkSelector && queryLinkHelpTextLink && (+ <QueryLinkStructureHelpText+ link={queryLinkHelpTextLink}+ className="mt-1.5 hidden sm:block"+ />+ )}</div>{rewards.length > 0 ? (diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/discount-codes.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/discount-codes.tsxnew file mode 100644index 0000000000..e96f984929--- /dev/null+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/discount-codes.tsx@@ -0,0 +1,523 @@+"use client";++import { constructPartnerLink } from "@/lib/partners/construct-partner-link";+import { getPlanCapabilities } from "@/lib/plan-capabilities";+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";+import useDiscountCodes from "@/lib/swr/use-discount-codes";+import { useDiscounts } from "@/lib/swr/use-discounts";+import useGroup from "@/lib/swr/use-group";+import {+ ProgramPartnerLinkExtended,+ useProgramPartnerLinks,+} from "@/lib/swr/use-program-partner-links";+import useWorkspace from "@/lib/swr/use-workspace";+import {+ DiscountCodeProps,+ DiscountProps,+ EnrolledPartnerExtendedProps,+ EnrolledPartnerProps,+ GroupProps,+} from "@/lib/types";+import { useAddDiscountCodeModal } from "@/ui/modals/add-discount-code-modal";+import { DeleteDiscountCodeModal } from "@/ui/modals/delete-discount-code-modal";+import { useEditPartnerDiscountModal } from "@/ui/modals/edit-partner-discount-modal";+import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";+import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";+import { ButtonLink } from "@/ui/placeholders/button-link";+import { ThreeDots } from "@/ui/shared/icons";+import {+ Button,+ CardList,+ LoadingSpinner,+ MenuItem,+ Popover,+ Tooltip,+ TooltipContent,+ useCopyToClipboard,+} from "@dub/ui";+import { Copy, DiscountCode, Trash } from "@dub/ui/icons";+import { cn, getPrettyUrl, nFormatter, pluralize } from "@dub/utils";+import { DiscountProvider } from "@prisma/client";+import { Command } from "cmdk";+import Link from "next/link";+import { type ReactNode, useMemo, useState } from "react";+import { toast } from "sonner";++type PartnerLink = ProgramPartnerLinkExtended;+type PartnerForDiscountOverride = Pick<+ EnrolledPartnerProps,+ "id" | "name" | "email" | "image" | "groupId" | "discountId"+>;++function getEffectiveDiscountProvider({+ link,+ discounts,+ partnerDiscount,+ groupDiscount,+}: {+ link: PartnerLink;+ discounts?: DiscountProps[] | null;+ partnerDiscount?: Pick<DiscountProps, "id" | "provider"> | null;+ groupDiscount?: Pick<DiscountProps, "id" | "provider"> | null;+}): DiscountProvider | null {+ const linkDiscount = discounts?.find((d) => d.id === link.discount);++ return (+ linkDiscount?.provider ??+ partnerDiscount?.provider ??+ groupDiscount?.provider ??+ null+ );+}++function linkHasEffectiveDiscount({+ link,+ partnerDiscount,+ groupDiscount,+}: {+ link: PartnerLink;+ partnerDiscount?: Pick<DiscountProps, "id"> | null;+ groupDiscount?: Pick<DiscountProps, "id"> | null;+}) {+ return Boolean(link.discount || partnerDiscount?.id || groupDiscount?.id);+}++export function PartnerDiscountCodes({+ partner,+}: {+ partner: EnrolledPartnerExtendedProps;+}) {+ const { slug, stripeConnectId, shopifyStoreId } = useWorkspace();+ const { group } = useGroup({+ groupIdOrSlug: partner.groupId ?? undefined,+ });++ const [selectedDiscountCode, setSelectedDiscountCode] =+ useState<DiscountCodeProps | null>(null);++ const [showDeleteDiscountCodeModal, setShowDeleteDiscountCodeModal] =+ useState(false);++ const { discountCodes, loading, error } = useDiscountCodes({+ partnerId: partner.id || null,+ });++ const { links } = useProgramPartnerLinks({+ partnerId: partner.id || null,+ });++ const { discounts } = useDiscounts({+ groupId: partner.groupId ?? undefined,+ });++ const { AddDiscountCodeModal, setShowAddDiscountCodeModal } =+ useAddDiscountCodeModal({+ partner,+ });++ const usedLinkIds = useMemo(+ () => new Set(discountCodes?.map((code) => code.linkId) ?? []),+ [discountCodes],+ );++ const eligibleLinks = useMemo(() => {+ if (!links) {+ return [];+ }++ return links.filter(+ (link) =>+ !usedLinkIds.has(link.id) &&+ linkHasEffectiveDiscount({+ link,+ partnerDiscount: partner.discount,+ groupDiscount: group?.discount,+ }),+ );+ }, [links, usedLinkIds, partner.discount, group?.discount]);++ const disabledReason = useMemo(() => {+ if (!links || links.length === 0) {+ return "No links assigned to this partner group. Please add a link before you can create a discount code.";+ }++ if (eligibleLinks.length === 0) {+ if (links.length === discountCodes?.length) {+ return "All links have a discount code assigned to them. Please add a new link before you can create a discount code.";+ }++ return "No discount assigned to this partner or their links. Please add a discount before you can create a discount code.";+ }++ const providers = new Set(+ eligibleLinks+ .map((link) =>+ getEffectiveDiscountProvider({+ link,+ discounts,+ partnerDiscount: partner.discount,+ groupDiscount: group?.discount,+ }),+ )+ .filter(Boolean),+ );++ if (providers.has(DiscountProvider.stripe) && !stripeConnectId) {+ return (+ <TooltipContent+ title="Your workspace isn't connected to Stripe yet. Please install the Dub Stripe app in settings to create discount codes."+ cta="Install Stripe app"+ href={`/${slug}/settings/integrations/stripe`}+ target="_blank"+ />+ );+ }++ if (providers.has(DiscountProvider.shopify) && !shopifyStoreId) {+ return (+ <TooltipContent+ title="Your workspace isn't connected to Shopify yet. Please install the Dub Shopify app in settings to create discount codes."+ cta="Install Shopify app"+ href={`/${slug}/settings/integrations/shopify`}+ target="_blank"+ />+ );+ }++ return undefined;+ }, [+ links,+ eligibleLinks,+ discountCodes,+ discounts,+ partner.discount,+ group?.discount,+ stripeConnectId,+ shopifyStoreId,+ slug,+ ]);++ const hasPartnerOrLinkDiscount = Boolean(+ partner.discount?.id ||+ group?.discount?.id ||+ links?.some((link) => link.discount) ||+ eligibleLinks.length > 0,+ );++ const discountCodeEmptyState = hasPartnerOrLinkDiscount+ ? {+ description:+ "Great for short-form content, podcasts and more. Works alongside link-based discounts.",+ buttonText: "Learn more",+ buttonHref:+ "https://dub.co/help/article/dual-sided-incentives#option-2-using-stripe-promo-codes-no-code-required",+ }+ : {+ description:+ "You need to create a group discount for this partner before you can create a discount code.",+ buttonText: "Create group discount",+ buttonHref: group?.slug+ ? `/${slug}/program/groups/${group.slug}/discounts`+ : `/${slug}/program/groups`,+ };++ return (+ <>+ <div className="flex items-end justify-between gap-4">+ <h2 className="text-content-emphasis text-lg font-semibold">+ Discount codes+ </h2>+ <Button+ variant="secondary"+ text="Create code"+ className="h-8 w-fit rounded-lg px-3 py-2 font-medium"+ onClick={() => setShowAddDiscountCodeModal(true)}+ disabled={!!disabledReason}+ disabledTooltip={disabledReason}+ />+ </div>++ {loading ? (+ <div className="flex justify-center py-16">+ <LoadingSpinner />+ </div>+ ) : !error && (!discountCodes || discountCodes.length === 0) ? (+ <div className="flex flex-col items-center justify-center gap-2 rounded-lg border border-neutral-200 bg-neutral-50 py-6">+ <div className="flex max-w-sm flex-col items-center gap-2 text-center">+ <DiscountCode className="mb-2 size-6 text-neutral-900" />+ <h3 className="text-content-emphasis text-sm font-semibold leading-5">+ No discount codes created+ </h3>+ <p className="text-content-subtle -mt-1 text-sm font-medium leading-5">+ {discountCodeEmptyState.description}+ </p>+ {discountCodeEmptyState.buttonHref && (+ <ButtonLink+ href={discountCodeEmptyState.buttonHref}+ target={+ discountCodeEmptyState.buttonHref.startsWith("https")+ ? "_blank"+ : undefined+ }+ variant="secondary"+ className="mt-2 h-7 rounded-md px-3 text-sm font-medium"+ >+ {discountCodeEmptyState.buttonText}+ </ButtonLink>+ )}+ </div>+ </div>+ ) : error ? (+ <div className="flex justify-center py-16">+ <span className="text-content-subtle text-sm">+ Failed to load discount codes+ </span>+ </div>+ ) : (+ <CardList variant="compact">+ {discountCodes?.map((discountCode) => {+ const link = links?.find((l) => l.id === discountCode.linkId);++ return (+ <DiscountCodeCard+ key={discountCode.id}+ discountCode={discountCode}+ link={link}+ partner={partner}+ group={group}+ slug={slug}+ onDelete={() => {+ setSelectedDiscountCode(discountCode);+ setShowDeleteDiscountCodeModal(true);+ }}+ />+ );+ })}+ </CardList>+ )}++ <AddDiscountCodeModal />++ {selectedDiscountCode && (+ <DeleteDiscountCodeModal+ showModal={showDeleteDiscountCodeModal}+ setShowModal={setShowDeleteDiscountCodeModal}+ discountCode={selectedDiscountCode}+ />+ )}+ </>+ );+}++function DiscountCodeCard({+ discountCode,+ link,+ partner,+ group,+ slug,+ onDelete,+}: {+ discountCode: DiscountCodeProps;+ link?: PartnerLink;+ partner: PartnerForDiscountOverride;+ group?: GroupProps | null;+ slug?: string;+ onDelete: () => void;+}) {+ const { plan } = useWorkspace();+ const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);+ const { advancedUpsellModal, setShowAdvancedUpsellModal } =+ useAdvancedUpsellModal();++ const partnerLink = link ? constructPartnerLink({ group, link }) : "";+ const hasDiscountOverride = Boolean(link?.discount);+ const conversions = link?.conversions ?? 0;++ const { EditPartnerDiscountModal, setShowEditPartnerDiscountModal } =+ useEditPartnerDiscountModal({+ target: link ? { type: "link", link, partner } : null,+ group,+ });++ const editDiscountDisabledTooltip = !link+ ? "Link not found"+ : !canUseAdvancedRewardLogic+ ? (+ <TooltipContent+ title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}+ cta="Upgrade to Advanced"+ onClick={() => setShowAdvancedUpsellModal(true)}+ />+ )+ : undefined;++ return (+ <>+ {advancedUpsellModal}+ <CardList.Card+ innerClassName="flex items-center justify-between gap-4 px-3 py-2.5"+ hoverStateEnabled={false}+ >+ <div className="flex min-w-0 flex-1 items-center">+ <div className="w-40 shrink-0">+ <DiscountCodeBadge+ code={discountCode.code}+ disabledAt={discountCode.disabledAt}+ />+ </div>++ {link ? (+ <div className="flex min-w-0 items-center gap-2">+ <Link+ href={`/${slug}/links/${link.domain}/${link.key}`}+ target="_blank"+ className="text-content-default cursor-alias truncate text-sm font-medium decoration-dotted hover:underline"+ >+ {getPrettyUrl(partnerLink)}+ </Link>+ {hasDiscountOverride && (+ <Tooltip+ content={+ <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">+ This link has a discount override+ </div>+ }+ >+ <div className="flex h-5 shrink-0 items-center justify-center rounded-md bg-neutral-100 px-1">+ <DiscountCode className="size-3 text-neutral-700" />+ </div>+ </Tooltip>+ )}+ </div>+ ) : (+ <span className="text-sm text-neutral-500">Link not found</span>+ )}+ </div>++ <div className="flex shrink-0 items-center gap-3">+ {link && (+ <Tooltip+ content={+ <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">+ {nFormatter(conversions, { full: true })}{" "}+ {pluralize("conversion", conversions)}+ </div>+ }+ >+ <Link+ href={`/${slug}/events?event=sales&interval=all&domain=${link.domain}&key=${link.key}`}+ target="_blank"+ className="flex items-center gap-1.5"+ >+ <DiscountCode+ data-active={conversions > 0}+ className={cn(+ "size-4 shrink-0 text-neutral-400",+ "data-[active=true]:text-green-600",+ )}+ />+ <span className="text-xs font-medium text-neutral-700">+ {nFormatter(conversions)}+ </span>+ </Link>+ </Tooltip>+ )}++ <DiscountCodeCardMenu+ code={discountCode.code}+ partnerLink={partnerLink}+ onDelete={onDelete}+ onEditDiscount={() => setShowEditPartnerDiscountModal(true)}+ editDiscountDisabledTooltip={editDiscountDisabledTooltip}+ />+ </div>+ </CardList.Card>+ <EditPartnerDiscountModal />+ </>+ );+}++function DiscountCodeCardMenu({+ code,+ partnerLink,+ onDelete,+ onEditDiscount,+ editDiscountDisabledTooltip,+}: {+ code: string;+ partnerLink: string;+ onDelete: () => void;+ onEditDiscount: () => void;+ editDiscountDisabledTooltip?: ReactNode;+}) {+ const [openPopover, setOpenPopover] = useState(false);+ const [, copyToClipboard] = useCopyToClipboard();++ return (+ <Popover+ align="end"+ openPopover={openPopover}+ setOpenPopover={setOpenPopover}+ content={+ <Command tabIndex={0} loop className="focus:outline-none">+ <Command.List className="flex w-screen flex-col gap-1 p-1.5 text-sm focus-visible:outline-none sm:w-auto sm:min-w-[180px]">+ <MenuItem+ as={Command.Item}+ icon={DiscountCode}+ disabledTooltip={editDiscountDisabledTooltip}+ onSelect={() => {+ setOpenPopover(false);+ onEditDiscount();+ }}+ >+ Edit discount+ </MenuItem>+ <MenuItem+ as={Command.Item}+ icon={Copy}+ onSelect={() => {+ toast.promise(copyToClipboard(code), {+ success: "Copied discount code to clipboard",+ });+ setOpenPopover(false);+ }}+ >+ Copy discount code+ </MenuItem>+ <MenuItem+ as={Command.Item}+ icon={Copy}+ disabled={!partnerLink}+ onSelect={() => {+ toast.promise(copyToClipboard(partnerLink), {+ success: "Copied to clipboard",+ });+ setOpenPopover(false);+ }}+ >+ Copy link+ </MenuItem>+ <MenuItem+ as={Command.Item}+ variant="danger"+ icon={Trash}+ onSelect={() => {+ setOpenPopover(false);+ onDelete();+ }}+ >+ Delete discount code+ </MenuItem>+ </Command.List>+ </Command>+ }+ >+ <Button+ type="button"+ variant="outline"+ className="size-6 shrink-0 rounded-lg p-0"+ icon={<ThreeDots className="size-3.5 shrink-0" />}+ />+ </Popover>+ );+}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/page.tsxindex 11256da140..ac0813af7f 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/page.tsx@@ -2,37 +2,16 @@import { usePartnerReferral } from "@/lib/partner-referrals/hooks/use-partner-referral";import { constructPartnerReferralLink } from "@/lib/partner-referrals/utils";-import { constructPartnerLink } from "@/lib/partners/construct-partner-link";-import useDiscountCodes from "@/lib/swr/use-discount-codes";-import useGroup from "@/lib/swr/use-group";import usePartner from "@/lib/swr/use-partner";import useProgram from "@/lib/swr/use-program";import useWorkspace from "@/lib/swr/use-workspace";-import {- DiscountCodeProps,- EnrolledPartnerExtendedProps,- EnrolledPartnerProps,-} from "@/lib/types";-import { useAddDiscountCodeModal } from "@/ui/modals/add-discount-code-modal";-import { useAddPartnerLinkModal } from "@/ui/modals/add-partner-link-modal";-import { DeleteDiscountCodeModal } from "@/ui/modals/delete-discount-code-modal";-import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";-import { ButtonLink } from "@/ui/placeholders/button-link";-import {- Button,- CopyButton,- LoadingSpinner,- Table,- Tag,- TooltipContent,- useTable,-} from "@dub/ui";-import { Trash } from "@dub/ui/icons";+import { EnrolledPartnerProps } from "@/lib/types";+import { CopyButton, LoadingSpinner, Table, useTable } from "@dub/ui";import { cn, currencyFormatter, getPrettyUrl, nFormatter } from "@dub/utils";-import { DiscountProvider } from "@prisma/client";-import Link from "next/link";import { useParams, useRouter } from "next/navigation";-import { useMemo, useState } from "react";+import { useMemo } from "react";+import { PartnerDiscountCodes } from "./discount-codes";+import { ReferralLinks } from "./referral-links";export default function ProgramPartnerLinksPage() {const { partnerId } = useParams() as { partnerId: string };@@ -40,7 +19,7 @@ export default function ProgramPartnerLinksPage() {return partner ? (<div className="grid min-w-0 gap-4">- <PartnerLinks partner={partner} />+ <ReferralLinks partner={partner} /><PartnerDiscountCodes partner={partner} /><PartnerReferralLink partner={partner} /></div>@@ -57,137 +36,6 @@ export default function ProgramPartnerLinksPage() {);}-const PartnerLinks = ({ partner }: { partner: EnrolledPartnerProps }) => {- const { slug } = useWorkspace();-- const { group } = useGroup({- groupIdOrSlug: partner.groupId ?? undefined,- });-- const { AddPartnerLinkModal, setShowAddPartnerLinkModal } =- useAddPartnerLinkModal({- partner,- });-- const table = useTable({- data: partner.links || [],- columns: [- {- id: "shortLink",- header: "Link",- meta: {- disableTruncate: true,- },- cell: ({ row }) => {- const partnerLink = constructPartnerLink({- group: group ?? undefined,- link: row.original,- });- return (- <div className="flex items-center gap-3">- <Link- href={`/${slug}/links/${row.original.domain}/${row.original.key}`}- target="_blank"- className="cursor-alias font-medium text-black decoration-dotted hover:underline"- >- {getPrettyUrl(partnerLink)}- </Link>- <CopyButton value={partnerLink} className="p-0.5" />- </div>- );- },- },- {- header: "Clicks",- size: 1,- minSize: 1,- cell: ({ row }) => (- <Link- href={`/${slug}/events?event=clicks&interval=all&domain=${row.original.domain}&key=${row.original.key}`}- target="_blank"- className="block w-full cursor-alias decoration-dotted hover:underline"- >- {nFormatter(row.original.clicks)}- </Link>- ),- },- {- header: "Leads",- size: 1,- minSize: 1,- cell: ({ row }) => (- <Link- href={`/${slug}/events?event=leads&interval=all&domain=${row.original.domain}&key=${row.original.key}`}- target="_blank"- className="block w-full cursor-alias decoration-dotted hover:underline"- >- {nFormatter(row.original.leads)}- </Link>- ),- },- {- header: "Conversions",- size: 1,- minSize: 1,- cell: ({ row }) => (- <Link- href={`/${slug}/events?event=sales&interval=all&domain=${row.original.domain}&key=${row.original.key}`}- target="_blank"- className="block w-full cursor-alias decoration-dotted hover:underline"- >- {nFormatter(row.original.conversions)}- </Link>- ),- },- {- header: "Revenue",- accessorFn: (d) =>- currencyFormatter(d.saleAmount, {- trailingZeroDisplay: "stripIfInteger",- }),- size: 1,- minSize: 1,- cell: ({ row }) => (- <Link- href={`/${slug}/events?event=sales&interval=all&domain=${row.original.domain}&key=${row.original.key}`}- target="_blank"- className="block w-full cursor-alias decoration-dotted hover:underline"- >- {currencyFormatter(row.original.saleAmount, {- trailingZeroDisplay: "stripIfInteger",- })}- </Link>- ),- },- ],- resourceName: (p) => `link${p ? "s" : ""}`,- thClassName: (id) =>- cn(id === "total" && "[&>div]:justify-end", "border-l-0"),- tdClassName: (id) => cn(id === "total" && "text-right", "border-l-0"),- className: "[&_tr:last-child>td]:border-b-transparent",- containerClassName: "w-full max-w-full overflow-hidden",- scrollWrapperClassName: "min-h-[40px] max-w-full",- } as any);-- return (- <>- <div className="flex items-end justify-between gap-4">- <h2 className="text-content-emphasis text-lg font-semibold">- Referral links- </h2>- <Button- variant="secondary"- text="Create link"- className="h-8 w-fit rounded-lg px-3 py-2 font-medium"- onClick={() => setShowAddPartnerLinkModal(true)}- />- </div>- <Table {...table} />- <AddPartnerLinkModal />- </>- );-};-const PartnerReferralLink = ({partner,}: {@@ -301,226 +149,3 @@ const PartnerReferralLink = ({</>);};--const PartnerDiscountCodes = ({- partner,-}: {- partner: EnrolledPartnerExtendedProps;-}) => {- const { slug, stripeConnectId, shopifyStoreId } = useWorkspace();- const { group } = useGroup({- groupIdOrSlug: partner.groupId ?? undefined,- });-- const [selectedDiscountCode, setSelectedDiscountCode] =- useState<DiscountCodeProps | null>(null);-- const [showDeleteDiscountCodeModal, setShowDeleteDiscountCodeModal] =- useState(false);-- const { discountCodes, loading, error } = useDiscountCodes({- partnerId: partner.id || null,- });-- const { AddDiscountCodeModal, setShowAddDiscountCodeModal } =- useAddDiscountCodeModal({- partner,- });-- const table = useTable({- data: discountCodes || [],- columns: [- {- id: "code",- header: "Code",- cell: ({ row }) => (- <DiscountCodeBadge- code={row.original.code}- disabledAt={row.original.disabledAt}- />- ),- },- {- id: "shortLink",- header: "Link",- cell: ({ row }) => {- const link = partner.links?.find((l) => l.id === row.original.linkId);- return link ? (- <Link- href={`/${slug}/links/${link.domain}/${link.key}`}- target="_blank"- className="cursor-alias font-medium text-black decoration-dotted hover:underline"- >- {getPrettyUrl(link.shortLink)}- </Link>- ) : (- <span className="text-neutral-500">Link not found</span>- );- },- },- {- id: "menu",- enableHiding: false,- minSize: 28,- size: 28,- maxSize: 28,- cell: ({ row }) => (- <Button- icon={<Trash className="size-3.5 shrink-0 text-neutral-600" />}- variant="outline"- className="size-8 whitespace-nowrap"- onClick={() => {- setSelectedDiscountCode(row.original);- setShowDeleteDiscountCodeModal(true);- }}- />- ),- },- ],- resourceName: (p) => `discount code${p ? "s" : ""}`,- thClassName: (id) =>- cn(id === "total" && "[&>div]:justify-end", "border-l-0"),- tdClassName: (id) => cn(id === "total" && "text-right", "border-l-0"),- className: "[&_tr:last-child>td]:border-b-transparent",- scrollWrapperClassName: "min-h-[40px]",- loading,- error: error ? "Failed to load discount codes" : undefined,- } as any);-- const disabledReason = useMemo(() => {- if (!partner.discount) {- return "No discount assigned to this partner group. Please add a discount before you can create a discount code.";- }-- if (- partner.discount.provider === DiscountProvider.stripe &&- !stripeConnectId- ) {- return (- <TooltipContent- title="Your workspace isn't connected to Stripe yet. Please install the Dub Stripe app in settings to create discount codes."- cta="Install Stripe app"- href={`/${slug}/settings/integrations/stripe`}- target="_blank"- />- );- }-- if (- partner.discount.provider === DiscountProvider.shopify &&- !shopifyStoreId- ) {- return (- <TooltipContent- title="Your workspace isn't connected to Shopify yet. Please install the Dub Shopify app in settings to create discount codes."- cta="Install Shopify app"- href={`/${slug}/settings/integrations/shopify`}- target="_blank"- />- );- }-- if (partner.links?.length === 0) {- return "No links assigned to this partner group. Please add a link before you can create a discount code.";- }-- if (partner.links?.length === discountCodes?.length) {- return "All links have a discount code assigned to them. Please add a new link before you can create a discount code.";- }-- return undefined;- }, [- partner.discount,- partner.links,- discountCodes,- stripeConnectId,- shopifyStoreId,- ]);-- const groupDiscount = group?.discount ?? partner.discount;-- const discountCodeEmptyState = groupDiscount- ? {- description:- "Great for short-form content, podcasts and more. Works alongside link-based discounts.",- buttonText: "Learn more",- buttonHref:- "https://dub.co/help/article/dual-sided-incentives#option-2-using-stripe-promo-codes-no-code-required",- }- : {- description:- "You need to create a group discount for this partner before you can create a discount code.",- buttonText: "Create group discount",- buttonHref: group?.slug- ? `/${slug}/program/groups/${group.slug}/discounts`- : `/${slug}/program/groups`,- };-- return (- <>- <div className="flex items-end justify-between gap-4">- <h2 className="text-content-emphasis text-lg font-semibold">- Discount codes- </h2>- <Button- variant="secondary"- text="Create code"- className="h-8 w-fit rounded-lg px-3 py-2 font-medium"- onClick={() => setShowAddDiscountCodeModal(true)}- disabled={!!disabledReason}- disabledTooltip={disabledReason}- />- </div>-- {loading ? (- <div className="flex justify-center py-16">- <LoadingSpinner />- </div>- ) : !error && (!discountCodes || discountCodes.length === 0) ? (- <div className="flex flex-col items-center justify-center gap-2 rounded-lg border border-neutral-200 bg-neutral-50 py-6">- <div className="flex max-w-sm flex-col items-center gap-2 text-center">- <Tag className="mb-2 size-6 text-neutral-900" />- <h3 className="text-content-emphasis text-sm font-semibold leading-5">- No discount codes created- </h3>- <p className="text-content-subtle -mt-1 text-sm font-medium leading-5">- {discountCodeEmptyState.description}- </p>- {discountCodeEmptyState.buttonHref && (- <ButtonLink- href={discountCodeEmptyState.buttonHref}- target={- discountCodeEmptyState.buttonHref.startsWith("https")- ? "_blank"- : undefined- }- variant="secondary"- className="mt-2 h-7 rounded-md px-3 text-sm font-medium"- >- {discountCodeEmptyState.buttonText}- </ButtonLink>- )}- </div>- </div>- ) : error ? (- <div className="flex justify-center py-16">- <span className="text-content-subtle text-sm">- Failed to load discount codes- </span>- </div>- ) : (- <Table {...table} />- )}-- <AddDiscountCodeModal />-- {selectedDiscountCode && (- <DeleteDiscountCodeModal- showModal={showDeleteDiscountCodeModal}- setShowModal={setShowDeleteDiscountCodeModal}- discountCode={selectedDiscountCode}- />- )}- </>- );-};diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsxnew file mode 100644index 0000000000..823fb84a88--- /dev/null+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx@@ -0,0 +1,467 @@+"use client";++import { constructPartnerLink } from "@/lib/partners/construct-partner-link";+import { getPlanCapabilities } from "@/lib/plan-capabilities";+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";+import useGroup from "@/lib/swr/use-group";+import {+ ProgramPartnerLinkExtended,+ useProgramPartnerLinks,+} from "@/lib/swr/use-program-partner-links";+import useWorkspace from "@/lib/swr/use-workspace";+import { EnrolledPartnerProps, GroupProps } from "@/lib/types";+import { useAddPartnerLinkModal } from "@/ui/modals/add-partner-link-modal";+import { useEditPartnerDiscountModal } from "@/ui/modals/edit-partner-discount-modal";+import { useEditPartnerRewardModal } from "@/ui/modals/edit-partner-reward-modal";+import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";+import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";+import { RewardOverrideIcon } from "@/ui/partners/rewards/reward-override-icon";+import { ThreeDots } from "@/ui/shared/icons";+import {+ Button,+ CardList,+ CopyButton,+ CursorRays,+ Discount,+ DiscountCode,+ InvoiceDollar,+ LoadingSpinner,+ MenuItem,+ Popover,+ Shuffle,+ Tooltip,+ TooltipContent,+ UserCheck,+ useCopyToClipboard,+} from "@dub/ui";+import {+ cn,+ currencyFormatter,+ getPrettyUrl,+ nFormatter,+ pluralize,+} from "@dub/utils";+import { Command } from "cmdk";+import Link from "next/link";+import { type ReactNode, useState } from "react";++type PartnerLink = ProgramPartnerLinkExtended;+type PartnerForOverrides = Pick<+ EnrolledPartnerProps,+ | "id"+ | "name"+ | "email"+ | "image"+ | "groupId"+ | "clickRewardId"+ | "leadRewardId"+ | "saleRewardId"+ | "discountId"+>;++const LINK_REWARD_OVERRIDE_EVENTS = ["click", "lead", "sale"] as const;++function getLinkRewardOverride(+ link: Pick<PartnerLink, "clickReward" | "leadReward" | "saleReward">,+) {+ return LINK_REWARD_OVERRIDE_EVENTS.filter((event) => {+ const reward = {+ click: link.clickReward,+ lead: link.leadReward,+ sale: link.saleReward,+ }[event];++ return Boolean(reward);+ });+}++function OverrideIndicator({+ tooltip,+ disabledTooltip,+ ariaLabel,+ onClick,+ children,+}: {+ tooltip: string;+ disabledTooltip?: ReactNode;+ ariaLabel: string;+ onClick: () => void;+ children: ReactNode;+}) {+ return (+ <Tooltip+ content={+ disabledTooltip ?? (+ <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">+ {tooltip}+ </div>+ )+ }+ >+ <button+ type="button"+ aria-label={ariaLabel}+ onClick={disabledTooltip ? undefined : onClick}+ className={cn(+ "flex h-5 items-center",+ disabledTooltip ? "cursor-not-allowed" : "cursor-pointer",+ )}+ >+ <span className="relative flex">+ {children}+ <RewardOverrideIcon />+ </span>+ </button>+ </Tooltip>+ );+}++function OverrideIndicatorGroup({+ disabled,+ children,+}: {+ disabled?: boolean;+ children: ReactNode;+}) {+ return (+ <div+ className={cn(+ "flex h-5 shrink-0 items-center gap-1 rounded-md bg-neutral-100 px-1 transition-colors",+ !disabled && "hover:bg-neutral-200",+ )}+ >+ {children}+ </div>+ );+}++const formatStatCount = ({ count, unit }: { count: number; unit: string }) => ({+ count,+ formatted: nFormatter(count),+ tooltip: `${nFormatter(count, { full: true })} ${pluralize(unit, count)}`,+});++const PARTNER_LINK_STATS = [+ {+ id: "clicks",+ icon: CursorRays,+ event: "clicks",+ iconClassName: "data-[active=true]:text-blue-500",+ getValue: (link: PartnerLink) =>+ formatStatCount({+ count: link.clicks,+ unit: "click",+ }),+ },+ {+ id: "leads",+ icon: UserCheck,+ event: "leads",+ iconClassName: "data-[active=true]:text-purple-500",+ getValue: (link: PartnerLink) =>+ formatStatCount({+ count: link.leads,+ unit: "lead",+ }),+ },+ {+ id: "conversions",+ icon: Shuffle,+ event: "sales",+ iconClassName: "data-[active=true]:text-orange-500",+ getValue: (link: PartnerLink) =>+ formatStatCount({+ count: link.conversions,+ unit: "conversion",+ }),+ },+ {+ id: "revenue",+ icon: InvoiceDollar,+ event: "sales",+ iconClassName: "data-[active=true]:text-teal-500",+ getValue: (link: PartnerLink) => ({+ count: link.saleAmount,+ formatted: `$${nFormatter(link.saleAmount / 100)}`,+ tooltip: `${currencyFormatter(link.saleAmount, { trailingZeroDisplay: "stripIfInteger" })} revenue`,+ }),+ },+] as const;++export function ReferralLinks({ partner }: { partner: EnrolledPartnerProps }) {+ const { slug } = useWorkspace();++ const { group } = useGroup({+ groupIdOrSlug: partner.groupId ?? undefined,+ });++ const { AddPartnerLinkModal, setShowAddPartnerLinkModal } =+ useAddPartnerLinkModal({+ partner,+ });++ const { links, loading, error } = useProgramPartnerLinks({+ partnerId: partner.id,+ });++ return (+ <>+ <div className="flex items-end justify-between gap-4">+ <h2 className="text-content-emphasis text-lg font-semibold">+ Referral links+ </h2>+ <Button+ variant="secondary"+ text="Create link"+ className="h-8 w-fit rounded-lg px-3 py-2 font-medium"+ onClick={() => setShowAddPartnerLinkModal(true)}+ />+ </div>+ {loading ? (+ <div className="flex justify-center py-8">+ <LoadingSpinner />+ </div>+ ) : error ? (+ <div className="text-content-subtle rounded-xl border border-neutral-200 py-8 text-center text-sm">+ Failed to load partner links+ </div>+ ) : links && links.length > 0 ? (+ <CardList variant="compact">+ {links.map((link) => (+ <PartnerLinkCard+ key={link.id}+ link={link}+ partner={partner}+ group={group}+ slug={slug}+ />+ ))}+ </CardList>+ ) : (+ <div className="text-content-subtle rounded-xl border border-neutral-200 py-8 text-center text-sm">+ No links created+ </div>+ )}+ <AddPartnerLinkModal />+ </>+ );+}++function PartnerLinkCard({+ link,+ partner,+ group,+ slug,+}: {+ link: PartnerLink;+ partner: PartnerForOverrides;+ group?: GroupProps | null;+ slug?: string;+}) {+ const { plan } = useWorkspace();+ const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);+ const { advancedUpsellModal, setShowAdvancedUpsellModal } =+ useAdvancedUpsellModal();++ const partnerLink = constructPartnerLink({+ group,+ link,+ });+ const rewardEvents = getLinkRewardOverride(link);+ const [rewardEvent, setRewardEvent] = useState<"sale" | "lead" | "click">(+ "sale",+ );++ const { EditPartnerRewardModal, setShowEditPartnerRewardModal } =+ useEditPartnerRewardModal({+ event: rewardEvent,+ target: { type: "link", link, partner },+ group,+ });++ const { EditPartnerDiscountModal, setShowEditPartnerDiscountModal } =+ useEditPartnerDiscountModal({+ target: { type: "link", link, partner },+ group,+ });++ const overrideDisabledTooltip = !canUseAdvancedRewardLogic ? (+ <TooltipContent+ title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}+ cta="Upgrade to Advanced"+ onClick={() => setShowAdvancedUpsellModal(true)}+ />+ ) : undefined;++ return (+ <>+ {advancedUpsellModal}+ <CardList.Card+ innerClassName="flex items-center justify-between gap-4 px-3 py-2.5"+ hoverStateEnabled={false}+ >+ <div className="flex min-w-0 items-center gap-2">+ <div className="flex min-w-0 items-center gap-1">+ <Link+ href={`/${slug}/links/${link.domain}/${link.key}`}+ target="_blank"+ className="text-content-default cursor-alias truncate text-sm font-medium decoration-dotted hover:underline"+ >+ {getPrettyUrl(partnerLink)}+ </Link>+ <CopyButton+ value={partnerLink}+ variant="neutral"+ className="shrink-0 p-1"+ />+ </div>+ {rewardEvents.length > 0 && (+ <OverrideIndicatorGroup disabled={Boolean(overrideDisabledTooltip)}>+ {rewardEvents.map((event) => {+ const Icon = REWARD_EVENT_ICON[event];+ return (+ <OverrideIndicator+ key={event}+ tooltip={`This link has a ${event} reward override`}+ disabledTooltip={overrideDisabledTooltip}+ ariaLabel={`Edit ${event} reward`}+ onClick={() => {+ setRewardEvent(event);+ setShowEditPartnerRewardModal(true);+ }}+ >+ <Icon className="size-3 text-neutral-700" />+ </OverrideIndicator>+ );+ })}+ </OverrideIndicatorGroup>+ )}+ {link.discount && (+ <OverrideIndicatorGroup disabled={Boolean(overrideDisabledTooltip)}>+ <OverrideIndicator+ tooltip="This link has a discount override"+ disabledTooltip={overrideDisabledTooltip}+ ariaLabel="Edit discount"+ onClick={() => setShowEditPartnerDiscountModal(true)}+ >+ <DiscountCode className="size-3 text-neutral-700" />+ </OverrideIndicator>+ </OverrideIndicatorGroup>+ )}+ </div>++ <div className="flex shrink-0 items-center gap-3">+ {PARTNER_LINK_STATS.map(+ ({ id, icon: Icon, event, getValue, iconClassName }) => {+ const { count, formatted, tooltip } = getValue(link);++ return (+ <Tooltip+ key={id}+ content={+ <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">+ {tooltip}+ </div>+ }+ >+ <Link+ href={`/${slug}/events?event=${event}&interval=all&domain=${link.domain}&key=${link.key}`}+ target="_blank"+ className="flex items-center gap-1.5"+ >+ <Icon+ data-active={count > 0}+ className={cn(+ "size-4 shrink-0 text-neutral-400",+ iconClassName,+ )}+ />+ <span className="text-xs font-medium text-neutral-700">+ {formatted}+ </span>+ </Link>+ </Tooltip>+ );+ },+ )}++ <PartnerLinkCardMenu+ partnerLink={partnerLink}+ overrideDisabledTooltip={overrideDisabledTooltip}+ onEditReward={(event) => {+ setRewardEvent(event);+ setShowEditPartnerRewardModal(true);+ }}+ onEditDiscount={() => setShowEditPartnerDiscountModal(true)}+ />+ </div>+ </CardList.Card>+ <EditPartnerRewardModal />+ <EditPartnerDiscountModal />+ </>+ );+}++function PartnerLinkCardMenu({+ partnerLink,+ onEditReward,+ onEditDiscount,+ overrideDisabledTooltip,+}: {+ partnerLink: string;+ onEditReward: (event: "sale" | "lead" | "click") => void;+ onEditDiscount: () => void;+ overrideDisabledTooltip?: ReactNode;+}) {+ const [openPopover, setOpenPopover] = useState(false);+ const [, copyToClipboard] = useCopyToClipboard();++ return (+ <Popover+ align="end"+ openPopover={openPopover}+ setOpenPopover={setOpenPopover}+ content={+ <Command tabIndex={0} loop className="focus:outline-none">+ <Command.List className="flex w-screen flex-col gap-1 p-1.5 text-sm focus-visible:outline-none sm:w-auto sm:min-w-[180px]">+ {(["sale", "lead", "click"] as const).map((event) => {+ const Icon = REWARD_EVENT_ICON[event];+ return (+ <MenuItem+ key={event}+ as={Command.Item}+ icon={Icon}+ disabledTooltip={overrideDisabledTooltip}+ onSelect={() => {+ setOpenPopover(false);+ onEditReward(event);+ }}+ >+ Edit {event} reward+ </MenuItem>+ );+ })}+ <MenuItem+ as={Command.Item}+ icon={Discount}+ disabledTooltip={overrideDisabledTooltip}+ onSelect={() => {+ setOpenPopover(false);+ onEditDiscount();+ }}+ >+ Edit discount+ </MenuItem>+ </Command.List>+ </Command>+ }+ >+ <Button+ type="button"+ variant="outline"+ className="size-6 shrink-0 rounded-lg p-0"+ icon={<ThreeDots className="size-3.5 shrink-0" />}+ />+ </Popover>+ );+}diff --git a/apps/web/lib/actions/partners/delete-discount.ts b/apps/web/lib/actions/partners/delete-discount.tsindex 7e86f67db7..0144e7aef3 100644--- a/apps/web/lib/actions/partners/delete-discount.ts+++ b/apps/web/lib/actions/partners/delete-discount.ts@@ -4,10 +4,10 @@ import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";import { getDiscountOrThrow } from "@/lib/api/partners/get-discount-or-throw";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";+import { getPartnersByDiscountIds } from "@/lib/discounts/get-partners-by-discount-ids";import { deleteDiscountJob } from "@/lib/jobs/handlers/delete-discount-job";import { invalidateLinksForDiscountsJob } from "@/lib/jobs/handlers/invalidate-links-for-discounts-job";import { prisma } from "@/lib/prisma";-import { pluck } from "@dub/utils";import { waitUntil } from "@vercel/functions";import * as z from "zod/v4";import { authActionClient } from "../safe-action";@@ -31,43 +31,34 @@ export const deleteDiscountAction = authActionClientconst programId = getDefaultProgramIdOrThrow(workspace);- const discount = await getDiscountOrThrow({- programId,- discountId,- });-- const [enrollments, partnerGroup] = await Promise.all([- prisma.programEnrollment.findMany({- where: {- discountId: discount.id,- },- select: {- partnerId: true,- },- }),-- discount.groupId- ? prisma.partnerGroup.findUnique({- where: {- id: discount.groupId,- },+ const [discount, partners] = await Promise.all([+ getDiscountOrThrow({+ programId,+ discountId,+ include: {+ partnerGroup: {select: {discountId: true,},- })- : null,+ },+ },+ }),++ getPartnersByDiscountIds({+ discountIds: [discountId],+ }),]);- const partnerIds = pluck(enrollments, "partnerId");+ const partnerIds = partners.map((partner) => partner.id);// If the partner group has a discountId and it is not the same as the discount being deleted,// restore to that discountId; otherwise, set to null+ const groupDiscountId = discount.partnerGroup?.discountId;const restoredDiscountId =- partnerGroup?.discountId !== discount.id- ? partnerGroup?.discountId- : null;+ groupDiscountId !== discount.id ? groupDiscountId : null;- const discountCodes =+ // No override, so we need to remove all discount codes for this discount+ const discountCodesToRemove =restoredDiscountId == null? await prisma.discountCode.findMany({where: {@@ -99,6 +90,18 @@ export const deleteDiscountAction = authActionClient},});+ // Clear link-level discount overrides that pointed at this discount+ await tx.linkReward.updateMany({+ where: {+ discountId: discount.id,+ },+ data: {+ discountId: null,+ },+ });++ // Nothing to remap onto: delete now. If partners fall back to a group default,+ // keep this row until deleteDiscountJob remaps codes (equivalence needs both discounts).if (restoredDiscountId == null) {await tx.discount.delete({where: {@@ -127,7 +130,7 @@ export const deleteDiscountAction = authActionClientwaitUntil(Promise.allSettled([- ...(partnerIds.length > 0+ ...(partners.length > 0? [invalidateLinksForDiscountsJob.dispatch({@@ -142,7 +145,9 @@ export const deleteDiscountAction = authActionClient]: []),- ...(discountCodes != null ? [deleteDiscountCodes(discountCodes)] : []),+ ...(discountCodesToRemove != null+ ? [deleteDiscountCodes(discountCodesToRemove)]+ : []),recordAuditLog({workspaceId: workspace.id,diff --git a/apps/web/lib/actions/partners/delete-reward.ts b/apps/web/lib/actions/partners/delete-reward.tsindex cfffc56c0f..f342ed5025 100644--- a/apps/web/lib/actions/partners/delete-reward.ts+++ b/apps/web/lib/actions/partners/delete-reward.ts@@ -37,21 +37,20 @@ export const deleteRewardAction = authActionClientconst programId = getDefaultProgramIdOrThrow(workspace);- const reward = await getRewardOrThrow({+ const { partnerGroup, ...reward } = await getRewardOrThrow({rewardId,programId,+ include: {+ partnerGroup: {+ select: {+ id: true,+ },+ },+ },});const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[reward.event];- const group = reward.groupId- ? await prisma.partnerGroup.findUnique({- where: {- id: reward.groupId,- },- })- : null;-await prisma.$transaction(async (tx) => {await tx.partnerGroup.updateMany({where: {@@ -73,10 +72,10 @@ export const deleteRewardAction = authActionClient});});- if (group) {+ if (partnerGroup) {await queueRewardProcessing({event: "reward-deleted",- groupId: group.id,+ groupId: partnerGroup.id,occurredAt: new Date().toISOString(),rewardSnapshot: {id: reward.id,@@ -112,7 +111,7 @@ export const deleteRewardAction = authActionClientuserId: user.id,resourceId: reward.id,parentResourceType: "group",- parentResourceId: group?.id ?? reward.groupId,+ parentResourceId: partnerGroup?.id,old: reward,new: null,description: activityDescription,diff --git a/apps/web/lib/api-logs/constants.ts b/apps/web/lib/api-logs/constants.tsindex 8069bc8ddf..9b30f94280 100644--- a/apps/web/lib/api-logs/constants.ts+++ b/apps/web/lib/api-logs/constants.ts@@ -25,6 +25,7 @@ export const ROUTE_PATTERNS = [// Partners"/partners/links/upsert",+ "/partners/links/:linkId","/partners/links","/partners/applications/approve","/partners/applications/reject",diff --git a/apps/web/lib/api/activity-log/to-reward-activity-snapshot.ts b/apps/web/lib/api/activity-log/to-reward-activity-snapshot.tsindex 0432085ad8..89c7b3c92d 100644--- a/apps/web/lib/api/activity-log/to-reward-activity-snapshot.ts+++ b/apps/web/lib/api/activity-log/to-reward-activity-snapshot.ts@@ -1,4 +1,14 @@-import type { DiscountProps, RewardProps } from "@/lib/types";+import type { DiscountProps, LinkProps, RewardProps } from "@/lib/types";++export function toLinkActivitySnapshot(+ link: Pick<LinkProps, "id" | "domain" | "key">,+) {+ return {+ id: link.id,+ domain: link.domain,+ key: link.key,+ };+}export function toRewardActivitySnapshot(reward: Pick<diff --git a/apps/web/lib/api/activity-log/track-reward-overrides.ts b/apps/web/lib/api/activity-log/track-reward-overrides.tsindex a2c47a6e05..d32daaede7 100644--- a/apps/web/lib/api/activity-log/track-reward-overrides.ts+++ b/apps/web/lib/api/activity-log/track-reward-overrides.ts@@ -1,10 +1,19 @@import {toDiscountActivitySnapshot,+ toLinkActivitySnapshot,toRewardActivitySnapshot,} from "@/lib/api/activity-log/to-reward-activity-snapshot";-import type { TrackActivityLogInput } from "@/lib/api/activity-log/track-activity-log";+import {+ trackActivityLog,+ type TrackActivityLogInput,+} from "@/lib/api/activity-log/track-activity-log";import { serializeReward } from "@/lib/api/partners/serialize-reward";-import type { EnrollmentRewardIds } from "@/lib/api/rewards/reward-overrides";+import type {+ EnrollmentRewardIds,+ RewardOverrideIds,+} from "@/lib/api/rewards/reward-overrides";+import { prisma } from "@/lib/prisma";+import type { LinkProps } from "@/lib/types";import { Prisma } from "@prisma/client";type RewardOverrideBaseInput = {@@ -167,3 +176,159 @@ export async function trackPartnerRewardOverrideLog(})),});}++type LinkSnapshot = Pick<LinkProps, "id" | "domain" | "key">;++// Track link-level reward/discount overrides. Unlike the partner-level tracker,+// this variant runs outside a transaction and dispatches via trackActivityLog.+export async function trackLinkRewardOverrideLog(input: {+ workspaceId: string;+ programId: string;+ partnerId: string;+ userId: string;+ previous: RewardOverrideIds;+ next: RewardOverrideIds;+ description?: string;+ link: LinkSnapshot;+}) {+ const {+ workspaceId,+ programId,+ partnerId,+ userId,+ previous,+ next,+ description,+ link,+ } = input;++ const rewardFields = [+ ["clickReward", previous.clickRewardId, next.clickRewardId],+ ["leadReward", previous.leadRewardId, next.leadRewardId],+ ["saleReward", previous.saleRewardId, next.saleRewardId],+ ] as const;++ const changedRewardFields = rewardFields.filter(+ ([, oldId, newId]) => oldId !== newId,+ );+ const discountChanged = previous.discountId !== next.discountId;++ if (changedRewardFields.length === 0 && !discountChanged) {+ return;+ }++ const rewardIds = [+ ...new Set(+ changedRewardFields.flatMap(([, oldId, newId]) =>+ [oldId, newId].filter((id): id is string => Boolean(id)),+ ),+ ),+ ];++ const discountIds = [+ ...new Set(+ [previous.discountId, next.discountId].filter((id): id is string =>+ Boolean(id),+ ),+ ),+ ];++ const [rewards, discounts] = await Promise.all([+ rewardIds.length > 0+ ? prisma.reward.findMany({+ where: { id: { in: rewardIds } },+ })+ : [],+ discountChanged && discountIds.length > 0+ ? prisma.discount.findMany({+ where: { id: { in: discountIds } },+ select: {+ id: true,+ amount: true,+ type: true,+ maxDuration: true,+ description: true,+ },+ })+ : [],+ ]);++ const rewardsById = new Map<+ string,+ ReturnType<typeof toRewardActivitySnapshot>+ >();+ const discountsById = new Map<+ string,+ ReturnType<typeof toDiscountActivitySnapshot>+ >();++ for (const reward of rewards) {+ rewardsById.set(+ reward.id,+ toRewardActivitySnapshot(serializeReward(reward)),+ );+ }++ for (const discount of discounts) {+ discountsById.set(discount.id, toDiscountActivitySnapshot(discount));+ }++ const base = {+ workspaceId,+ programId,+ resourceType: "partner" as const,+ resourceId: partnerId,+ userId,+ };++ const activityLogs: TrackActivityLogInput[] = [];++ if (changedRewardFields.length > 0) {+ activityLogs.push({+ ...base,+ action: "link.rewardChanged",+ description,+ changeSet: {+ link: {+ old: null,+ new: toLinkActivitySnapshot(link),+ },+ ...Object.fromEntries(+ changedRewardFields.map(([field, oldId, newId]) => [+ field,+ {+ old: oldId ? rewardsById.get(oldId) ?? { id: oldId } : null,+ new: newId ? rewardsById.get(newId) ?? { id: newId } : null,+ },+ ]),+ ),+ },+ });+ }++ if (discountChanged) {+ activityLogs.push({+ ...base,+ action: "link.discountChanged",+ description,+ changeSet: {+ link: {+ old: null,+ new: toLinkActivitySnapshot(link),+ },+ discount: {+ old: previous.discountId+ ? discountsById.get(previous.discountId) ?? {+ id: previous.discountId,+ }+ : null,+ new: next.discountId+ ? discountsById.get(next.discountId) ?? { id: next.discountId }+ : null,+ },+ },+ });+ }++ await trackActivityLog(activityLogs);+}diff --git a/apps/web/lib/api/commissions/update-partner-commission.ts b/apps/web/lib/api/commissions/update-partner-commission.tsindex 5d8b4b8c12..87db97c92f 100644--- a/apps/web/lib/api/commissions/update-partner-commission.ts+++ b/apps/web/lib/api/commissions/update-partner-commission.ts@@ -147,10 +147,13 @@ export async function updatePartnerCommission({},});- const reward = determinePartnerReward({+ const partnerReward = await determinePartnerReward({event: "sale",programEnrollment,- })?.reward;+ linkId: commission.linkId,+ });++ const reward = partnerReward?.reward;if (!reward) {throw new DubApiError({diff --git a/apps/web/lib/api/links/create-link.ts b/apps/web/lib/api/links/create-link.tsindex bd518e74af..4fdb159047 100644--- a/apps/web/lib/api/links/create-link.ts+++ b/apps/web/lib/api/links/create-link.ts@@ -1,4 +1,8 @@import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";+import {+ hasRewardAssignment,+ RewardOverrideIdsInput,+} from "@/lib/api/rewards/reward-overrides";import { qstash } from "@/lib/cron";import { getPartnerEnrollmentInfo } from "@/lib/planetscale/get-partner-enrollment-info";import { prisma } from "@/lib/prisma";@@ -8,8 +12,8 @@ import { ProcessedLinkProps } from "@/lib/types";import { publishWorkspaceLinksUsageEvent } from "@/lib/upstash/redis-streams/workspace-links-usage";import {APP_DOMAIN_WITH_NGROK,- R2_URL,getParamsFromURL,+ R2_URL,truncate,} from "@dub/utils";import { linkConstructorSimple } from "@dub/utils/src/functions/link-constructor";@@ -24,7 +28,11 @@ import { encodeKeyIfCaseSensitive } from "./case-sensitivity";import { includeTags } from "./include-tags";import { transformLink } from "./utils";-export async function createLink(link: ProcessedLinkProps) {+type CreateLinkOptions = ProcessedLinkProps & {+ linkReward?: RewardOverrideIdsInput;+};++export async function createLink(link: CreateLinkOptions) {let {key,url,@@ -45,13 +53,15 @@ export async function createLink(link: ProcessedLinkProps) {const { utm_source, utm_medium, utm_campaign, utm_term, utm_content } =getParamsFromURL(url);- const { tagId, tagIds, tagNames, webhookIds, ...rest } = link;+ const { tagId, tagIds, tagNames, webhookIds, linkReward, ...rest } = link;key = encodeKeyIfCaseSensitive({domain: link.domain,key,});+ const hasLinkLevelReward = linkReward && hasRewardAssignment(linkReward);+const response = await withPrismaRetry(() =>prisma.link.create({data: {@@ -128,6 +138,18 @@ export async function createLink(link: ProcessedLinkProps) {},},}),++ // Link level rewards+ ...(hasLinkLevelReward && {+ linkReward: {+ create: {+ clickRewardId: linkReward.clickRewardId ?? null,+ leadRewardId: linkReward.leadRewardId ?? null,+ saleRewardId: linkReward.saleRewardId ?? null,+ discountId: linkReward.discountId ?? null,+ },+ },+ }),},include: {...includeTags,@@ -144,6 +166,7 @@ export async function createLink(link: ProcessedLinkProps) {const { partner, discount } = await getPartnerEnrollmentInfo({programId: response.programId,partnerId: response.partnerId,+ linkId: response.id,});await Promise.allSettled([diff --git a/apps/web/lib/api/links/update-link.ts b/apps/web/lib/api/links/update-link.tsindex d817179e29..365726b5c5 100644--- a/apps/web/lib/api/links/update-link.ts+++ b/apps/web/lib/api/links/update-link.ts@@ -180,6 +180,7 @@ export async function updateLink({const { partner, discount } = await getPartnerEnrollmentInfo({programId: response.programId,partnerId: response.partnerId,+ linkId: response.id,});await Promise.allSettled([diff --git a/apps/web/lib/api/partners/get-discount-or-throw.ts b/apps/web/lib/api/partners/get-discount-or-throw.tsindex 013bcb28b2..d7252ff35d 100644--- a/apps/web/lib/api/partners/get-discount-or-throw.ts+++ b/apps/web/lib/api/partners/get-discount-or-throw.ts@@ -1,17 +1,23 @@import { prisma } from "@/lib/prisma";+import { Prisma } from "@prisma/client";import { DubApiError } from "../errors";-export async function getDiscountOrThrow({+export async function getDiscountOrThrow<+ T extends Prisma.DiscountInclude = {},+>({discountId,programId,+ include,}: {discountId: string;programId: string;-}) {+ include?: T;+}): Promise<Prisma.DiscountGetPayload<{ include: T }>> {const discount = await prisma.discount.findUnique({where: {id: discountId,},+ include,});if (!discount) {@@ -28,5 +34,5 @@ export async function getDiscountOrThrow({});}- return discount;+ return discount as Prisma.DiscountGetPayload<{ include: T }>;}diff --git a/apps/web/lib/api/partners/get-reward-or-throw.ts b/apps/web/lib/api/partners/get-reward-or-throw.tsindex 2ca9287487..577e1eb6fa 100644--- a/apps/web/lib/api/partners/get-reward-or-throw.ts+++ b/apps/web/lib/api/partners/get-reward-or-throw.ts@@ -1,17 +1,21 @@import { prisma } from "@/lib/prisma";+import { Prisma } from "@prisma/client";import { DubApiError } from "../errors";-export async function getRewardOrThrow({+export async function getRewardOrThrow<T extends Prisma.RewardInclude = {}>({rewardId,programId,+ include,}: {rewardId: string;programId: string;-}) {+ include?: T;+}): Promise<Prisma.RewardGetPayload<{ include: T }>> {const reward = await prisma.reward.findUnique({where: {id: rewardId,},+ include,});if (!reward) {@@ -28,5 +32,5 @@ export async function getRewardOrThrow({});}- return reward;+ return reward as Prisma.RewardGetPayload<{ include: T }>;}diff --git a/apps/web/lib/api/partners/update-partner-link.ts b/apps/web/lib/api/partners/update-partner-link.tsnew file mode 100644index 0000000000..fa4975fa99--- /dev/null+++ b/apps/web/lib/api/partners/update-partner-link.ts@@ -0,0 +1,206 @@+import { trackLinkRewardOverrideLog } from "@/lib/api/activity-log/track-reward-overrides";+import { DubApiError } from "@/lib/api/errors";+import { linkCache } from "@/lib/api/links/cache";+import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";+import { notifyPartnerRewardOverride } from "@/lib/api/partners/notify-partner-reward-change";+import {+ hasRewardAssignment,+ hasRewardIdsInput,+ omitGroupDefaultRewardIds,+ RewardOverrideIdsInput,+ toPartnerLinkRewardIdFields,+} from "@/lib/api/rewards/reward-overrides";+import { throwIfInvalidRewards } from "@/lib/api/rewards/throw-if-invalid-rewards";+import { remapDiscountCodesForPartnerJob } from "@/lib/jobs/handlers/remap-discount-codes-for-partner-job";+import { getPlanCapabilities } from "@/lib/plan-capabilities";+import { prisma } from "@/lib/prisma";+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";+import { WorkspaceProps } from "@/lib/types";+import { updatePartnerLinkSchema } from "@/lib/zod/schemas/partners";+import { waitUntil } from "@vercel/functions";+import * as z from "zod/v4";++type UpdatePartnerLinkParams = {+ workspace: Pick<WorkspaceProps, "id" | "plan">;+ programId: string;+ linkId: string;+ userId: string;+ activityDescription?: z.infer<+ typeof updatePartnerLinkSchema+ >["activityDescription"];+} & RewardOverrideIdsInput;++export async function updatePartnerLink({+ workspace,+ programId,+ linkId,+ userId,+ activityDescription,+ ...body+}: UpdatePartnerLinkParams) {+ if (!hasRewardIdsInput(body)) {+ throw new DubApiError({+ code: "bad_request",+ message:+ "At least one of clickRewardId, leadRewardId, saleRewardId, or discountId must be provided.",+ });+ }++ if (+ hasRewardAssignment(body) &&+ !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic+ ) {+ throw new DubApiError({+ code: "forbidden",+ message: PARTNER_LEVEL_REWARDS_PLAN_ERROR,+ });+ }++ const link = await getLinkOrThrow({+ workspaceId: workspace.id,+ linkId,+ });++ if (link.programId !== programId || !link.partnerId) {+ throw new DubApiError({+ code: "not_found",+ message: "Partner link not found.",+ });+ }++ const [existingLinkReward, programEnrollment] = await Promise.all([+ prisma.linkReward.findUnique({+ where: {+ linkId: link.id,+ },+ select: {+ clickRewardId: true,+ leadRewardId: true,+ saleRewardId: true,+ discountId: true,+ },+ }),++ prisma.programEnrollment.findUnique({+ where: {+ partnerId_programId: {+ partnerId: link.partnerId,+ programId,+ },+ },+ select: {+ groupId: true,+ discountId: true,+ partnerGroup: {+ select: {+ clickRewardId: true,+ leadRewardId: true,+ saleRewardId: true,+ discountId: true,+ },+ },+ },+ }),+ ]);++ if (!programEnrollment) {+ throw new DubApiError({+ code: "not_found",+ message: "Partner not found.",+ });+ }++ const { partnerGroup } = programEnrollment;++ // Group defaults are inherited; only persist real link-level overrides.+ const linkRewardInput = omitGroupDefaultRewardIds({+ rewardIds: body,+ groupDefaults: partnerGroup,+ });++ await throwIfInvalidRewards({+ programId,+ groupId: programEnrollment.groupId,+ ...linkRewardInput,+ });++ const linkReward =+ hasRewardAssignment(linkRewardInput) || existingLinkReward+ ? await prisma.linkReward.upsert({+ where: {+ linkId: link.id,+ },+ create: {+ linkId: link.id,+ ...linkRewardInput,+ },+ update: {+ ...linkRewardInput,+ },+ })+ : null;++ if (body.discountId !== undefined) {+ await remapDiscountCodesForPartnerJob.dispatch(+ {+ programId,+ partnerId: link.partnerId,+ },+ {+ label: link.partnerId,+ },+ );+ }++ waitUntil(+ Promise.allSettled([+ linkCache.expireMany([link]),+ trackLinkRewardOverrideLog({+ workspaceId: workspace.id,+ programId,+ partnerId: link.partnerId,+ userId,+ description: activityDescription,+ previous: {+ clickRewardId: existingLinkReward?.clickRewardId ?? null,+ leadRewardId: existingLinkReward?.leadRewardId ?? null,+ saleRewardId: existingLinkReward?.saleRewardId ?? null,+ discountId: existingLinkReward?.discountId ?? null,+ },+ next: {+ clickRewardId: linkReward?.clickRewardId ?? null,+ leadRewardId: linkReward?.leadRewardId ?? null,+ saleRewardId: linkReward?.saleRewardId ?? null,+ discountId: linkReward?.discountId ?? null,+ },+ link,+ }),++ notifyPartnerRewardOverride({+ programId,+ partnerId: link.partnerId,+ previous: {+ clickRewardId: existingLinkReward?.clickRewardId ?? null,+ leadRewardId: existingLinkReward?.leadRewardId ?? null,+ saleRewardId: existingLinkReward?.saleRewardId ?? null,+ },+ next: {+ clickRewardId: linkReward?.clickRewardId ?? null,+ leadRewardId: linkReward?.leadRewardId ?? null,+ saleRewardId: linkReward?.saleRewardId ?? null,+ },+ groupRewardIds: {+ clickRewardId: partnerGroup?.clickRewardId ?? null,+ leadRewardId: partnerGroup?.leadRewardId ?? null,+ saleRewardId: partnerGroup?.saleRewardId ?? null,+ },+ activityDescription,+ }),+ ]),+ );++ return {+ ...link,+ ...toPartnerLinkRewardIdFields(linkReward),+ };+}diff --git a/apps/web/lib/api/programs/get-program-enrollment-or-throw.ts b/apps/web/lib/api/programs/get-program-enrollment-or-throw.tsindex 4b08f18e62..f94057dee5 100644--- a/apps/web/lib/api/programs/get-program-enrollment-or-throw.ts+++ b/apps/web/lib/api/programs/get-program-enrollment-or-throw.ts@@ -18,6 +18,7 @@ export async function getProgramEnrollmentOrThrow<...include,links: include.links? {+ ...(typeof include.links === "object" ? include.links : {}),orderBy: {createdAt: "asc",},diff --git a/apps/web/lib/api/rewards/reward-overrides.ts b/apps/web/lib/api/rewards/reward-overrides.tsindex 75ac7de54a..8c2e1c0d91 100644--- a/apps/web/lib/api/rewards/reward-overrides.ts+++ b/apps/web/lib/api/rewards/reward-overrides.ts@@ -1,35 +1,75 @@-export type EnrollmentRewardIds = {- clickRewardId: string | null;- leadRewardId: string | null;- saleRewardId: string | null;- discountId: string | null;+import { ProgramEnrollment } from "@prisma/client";++export type RewardOverrideIds = Pick<+ ProgramEnrollment,+ "clickRewardId" | "leadRewardId" | "saleRewardId" | "discountId"+>;++export type RewardOverrideIdsInput = Partial<RewardOverrideIds>;+export type EnrollmentRewardIds = RewardOverrideIds;+export type EnrollmentRewardIdsInput = RewardOverrideIdsInput;+export type LinkRewardIds = RewardOverrideIds;+export type LinkRewardIdsInput = RewardOverrideIdsInput;++export const REWARD_OVERRIDE_ID_KEYS = [+ "clickRewardId",+ "leadRewardId",+ "saleRewardId",+ "discountId",+] as const;++// Group defaults are inherited; only persist real link-level overrides.+const omitGroupDefault = ({+ value,+ groupDefaultId,+}: {+ value: string | null | undefined;+ groupDefaultId: string | null | undefined;+}) => (value && value === groupDefaultId ? null : value);++export const omitGroupDefaultRewardIds = ({+ rewardIds,+ groupDefaults,+}: {+ rewardIds: RewardOverrideIdsInput;+ groupDefaults: Partial<RewardOverrideIds> | null | undefined;+}): RewardOverrideIdsInput => {+ const result: RewardOverrideIdsInput = {};++ for (const key of REWARD_OVERRIDE_ID_KEYS) {+ const value = rewardIds[key];+ if (value === undefined) {+ continue;+ }++ result[key] = omitGroupDefault({+ value,+ groupDefaultId: groupDefaults?.[key],+ });+ }++ return result;};-export type EnrollmentRewardIdsInput = Partial<EnrollmentRewardIds>;+// Maps *RewardId / discountId fields to ProgramPartnerLinkSchemaInternal names.+export const toPartnerLinkRewardIdFields = (+ linkReward: RewardOverrideIdsInput | null | undefined,+) => ({+ clickReward: linkReward?.clickRewardId ?? null,+ leadReward: linkReward?.leadRewardId ?? null,+ saleReward: linkReward?.saleRewardId ?? null,+ discount: linkReward?.discountId ?? null,+});// True when any reward/discount field was sent, including explicit null clears.-export const hasRewardIdsInput = ({- clickRewardId,- leadRewardId,- saleRewardId,- discountId,-}: EnrollmentRewardIdsInput) => {- return (- clickRewardId !== undefined ||- leadRewardId !== undefined ||- saleRewardId !== undefined ||- discountId !== undefined- );+export const hasRewardIdsInput = (rewardIds: RewardOverrideIdsInput) => {+ return REWARD_OVERRIDE_ID_KEYS.some((key) => rewardIds[key] !== undefined);};// True when any field assigns a non-null reward/discount id (not a clear).-export const hasRewardAssignment = ({- clickRewardId,- leadRewardId,- saleRewardId,- discountId,-}: EnrollmentRewardIdsInput) => {- return [clickRewardId, leadRewardId, saleRewardId, discountId].some(- (id) => id !== undefined && id !== null,- );+export const hasRewardAssignment = (rewardIds: RewardOverrideIdsInput) => {+ return REWARD_OVERRIDE_ID_KEYS.some((key) => {+ const id = rewardIds[key];+ return id !== undefined && id !== null;+ });};diff --git a/apps/web/lib/api/rewards/throw-if-invalid-rewards.ts b/apps/web/lib/api/rewards/throw-if-invalid-rewards.tsindex e71ad9c704..c768a965e0 100644--- a/apps/web/lib/api/rewards/throw-if-invalid-rewards.ts+++ b/apps/web/lib/api/rewards/throw-if-invalid-rewards.ts@@ -137,7 +137,7 @@ export async function throwIfInvalidRewards({select: {id: true,groupId: true,- partnerGroup: {+ defaultForPartnerGroup: {select: {id: true,},@@ -156,7 +156,7 @@ export async function throwIfInvalidRewards({!belongsToGroup({groupId,entityGroupId: discount.groupId,- defaultGroupId: discount.partnerGroup?.id,+ defaultGroupId: discount.defaultForPartnerGroup?.id,})) {throw new DubApiError({diff --git a/apps/web/lib/commissions/process-click-aggregation.ts b/apps/web/lib/commissions/process-click-aggregation.tsnew file mode 100644index 0000000000..c94141b01c--- /dev/null+++ b/apps/web/lib/commissions/process-click-aggregation.ts@@ -0,0 +1,374 @@+import { createId } from "@/lib/api/create-id";+import { serializeReward } from "@/lib/api/partners/serialize-reward";+import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";+import { getRewardSpendLimitWindow } from "@/lib/api/rewards/reward-spend-limit-window";+import { buildCommissionDescription } from "@/lib/commissions/build-commission-description";+import { getRewardAmount } from "@/lib/partners/get-reward-amount";+import { prisma } from "@/lib/prisma";+import { resolveClickReward } from "@/lib/rewards/resolve-click-reward";+import { getTopLinksByCountries } from "@/lib/tinybird/get-top-links-by-countries";+import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";+import { pluck } from "@dub/utils";+import {+ CommissionStatus,+ CommissionType,+ Prisma,+ ProgramEnrollment,+ Reward,+} from "@prisma/client";++type LinkEarnings = {+ clicks: number;+ earnings: number;+ reward: Reward;+};++type ProcessClickAggregationInput = {+ programId: string;+ partnerId: string;+ startDate: Date;+ endDate: Date;+};++export async function processClickAggregation({+ programId,+ partnerId,+ startDate,+ endDate,+}: ProcessClickAggregationInput) {+ const programEnrollment = await prisma.programEnrollment.findUnique({+ where: {+ partnerId_programId: {+ partnerId,+ programId,+ },+ },+ select: {+ id: true,+ status: true,+ programId: true,+ partnerId: true,+ clickReward: true,+ },+ });++ if (!programEnrollment) {+ console.log(+ `Enrollment not found for partner ${partnerId} and program ${programId}`,+ );+ return;+ }++ if (+ !COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES.includes(programEnrollment.status)+ ) {+ console.log(+ `Enrollment not commission eligible for partner ${partnerId} and program ${programId}`,+ );+ return;+ }++ const linkEarningsMap = await calculateEarningsByLink({+ startDate,+ endDate,+ programEnrollment,+ });++ if (!linkEarningsMap) {+ return;+ }++ await createClickCommissions({+ startDate,+ endDate,+ programEnrollment,+ linkEarningsMap,+ });+}++// Calculate how much was earned by each link for a program enrollment between two dates+async function calculateEarningsByLink({+ startDate,+ endDate,+ programEnrollment,+}: Pick<ProcessClickAggregationInput, "startDate" | "endDate"> & {+ programEnrollment: Pick<ProgramEnrollment, "programId" | "partnerId"> & {+ clickReward: Reward | null;+ };+}) {+ const { programId, partnerId } = programEnrollment;++ const links = await prisma.link.findMany({+ where: {+ programId,+ partnerId,+ // links that were clicked on after the start date+ lastClicked: {+ gte: startDate,+ },+ clicks: {+ gt: 0,+ },+ },+ orderBy: {+ id: "asc",+ },+ select: {+ id: true,+ shortLink: true,+ linkReward: {+ select: {+ clickReward: true,+ },+ },+ },+ });++ if (links.length === 0) {+ console.log(+ `No links found for partner ${partnerId} and program ${programId} with clicks after ${startDate}.`,+ );+ return;+ }++ const clicksByCountries = await getTopLinksByCountries({+ linkIds: pluck(links, "id"),+ start: startDate,+ end: endDate,+ });++ // Group clicks by link+ const clicksByLinkId = new Map<string, typeof clicksByCountries>();++ for (const click of clicksByCountries) {+ const existing = clicksByLinkId.get(click.link_id) || [];+ existing.push(click);+ clicksByLinkId.set(click.link_id, existing);+ }++ // Calculate earnings per link considering geo CPC+ const linkEarningsMap = new Map<string, LinkEarnings>();++ for (const link of links) {+ const clickReward =+ link.linkReward?.clickReward ?? programEnrollment.clickReward;++ // Skip soft deleted click rewards+ if (clickReward?.programId === null || clickReward?.groupId === null) {+ console.log(+ `Click reward ${clickReward.id} for link ${link.id} is soft deleted (programId=${clickReward.programId}, groupId=${clickReward.groupId}). Skipping...`,+ );+ continue;+ }++ if (!clickReward) {+ console.log(`No click reward for link ${link.id}. Skipping...`);+ continue;+ }++ const linkClicksByCountry = clicksByLinkId.get(link.id) || [];++ if (linkClicksByCountry.length === 0) {+ console.log(+ `No clicks in aggregation window for link ${link.id}. Skipping...`,+ );+ continue;+ }++ // Calculate earnings per country for each link+ for (const { country, clicks } of linkClicksByCountry) {+ const finalReward = resolveClickReward({+ reward: clickReward,+ country,+ });++ const existing = linkEarningsMap.get(link.id) || {+ clicks: 0,+ earnings: 0,+ reward: clickReward,+ };++ const amountInCents = getRewardAmount(serializeReward(finalReward));++ linkEarningsMap.set(link.id, {+ clicks: existing.clicks + clicks,+ earnings: existing.earnings + amountInCents * clicks,+ reward: clickReward,+ });+ }+ }++ return linkEarningsMap;+}++async function getHistoricalClicksEarnings({+ startDate: aggregationStartDate,+ programEnrollment,+ reward,+}: {+ programEnrollment: Pick<ProgramEnrollment, "programId" | "partnerId">;+ startDate: Date;+ reward: Pick<Reward, "id" | "spendLimitInterval">;+}) {+ if (!reward.spendLimitInterval) {+ return 0;+ }++ const { startDate, endDate } = getRewardSpendLimitWindow({+ spendLimitInterval: reward.spendLimitInterval,+ referenceDate: aggregationStartDate,+ });++ const {+ _sum: { earnings },+ } = await prisma.commission.aggregate({+ where: {+ programId: programEnrollment.programId,+ partnerId: programEnrollment.partnerId,+ rewardId: reward.id,+ type: CommissionType.click,+ status: {+ in: [+ CommissionStatus.pending,+ CommissionStatus.processed,+ CommissionStatus.paid,+ ],+ },+ ...(startDate && endDate+ ? {+ createdAt: {+ gte: startDate,+ lte: endDate,+ },+ }+ : {}),+ },+ _sum: {+ earnings: true,+ },+ });++ return earnings ?? 0;+}++async function createClickCommissions({+ startDate,+ endDate,+ programEnrollment,+ linkEarningsMap,+}: Pick<ProcessClickAggregationInput, "startDate" | "endDate"> & {+ programEnrollment: Pick<ProgramEnrollment, "programId" | "partnerId">;+ linkEarningsMap: Map<string, LinkEarnings>;+}) {+ const { programId, partnerId } = programEnrollment;++ if (linkEarningsMap.size === 0) {+ console.log(+ `No link earnings to commission for partner ${partnerId} in program ${programId}. Skipping...`,+ );+ return;+ }++ const aggregationDate = startDate.toISOString().split("T")[0];+ const usedSpendLimitByReward = new Map<string, number>();+ const historicalEarningsByReward = new Map<string, number>();+ const rewardsWithSpendLimit = new Map<string, Reward>();++ for (const { reward } of linkEarningsMap.values()) {+ if (reward.spendLimitAmount && reward.spendLimitInterval) {+ rewardsWithSpendLimit.set(reward.id, reward);+ }+ }++ await Promise.all(+ Array.from(rewardsWithSpendLimit.values()).map(async (reward) => {+ const historicalEarnings = await getHistoricalClicksEarnings({+ programEnrollment,+ startDate,+ reward,+ });++ historicalEarningsByReward.set(reward.id, historicalEarnings);+ }),+ );++ const commissionsToCreate: Prisma.CommissionCreateManyInput[] = [];++ // Create commissions for each link+ for (const [linkId, { clicks, earnings, reward }] of linkEarningsMap) {+ if (clicks === 0 || earnings === 0) {+ console.log(+ `No click earnings for link ${linkId} (clicks=${clicks}, earnings=${earnings}). Skipping...`,+ );+ continue;+ }++ let cappedEarnings = earnings;++ // Cap earnings to spend limit+ if (reward.spendLimitAmount && reward.spendLimitInterval) {+ const usedThisBatch = usedSpendLimitByReward.get(reward.id) ?? 0;+ const historicalEarnings = historicalEarningsByReward.get(reward.id) ?? 0;++ const remainingSpendLimit =+ reward.spendLimitAmount - historicalEarnings - usedThisBatch;++ cappedEarnings = Math.max(0, Math.min(earnings, remainingSpendLimit));++ if (cappedEarnings === 0) {+ console.log(+ `Reached spend limit for partner ${partnerId} on link ${linkId} (reward ${reward.id}). Skipping...`,+ );+ continue;+ }++ usedSpendLimitByReward.set(reward.id, usedThisBatch + cappedEarnings);+ }++ // Persist the base click reward description (no per-country clause —+ // one commission can mix countries/rates).+ const description = buildCommissionDescription({+ reward: serializeReward(reward),+ earnings,+ cappedEarnings,+ });++ commissionsToCreate.push({+ id: createId({ prefix: "cm_" }),+ programId,+ partnerId,+ rewardId: reward.id,+ linkId,+ quantity: clicks,+ type: CommissionType.click,+ amount: 0,+ earnings: cappedEarnings,+ description,+ createdAt: endDate,+ invoiceId: `${linkId}-${aggregationDate}`, // used as a idempotency key+ });+ }++ if (commissionsToCreate.length === 0) {+ console.log(+ `No click commissions to create for partner ${partnerId} in program ${programId}. Skipping...`,+ );+ return;+ }++ const { count } = await prisma.commission.createMany({+ data: commissionsToCreate,+ skipDuplicates: true,+ });++ console.log(+ `Created ${count} click commissions for partner ${partnerId} in program ${programId}.`,+ );++ if (count > 0) {+ await syncTotalCommissions({+ partnerId,+ programId,+ });+ }+}diff --git a/apps/web/lib/discounts/get-partners-by-discount-ids.ts b/apps/web/lib/discounts/get-partners-by-discount-ids.tsnew file mode 100644index 0000000000..debb55abe9--- /dev/null+++ b/apps/web/lib/discounts/get-partners-by-discount-ids.ts@@ -0,0 +1,49 @@+import { prisma } from "@/lib/prisma";+import { Partner } from "@prisma/client";++export async function getPartnersByDiscountIds({+ discountIds,+}: {+ discountIds: string[];+}): Promise<Pick<Partner, "id">[]> {+ if (discountIds.length === 0) {+ return [];+ }++ const [enrollments, linkRewards] = await Promise.all([+ prisma.programEnrollment.findMany({+ where: {+ discountId: {+ in: discountIds,+ },+ },+ select: {+ partnerId: true,+ },+ }),++ prisma.linkReward.findMany({+ where: {+ discountId: {+ in: discountIds,+ },+ },+ select: {+ link: {+ select: {+ partnerId: true,+ },+ },+ },+ }),+ ]);++ return [+ ...new Set([+ ...enrollments.map((enrollment) => enrollment.partnerId),+ ...linkRewards.flatMap((linkReward) =>+ linkReward.link.partnerId ? [linkReward.link.partnerId] : [],+ ),+ ]),+ ].map((id) => ({ id }));+}diff --git a/apps/web/lib/discounts/remap-discount-codes.ts b/apps/web/lib/discounts/remap-discount-codes.tsindex 9988a311c8..f18775cd47 100644--- a/apps/web/lib/discounts/remap-discount-codes.ts+++ b/apps/web/lib/discounts/remap-discount-codes.ts@@ -1,10 +1,11 @@+import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";import { prisma } from "@/lib/prisma";-import { ProgramEnrollment } from "@prisma/client";-import { createDiscountCode } from "./create-discount-code";+import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";+import { Discount, ProgramEnrollment } from "@prisma/client";import { deleteDiscountCodes } from "./delete-discount-code";-import { isDiscountProviderError } from "./discount-error";import { isDiscountEquivalent } from "./is-discount-equivalent";+// Remap discount codes for a partner in a programexport async function remapDiscountCodes({programId,partnerId,@@ -19,12 +20,6 @@ export async function remapDiscountCodes({select: {id: true,discount: true,- partner: {- select: {- id: true,- name: true,- },- },},});@@ -43,14 +38,33 @@ export async function remapDiscountCodes({},include: {discount: true,+ link: {+ select: {+ id: true,+ linkReward: {+ select: {+ discount: true,+ },+ },+ },+ },},});- const newDiscount = programEnrollment.discount;- const discountCodesToDelete: typeof discountCodes = [];+ if (discountCodes.length === 0) {+ console.log(+ `No discount codes found for partner ${partnerId} and program ${programId}. Skipping...`,+ );+ }++ const enrollmentDiscount = programEnrollment.discount;+ const discountCodesToDelete: (typeof discountCodes)[number][] = [];for (const discountCode of discountCodes) {const existingDiscount = discountCode.discount;+ // Prefer the link discount if it exists, otherwise use the enrollment discount+ const newDiscount =+ discountCode.link?.linkReward?.discount ?? enrollmentDiscount;// No discount exists for this discount code, delete itif (!newDiscount) {@@ -86,10 +100,21 @@ export async function remapDiscountCodes({await deleteDiscountCodes(discountCodesToDelete);}- if (!newDiscount?.autoProvisionEnabledAt) {- return;- }+ await enqueueMissingDiscountCodes({+ programId,+ partnerId,+ enrollmentDiscount,+ });+}+// Find default links that do not have a discount code assigned to them and enqueue a job to create one+async function enqueueMissingDiscountCodes({+ programId,+ partnerId,+ enrollmentDiscount,+}: Pick<ProgramEnrollment, "programId" | "partnerId"> & {+ enrollmentDiscount: Pick<Discount, "autoProvisionEnabledAt"> | null;+}) {const links = await prisma.link.findMany({where: {partnerId,@@ -103,52 +128,34 @@ export async function remapDiscountCodes({},select: {id: true,+ linkReward: {+ select: {+ discount: {+ select: {+ autoProvisionEnabledAt: true,+ },+ },+ },+ },},});- if (links.length === 0) {- return;- }-- const workspace = await prisma.project.findUniqueOrThrow({- where: {- defaultProgramId: programId,- },- select: {- id: true,- webhookEnabled: true,- stripeConnectId: true,- shopifyStoreId: true,- },+ const linksToProvision = links.filter((link) => {+ const discount = link.linkReward?.discount ?? enrollmentDiscount;+ return Boolean(discount?.autoProvisionEnabledAt);});- for (const link of links) {- try {- await createDiscountCode({- workspace,- partner: programEnrollment.partner,- link,- discount: newDiscount,- });- } catch (error) {- if (isDiscountProviderError(error)) {- if (- error.providerCode === "INTEGRATION_NOT_AVAILABLE" ||- error.providerCode === "AUTH_EXPIRED" ||- error.providerCode === "PERMISSIONS_REQUIRED" ||- error.providerCode === "COUPON_NOT_FOUND"- ) {- console.warn(- `${error.message} Skipping remaining discount code creation for remap.`,- );- break;- }- }-- console.error(- `Failed to create discount code for link ${link.id}:`,- error,- );- }+ if (linksToProvision.length === 0) {+ return;}++ await enqueueBatchJobs(+ linksToProvision.map((link) => ({+ queueName: "create-discount-code",+ url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create`,+ body: {+ linkId: link.id,+ },+ })),+ );}diff --git a/apps/web/lib/jobs/handlers/aggregate-clicks-job.ts b/apps/web/lib/jobs/handlers/aggregate-clicks-job.tsnew file mode 100644index 0000000000..a0e151b5b8--- /dev/null+++ b/apps/web/lib/jobs/handlers/aggregate-clicks-job.ts@@ -0,0 +1,27 @@+import { processClickAggregation } from "@/lib/commissions/process-click-aggregation";+import * as z from "zod/v4";+import { defineJob } from "../index";++const inputSchema = z.object({+ partnerId: z.string(),+ programId: z.string(),+ startDate: z.coerce.date(),+ endDate: z.coerce.date(),+});++// Aggregate clicks for links per day for a program enrollment+export const aggregateClicksJob = defineJob({+ name: "aggregate-clicks-job",+ schema: inputSchema,+ defaults: {+ queue: "aggregate-clicks",+ },+ async handle({ programId, partnerId, startDate, endDate }) {+ await processClickAggregation({+ programId,+ partnerId,+ startDate,+ endDate,+ });+ },+});diff --git a/apps/web/lib/jobs/handlers/invalidate-links-for-discounts-job.ts b/apps/web/lib/jobs/handlers/invalidate-links-for-discounts-job.tsindex 1d6809bc73..a3e56d5ef2 100644--- a/apps/web/lib/jobs/handlers/invalidate-links-for-discounts-job.ts+++ b/apps/web/lib/jobs/handlers/invalidate-links-for-discounts-job.ts@@ -5,7 +5,7 @@ import * as z from "zod/v4";import { defineJob } from "../index";const inputSchema = z.discriminatedUnion("type", [- // Discount is still assigned to enrollments.+ // Discount is still assigned to enrollments or link overrides.z.object({type: z.literal("discount"),discountId: z.string(),@@ -47,11 +47,22 @@ async function findLinksToInvalidate(input: InvalidateLinksForDiscountsInput) {if (input.type === "discount") {return prisma.link.findMany({where: {- programEnrollment: {- is: {- discountId: input.discountId,+ OR: [+ {+ programEnrollment: {+ is: {+ discountId: input.discountId,+ },+ },},- },+ {+ linkReward: {+ is: {+ discountId: input.discountId,+ },+ },+ },+ ],},select: {domain: true,diff --git a/apps/web/lib/jobs/registry.ts b/apps/web/lib/jobs/registry.tsindex 4364cf3371..6c21044e63 100644--- a/apps/web/lib/jobs/registry.ts+++ b/apps/web/lib/jobs/registry.ts@@ -83,6 +83,9 @@ const jobLoaders = {"delete-discount-job": () =>import("./handlers/delete-discount-job").then((m) => m.deleteDiscountJob),++ "aggregate-clicks-job": () =>+ import("./handlers/aggregate-clicks-job").then((m) => m.aggregateClicksJob),} as const satisfies Record<string, () => Promise<JobDefinition>>;const jobCache = new Map<string, JobDefinition>();diff --git a/apps/web/lib/middleware/link.ts b/apps/web/lib/middleware/link.tsindex 35b00563e7..de89f31a34 100644--- a/apps/web/lib/middleware/link.ts+++ b/apps/web/lib/middleware/link.ts@@ -131,6 +131,7 @@ export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {const { partner, discount } = await getPartnerEnrollmentInfo({programId: linkData.programId,partnerId: linkData.partnerId,+ linkId: linkData.id,});// we'll use this data on /track/clickdiff --git a/apps/web/lib/partner-referrals/create-network-referral-commission.ts b/apps/web/lib/partner-referrals/create-network-referral-commission.tsindex e99a64b843..72f90f4d8d 100644--- a/apps/web/lib/partner-referrals/create-network-referral-commission.ts+++ b/apps/web/lib/partner-referrals/create-network-referral-commission.ts@@ -167,10 +167,13 @@ export const createNetworkReferralCommission = async ({console.error(`No customer found for partner ${partner.id}.`);}- const reward = determinePartnerReward({+ const partnerReward = await determinePartnerReward({event: "sale",programEnrollment,- })?.reward;+ linkId: null,+ });++ const reward = partnerReward?.reward;if (!reward) {console.log(diff --git a/apps/web/lib/partners/determine-partner-reward.ts b/apps/web/lib/partners/determine-partner-reward.tsindex efadb94115..26f92ae96f 100644--- a/apps/web/lib/partners/determine-partner-reward.ts+++ b/apps/web/lib/partners/determine-partner-reward.ts@@ -1,6 +1,7 @@-import { prettyPrint, toCentsNumber } from "@dub/utils";+import { toCentsNumber } from "@dub/utils";import { EventType, Link, Prisma, Reward } from "@prisma/client";import { serializeReward } from "../api/partners/serialize-reward";+import { prisma } from "../prisma";import { RewardConditions, RewardContext, RewardProps } from "../types";import {rewardConditionsArraySchema,@@ -14,7 +15,7 @@ const REWARD_EVENT_COLUMN_MAPPING = {[EventType.click]: "clickReward",[EventType.lead]: "leadReward",[EventType.sale]: "saleReward",-};+} as const;interface ProgramEnrollmentWithReward {partner: { country: string | null };@@ -34,6 +35,17 @@ interface ProductReward {};}+interface LinkRewards {+ clickReward?: Reward | null;+ leadReward?: Reward | null;+ saleReward?: Reward | null;+}++type DeterminePartnerRewardResult = {+ reward: RewardProps;+ matchedCondition: RewardConditions | null;+};+export const getRewardMaxDurationForContext = ({reward,context,@@ -63,20 +75,26 @@ export const getRewardMaxDurationForContext = ({return reward.maxDuration;};-export const determinePartnerReward = ({+export const determinePartnerReward = async ({event,programEnrollment,+ linkId,context,}: {event: EventType;programEnrollment: ProgramEnrollmentWithReward;+ linkId: string | null; // ID of the link that triggered the eventcontext?: RewardContext; // additional reward context (e.g. customer.country, sale.productId, etc.)-}): {- reward: RewardProps;- matchedCondition: RewardConditions | null;-} | null => {- let partnerReward: Reward =- programEnrollment[REWARD_EVENT_COLUMN_MAPPING[event]];+}): Promise<DeterminePartnerRewardResult | null> => {+ const rewardEventColumn = REWARD_EVENT_COLUMN_MAPPING[event];++ const linkRewards = await getLinkRewards({+ event,+ linkId,+ });++ let partnerReward =+ linkRewards?.[rewardEventColumn] ?? programEnrollment[rewardEventColumn];if (!partnerReward) {return null;@@ -143,40 +161,57 @@ export const determinePartnerReward = ({};};-export const determinePartnerRewards = ({+// Resolves one or more rewards for a sale: when Stripe line items have a+// productId modifier, returns a reward per product; otherwise a single reward.+export const determinePartnerRewards = async ({event,programEnrollment,context,amount,quantity,+ linkId,}: {event: EventType;programEnrollment: ProgramEnrollmentWithReward;context?: RewardContext; // additional reward context (e.g. customer.country, sale.productId, etc.)amount: number;quantity: number;-}): ProductReward[] => {+ linkId: string | null;+}): Promise<ProductReward[]> => {const rewards: ProductReward[] = [];const products = context?.sale?.products ?? [];- const modifiers = rewardConditionsArraySchema.safeParse(- programEnrollment.saleReward?.modifiers,- );+ let hasProductIdModifier = false;++ if (products.length > 0) {+ const linkRewards = await getLinkRewards({+ event,+ linkId,+ });++ const partnerReward =+ linkRewards?.saleReward ?? programEnrollment["saleReward"];- const hasProductIdModifier = modifiers.success- ? modifiers.data.some((m) =>+ const modifiers = rewardConditionsArraySchema.safeParse(+ partnerReward?.modifiers,+ );++ if (modifiers.success) {+ hasProductIdModifier = modifiers.data.some((m) =>m.conditions.some((c) => c.entity === "sale" && c.attribute === "productId",),- )- : false;+ );+ }+ }// If there are products and a productId modifier,// we need to calculate the reward for each product (for Stripe integration only)if (products.length > 0 && hasProductIdModifier) {for (const product of products) {- const result = determinePartnerReward({+ const result = await determinePartnerReward({event,programEnrollment,+ linkId,context: {...context,sale: {@@ -201,9 +236,10 @@ export const determinePartnerRewards = ({}}} else {- const result = determinePartnerReward({+ const result = await determinePartnerReward({event,programEnrollment,+ linkId,...(context ? { context } : {}),});@@ -219,7 +255,28 @@ export const determinePartnerRewards = ({}}- console.log("Reward context", prettyPrint(context));-return rewards;};++const getLinkRewards = async ({+ event,+ linkId,+}: {+ event: EventType;+ linkId: string | null;+}): Promise<LinkRewards | null> => {+ if (!linkId) {+ return null;+ }++ const rewardEventColumn = REWARD_EVENT_COLUMN_MAPPING[event];++ return prisma.linkReward.findUnique({+ where: {+ linkId,+ },+ select: {+ [rewardEventColumn]: true,+ },+ });+};diff --git a/apps/web/lib/planetscale/get-link-with-partner.ts b/apps/web/lib/planetscale/get-link-with-partner.tsindex 63117fc028..9b1a64f307 100644--- a/apps/web/lib/planetscale/get-link-with-partner.ts+++ b/apps/web/lib/planetscale/get-link-with-partner.ts@@ -52,7 +52,8 @@ export const getLinkWithPartner = async ({FROM LinkLEFT JOIN ProgramEnrollment ON ProgramEnrollment.programId = Link.programId AND ProgramEnrollment.partnerId = Link.partnerIdLEFT JOIN Partner ON Partner.id = ProgramEnrollment.partnerId- LEFT JOIN Discount PartnerDiscount ON ProgramEnrollment.discountId = PartnerDiscount.id+ LEFT JOIN LinkReward ON LinkReward.linkId = Link.id+ LEFT JOIN Discount PartnerDiscount ON PartnerDiscount.id = COALESCE(LinkReward.discountId, ProgramEnrollment.discountId)LEFT JOIN Program ON Program.id = Link.programIdWHERE Link.domain = ? AND Link.key = ?`,[domain, keyToQuery],diff --git a/apps/web/lib/planetscale/get-partner-enrollment-info.ts b/apps/web/lib/planetscale/get-partner-enrollment-info.tsindex 4cd3e6d5d9..5d4b4248c6 100644--- a/apps/web/lib/planetscale/get-partner-enrollment-info.ts+++ b/apps/web/lib/planetscale/get-partner-enrollment-info.ts@@ -42,9 +42,11 @@ function parsePartnerTagIds(value: QueryResult["partnerTagIds"]): string[] {export const getPartnerEnrollmentInfo = async ({partnerId,programId,+ linkId,}: {partnerId: string | null;programId: string | null;+ linkId: string;}) => {if (!partnerId || !programId) {return {@@ -70,7 +72,8 @@ export const getPartnerEnrollmentInfo = async ({FROMProgramEnrollmentLEFT JOIN Partner ON Partner.id = ProgramEnrollment.partnerId- LEFT JOIN Discount ON Discount.id = ProgramEnrollment.discountId+ LEFT JOIN LinkReward ON LinkReward.linkId = ?+ LEFT JOIN Discount ON Discount.id = COALESCE(LinkReward.discountId, ProgramEnrollment.discountId)LEFT JOIN (SELECTprogramId,@@ -91,7 +94,7 @@ export const getPartnerEnrollmentInfo = async ({WHEREProgramEnrollment.partnerId = ?AND ProgramEnrollment.programId = ?`,- [programId, partnerId, partnerId, programId],+ [linkId, programId, partnerId, partnerId, programId],);const result =diff --git a/apps/web/lib/rewardful/import-campaigns.ts b/apps/web/lib/rewardful/import-campaigns.tsindex 7e09661dc6..548eac41d6 100644--- a/apps/web/lib/rewardful/import-campaigns.ts+++ b/apps/web/lib/rewardful/import-campaigns.ts@@ -214,8 +214,8 @@ export async function importCampaigns(payload: RewardfulImportPayload) {type: dubDiscountAttrs?.type ?? "percentage",maxDuration: dubDiscountAttrs?.maxDuration ?? null,couponId: campaign.stripe_coupon_id,- // connect the discount to the group- partnerGroup: {+ // connect the discount as the group's default+ defaultForPartnerGroup: {connect: {id: createdGroup.id,},diff --git a/apps/web/lib/rewards/get-click-reward-enrollments.ts b/apps/web/lib/rewards/get-click-reward-enrollments.tsnew file mode 100644index 0000000000..84a7232951--- /dev/null+++ b/apps/web/lib/rewards/get-click-reward-enrollments.ts@@ -0,0 +1,59 @@+import { prisma } from "@/lib/prisma";+import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";+import { ProgramEnrollment } from "@prisma/client";++// Find enrollments with a qualifying clicked link and either an enrollment+// click reward or a link-level click reward.+export async function getClickRewardEnrollments({+ startDate,+ startingAfterId,+ take,+}: {+ startDate: Date;+ startingAfterId?: string;+ take: number;+}): Promise<Pick<ProgramEnrollment, "id" | "partnerId" | "programId">[]> {+ return prisma.programEnrollment.findMany({+ where: {+ ...(startingAfterId && {+ id: {+ gt: startingAfterId,+ },+ }),+ status: {+ in: COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES,+ },+ OR: [+ {+ clickRewardId: { not: null },+ links: {+ some: {+ clicks: { gt: 0 },+ lastClicked: { gte: startDate },+ },+ },+ },+ {+ links: {+ some: {+ clicks: { gt: 0 },+ lastClicked: { gte: startDate },+ linkReward: {+ clickRewardId: { not: null },+ },+ },+ },+ },+ ],+ },+ select: {+ id: true,+ partnerId: true,+ programId: true,+ },+ orderBy: {+ id: "asc",+ },+ take,+ });+}diff --git a/apps/web/lib/rewards/get-resolved-partner-link-rewards.ts b/apps/web/lib/rewards/get-resolved-partner-link-rewards.tsnew file mode 100644index 0000000000..41efab8c85--- /dev/null+++ b/apps/web/lib/rewards/get-resolved-partner-link-rewards.ts@@ -0,0 +1,42 @@+import "server-only";++import { serializeReward } from "@/lib/api/partners/serialize-reward";+import { DiscountProps } from "@/lib/types";+import { Discount, Reward } from "@prisma/client";++export type LinkRewardWithOptionalRewards = {+ clickReward?: Reward | null;+ leadReward?: Reward | null;+ saleReward?: Reward | null;+ discount?: Discount | null;+};++export function getResolvedPartnerLinkRewards({+ linkReward,+ enrollmentRewards,+ enrollmentDiscount,+}: {+ linkReward: LinkRewardWithOptionalRewards | null | undefined;+ enrollmentRewards: Array<Reward | null | undefined>;+ enrollmentDiscount: Discount | DiscountProps | null | undefined;+}) {+ return {+ clickReward: serializeNullableReward(+ linkReward?.clickReward ??+ enrollmentRewards.find((reward) => reward?.event === "click"),+ ),+ leadReward: serializeNullableReward(+ linkReward?.leadReward ??+ enrollmentRewards.find((reward) => reward?.event === "lead"),+ ),+ saleReward: serializeNullableReward(+ linkReward?.saleReward ??+ enrollmentRewards.find((reward) => reward?.event === "sale"),+ ),+ discount: linkReward?.discount ?? enrollmentDiscount ?? null,+ };+}++function serializeNullableReward(reward: Reward | null | undefined) {+ return reward ? serializeReward(reward) : null;+}diff --git a/apps/web/app/(ee)/api/cron/aggregate-clicks/resolve-click-reward-amount.ts b/apps/web/lib/rewards/resolve-click-reward.tssimilarity index 100%rename from apps/web/app/(ee)/api/cron/aggregate-clicks/resolve-click-reward-amount.tsrename to apps/web/lib/rewards/resolve-click-reward.tsdiff --git a/apps/web/lib/rewards/resolve-partner-link-rewards.ts b/apps/web/lib/rewards/resolve-partner-link-rewards.tsnew file mode 100644index 0000000000..172d41370f--- /dev/null+++ b/apps/web/lib/rewards/resolve-partner-link-rewards.ts@@ -0,0 +1,71 @@+import { getRewardAmount } from "@/lib/partners/get-reward-amount";+import { DiscountProps, RewardProps } from "@/lib/types";++function pickDisplayReward(reward: RewardProps | null | undefined) {+ if (!reward || getRewardAmount(reward) < 0) {+ return null;+ }++ return reward;+}++function getDisplayCustomRewards(enrollmentRewards: RewardProps[]) {+ return enrollmentRewards.filter(+ (reward) => reward.event === "custom" && getRewardAmount(reward) >= 0,+ );+}++export function getPartnerLinkDisplayRewards({+ clickReward,+ leadReward,+ saleReward,+ discount,+ enrollmentRewards = [],+}: {+ clickReward?: RewardProps | null;+ leadReward?: RewardProps | null;+ saleReward?: RewardProps | null;+ discount?: DiscountProps | null;+ enrollmentRewards?: RewardProps[];+}) {+ return {+ rewards: [+ pickDisplayReward(saleReward),+ pickDisplayReward(leadReward),+ pickDisplayReward(clickReward),+ ...getDisplayCustomRewards(enrollmentRewards),+ ].filter((reward): reward is RewardProps => reward != null),+ discount: discount ?? null,+ };+}++const PRIMARY_REWARD_EVENTS = ["sale", "lead", "click"] as const;++export function getPartnerLinkPrimaryIncentive({+ rewards,+ discount,+}: {+ rewards: RewardProps[];+ discount: DiscountProps | null;+}): {+ primaryReward: RewardProps | null;+ primaryDiscount: DiscountProps | null;+ additionalCount: number;+} {+ const primaryReward =+ PRIMARY_REWARD_EVENTS.map((event) =>+ rewards.find((reward) => reward.event === event),+ ).find(Boolean) ??+ rewards[0] ??+ null;++ const primaryDiscount = primaryReward ? null : discount;+ const totalCount = rewards.length + (discount ? 1 : 0);+ const additionalCount = Math.max(0, totalCount - 1);++ return {+ primaryReward: primaryReward ?? null,+ primaryDiscount,+ additionalCount,+ };+}diff --git a/apps/web/lib/swr/use-program-partner-links.ts b/apps/web/lib/swr/use-program-partner-links.tsnew file mode 100644index 0000000000..e8995a2c82--- /dev/null+++ b/apps/web/lib/swr/use-program-partner-links.ts@@ -0,0 +1,40 @@+import { ProgramPartnerLinkSchemaInternal } from "@/lib/zod/schemas/programs";+import { fetcher } from "@dub/utils";+import useSWR, { SWRConfiguration } from "swr";+import * as z from "zod/v4";+import useWorkspace from "./use-workspace";++type UseProgramPartnerLinksProps = {+ partnerId: string | null;+};++export type ProgramPartnerLinkExtended = z.infer<+ typeof ProgramPartnerLinkSchemaInternal+>;++export function useProgramPartnerLinks(+ { partnerId }: UseProgramPartnerLinksProps,+ swrOptions: SWRConfiguration = {},+) {+ const { id: workspaceId } = useWorkspace();++ const {+ data: links,+ error,+ isLoading,+ isValidating,+ } = useSWR<ProgramPartnerLinkExtended[]>(+ partnerId && workspaceId+ ? `/api/partners/links?partnerId=${partnerId}&workspaceId=${workspaceId}&includeRewards=true`+ : null,+ fetcher,+ swrOptions,+ );++ return {+ links,+ loading: isLoading,+ error,+ isValidating,+ };+}diff --git a/apps/web/lib/zod/schemas/activity-log.ts b/apps/web/lib/zod/schemas/activity-log.tsindex bbd597fabf..889b7bd96c 100644--- a/apps/web/lib/zod/schemas/activity-log.ts+++ b/apps/web/lib/zod/schemas/activity-log.ts@@ -25,6 +25,9 @@ export const activityLogActionSchema = z.enum(["partner.archived","partner.unarchived",+ "link.rewardChanged",+ "link.discountChanged",+"commission.updated","reward.created",diff --git a/apps/web/lib/zod/schemas/partner-profile.ts b/apps/web/lib/zod/schemas/partner-profile.tsindex 5efc3512c9..a6026e7357 100644--- a/apps/web/lib/zod/schemas/partner-profile.ts+++ b/apps/web/lib/zod/schemas/partner-profile.ts@@ -23,9 +23,11 @@ import {} from "./commissions";import { customerActivityResponseSchema } from "./customer-activity";import { CustomerEnrichedSchema } from "./customers";+import { DiscountSchema } from "./discount";import { LinkSchema } from "./links";import { getPaginationQuerySchema } from "./misc";import { payoutsQuerySchema } from "./payouts";+import { RewardSchema } from "./rewards";import { submittedLeadFormDataSchema } from "./submitted-lead-form";import { centsSchema } from "./utils";@@ -99,6 +101,10 @@ export const PartnerProfileLinkSchema = LinkSchema.pick({}).extend({createdAt: z.string().or(z.date()),partnerGroupDefaultLinkId: z.string().nullish(),+ clickReward: RewardSchema.nullable().default(null),+ leadReward: RewardSchema.nullable().default(null),+ saleReward: RewardSchema.nullable().default(null),+ discount: DiscountSchema.nullable().default(null),discountCode: z.string().nullable().default(null),discountCodeDisabledAt: z.coerce.date().nullable().default(null),});diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.tsindex ea1ebce937..c411b23f8a 100644--- a/apps/web/lib/zod/schemas/partners.ts+++ b/apps/web/lib/zod/schemas/partners.ts@@ -28,6 +28,7 @@ import { createLinkBodySchema } from "./links";import { booleanQuerySchema, getPaginationQuerySchema } from "./misc";import { PartnerTagSchema } from "./partner-tags";import { ProgramEnrollmentSchema } from "./programs";+import { rewardActivityDescriptionSchema } from "./rewards";import { centsSchema, centsSchemaWithDefault, parseUrlSchema } from "./utils";export const PARTNERS_MAX_PAGE_SIZE = 100;@@ -867,6 +868,24 @@ export const upsertPartnerLinkSchema = createPartnerLinkSchema.extend({url: parseUrlSchema.describe("The URL to upsert for."),});+// Internal-only fields used by the Dub UI.+// These fields are not exposed through the public API.+export const createPartnerLinkSchemaInternal = createPartnerLinkSchema.extend({+ clickRewardId: z.string().nullish(),+ leadRewardId: z.string().nullish(),+ saleRewardId: z.string().nullish(),+ discountId: z.string().nullish(),+});++export const updatePartnerLinkSchema = createPartnerLinkSchemaInternal+ .pick({+ clickRewardId: true,+ leadRewardId: true,+ saleRewardId: true,+ discountId: true,+ })+ .extend(rewardActivityDescriptionSchema.shape);+// For /api/partners/analyticsexport const partnerAnalyticsQuerySchema = analyticsQuerySchema.pick({@@ -1010,6 +1029,12 @@ export const bulkRejectPartnersSchema = z.object({export const retrievePartnerLinksSchema = partnerIdTenantIdSchema;+// Only Dub UI uses the following query parameters+export const retrievePartnerLinksSchemaInternal =+ retrievePartnerLinksSchema.extend({+ includeRewards: booleanQuerySchema.default(false),+ });+export const banPartnerSchema = z.object({workspaceId: z.string(),partnerId: z.string(),diff --git a/apps/web/lib/zod/schemas/programs.ts b/apps/web/lib/zod/schemas/programs.tsindex dc12588ff4..5892a28151 100644--- a/apps/web/lib/zod/schemas/programs.ts+++ b/apps/web/lib/zod/schemas/programs.ts@@ -123,6 +123,17 @@ export const ProgramPartnerLinkSchema = LinkSchema.pick({saleAmount: true,});+// Internal-only fields used by the Dub UI.+// These fields are not exposed through the public API.+export const ProgramPartnerLinkSchemaInternal = ProgramPartnerLinkSchema.extend(+ {+ clickReward: z.string().nullable().default(null),+ leadReward: z.string().nullable().default(null),+ saleReward: z.string().nullable().default(null),+ discount: z.string().nullable().default(null),+ },+);+export const ProgramEnrollmentApplicationSchema = z.object({rejectionReason: z.enum(ProgramApplicationRejectionReason)diff --git a/apps/web/lib/zod/schemas/referrals-embed.ts b/apps/web/lib/zod/schemas/referrals-embed.tsindex 8fc0124414..494788c8ce 100644--- a/apps/web/lib/zod/schemas/referrals-embed.ts+++ b/apps/web/lib/zod/schemas/referrals-embed.ts@@ -1,5 +1,7 @@import * as z from "zod/v4";+import { DiscountSchema } from "./discount";import { LinkSchema } from "./links";+import { RewardSchema } from "./rewards";export const ReferralsEmbedLinkSchema = LinkSchema.pick({id: true,@@ -12,4 +14,8 @@ export const ReferralsEmbedLinkSchema = LinkSchema.pick({conversions: true,}).extend({partnerGroupDefaultLinkId: z.string().nullish(),+ clickReward: RewardSchema.nullable().default(null),+ leadReward: RewardSchema.nullable().default(null),+ saleReward: RewardSchema.nullable().default(null),+ discount: DiscountSchema.nullable().default(null),});diff --git a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts b/apps/web/playwright/api/discount-codes/discount-codes.spec.tsindex 3c1c7d71c9..f501f93410 100644--- a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts+++ b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts@@ -94,6 +94,24 @@ test.afterAll(async () => {},});+ await prisma.partnerGroup.update({+ where: {+ id: partnerGroupId,+ },+ data: {+ discountId: null,+ },+ });++ await prisma.discount.updateMany({+ where: {+ groupId: partnerGroupId,+ },+ data: {+ groupId: null,+ },+ });+await prisma.partnerGroup.delete({where: {id: partnerGroupId,@@ -279,6 +297,148 @@ test("POST /discount-codes – auto-generated first-name collision retries", asy}});+test("POST /discount-codes – uses link-level discount over enrollment discount", async ({+ api,+ program,+}) => {+ let partnerId: string | undefined;+ let linkDiscountId: string | undefined;++ try {+ const { data: partner } = await createPartner(api);+ partnerId = partner.id;+ const linkId = partner.links?.[0]?.id;++ if (!linkId) {+ throw new Error("Partner was created without a default link.");+ }++ const linkDiscount = await prisma.discount.create({+ data: {+ id: createId({ prefix: "disc_" }),+ programId: program.id,+ ...customDiscount,+ amount: 25,+ },+ });+ linkDiscountId = linkDiscount.id;++ await prisma.linkReward.create({+ data: {+ linkId,+ discountId: linkDiscount.id,+ },+ });++ const { status, data } = await api.post<DiscountCode>(+ "/api/discount-codes",+ {+ partnerId: partner.id,+ linkId,+ code: `PW${nanoid(8)}`,+ },+ );++ expect(status).toEqual(200);+ expect(data.discountId).toEqual(linkDiscount.id);+ } finally {+ try {+ await deletePartner(partnerId);+ } finally {+ if (linkDiscountId) {+ await prisma.linkReward.deleteMany({+ where: {+ discountId: linkDiscountId,+ },+ });++ await prisma.discount.deleteMany({+ where: {+ id: linkDiscountId,+ },+ });+ }+ }+ }+});++test("POST /discount-codes – uses link-level discount when enrollment has none", async ({+ api,+ program,+}) => {+ let partnerId: string | undefined;+ let linkDiscountId: string | undefined;++ try {+ const { data: partner } = await createPartner(api);+ partnerId = partner.id;+ const linkId = partner.links?.[0]?.id;++ if (!linkId) {+ throw new Error("Partner was created without a default link.");+ }++ await prisma.programEnrollment.update({+ where: {+ partnerId_programId: {+ partnerId: partner.id,+ programId: program.id,+ },+ },+ data: {+ discountId: null,+ },+ });++ const linkDiscount = await prisma.discount.create({+ data: {+ id: createId({ prefix: "disc_" }),+ programId: program.id,+ ...customDiscount,+ amount: 15,+ },+ });+ linkDiscountId = linkDiscount.id;++ await prisma.linkReward.create({+ data: {+ linkId,+ discountId: linkDiscount.id,+ },+ });++ const { status, data } = await api.post<DiscountCode>(+ "/api/discount-codes",+ {+ partnerId: partner.id,+ linkId,+ code: `PW${nanoid(8)}`,+ },+ );++ expect(status).toEqual(200);+ expect(data.discountId).toEqual(linkDiscount.id);+ } finally {+ try {+ await deletePartner(partnerId);+ } finally {+ if (linkDiscountId) {+ await prisma.linkReward.deleteMany({+ where: {+ discountId: linkDiscountId,+ },+ });++ await prisma.discount.deleteMany({+ where: {+ id: linkDiscountId,+ },+ });+ }+ }+ }+});+test("POST /discount-codes – same link", async ({ api }) => {let partnerId: string | undefined;diff --git a/apps/web/playwright/api/discounts/discounts.spec.ts b/apps/web/playwright/api/discounts/discounts.spec.tsindex 4e4f343b60..bec2fca198 100644--- a/apps/web/playwright/api/discounts/discounts.spec.ts+++ b/apps/web/playwright/api/discounts/discounts.spec.ts@@ -115,6 +115,24 @@ test.afterAll(async () => {},});+ await prisma.partnerGroup.update({+ where: {+ id: partnerGroupId,+ },+ data: {+ discountId: null,+ },+ });++ await prisma.discount.updateMany({+ where: {+ groupId: partnerGroupId,+ },+ data: {+ groupId: null,+ },+ });+await prisma.partnerGroup.delete({where: {id: partnerGroupId,diff --git a/apps/web/playwright/api/fixtures.ts b/apps/web/playwright/api/fixtures.tsindex a22393c40d..ac66d68c81 100644--- a/apps/web/playwright/api/fixtures.ts+++ b/apps/web/playwright/api/fixtures.ts@@ -17,6 +17,7 @@ type ApiResponse<T> = {export type ApiClient = {get: <T>(url: string) => Promise<ApiResponse<T>>;post: <T>(url: string, data?: unknown) => Promise<ApiResponse<T>>;+ put: <T>(url: string, data?: unknown) => Promise<ApiResponse<T>>;patch: <T>(url: string, data?: unknown) => Promise<ApiResponse<T>>;delete: <T>(url: string) => Promise<ApiResponse<T>>;};@@ -52,6 +53,8 @@ function createApiClient(request: APIRequestContext): ApiClient {get: <T>(url: string) => parse<T>(request.get(url)),post: <T>(url: string, data?: unknown) =>parse<T>(request.post(url, { data })),+ put: <T>(url: string, data?: unknown) =>+ parse<T>(request.put(url, { data })),patch: <T>(url: string, data?: unknown) =>parse<T>(request.patch(url, { data })),delete: <T>(url: string) => parse<T>(request.delete(url)),diff --git a/apps/web/playwright/api/rewards/click-reward.spec.ts b/apps/web/playwright/api/rewards/click-reward.spec.tsindex 9239469155..cef34f9f02 100644--- a/apps/web/playwright/api/rewards/click-reward.spec.ts+++ b/apps/web/playwright/api/rewards/click-reward.spec.ts@@ -1,8 +1,8 @@import { getRewardAmount } from "@/lib/partners/get-reward-amount";+import { resolveClickReward } from "@/lib/rewards/resolve-click-reward";import type { RewardConditionsArray } from "@/lib/types";import { expect } from "@playwright/test";import { EventType, Prisma, Reward, RewardStructure } from "@prisma/client";-import { resolveClickReward } from "../../../app/(ee)/api/cron/aggregate-clicks/resolve-click-reward-amount";import { test } from "../fixtures";import { createReward, deleteReward, updateReward } from "./helpers";diff --git a/apps/web/prisma/schema/discount.prisma b/apps/web/prisma/schema/discount.prismaindex 1224423268..4fc449e116 100644--- a/apps/web/prisma/schema/discount.prisma+++ b/apps/web/prisma/schema/discount.prisma@@ -19,10 +19,12 @@ model Discount {createdAt DateTime @default(now())updatedAt DateTime @updatedAt- programEnrollments ProgramEnrollment[]- program Program @relation("ProgramDiscounts", fields: [programId], references: [id])- partnerGroup PartnerGroup?- discountCodes DiscountCode[]+ programEnrollments ProgramEnrollment[]+ program Program @relation("ProgramDiscounts", fields: [programId], references: [id])+ partnerGroup PartnerGroup? @relation("GroupDiscounts", fields: [groupId], references: [id], onDelete: NoAction, onUpdate: NoAction) // Owning group+ defaultForPartnerGroup PartnerGroup? @relation("PartnerGroupDefaultDiscount") // Group that uses this as its default+ discountCodes DiscountCode[]+ linkDiscounts LinkReward[]@@index(programId)@@index(groupId)diff --git a/apps/web/prisma/schema/group.prisma b/apps/web/prisma/schema/group.prismaindex b18000c877..e5b60715bb 100644--- a/apps/web/prisma/schema/group.prisma+++ b/apps/web/prisma/schema/group.prisma@@ -39,7 +39,9 @@ model PartnerGroup {saleReward Reward? @relation("SaleReward", fields: [saleRewardId], references: [id])referralReward Reward? @relation("ReferralReward", fields: [referralRewardId], references: [id])customReward Reward? @relation("CustomReward", fields: [customRewardId], references: [id])- discount Discount? @relation(fields: [discountId], references: [id])+ discount Discount? @relation("PartnerGroupDefaultDiscount", fields: [discountId], references: [id])+ discounts Discount[] @relation("GroupDiscounts")+ rewards Reward[] @relation("GroupRewards")partners ProgramEnrollment[]applications ProgramApplication[]bounties BountyGroup[]diff --git a/apps/web/prisma/schema/link.prisma b/apps/web/prisma/schema/link.prismaindex 881a004bf4..acfb384835 100644--- a/apps/web/prisma/schema/link.prisma+++ b/apps/web/prisma/schema/link.prisma@@ -91,6 +91,7 @@ model Link {customers Customer[]commissions Commission[]fraudEvents FraudEvent[]+ linkReward LinkReward?@@unique([domain, key]) // for getting a link by domain and key@@unique([projectId, externalId]) // for getting a link by externalIddiff --git a/apps/web/prisma/schema/reward.prisma b/apps/web/prisma/schema/reward.prismaindex 8e3d01ffec..35d79ba5e6 100644--- a/apps/web/prisma/schema/reward.prisma+++ b/apps/web/prisma/schema/reward.prisma@@ -37,6 +37,7 @@ model Reward {updatedAt DateTime @updatedAtprogram Program? @relation(fields: [programId], references: [id])+ partnerGroup PartnerGroup? @relation("GroupRewards", fields: [groupId], references: [id], onDelete: NoAction, onUpdate: NoAction) // Owning groupclickEnrollments ProgramEnrollment[] @relation("ClickRewardEnrollments")leadEnrollments ProgramEnrollment[] @relation("LeadRewardEnrollments")saleEnrollments ProgramEnrollment[] @relation("SaleRewardEnrollments")@@ -48,8 +49,33 @@ model Reward {referralPartnerGroup PartnerGroup? @relation("ReferralReward")customPartnerGroup PartnerGroup? @relation("CustomReward")commissions Commission[]+ clickLinkRewards LinkReward[] @relation("ClickLinkRewards")+ leadLinkRewards LinkReward[] @relation("LeadLinkRewards")+ saleLinkRewards LinkReward[] @relation("SaleLinkRewards")@@index([programId, event])@@index(event) // used in aggregate-clicks cron job@@index(groupId)}++model LinkReward {+ id String @id @default(cuid())+ linkId String @unique+ clickRewardId String?+ leadRewardId String?+ saleRewardId String?+ discountId String?+ createdAt DateTime @default(now())+ updatedAt DateTime @updatedAt++ link Link @relation(fields: [linkId], references: [id], onDelete: Cascade)+ clickReward Reward? @relation("ClickLinkRewards", fields: [clickRewardId], references: [id])+ leadReward Reward? @relation("LeadLinkRewards", fields: [leadRewardId], references: [id])+ saleReward Reward? @relation("SaleLinkRewards", fields: [saleRewardId], references: [id])+ discount Discount? @relation(fields: [discountId], references: [id])++ @@index(clickRewardId)+ @@index(leadRewardId)+ @@index(saleRewardId)+ @@index(discountId)+}diff --git a/apps/web/scripts/migrations/backfill-discount-group.ts b/apps/web/scripts/migrations/backfill-discount-group.tsindex 1037973796..f6f174665d 100644--- a/apps/web/scripts/migrations/backfill-discount-group.ts+++ b/apps/web/scripts/migrations/backfill-discount-group.ts@@ -20,7 +20,7 @@ async function main() {},select: {id: true,- partnerGroup: {+ defaultForPartnerGroup: {select: {id: true,},@@ -40,7 +40,7 @@ async function main() {await Promise.all(discounts.map((discount) => {- const groupId = discount.partnerGroup?.id;+ const groupId = discount.defaultForPartnerGroup?.id;if (!groupId) {console.log(`No group found for discount ${discount.id}`);diff --git a/apps/web/tests/rewards/determine-partner-rewards.test.ts b/apps/web/tests/rewards/determine-partner-rewards.test.tsindex e20abefc2e..7762f8b3f8 100644--- a/apps/web/tests/rewards/determine-partner-rewards.test.ts+++ b/apps/web/tests/rewards/determine-partner-rewards.test.ts@@ -1,16 +1,32 @@import { calculateSaleEarnings } from "@/lib/api/sales/calculate-sale-earnings";import { determinePartnerRewards } from "@/lib/partners/determine-partner-reward";+import { RewardContext } from "@/lib/types";import { Prisma, Reward } from "@prisma/client";-import { describe, expect, test, vi } from "vitest";+import { beforeEach, describe, expect, test, vi } from "vitest";++const mocks = vi.hoisted(() => ({+ findUnique: vi.fn(),+}));vi.mock("server-only", () => ({}));+vi.mock("@/lib/prisma", () => ({+ prisma: {+ linkReward: {+ findUnique: mocks.findUnique,+ },+ },+}));+const ADDON_PRODUCT_ID = "prod_abc";+const OTHER_PRODUCT_ID = "prod_other";+const LINK_ID = "link_test";function saleReward(overrides: Partial<Reward> = {}): Reward {return {id: "rw_test",programId: "prog_test",+ groupId: "grp_test",description: null,tooltipDescription: null,event: "sale",@@ -22,62 +38,122 @@ function saleReward(overrides: Partial<Reward> = {}): Reward {config: null,spendLimitAmount: null,spendLimitInterval: null,- groupId: null,createdAt: new Date("2026-01-01"),updatedAt: new Date("2026-01-01"),...overrides,};}-function enrollment(saleRewardValue: Reward) {+function enrollment(+ saleRewardValue: Reward | null,+ { linkId }: { linkId?: string | null } = {},+) {return {partner: { country: null },- links: null,+ links: linkId ? [{ id: linkId } as any] : null,totalCommissions: 0,saleReward: saleRewardValue,};}+function mockLinkSaleReward(saleRewardValue: Reward | null) {+ mocks.findUnique.mockResolvedValue({+ clickReward: null,+ leadReward: null,+ saleReward: saleRewardValue,+ });+}++function productIdModifier({+ id,+ productId,+ amountInPercentage,+}: {+ id: string;+ productId: string;+ amountInPercentage: number;+}) {+ return {+ id,+ type: "percentage" as const,+ operator: "AND" as const,+ conditions: [+ {+ value: productId,+ entity: "sale" as const,+ operator: "equals_to" as const,+ attribute: "productId" as const,+ },+ ],+ amountInPercentage,+ };+}++function determineRewards({+ saleReward: saleRewardValue,+ context,+ amount = 20000,+ quantity = 1,+ linkId = null,+}: {+ saleReward: Reward | null;+ context?: RewardContext;+ amount?: number;+ quantity?: number;+ linkId?: string | null;+}) {+ return determinePartnerRewards({+ event: "sale",+ programEnrollment: enrollment(saleRewardValue, { linkId }),+ ...(context ? { context } : {}),+ amount,+ quantity,+ linkId,+ });+}+describe("determinePartnerRewards", () => {- test("does not multiply a flat reward by Stripe line quantity", () => {- const rewards = determinePartnerRewards({- event: "sale",- programEnrollment: enrollment(- saleReward({- modifiers: [- {- id: "product-zero-percent",- type: "percentage",- operator: "AND",- conditions: [- {- value: [ADDON_PRODUCT_ID, "prod_xyz"],- entity: "sale",- operator: "in",- attribute: "productId",- },- ],- maxDuration: 12,- amountInPercentage: 0,- },- {- id: "amount-gte-200",- type: "flat",- operator: "AND",- conditions: [- {- value: 20000,- entity: "sale",- operator: "greater_than_or_equal",- attribute: "amount",- },- ],- maxDuration: 0,- amountInCents: 6000,- },- ],- }),- ),+ beforeEach(() => {+ mocks.findUnique.mockReset();+ mocks.findUnique.mockResolvedValue(null);+ });++ test("does not multiply a flat reward by Stripe line quantity", async () => {+ const rewards = await determineRewards({+ saleReward: saleReward({+ modifiers: [+ {+ id: "product-zero-percent",+ type: "percentage",+ operator: "AND",+ conditions: [+ {+ value: [ADDON_PRODUCT_ID, "prod_xyz"],+ entity: "sale",+ operator: "in",+ attribute: "productId",+ },+ ],+ maxDuration: 12,+ amountInPercentage: 0,+ },+ {+ id: "amount-gte-200",+ type: "flat",+ operator: "AND",+ conditions: [+ {+ value: 20000,+ entity: "sale",+ operator: "greater_than_or_equal",+ attribute: "amount",+ },+ ],+ maxDuration: 0,+ amountInCents: 6000,+ },+ ],+ }),context: {sale: {amount: 20000,@@ -90,10 +166,9 @@ describe("determinePartnerRewards", () => {],},},- amount: 20000,- quantity: 1,});+ expect(mocks.findUnique).not.toHaveBeenCalled();expect(rewards).toHaveLength(1);expect(rewards[0].sale).toEqual({ amount: 20000, quantity: 1 });expect(rewards[0].reward.type).toBe("flat");@@ -111,28 +186,55 @@ describe("determinePartnerRewards", () => {).toBe(6000);});- test("applies percentage rewards to the line total, ignoring line quantity", () => {- const rewards = determinePartnerRewards({- event: "sale",- programEnrollment: enrollment(- saleReward({- modifiers: [+ test("applies percentage rewards to the line total, ignoring line quantity", async () => {+ const rewards = await determineRewards({+ saleReward: saleReward({+ modifiers: [+ {+ type: "percentage",+ operator: "AND",+ amountInPercentage: 10,+ conditions: [+ {+ entity: "sale",+ attribute: "productId",+ operator: "equals_to",+ value: ADDON_PRODUCT_ID,+ },+ ],+ },+ ],+ }),+ context: {+ sale: {+ products: [{- type: "percentage",- operator: "AND",- amountInPercentage: 10,- conditions: [- {- entity: "sale",- attribute: "productId",- operator: "equals_to",- value: ADDON_PRODUCT_ID,- },- ],+ id: ADDON_PRODUCT_ID,+ amount: 20000,+ quantity: 200,},],- }),- ),+ },+ },+ });++ expect(rewards).toHaveLength(1);+ expect(rewards[0].sale.quantity).toBe(1);+ expect(+ calculateSaleEarnings({+ reward: rewards[0].reward,+ sale: rewards[0].sale,+ }),+ ).toBe(2000);+ });++ test("uses the sale quantity when there is no productId modifier", async () => {+ const rewards = await determineRewards({+ saleReward: saleReward({+ type: "flat",+ amountInCents: 500,+ amountInPercentage: null,+ }),context: {sale: {products: [@@ -144,47 +246,143 @@ describe("determinePartnerRewards", () => {],},},+ });++ expect(rewards).toHaveLength(1);+ expect(rewards[0].sale).toEqual({ amount: 20000, quantity: 1 });+ expect(rewards[0].matchedCondition).toBeNull();+ });++ test("uses LinkReward.saleReward when it differs from the enrollment reward", async () => {+ const enrollmentReward = saleReward({+ id: "rw_enrollment",+ amountInPercentage: new Prisma.Decimal(30),+ });+ const linkOverride = saleReward({+ id: "rw_link",+ amountInPercentage: new Prisma.Decimal(50),+ });+ mockLinkSaleReward(linkOverride);++ const rewards = await determineRewards({+ saleReward: enrollmentReward,+ linkId: LINK_ID,amount: 20000,quantity: 1,});+ expect(mocks.findUnique).toHaveBeenCalledWith({+ where: {+ linkId: LINK_ID,+ },+ select: {+ saleReward: true,+ },+ });expect(rewards).toHaveLength(1);- expect(rewards[0].sale.quantity).toBe(1);+ expect(rewards[0].reward.id).toBe("rw_link");+ expect(rewards[0].reward.amountInPercentage).toBe(50);expect(calculateSaleEarnings({reward: rewards[0].reward,sale: rewards[0].sale,}),- ).toBe(2000);+ ).toBe(10000);});- test("uses the sale quantity when there is no productId modifier", () => {- const rewards = determinePartnerRewards({- event: "sale",- programEnrollment: enrollment(- saleReward({- type: "flat",- amountInCents: 500,- amountInPercentage: null,+ test("falls back to the enrollment reward when the link has no sale override", async () => {+ mockLinkSaleReward(null);++ const rewards = await determineRewards({+ saleReward: saleReward({+ id: "rw_enrollment",+ amountInPercentage: new Prisma.Decimal(30),+ }),+ linkId: LINK_ID,+ amount: 20000,+ quantity: 1,+ });++ expect(mocks.findUnique).toHaveBeenCalledOnce();+ expect(rewards).toHaveLength(1);+ expect(rewards[0].reward.id).toBe("rw_enrollment");+ expect(rewards[0].reward.amountInPercentage).toBe(30);+ expect(+ calculateSaleEarnings({+ reward: rewards[0].reward,+ sale: rewards[0].sale,+ }),+ ).toBe(6000);+ });++ test("applies the link sale reward's product rates when splitting Stripe line items", async () => {+ const enrollmentReward = saleReward({+ id: "rw_enrollment",+ amountInPercentage: new Prisma.Decimal(30),+ modifiers: [+ productIdModifier({+ id: "enrollment-addon-zero",+ productId: ADDON_PRODUCT_ID,+ amountInPercentage: 0,+ }),+ ],+ });+ const linkOverride = saleReward({+ id: "rw_link",+ amountInPercentage: new Prisma.Decimal(20),+ modifiers: [+ productIdModifier({+ id: "link-addon-fifty",+ productId: ADDON_PRODUCT_ID,+ amountInPercentage: 50,}),- ),+ ],+ });+ mockLinkSaleReward(linkOverride);++ const rewards = await determineRewards({+ saleReward: enrollmentReward,+ linkId: LINK_ID,context: {sale: {products: [{id: ADDON_PRODUCT_ID,amount: 20000,- quantity: 200,+ quantity: 1,+ },+ {+ id: OTHER_PRODUCT_ID,+ amount: 10000,+ quantity: 1,},],},},- amount: 20000,+ amount: 30000,quantity: 1,});- expect(rewards).toHaveLength(1);+ expect(rewards).toHaveLength(2);+ expect(rewards.map((item) => item.reward.id)).toEqual([+ "rw_link",+ "rw_link",+ ]);expect(rewards[0].sale).toEqual({ amount: 20000, quantity: 1 });- expect(rewards[0].matchedCondition).toBeNull();+ expect(rewards[0].reward.amountInPercentage).toBe(50);+ expect(rewards[1].sale).toEqual({ amount: 10000, quantity: 1 });+ expect(rewards[1].reward.amountInPercentage).toBe(20);+ expect(+ calculateSaleEarnings({+ reward: rewards[0].reward,+ sale: rewards[0].sale,+ }),+ ).toBe(10000);+ expect(+ calculateSaleEarnings({+ reward: rewards[1].reward,+ sale: rewards[1].sale,+ }),+ ).toBe(2000);});});diff --git a/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx b/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsxindex b5cd61b9f7..40c3f13d7f 100644--- a/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx+++ b/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx@@ -1,6 +1,12 @@-import { ActivityLog, DiscountProps, RewardProps } from "@/lib/types";+import {+ ActivityLog,+ DiscountProps,+ LinkProps,+ RewardProps,+} from "@/lib/types";import { formatDiscountDescription } from "@/ui/partners/format-discount-description";import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";+import { linkConstructor } from "@dub/utils";import { Fragment, ReactNode } from "react";import { ActivityValueChip, UserChip } from "../activity-entry-chips";@@ -72,6 +78,43 @@ function isDiscountSnapshot(value: unknown): value is DiscountSnapshot {);}+function isLinkSnapshot(+ value: unknown,+): value is Pick<LinkProps, "id" | "domain" | "key"> {+ return (+ typeof value === "object" &&+ value !== null &&+ "domain" in value &&+ "key" in value &&+ typeof (value as Pick<LinkProps, "domain">).domain === "string" &&+ typeof (value as Pick<LinkProps, "key">).key === "string"+ );+}++function OnLink({ log }: { log: ActivityLog }) {+ const diff = log.changeSet?.link as+ | FieldDiff<Pick<LinkProps, "id" | "domain" | "key">>+ | undefined;+ const link = diff?.new ?? diff?.old;++ if (!isLinkSnapshot(link)) {+ return null;+ }++ return (+ <>+ <Label>on</Label>+ <ActivityValueChip>+ {linkConstructor({+ domain: link.domain,+ key: link.key,+ pretty: true,+ })}+ </ActivityValueChip>+ </>+ );+}+function RewardValueChip({ value }: { value: unknown }) {return (<ActivityValueChip>@@ -128,7 +171,13 @@ export function PartnerRewardChangedRenderer({ log }: { log: ActivityLog }) {});if (changes.length === 0) {- return <span>Reward updated</span>;+ return (+ <>+ <span>Reward updated</span>+ <OnLink log={log} />+ <ByUser user={log.user} />+ </>+ );}return (@@ -142,6 +191,7 @@ export function PartnerRewardChangedRenderer({ log }: { log: ActivityLog }) {{change.value ? <RewardValueChip value={change.value} /> : null}</Fragment>))}+ <OnLink log={log} /><ByUser user={log.user} /></>);@@ -153,7 +203,13 @@ export function PartnerDiscountChangedRenderer({ log }: { log: ActivityLog }) {| undefined;if (!discountChange) {- return <span>Discount updated</span>;+ return (+ <>+ <span>Discount updated</span>+ <OnLink log={log} />+ <ByUser user={log.user} />+ </>+ );}const verb = getChangeVerb(discountChange.old, discountChange.new);@@ -164,6 +220,7 @@ export function PartnerDiscountChangedRenderer({ log }: { log: ActivityLog }) {{verb !== "removed" ? (<DiscountValueChip value={discountChange.new} />) : null}+ <OnLink log={log} /><ByUser user={log.user} /></>);diff --git a/apps/web/ui/activity-logs/activity-log-registry.tsx b/apps/web/ui/activity-logs/activity-log-registry.tsxindex 250b9c0a16..6b7564612d 100644--- a/apps/web/ui/activity-logs/activity-log-registry.tsx+++ b/apps/web/ui/activity-logs/activity-log-registry.tsx@@ -46,6 +46,8 @@ const ACTIVITY_LOG_ICONS: Partial<"partner.groupChanged": UserArrowRight,"partner.rewardChanged": MoneyBill2,"partner.discountChanged": Gift,+ "link.rewardChanged": MoneyBill2,+ "link.discountChanged": Gift,...Object.fromEntries(PARTNER_STATUS_ACTIONS.map((action) => [action, CircleDotted]),),@@ -82,6 +84,14 @@ const ACTIVITY_LOG_REGISTRY: Array<{action: "partner.discountChanged",renderer: PartnerDiscountChangedRenderer,},+ {+ action: "link.rewardChanged",+ renderer: PartnerRewardChangedRenderer,+ },+ {+ action: "link.discountChanged",+ renderer: PartnerDiscountChangedRenderer,+ },...PARTNER_STATUS_ACTIONS.map((action) => ({action,renderer: PartnerStatusChangedRenderer,diff --git a/apps/web/ui/modals/add-partner-link-modal.tsx b/apps/web/ui/modals/add-partner-link-modal.tsxindex c1c223d503..0e420ea8cf 100644--- a/apps/web/ui/modals/add-partner-link-modal.tsx+++ b/apps/web/ui/modals/add-partner-link-modal.tsx@@ -1,32 +1,52 @@+import { getPlanCapabilities } from "@/lib/plan-capabilities";+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";+import { mutatePrefix } from "@/lib/swr/mutate";import useProgram from "@/lib/swr/use-program";import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerProps, LinkProps } from "@/lib/types";+import { createPartnerLinkSchemaInternal } from "@/lib/zod/schemas/partners";+import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";+import { DiscountSelector } from "@/ui/partners/rewards/discount-selector";+import { RewardSelector } from "@/ui/partners/rewards/reward-selector";+import { useCustomRewardAndDiscountOptions } from "@/ui/partners/rewards/use-custom-reward-and-discount-options";import {+ AnimatedSizeContainer,ArrowTurnLeft,Button,InfoTooltip,Modal,+ Tooltip,+ TooltipContent,useCopyToClipboard,useLatestCallback,useMediaQuery,} from "@dub/ui";-import { useCallback, useMemo, useRef, useState } from "react";-import { useForm } from "react-hook-form";+import { cn } from "@dub/utils";+import { ChevronDown } from "lucide-react";+import { motion } from "motion/react";+import { useCallback, useEffect, useMemo, useRef, useState } from "react";+import { Controller, useForm } from "react-hook-form";import { toast } from "sonner";import { mutate } from "swr";+import * as z from "zod/v4";import { X } from "../shared/icons";interface AddPartnerLinkModalProps {showModal: boolean;setShowModal: (showModal: boolean) => void;onSuccess?: (link: LinkProps) => void;- partner: Pick<EnrolledPartnerProps, "id" | "email">;+ partner: Pick<EnrolledPartnerProps, "id" | "email" | "groupId">;}-interface FormData {- key: string;- url: string;-}+type FormData = Pick<+ z.infer<typeof createPartnerLinkSchemaInternal>,+ | "key"+ | "url"+ | "clickRewardId"+ | "leadRewardId"+ | "saleRewardId"+ | "discountId"+>;const AddPartnerLinkModal = ({showModal,@@ -36,20 +56,57 @@ const AddPartnerLinkModal = ({}: AddPartnerLinkModalProps) => {const { program } = useProgram();const { isMobile } = useMediaQuery();- const { id: workspaceId } = useWorkspace();+ const { id: workspaceId, plan } = useWorkspace();+ const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);+ const { advancedUpsellModal, setShowAdvancedUpsellModal } =+ useAdvancedUpsellModal();const [, copyToClipboard] = useCopyToClipboard();const formRef = useRef<HTMLFormElement>(null);const [isSubmitting, setIsSubmitting] = useState(false);const [errorMessage, setErrorMessage] = useState<string | null>(null);+ const [showOverrides, setShowOverrides] = useState(false);- const { register, handleSubmit, watch } = useForm<FormData>({- defaultValues: {- key: "",- url: program?.url || "",- },+ const {+ clickRewards,+ saleRewards,+ leadRewards,+ discounts,+ groupClickRewardId,+ groupLeadRewardId,+ groupSaleRewardId,+ groupDiscountId,+ } = useCustomRewardAndDiscountOptions({+ partnerGroupId: partner.groupId,});+ const { register, handleSubmit, watch, setValue, control } =+ useForm<FormData>({+ defaultValues: {+ key: "",+ url: program?.url || "",+ clickRewardId: null,+ leadRewardId: null,+ saleRewardId: null,+ discountId: null,+ },+ });+const key = watch("key");+ const prevShowModal = useRef(showModal);++ useEffect(() => {+ if (showModal && !prevShowModal.current) {+ setValue("key", "");+ setValue("url", program?.url || "");+ setValue("clickRewardId", null);+ setValue("leadRewardId", null);+ setValue("saleRewardId", null);+ setValue("discountId", null);+ setShowOverrides(false);+ setErrorMessage(null);+ }+ prevShowModal.current = showModal;+ }, [showModal, program?.url, setValue]);const onSubmit = async (formData: FormData) => {if (!partner.id) {@@ -71,6 +128,10 @@ const AddPartnerLinkModal = ({partnerId: partner.id,key: formData.key,url: formData.url || undefined,+ clickRewardId: formData.clickRewardId || undefined,+ leadRewardId: formData.leadRewardId || undefined,+ saleRewardId: formData.saleRewardId || undefined,+ discountId: formData.discountId || undefined,}),},);@@ -81,7 +142,10 @@ const AddPartnerLinkModal = ({throw new Error(data.error.message);}- await mutate(`/api/partners/${partner.id}?workspaceId=${workspaceId}`);+ await Promise.all([+ mutatePrefix("/api/partners/links"),+ mutate(`/api/partners/${partner.id}?workspaceId=${workspaceId}`),+ ]);toast.success("Link created successfully!");onSuccess?.(data);setShowModal(false);@@ -99,8 +163,9 @@ const AddPartnerLinkModal = ({<ModalshowModal={showModal}setShowModal={setShowModal}- className="max-w-lg"+ className="max-w-lg overflow-visible">+ {advancedUpsellModal}<form ref={formRef} onSubmit={handleSubmit(onSubmit)}><div className="flex flex-col items-start justify-between gap-4 px-6 py-4"><div className="flex w-full items-center justify-between">@@ -120,9 +185,9 @@ const AddPartnerLinkModal = ({<div className="flex items-center gap-2"><labelhtmlFor="key"- className="block text-sm font-medium text-neutral-700"+ className="text-content-emphasis block text-sm font-medium">- Short Link+ Short link</label><InfoTooltip content="This is the short link that will redirect to your destination URL. [Learn more.](https://dub.co/help/article/how-to-create-link)" />@@ -157,7 +222,7 @@ const AddPartnerLinkModal = ({<div className="flex items-center gap-2"><labelhtmlFor="url"- className="block text-sm font-medium text-neutral-700"+ className="text-content-emphasis block text-sm font-medium">Destination URL</label>@@ -174,10 +239,111 @@ const AddPartnerLinkModal = ({/></div></div>++ <div className="flex flex-col">+ <Tooltip+ content={+ !canUseAdvancedRewardLogic ? (+ <TooltipContent+ title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}+ cta="Upgrade to Advanced"+ onClick={() => setShowAdvancedUpsellModal(true)}+ />+ ) : undefined+ }+ >+ <button+ type="button"+ className={cn(+ "flex w-full items-center gap-2",+ !canUseAdvancedRewardLogic &&+ "cursor-not-allowed opacity-50",+ )}+ onClick={() => {+ if (!canUseAdvancedRewardLogic) {+ return;+ }+ setShowOverrides(!showOverrides);+ }}+ >+ <p className="text-sm text-neutral-600">+ {showOverrides ? "Hide" : "Show"} rewards and discount+ overrides+ </p>+ <motion.div+ animate={{ rotate: showOverrides ? 180 : 0 }}+ className="text-neutral-600"+ >+ <ChevronDown className="size-4" />+ </motion.div>+ </button>+ </Tooltip>++ <AnimatedSizeContainer height className="-mx-1 overflow-visible">+ {showOverrides && canUseAdvancedRewardLogic && (+ <div className="flex flex-col gap-6 px-1 pt-4">+ <Controller+ control={control}+ name="saleRewardId"+ render={({ field }) => (+ <RewardSelector+ label="Sale reward"+ options={saleRewards}+ selectedId={field.value ?? groupSaleRewardId}+ onChange={field.onChange}+ />+ )}+ />+ <Controller+ control={control}+ name="leadRewardId"+ render={({ field }) => (+ <RewardSelector+ label="Lead reward"+ options={leadRewards}+ selectedId={field.value ?? groupLeadRewardId}+ onChange={field.onChange}+ />+ )}+ />+ <Controller+ control={control}+ name="clickRewardId"+ render={({ field }) => (+ <RewardSelector+ label="Click reward"+ options={clickRewards}+ selectedId={field.value ?? groupClickRewardId}+ onChange={field.onChange}+ />+ )}+ />+ <Controller+ control={control}+ name="discountId"+ render={({ field }) => (+ <DiscountSelector+ options={discounts}+ selectedId={field.value ?? groupDiscountId}+ onChange={field.onChange}+ />+ )}+ />+ </div>+ )}+ </AnimatedSizeContainer>+ </div></div></div>-- <div className="flex items-center justify-end border-t border-neutral-200 bg-neutral-50 p-4">+ <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 p-4">+ <Button+ type="button"+ variant="secondary"+ text="Cancel"+ className="h-8 w-fit px-3"+ onClick={() => setShowModal(false)}+ disabled={isSubmitting}+ /><Buttontype="submit"text={@@ -203,7 +369,7 @@ export function useAddPartnerLinkModal({partner,}: {onSuccess?: (link: LinkProps) => void;- partner: Pick<EnrolledPartnerProps, "id" | "email">;+ partner: Pick<EnrolledPartnerProps, "id" | "email" | "groupId">;}) {const [showAddPartnerLinkModal, setShowAddPartnerLinkModal] = useState(false);@@ -218,7 +384,12 @@ export function useAddPartnerLinkModal({partner={partner}/>);- }, [showAddPartnerLinkModal, setShowAddPartnerLinkModal, onSuccessCallback]);+ }, [+ showAddPartnerLinkModal,+ setShowAddPartnerLinkModal,+ onSuccessCallback,+ partner,+ ]);return useMemo(() => ({diff --git a/apps/web/ui/modals/confirm-reward-change-modal.tsx b/apps/web/ui/modals/confirm-reward-change-modal.tsxindex c64941b1e8..345927845c 100644--- a/apps/web/ui/modals/confirm-reward-change-modal.tsx+++ b/apps/web/ui/modals/confirm-reward-change-modal.tsx@@ -12,7 +12,7 @@ import { useForm } from "react-hook-form";import { PartnerEmailNotificationTooltipHelper } from "../shared/partner-email-notification-tooltip-helper";export type RewardChangeAction = "created" | "updated" | "deleted";-type RewardNotificationTarget = "group" | "partner";+type RewardNotificationTarget = "group" | "partner" | "link";function shouldNotifyRewardChange({action,@@ -25,7 +25,7 @@ function shouldNotifyRewardChange({isDefault?: boolean;partnerCount?: number;}): boolean {- if (target === "partner") {+ if (target === "partner" || target === "link") {return true;}@@ -107,6 +107,15 @@ function getDescription({);}+ if (target === "link") {+ return (+ <>+ The reward below will be updated for this link, and the partner will be{" "}+ <PartnerEmailNotificationTooltipHelper />.+ </>+ );+ }+return (<>The reward below will be {GROUP_CHANGE_COPY[action]} the groupdiff --git a/apps/web/ui/modals/edit-partner-discount-modal.tsx b/apps/web/ui/modals/edit-partner-discount-modal.tsxindex abd8a13ae3..5d7d7221ea 100644--- a/apps/web/ui/modals/edit-partner-discount-modal.tsx+++ b/apps/web/ui/modals/edit-partner-discount-modal.tsx@@ -3,41 +3,62 @@import { parseActionError } from "@/lib/actions/parse-action-errors";import { deleteDiscountAction } from "@/lib/actions/partners/delete-discount";import { updatePartnerEnrollmentAction } from "@/lib/actions/partners/update-partner-enrollment";+import { constructPartnerLink } from "@/lib/partners/construct-partner-link";import { mutatePrefix } from "@/lib/swr/mutate";+import { useApiMutation } from "@/lib/swr/use-api-mutation";import { useDiscounts } from "@/lib/swr/use-discounts";import useGroup from "@/lib/swr/use-group";+import { ProgramPartnerLinkExtended } from "@/lib/swr/use-program-partner-links";import useWorkspace from "@/lib/swr/use-workspace";-import { DiscountProps, EnrolledPartnerProps } from "@/lib/types";+import { DiscountProps, EnrolledPartnerProps, GroupProps } from "@/lib/types";import { DiscountSheet } from "@/ui/partners/discounts/add-edit-discount-sheet";import { formatDiscountDescription } from "@/ui/partners/format-discount-description";import { PartnerAvatar } from "@/ui/partners/partner-avatar";import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";import { AdditionalRewardOptionList } from "@/ui/partners/rewards/additional-reward-option-list";-import { Button, Modal } from "@dub/ui";+import { ArrowTurnRight2, Button, Modal } from "@dub/ui";import { Discount } from "@dub/ui/icons";+import { cn, getPrettyUrl } from "@dub/utils";import { useAction } from "next-safe-action/hooks";+import Link from "next/link";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { toast } from "sonner";+type PartnerLink = ProgramPartnerLinkExtended;type PartnerDiscountOverridePartner = Pick<EnrolledPartnerProps,"id" | "name" | "email" | "image" | "groupId" | "discountId">;-export type PartnerDiscountOverrideTarget = {- type: "partner";- partner: PartnerDiscountOverridePartner;-};+export type PartnerDiscountOverrideTarget =+ | {+ type: "partner";+ partner: PartnerDiscountOverridePartner;+ }+ | {+ type: "link";+ link: PartnerLink;+ partner: PartnerDiscountOverridePartner;+ };-/** What the partner currently inherits or overrides. */+/** What the target currently inherits or overrides. */function getEffectiveDiscountId({- partnerOverrideDiscountId,+ target,groupDefaultDiscountId,}: {- partnerOverrideDiscountId: string | null | undefined;+ target: PartnerDiscountOverrideTarget;groupDefaultDiscountId: string | null | undefined;}) {- return partnerOverrideDiscountId ?? groupDefaultDiscountId ?? null;+ if (target.type === "partner") {+ return target.partner.discountId ?? groupDefaultDiscountId ?? null;+ }++ return (+ target.link.discount ??+ target.partner.discountId ??+ groupDefaultDiscountId ??+ null+ );}/**@@ -60,12 +81,14 @@ interface EditPartnerDiscountModalProps {showModal: boolean;setShowModal: (showModal: boolean) => void;target: PartnerDiscountOverrideTarget;+ group?: GroupProps | null;}function EditPartnerDiscountModal({showModal,setShowModal,target,+ group: groupProp,}: EditPartnerDiscountModalProps) {const { partner } = target;@@ -77,10 +100,11 @@ function EditPartnerDiscountModal({discount: DiscountProps | null;} | null>(null);- const { id: workspaceId } = useWorkspace();- const { group } = useGroup({+ const { id: workspaceId, slug } = useWorkspace();+ const { group: fetchedGroup } = useGroup({groupIdOrSlug: partner.groupId ?? undefined,});+ const group = groupProp ?? fetchedGroup;const { discounts, loading: discountsLoading } = useDiscounts({groupId: partner.groupId,@@ -90,6 +114,9 @@ function EditPartnerDiscountModal({},);+ const { makeRequest: updatePartnerLink, isSubmitting: isUpdatingLink } =+ useApiMutation();+const { executeAsync: updateEnrollment, isPending: isUpdatingEnrollment } =useAction(updatePartnerEnrollmentAction, {onSuccess: async () => {@@ -115,13 +142,12 @@ function EditPartnerDiscountModal({},);- const partnerOverrideDiscountId = partner.discountId;const groupDefaultDiscountId = group?.discount?.id;const effectiveDiscountId = getEffectiveDiscountId({- partnerOverrideDiscountId,+ target,groupDefaultDiscountId,});- const isSubmitting = isUpdatingEnrollment || isDeleting;+ const isSubmitting = isUpdatingLink || isUpdatingEnrollment || isDeleting;const sortedDiscounts = useMemo(() => {return [...(discounts ?? [])].sort((a, b) => {@@ -182,7 +208,7 @@ function EditPartnerDiscountModal({async (e: React.FormEvent) => {e.preventDefault();- if (!selectedDiscountId || !workspaceId) {+ if (!selectedDiscountId) {return;}@@ -191,13 +217,34 @@ function EditPartnerDiscountModal({return;}- await updateEnrollment({- workspaceId,- partnerId: partner.id,- discountId: getDiscountIdToPersist({- selectedDiscountId,- groupDefaultDiscountId,- }),+ const isGroupSelection = selectedDiscountId === groupDefaultDiscountId;++ if (target.type === "partner") {+ if (!workspaceId) {+ return;+ }++ await updateEnrollment({+ workspaceId,+ partnerId: partner.id,+ discountId: getDiscountIdToPersist({+ selectedDiscountId,+ groupDefaultDiscountId,+ }),+ });+ return;+ }++ await updatePartnerLink(`/api/partners/links/${target.link.id}`, {+ method: "PATCH",+ body: {+ discountId: isGroupSelection ? null : selectedDiscountId,+ },+ onSuccess: async () => {+ setShowModal(false);+ toast.success("Discount updated");+ await mutatePrefix(["/api/partners", "/api/partners/links"]);+ },});},[@@ -206,6 +253,8 @@ function EditPartnerDiscountModal({effectiveDiscountId,setShowModal,updateEnrollment,+ updatePartnerLink,+ target,partner.id,groupDefaultDiscountId,],@@ -310,9 +359,30 @@ function EditPartnerDiscountModal({<div className="border-border-subtle flex items-center justify-between gap-4 border-t px-4 py-4"><div className="flex min-w-0 items-center gap-2"><PartnerAvatar partner={partner} className="size-6 shrink-0" />- <h4 className="min-w-0 truncate text-sm font-medium text-neutral-900">- {partner.name}- </h4>+ <div className="min-w-0 leading-tight">+ <Link+ href={`/${slug}/program/partners/${partner.id}`}+ target="_blank"+ className={cn(+ "block cursor-alias truncate text-xs font-medium text-neutral-900 decoration-dotted hover:underline",+ target.type !== "link" && "text-sm",+ )}+ >+ {partner.name}+ </Link>+ {target.type === "link" && (+ <Link+ href={`/${slug}/links/${getPrettyUrl(target.link.shortLink)}`}+ target="_blank"+ className="flex cursor-alias items-center gap-1 truncate text-[11px] text-neutral-500 decoration-dotted hover:underline"+ >+ <ArrowTurnRight2 className="size-3" />+ {getPrettyUrl(+ constructPartnerLink({ group, link: target.link }),+ )}+ </Link>+ )}+ </div></div><div className="flex shrink-0 items-center gap-2"><Button@@ -339,19 +409,24 @@ function EditPartnerDiscountModal({export function useEditPartnerDiscountModal({target,+ group,}: {target: PartnerDiscountOverrideTarget | null;+ group?: GroupProps | null;}) {const [showModal, setShowModal] = useState(false);+ const propsRef = useRef({ target, group });const lastTargetRef = useRef(target);+ propsRef.current = { target, group };if (target) {lastTargetRef.current = target;}const EditPartnerDiscountModalCallback = useCallback(() => {- const activeTarget = target ?? lastTargetRef.current;+ const { group: currentGroup } = propsRef.current;+ const currentTarget = propsRef.current.target ?? lastTargetRef.current;- if (!activeTarget) {+ if (!currentTarget) {return null;}@@ -359,10 +434,11 @@ export function useEditPartnerDiscountModal({<EditPartnerDiscountModalshowModal={showModal}setShowModal={setShowModal}- target={activeTarget}+ target={currentTarget}+ group={currentGroup}/>);- }, [showModal, target]);+ }, [showModal]);return {setShowEditPartnerDiscountModal: setShowModal,diff --git a/apps/web/ui/modals/edit-partner-reward-modal.tsx b/apps/web/ui/modals/edit-partner-reward-modal.tsxindex 880f646161..e5c5eb9e7a 100644--- a/apps/web/ui/modals/edit-partner-reward-modal.tsx+++ b/apps/web/ui/modals/edit-partner-reward-modal.tsx@@ -3,8 +3,11 @@import { parseActionError } from "@/lib/actions/parse-action-errors";import { deleteRewardAction } from "@/lib/actions/partners/delete-reward";import { updatePartnerEnrollmentAction } from "@/lib/actions/partners/update-partner-enrollment";+import { constructPartnerLink } from "@/lib/partners/construct-partner-link";import { mutatePrefix } from "@/lib/swr/mutate";+import { useApiMutation } from "@/lib/swr/use-api-mutation";import useGroup from "@/lib/swr/use-group";+import { ProgramPartnerLinkExtended } from "@/lib/swr/use-program-partner-links";import { useRewards } from "@/lib/swr/use-rewards";import useWorkspace from "@/lib/swr/use-workspace";import { EnrolledPartnerProps, GroupProps, RewardProps } from "@/lib/types";@@ -16,11 +19,14 @@ import { ProgramRewardDescription } from "@/ui/partners/program-reward-descriptiimport { RewardSheet } from "@/ui/partners/rewards/add-edit-reward-sheet";import { AdditionalRewardOptionList } from "@/ui/partners/rewards/additional-reward-option-list";import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";-import { Button, Modal } from "@dub/ui";+import { ArrowTurnRight2, Button, Modal } from "@dub/ui";+import { cn, getPrettyUrl } from "@dub/utils";import { useAction } from "next-safe-action/hooks";+import Link from "next/link";import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { toast } from "sonner";+type PartnerLink = ProgramPartnerLinkExtended;type OverrideRewardEvent = "sale" | "lead" | "click";type PartnerRewardOverridePartner = Pick<@@ -35,10 +41,16 @@ type PartnerRewardOverridePartner = Pick<| "saleRewardId">;-export type PartnerRewardOverrideTarget = {- type: "partner";- partner: PartnerRewardOverridePartner;-};+export type PartnerRewardOverrideTarget =+ | {+ type: "partner";+ partner: PartnerRewardOverridePartner;+ }+ | {+ type: "link";+ link: PartnerLink;+ partner: PartnerRewardOverridePartner;+ };function getGroupRewardId(group: GroupProps | null | undefined,@@ -62,16 +74,35 @@ function getPartnerRewardId(}[event];}+function getLinkRewardId(link: PartnerLink, event: OverrideRewardEvent) {+ return (+ {+ sale: link.saleReward,+ lead: link.leadReward,+ click: link.clickReward,+ }[event] ?? null+ );+}+function getSelectedRewardId({- partner,+ target,event,groupRewardId,}: {- partner: PartnerRewardOverridePartner;+ target: PartnerRewardOverrideTarget;event: OverrideRewardEvent;groupRewardId: string | null | undefined;}) {- return getPartnerRewardId(partner, event) ?? groupRewardId ?? null;+ if (target.type === "partner") {+ return getPartnerRewardId(target.partner, event) ?? groupRewardId ?? null;+ }++ return (+ getLinkRewardId(target.link, event) ??+ getPartnerRewardId(target.partner, event) ??+ groupRewardId ??+ null+ );}interface EditPartnerRewardModalProps {@@ -79,6 +110,7 @@ interface EditPartnerRewardModalProps {setShowModal: (showModal: boolean) => void;event: OverrideRewardEvent;target: PartnerRewardOverrideTarget;+ group?: GroupProps | null;}function EditPartnerRewardModal({@@ -86,6 +118,7 @@ function EditPartnerRewardModal({setShowModal,event,target,+ group: groupProp,}: EditPartnerRewardModalProps) {const { partner } = target;@@ -95,7 +128,7 @@ function EditPartnerRewardModal({} | null>(null);const [isRewardSheetOpen, setIsRewardSheetOpen] = useState(false);- const { id: workspaceId } = useWorkspace();+ const { id: workspaceId, slug } = useWorkspace();const { rewards, loading: rewardsLoading } = useRewards({groupId: partner.groupId,@@ -104,12 +137,16 @@ function EditPartnerRewardModal({revalidateOnFocus: true,},);- const { group } = useGroup({+ const { group: fetchedGroup } = useGroup({groupIdOrSlug: partner.groupId ?? undefined,});+ const group = groupProp ?? fetchedGroup;const { ConfirmRewardChangeModal, confirmRewardChange } =useConfirmRewardChangeModal();+ const { makeRequest: updatePartnerLink, isSubmitting: isUpdatingLink } =+ useApiMutation();+const { executeAsync: updateEnrollment, isPending: isUpdatingEnrollment } =useAction(updatePartnerEnrollmentAction, {onSuccess: async () => {@@ -149,12 +186,13 @@ function EditPartnerRewardModal({}, [rewards, event, groupRewardId]);const currentId = getSelectedRewardId({- partner,+ target,event,groupRewardId,});const resolvedSelectedId = selectedId ?? currentId;const hasChanges = resolvedSelectedId !== currentId;+ const isSubmitting = isUpdatingLink || isUpdatingEnrollment;const options = useMemo(() =>@@ -195,20 +233,36 @@ function EditPartnerRewardModal({const persistOverride = useCallback(async (activityDescription?: string) => {- if (!workspaceId) {- return;- }-const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[event];const isGroupSelection = resolvedSelectedId === groupRewardId;- await updateEnrollment({- workspaceId,- partnerId: partner.id,- [rewardIdColumn]: isGroupSelection- ? groupRewardId ?? null- : resolvedSelectedId,- activityDescription,+ if (target.type === "partner") {+ if (!workspaceId) {+ return;+ }++ await updateEnrollment({+ workspaceId,+ partnerId: partner.id,+ [rewardIdColumn]: isGroupSelection+ ? groupRewardId ?? null+ : resolvedSelectedId,+ activityDescription,+ });+ return;+ }++ await updatePartnerLink(`/api/partners/links/${target.link.id}`, {+ method: "PATCH",+ body: {+ [rewardIdColumn]: isGroupSelection ? null : resolvedSelectedId,+ activityDescription,+ },+ onSuccess: async () => {+ setShowModal(false);+ toast.success("Reward updated");+ await mutatePrefix(["/api/partners", "/api/partners/links"]);+ },});},[@@ -217,7 +271,10 @@ function EditPartnerRewardModal({resolvedSelectedId,groupRewardId,updateEnrollment,+ updatePartnerLink,+ target,partner.id,+ setShowModal,],);@@ -244,9 +301,9 @@ function EditPartnerRewardModal({await confirmRewardChange({action: "updated",- target: "partner",+ target: target.type,reward: selectedReward,- isPending: isUpdatingEnrollment,+ isPending: isSubmitting,onConfirm: persistOverride,});},@@ -256,7 +313,8 @@ function EditPartnerRewardModal({eventRewards,setShowModal,confirmRewardChange,- isUpdatingEnrollment,+ target.type,+ isSubmitting,persistOverride,],);@@ -373,9 +431,30 @@ function EditPartnerRewardModal({<div className="border-border-subtle flex items-center justify-between gap-4 border-t px-4 py-4"><div className="flex min-w-0 items-center gap-2"><PartnerAvatar partner={partner} className="size-6 shrink-0" />- <h4 className="min-w-0 truncate text-sm font-medium text-neutral-900">- {partner.name}- </h4>+ <div className="min-w-0 leading-tight">+ <Link+ href={`/${slug}/program/partners/${partner.id}`}+ target="_blank"+ className={cn(+ "block cursor-alias truncate text-xs font-medium text-neutral-900 decoration-dotted hover:underline",+ target.type !== "link" && "text-sm",+ )}+ >+ {partner.name}+ </Link>+ {target.type === "link" && (+ <Link+ href={`/${slug}/links/${getPrettyUrl(target.link.shortLink)}`}+ target="_blank"+ className="flex cursor-alias items-center gap-1 truncate text-[11px] text-neutral-500 decoration-dotted hover:underline"+ >+ <ArrowTurnRight2 className="size-3" />+ {getPrettyUrl(+ constructPartnerLink({ group, link: target.link }),+ )}+ </Link>+ )}+ </div></div><div className="flex shrink-0 items-center gap-2"><Button@@ -384,13 +463,13 @@ function EditPartnerRewardModal({text="Cancel"className="h-8 w-fit px-3"onClick={() => setShowModal(false)}- disabled={isUpdatingEnrollment}+ disabled={isSubmitting}/><Buttontype="submit"text="Save"className="h-8 w-fit px-3"- loading={isUpdatingEnrollment}+ loading={isSubmitting}disabled={!resolvedSelectedId || options.length === 0 || !hasChanges}@@ -405,20 +484,22 @@ function EditPartnerRewardModal({export function useEditPartnerRewardModal({event,target,+ group,}: {event: OverrideRewardEvent;target: PartnerRewardOverrideTarget | null;+ group?: GroupProps | null;}) {const [showModal, setShowModal] = useState(false);- const propsRef = useRef({ event, target });+ const propsRef = useRef({ event, target, group });const lastTargetRef = useRef(target);- propsRef.current = { event, target };+ propsRef.current = { event, target, group };if (target) {lastTargetRef.current = target;}const EditPartnerRewardModalCallback = useCallback(() => {- const { event: currentEvent } = propsRef.current;+ const { event: currentEvent, group: currentGroup } = propsRef.current;const currentTarget = propsRef.current.target ?? lastTargetRef.current;if (!currentTarget) {@@ -431,6 +512,7 @@ export function useEditPartnerRewardModal({setShowModal={setShowModal}event={currentEvent}target={currentTarget}+ group={currentGroup}/>);}, [showModal]);diff --git a/apps/web/ui/partners/discounts/discount-code-tooltip.tsx b/apps/web/ui/partners/discounts/discount-code-tooltip.tsxnew file mode 100644index 0000000000..0fab243a16--- /dev/null+++ b/apps/web/ui/partners/discounts/discount-code-tooltip.tsx@@ -0,0 +1,59 @@+"use client";++import { DiscountProps } from "@/lib/types";+import { Gift, Tooltip } from "@dub/ui";+import { PropsWithChildren } from "react";+import { formatDiscountDescription } from "../format-discount-description";++type DiscountTooltipDiscount = Pick<+ DiscountProps,+ "amount" | "type" | "maxDuration" | "description"+>;++export function DiscountCodeTooltip({+ discount,+ children,+}: PropsWithChildren<{+ discount?: DiscountTooltipDiscount | null;+}>) {+ return (+ <Tooltip content={<DiscountCodeTooltipContent discount={discount} />}>+ {children}+ </Tooltip>+ );+}++function DiscountCodeTooltipContent({+ discount,+}: {+ discount?: DiscountTooltipDiscount | null;+}) {+ const description = discount ? formatDiscountDescription(discount) : null;++ return (+ <div className="w-64">+ {description && (+ <div className="p-1">+ <div className="flex flex-col gap-2 rounded-md border border-neutral-200 bg-neutral-100 p-2">+ <Gift className="size-3.5 shrink-0 text-neutral-800" />+ <p className="text-xs font-semibold leading-4 tracking-tight text-neutral-700">+ {description}+ </p>+ </div>+ </div>+ )}+ <p className="px-3 pb-2 pt-1 text-xs font-medium leading-4 tracking-tight text-neutral-600">+ Sales made with this code are tracked and credited to you.{" "}+ <a+ href="https://dub.co/help/article/dual-sided-incentives"+ target="_blank"+ rel="noopener noreferrer"+ className="underline underline-offset-2"+ onClick={(e) => e.stopPropagation()}+ >+ Learn more+ </a>+ </p>+ </div>+ );+}diff --git a/apps/web/ui/partners/groups/reward-discount-partners-card.tsx b/apps/web/ui/partners/groups/reward-discount-partners-card.tsxindex 4da53b4ac2..ef23fbcd4c 100644--- a/apps/web/ui/partners/groups/reward-discount-partners-card.tsx+++ b/apps/web/ui/partners/groups/reward-discount-partners-card.tsx@@ -155,6 +155,10 @@ function PartnersCompactTable({cn("border-l-0", columnId !== "menu" && "max-w-0 truncate"),resourceName: (p: boolean) => `partner${p ? "s" : ""}`,rowCount: partners?.length || 0,+ onRowClick: (row) =>+ window.open(`/${slug}/program/partners/${row.original.id}`, "_blank"),+ onRowAuxClick: (row) =>+ window.open(`/${slug}/program/partners/${row.original.id}`, "_blank"),});const viewAllParams = new URLSearchParams({ groupId });diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsxindex 1ea3f17a36..66760374f4 100644--- a/apps/web/ui/partners/partner-info-cards.tsx+++ b/apps/web/ui/partners/partner-info-cards.tsx@@ -36,6 +36,7 @@ import {} from "@dub/ui/icons";import {COUNTRIES,+ cn,fetcher,formatDate,formatDateTimeSmart,@@ -67,6 +68,8 @@ import {useUpdatePartnerTagsModal,} from "./update-partner-tags-modal";+const MAX_VISIBLE_BOUNTIES = 3;+type PartnerInfoCardsProps = {showFraudIndicator?: boolean;showApplicationRiskAnalysis?: boolean;@@ -518,44 +521,11 @@ export function PartnerInfoCards({)}</div>{/* Eligible bounties */}- <div className="flex flex-col gap-2">- <h3 className="text-content-emphasis text-sm font-semibold">- Eligible Bounties- </h3>- {bounties ? (- bounties.length ? (- <div className="flex flex-col gap-2">- {bounties.map((bounty) => {- const Icon =- bounty.type === "performance" ? Trophy : Heart;- return (- <Link- key={bounty.id}- target="_blank"- href={`/${workspaceSlug}/program/bounties/${bounty.id}`}- className="text-content-subtle flex cursor-alias items-center gap-2 decoration-dotted underline-offset-2 hover:underline"- >- <Icon className="size-3.5 shrink-0" />- <span className="text-xs font-medium">- {bounty.name}- </span>- </Link>- );- })}- </div>- ) : (- <p className="text-content-subtle text-xs">- No eligible bounties- </p>- )- ) : errorBounties ? (- <p className="text-content-subtle text-xs">- Failed to load bounties- </p>- ) : (- <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />- )}- </div>+ <EligibleBounties+ bounties={bounties}+ errorBounties={errorBounties}+ workspaceSlug={workspaceSlug}+ /></>)}</div>@@ -564,6 +534,70 @@ export function PartnerInfoCards({);}+function EligibleBounties({+ bounties,+ errorBounties,+ workspaceSlug,+}: {+ bounties: BountyListProps[] | undefined;+ errorBounties: unknown;+ workspaceSlug: string | undefined;+}) {+ const [showAllBounties, setShowAllBounties] = useState(false);+ const shouldCollapseBounties = (bounties?.length ?? 0) > MAX_VISIBLE_BOUNTIES;++ return (+ <div className="flex flex-col gap-2">+ <h3 className="text-content-emphasis text-sm font-semibold">+ Eligible Bounties+ </h3>+ {bounties ? (+ bounties.length ? (+ <div>+ <div className="flex flex-col gap-2">+ {(shouldCollapseBounties && !showAllBounties+ ? bounties.slice(0, MAX_VISIBLE_BOUNTIES)+ : bounties+ ).map((bounty) => {+ const Icon = bounty.type === "performance" ? Trophy : Heart;+ return (+ <Link+ key={bounty.id}+ target="_blank"+ href={`/${workspaceSlug}/program/bounties/${bounty.id}`}+ className="text-content-subtle flex cursor-alias items-center gap-2 decoration-dotted underline-offset-2 hover:underline"+ >+ <Icon className="size-3.5 shrink-0" />+ <span className="text-xs font-medium">{bounty.name}</span>+ </Link>+ );+ })}+ </div>+ {shouldCollapseBounties && (+ <button+ type="button"+ className={cn(+ "mt-3 flex h-6 w-fit items-center justify-center rounded-md px-1.5 text-xs font-medium tracking-[-0.02em] text-neutral-900 transition-colors",+ "bg-neutral-200/50 hover:bg-neutral-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-300",+ )}+ onClick={() => setShowAllBounties((current) => !current)}+ >+ {showAllBounties ? "View less bounties" : "View all bounties"}+ </button>+ )}+ </div>+ ) : (+ <p className="text-content-subtle text-xs">No eligible bounties</p>+ )+ ) : errorBounties ? (+ <p className="text-content-subtle text-xs">Failed to load bounties</p>+ ) : (+ <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />+ )}+ </div>+ );+}+function TagsList({ partner }: { partner: EnrolledPartnerExtendedProps }) {const { showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =useUpdatePartnerTagsModal();diff --git a/apps/web/ui/partners/program-reward-list.tsx b/apps/web/ui/partners/program-reward-list.tsxindex b1f295b373..a3741559c5 100644--- a/apps/web/ui/partners/program-reward-list.tsx+++ b/apps/web/ui/partners/program-reward-list.tsx@@ -10,6 +10,7 @@ import { PropsWithChildren, ReactNode } from "react";import { formatDiscountDescription } from "./format-discount-description";import { ProgramRewardDescription } from "./program-reward-description";import { REWARD_EVENT_ICON } from "./rewards/reward-event-icon";+import { RewardOverrideIcon } from "./rewards/reward-override-icon";const EDITABLE_REWARD_EVENTS = new Set(["sale", "lead", "click"]);@@ -152,29 +153,6 @@ function EditAction({return <Tooltip content={disabledTooltip}>{button}</Tooltip>;}-function RewardOverrideIcon() {- return (- <span aria-hidden className="absolute right-0 top-0 size-1">- <svg- width="8"- height="8"- viewBox="0 0 8 8"- fill="none"- className="absolute inset-[-50%] overflow-visible"- >- <circle- cx="4"- cy="4"- r="3"- fill="#155DFC"- stroke="white"- strokeWidth="2"- />- </svg>- </span>- );-}-const Item = ({icon: Icon,children,diff --git a/apps/web/ui/partners/rewards/discount-selector.tsx b/apps/web/ui/partners/rewards/discount-selector.tsxnew file mode 100644index 0000000000..b0476a399f--- /dev/null+++ b/apps/web/ui/partners/rewards/discount-selector.tsx@@ -0,0 +1,70 @@+import { GroupBadge } from "@/ui/partners/rewards/group-badge";+import { Combobox, ComboboxOption } from "@dub/ui";+import { cn } from "@dub/utils";++export type DiscountSelectorOption = ComboboxOption<{+ isGroup?: boolean;+ partnersCount?: number | null;+}>;++export function DiscountSelector({+ options,+ selectedId,+ onChange,+}: {+ options: DiscountSelectorOption[];+ selectedId: string | null | undefined;+ onChange: (id: string | null) => void;+}) {+ const selected =+ options.find((option) => option.value === selectedId) ?? null;++ return (+ <div className="flex flex-col gap-2">+ <label className="text-content-emphasis block text-sm font-medium">+ Discount+ </label>+ <Combobox+ selected={selected}+ setSelected={(option) => {+ if (!option) {+ onChange(null);+ return;+ }++ onChange(option.meta?.isGroup ? null : option.value);+ }}+ options={options}+ caret+ hideSearch+ shouldFilter={false}+ matchTriggerWidth+ placeholder="None"+ popoverProps={{+ contentClassName: "w-[var(--radix-popover-trigger-width)]",+ }}+ buttonProps={{+ className: cn(+ "w-full h-10 justify-start px-3",+ "data-[state=open]:ring-1 data-[state=open]:ring-neutral-500 data-[state=open]:border-neutral-500",+ "focus:ring-1 focus:ring-neutral-500 focus:border-neutral-500 transition-none",+ ),+ }}+ labelProps={{+ className:+ "flex min-w-0 items-center justify-between gap-2 overflow-hidden",+ }}+ optionRight={(option) =>+ option.meta?.isGroup ? <GroupBadge /> : undefined+ }+ >+ {selected ? (+ <>+ <span className="min-w-0 truncate">{selected.label}</span>+ {selected.meta?.isGroup && <GroupBadge />}+ </>+ ) : null}+ </Combobox>+ </div>+ );+}diff --git a/apps/web/ui/partners/rewards/reward-override-icon.tsx b/apps/web/ui/partners/rewards/reward-override-icon.tsxnew file mode 100644index 0000000000..c1b93571a0--- /dev/null+++ b/apps/web/ui/partners/rewards/reward-override-icon.tsx@@ -0,0 +1,22 @@+export function RewardOverrideIcon() {+ return (+ <span aria-hidden className="absolute right-0 top-0 size-1">+ <svg+ width="8"+ height="8"+ viewBox="0 0 8 8"+ fill="none"+ className="absolute inset-[-50%] overflow-visible"+ >+ <circle+ cx="4"+ cy="4"+ r="3"+ fill="#155DFC"+ stroke="white"+ strokeWidth="2"+ />+ </svg>+ </span>+ );+}diff --git a/apps/web/ui/partners/rewards/reward-selector.tsx b/apps/web/ui/partners/rewards/reward-selector.tsxnew file mode 100644index 0000000000..c341b56150--- /dev/null+++ b/apps/web/ui/partners/rewards/reward-selector.tsx@@ -0,0 +1,72 @@+import { GroupBadge } from "@/ui/partners/rewards/group-badge";+import { Combobox, ComboboxOption } from "@dub/ui";+import { cn } from "@dub/utils";++export type RewardSelectorOption = ComboboxOption<{+ isGroup?: boolean;+ partnersCount?: number | null;+}>;++export function RewardSelector({+ label,+ options,+ selectedId,+ onChange,+}: {+ label: string;+ options: RewardSelectorOption[];+ selectedId: string | null | undefined;+ onChange: (id: string | null) => void;+}) {+ const selected =+ options.find((option) => option.value === selectedId) ?? null;++ return (+ <div className="flex flex-col gap-2">+ <label className="text-content-emphasis block text-sm font-medium">+ {label}+ </label>+ <Combobox+ selected={selected}+ setSelected={(option) => {+ if (!option) {+ onChange(null);+ return;+ }++ onChange(option.meta?.isGroup ? null : option.value);+ }}+ options={options}+ caret+ hideSearch+ shouldFilter={false}+ matchTriggerWidth+ placeholder="None"+ popoverProps={{+ contentClassName: "w-[var(--radix-popover-trigger-width)]",+ }}+ buttonProps={{+ className: cn(+ "w-full h-10 justify-start px-3",+ "data-[state=open]:ring-1 data-[state=open]:ring-neutral-500 data-[state=open]:border-neutral-500",+ "focus:ring-1 focus:ring-neutral-500 focus:border-neutral-500 transition-none",+ ),+ }}+ labelProps={{+ className:+ "flex min-w-0 items-center justify-between gap-2 overflow-hidden",+ }}+ optionRight={(option) =>+ option.meta?.isGroup ? <GroupBadge /> : undefined+ }+ >+ {selected ? (+ <>+ <span className="min-w-0 truncate">{selected.label}</span>+ {selected.meta?.isGroup && <GroupBadge />}+ </>+ ) : null}+ </Combobox>+ </div>+ );+}diff --git a/apps/web/ui/partners/rewards/use-custom-reward-and-discount-options.ts b/apps/web/ui/partners/rewards/use-custom-reward-and-discount-options.tsnew file mode 100644index 0000000000..b17fbf5d62--- /dev/null+++ b/apps/web/ui/partners/rewards/use-custom-reward-and-discount-options.ts@@ -0,0 +1,87 @@+import { useDiscounts } from "@/lib/swr/use-discounts";+import useGroup from "@/lib/swr/use-group";+import { useRewards } from "@/lib/swr/use-rewards";+import { EnrolledPartnerProps } from "@/lib/types";+import { REWARD_EVENT_COLUMN_MAPPING } from "@/lib/zod/schemas/rewards";+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";+import { formatRewardDescription } from "@/ui/partners/format-reward-description";+import { DiscountSelectorOption } from "@/ui/partners/rewards/discount-selector";+import { RewardSelectorOption } from "@/ui/partners/rewards/reward-selector";+import { useMemo } from "react";++export function useCustomRewardAndDiscountOptions({+ partnerGroupId,+}: {+ partnerGroupId: EnrolledPartnerProps["groupId"];+}) {+ const { group } = useGroup({ groupIdOrSlug: partnerGroupId ?? undefined });+ const { rewards } = useRewards({ groupId: partnerGroupId });+ const { discounts } = useDiscounts({ groupId: partnerGroupId });++ return useMemo(() => {+ const clickRewards: RewardSelectorOption[] = [];+ const saleRewards: RewardSelectorOption[] = [];+ const leadRewards: RewardSelectorOption[] = [];++ const optionsByColumn = {+ [REWARD_EVENT_COLUMN_MAPPING.click]: clickRewards,+ [REWARD_EVENT_COLUMN_MAPPING.lead]: leadRewards,+ [REWARD_EVENT_COLUMN_MAPPING.sale]: saleRewards,+ };++ const groupRewardIds = {+ click: group?.clickReward?.id,+ lead: group?.leadReward?.id,+ sale: group?.saleReward?.id,+ };++ for (const reward of rewards ?? []) {+ if (!["click", "lead", "sale"].includes(reward.event)) {+ continue;+ }++ const groupRewardId = groupRewardIds[reward.event];++ optionsByColumn[REWARD_EVENT_COLUMN_MAPPING[reward.event]].push({+ value: reward.id,+ label: formatRewardDescription(reward),+ first: reward.id === groupRewardId,+ meta: {+ isGroup: reward.id === groupRewardId,+ partnersCount: reward.partnersCount,+ },+ });+ }++ const groupDiscountId = group?.discount?.id;+ const discountOptions: DiscountSelectorOption[] = (discounts ?? []).map(+ (discount) => ({+ value: discount.id,+ label: formatDiscountDescription(discount),+ first: discount.id === groupDiscountId,+ meta: {+ isGroup: discount.id === groupDiscountId,+ partnersCount: discount.partnersCount,+ },+ }),+ );++ return {+ clickRewards,+ saleRewards,+ leadRewards,+ discounts: discountOptions,+ groupClickRewardId: groupRewardIds.click,+ groupLeadRewardId: groupRewardIds.lead,+ groupSaleRewardId: groupRewardIds.sale,+ groupDiscountId,+ };+ }, [+ rewards,+ discounts,+ group?.clickReward?.id,+ group?.leadReward?.id,+ group?.saleReward?.id,+ group?.discount?.id,+ ]);+}diff --git a/packages/ui/src/combobox/index.tsx b/packages/ui/src/combobox/index.tsxindex 2dba53ec70..7a4f14c347 100644--- a/packages/ui/src/combobox/index.tsx+++ b/packages/ui/src/combobox/index.tsx@@ -238,6 +238,7 @@ export function Combobox({setOpenPopover={setIsOpen}align="start"side={side}+ collisionPadding={8}forceDropdown={forceDropdown}onWheel={(e) => {// Allows scrolling to work when the popover's in a modaldiff --git a/packages/ui/src/icons/nucleo/discount-code.tsx b/packages/ui/src/icons/nucleo/discount-code.tsxnew file mode 100644index 0000000000..f54abdd293--- /dev/null+++ b/packages/ui/src/icons/nucleo/discount-code.tsx@@ -0,0 +1,37 @@+import { SVGProps } from "react";++export function DiscountCode(props: SVGProps<SVGSVGElement>) {+ return (+ <svg+ height="18"+ width="18"+ viewBox="0 0 18 18"+ xmlns="http://www.w3.org/2000/svg"+ {...props}+ >+ <g fill="currentColor">+ <path+ d="M14.25,3.75h-10.5c-.966,0-1.75,.784-1.75,1.75v1.25c1.105,0,2,.895,2,2s-.895,2-2,2v1.25c0,.966,.784,1.75,1.75,1.75h10.5c.966,0,1.75-.784,1.75-1.75v-1.25c-1.105,0-2-.895-2-2s.895-2,2-2v-1.25c0-.966-.784-1.75-1.75-1.75Z"+ fill="none"+ stroke="currentColor"+ strokeLinecap="round"+ strokeLinejoin="round"+ strokeWidth="1.5"+ />+ <circle cx="7" cy="7" fill="currentColor" r="1" stroke="none" />+ <circle cx="11" cy="11" fill="currentColor" r="1" stroke="none" />+ <line+ fill="none"+ stroke="currentColor"+ strokeLinecap="round"+ strokeLinejoin="round"+ strokeWidth="1.5"+ x1="6.75"+ x2="11.25"+ y1="11.25"+ y2="6.75"+ />+ </g>+ </svg>+ );+}diff --git a/packages/ui/src/icons/nucleo/index.ts b/packages/ui/src/icons/nucleo/index.tsindex a0dc4f2116..0f05bd0ce4 100644--- a/packages/ui/src/icons/nucleo/index.ts+++ b/packages/ui/src/icons/nucleo/index.ts@@ -37,7 +37,7 @@ export * from "./chart-line";export * from "./chat-task";export * from "./check";export * from "./check2";-export { CheckboxIcon } from "./checkbox";+export * from "./checkbox";export * from "./chevron-left";export * from "./chevron-right";export * from "./chevron-up";@@ -78,6 +78,7 @@ export * from "./desktop";export * from "./diamond-turn-right";export * from "./directions";export * from "./discount";+export * from "./discount-code";export * from "./dots";export * from "./download";export * from "./duplicate";diff --git a/packages/ui/src/popover.tsx b/packages/ui/src/popover.tsxindex 3194624e02..4fb0b7349c 100644--- a/packages/ui/src/popover.tsx+++ b/packages/ui/src/popover.tsx@@ -23,6 +23,7 @@ export type PopoverProps = PropsWithChildren<{onEscapeKeyDown?: (event: KeyboardEvent) => void;onWheel?: WheelEventHandler;sideOffset?: number;+ collisionPadding?: PopoverPrimitive.PopoverContentProps["collisionPadding"];anchor?: ReactNode;}>;@@ -43,6 +44,7 @@ export function Popover({onEscapeKeyDown,onWheel,sideOffset = 8,+ collisionPadding,anchor,}: PopoverProps) {const { isMobile } = useMediaQuery();@@ -103,6 +105,7 @@ export function Popover({)}sticky={sticky}collisionBoundary={collisionBoundary}+ collisionPadding={collisionPadding}onOpenAutoFocus={onOpenAutoFocus}onCloseAutoFocus={onCloseAutoFocus}onEscapeKeyDown={onEscapeKeyDown}