[pull] main from dubinc:main

apps/web/app/(ee)/api/commissions/route.ts

@@ -90,15 +90,18 @@ export const POST = withWorkspace(
 
     console.timeEnd("createManualCommissions");
 
-    return NextResponse.json(
-      createCommissionResponseSchema.parse({
-        success: true,
-        message: "Your commissions are being created and will appear shortly.",
-      }),
-      {
-        status: 202,
-      },
-    );
+    const isClawback = body.type === "custom" && body.amount < 0;
+
+    const response = createCommissionResponseSchema.parse({
+      success: true,
+      message: isClawback
+        ? "A clawback has been queued for the partner!"
+        : "Your commissions are being created and will appear shortly.",
+    });
+
+    return NextResponse.json(response, {
+      status: 202,
+    });
   },
   {
     requiredPlan: ["business", "advanced", "enterprise"],

apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts

@@ -9,7 +9,7 @@ import {
   MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING,
 } from "@/lib/constants/partner-profile";
 import { partnerProfileAnalyticsQuerySchema } from "@/lib/zod/schemas/partner-profile";
-import { parseFilterValue, toCentsNumber } from "@dub/utils";
+import { parseFilterValue, serializeError, toCentsNumber } from "@dub/utils";
 import { NextResponse } from "next/server";
 
 // GET /api/partner-profile/programs/[programId]/analytics – get analytics for a program enrollment link
@@ -81,21 +81,34 @@ export const GET = withPartnerProfile(
       };
     }
 
-    const response = await getAnalytics({
-      ...(LARGE_PROGRAM_IDS.includes(program.id) &&
-      toCentsNumber(totalCommissions) <
-        LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS
-        ? { event: parsedParams.event, groupBy: "count", interval: "all" }
-        : parsedParams),
-      workspaceId: program.workspaceId,
-      ...(parsedParams.linkId
-        ? { linkId: parsedParams.linkId }
-        : links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
-          ? { partnerId: partner.id }
-          : { linkId: parseFilterValue(links.map((link) => link.id)) }),
-      dataAvailableFrom: program.startedAt ?? program.createdAt,
-    });
+    try {
+      const response = await getAnalytics({
+        ...(LARGE_PROGRAM_IDS.includes(program.id) &&
+        toCentsNumber(totalCommissions) <
+          LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS
+          ? { event: parsedParams.event, groupBy: "count", interval: "all" }
+          : parsedParams),
+        workspaceId: program.workspaceId,
+        ...(parsedParams.linkId
+          ? { linkId: parsedParams.linkId }
+          : links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
+            ? { partnerId: partner.id }
+            : { linkId: parseFilterValue(links.map((link) => link.id)) }),
+        dataAvailableFrom: program.startedAt ?? program.createdAt,
+      });
+
+      return NextResponse.json(response);
+    } catch (error) {
+      // Tinybird times out after 30s on heavy partner queries; return a 400
+      // instead of 500 so the UI can show a retry hint.
+      if (serializeError(error).includes("Timeout exceeded")) {
+        throw new DubApiError({
+          code: "bad_request",
+          message: "Failed to fetch analytics. Refresh the page and try again.",
+        });
+      }
 
-    return NextResponse.json(response);
+      throw error;
+    }
   },
 );

apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts

@@ -11,6 +11,8 @@ import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
 import { recordLink } from "@/lib/tinybird";
 import { redis } from "@/lib/upstash";
+import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
+import { partnerMergedWebhookSchema } from "@/lib/zod/schemas/partners";
 import { sendBatchEmail } from "@dub/email";
 import PartnerAccountMerged from "@dub/email/templates/partner-account-merged";
 import { log, prettyPrint, R2_URL } from "@dub/utils";
@@ -87,6 +89,8 @@ export const { POST } = serve<Input>(
           enrollmentId,
           sourcePartnerId,
           targetPartnerId,
+          sourceEmail,
+          targetEmail,
         });
       });
     }
@@ -343,6 +347,7 @@ async function loadMergePlan({
   };
 }
 
+// High-volume resources: move in batches of PRISMA_UPDATEMANY_LIMIT
 async function transferRowsInBatches(
   updateBatch: () => Promise<number>,
   {
@@ -360,6 +365,31 @@ async function transferRowsInBatches(
   }
 }
 
+// Rows unique on (programId, partnerId): move the source row when the target
+// has none, otherwise delete it so rewriting enrollment.partnerId cannot collide.
+async function transferIfNotExistElseDelete({
+  findTarget,
+  transferSource,
+  deleteSource,
+  resourceName,
+}: {
+  findTarget: () => Promise<unknown>;
+  transferSource: () => Promise<number>;
+  deleteSource: () => Promise<number>;
+  resourceName: string;
+}) {
+  if (await findTarget()) {
+    const count = await deleteSource();
+    console.log(
+      `Deleted ${count} source ${resourceName} (target already exists)`,
+    );
+    return;
+  }
+
+  const count = await transferSource();
+  console.log(`Transferred ${count} ${resourceName}`);
+}
+
 async function transferPartnerProgramData({
   sourcePartnerId,
   targetPartnerId,
@@ -418,6 +448,33 @@ async function transferPartnerProgramData({
     prisma.notificationEmail.updateMany(payload),
     prisma.message.updateMany(payload),
     prisma.partnerComment.updateMany(payload),
+    // Unique on (programId, partnerId) — transfer or delete, never rewrite over
+    transferIfNotExistElseDelete({
+      findTarget: () =>
+        prisma.programApplicationEvent.findUnique({
+          where: {
+            programId_partnerId: { programId, partnerId: targetPartnerId },
+          },
+        }),
+      transferSource: async () =>
+        (await prisma.programApplicationEvent.updateMany(payload)).count,
+      deleteSource: async () =>
+        (await prisma.programApplicationEvent.deleteMany({ where })).count,
+      resourceName: "application event",
+    }),
+    transferIfNotExistElseDelete({
+      findTarget: () =>
+        prisma.discoveredPartner.findUnique({
+          where: {
+            programId_partnerId: { programId, partnerId: targetPartnerId },
+          },
+        }),
+      transferSource: async () =>
+        (await prisma.discoveredPartner.updateMany(payload)).count,
+      deleteSource: async () =>
+        (await prisma.discoveredPartner.deleteMany({ where })).count,
+      resourceName: "discovered partner",
+    }),
   ]);
 
   // After payouts are moved onto the target partner, fold any duplicate
@@ -432,13 +489,29 @@ async function mergeSingleEnrollment({
   enrollmentId,
   sourcePartnerId,
   targetPartnerId,
+  sourceEmail,
+  targetEmail,
 }: {
   enrollmentId: string;
   sourcePartnerId: string;
   targetPartnerId: string;
+  sourceEmail: string;
+  targetEmail: string;
 }) {
   const sourceEnrollment = await prisma.programEnrollment.findUnique({
     where: { id: enrollmentId },
+    include: {
+      program: {
+        select: {
+          workspace: {
+            select: {
+              id: true,
+              webhookEnabled: true,
+            },
+          },
+        },
+      },
+    },
   });
 
   if (!sourceEnrollment) {
@@ -484,6 +557,8 @@ async function mergeSingleEnrollment({
     programId,
   });
 
+  let action: "overlap" | "transfer";
+
   if (targetEnrollment) {
     await prisma.$transaction(async (tx) => {
       if (
@@ -539,32 +614,51 @@ async function mergeSingleEnrollment({
       }
     });
 
-    return logAndReturn({
-      programId,
-      action: "overlap",
-      outputLog: `Merged overlapping enrollment for program ${programId}`,
+    action = "overlap";
+  } else {
+    // Scope the transfer to the source partner so a concurrent reassignment
+    // can't make us steal another partner's enrollment.
+    const { count } = await prisma.programEnrollment.updateMany({
+      where: { id: sourceEnrollment.id, partnerId: sourcePartnerId },
+      data: { partnerId: targetPartnerId },
     });
-  }
 
-  // Scope the transfer to the source partner so a concurrent reassignment
-  // can't make us steal another partner's enrollment.
-  const { count } = await prisma.programEnrollment.updateMany({
-    where: { id: sourceEnrollment.id, partnerId: sourcePartnerId },
-    data: { partnerId: targetPartnerId },
-  });
+    if (count === 0) {
+      return logAndReturn({
+        programId,
+        action: "skip",
+        outputLog: `Enrollment ${sourceEnrollment.id} no longer owned by ${sourcePartnerId}, skipping transfer`,
+      });
+    }
 
-  if (count === 0) {
-    return logAndReturn({
-      programId,
-      action: "skip",
-      outputLog: `Enrollment ${sourceEnrollment.id} no longer owned by ${sourcePartnerId}, skipping transfer`,
-    });
+    action = "transfer";
   }
 
+  await sendWorkspaceWebhook({
+    workspace: sourceEnrollment.program.workspace,
+    trigger: "partner.merged",
+    data: partnerMergedWebhookSchema.parse({
+      sourcePartner: {
+        id: sourcePartnerId,
+        tenantId: sourceEnrollment.tenantId,
+        email: sourceEmail,
+      },
+      targetPartner: {
+        id: targetPartnerId,
+        tenantId: targetEnrollment?.tenantId ?? sourceEnrollment.tenantId,
+        email: targetEmail,
+      },
+      targetAlreadyEnrolled: Boolean(targetEnrollment),
+    }),
+  });
+
   return logAndReturn({
     programId,
-    action: "transfer",
-    outputLog: `Transferred enrollment for program ${programId}`,
+    action,
+    outputLog:
+      action === "overlap"
+        ? `Merged overlapping enrollment for program ${programId}: ${sourceEmail} (${sourcePartnerId}) -> ${targetEmail} (${targetPartnerId}).`
+        : `Transferred enrollment for program ${programId}: ${sourceEmail} (${sourcePartnerId}) -> ${targetEmail} (${targetPartnerId}).`,
   });
 }
 

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx

@@ -601,7 +601,7 @@ function BountySubmissionDetailsSheetContent({
         </div>
       </div>
 
-      <RejectBountySubmissionModal />
+      {RejectBountySubmissionModal}
       {ConfirmApproveBountySubmissionModal}
     </div>
   );

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx

@@ -3,7 +3,7 @@
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import useUser from "@/lib/swr/use-user";
 import { Button, Modal, useEnterSubmit, useMediaQuery } from "@dub/ui";
-import { Dispatch, SetStateAction, useState } from "react";
+import { Dispatch, SetStateAction, useCallback, useState } from "react";
 import { useWatch } from "react-hook-form";
 import { toast } from "sonner";
 import { useCampaignFormContext } from "./campaign-form-context";
@@ -135,15 +135,20 @@ export function useSendEmailPreviewModal({
   const [showSendEmailPreviewModal, setShowSendEmailPreviewModal] =
     useState(false);
 
-  return {
-    showSendEmailPreviewModal,
-    setShowSendEmailPreviewModal,
-    SendEmailPreviewModal: () => (
+  const SendEmailPreviewModalCallback = useCallback(
+    () => (
       <SendEmailPreviewModal
         showModal={showSendEmailPreviewModal}
         setShowModal={setShowSendEmailPreviewModal}
         campaignId={campaignId}
       />
     ),
+    [showSendEmailPreviewModal, campaignId],
+  );
+
+  return {
+    showSendEmailPreviewModal,
+    setShowSendEmailPreviewModal,
+    SendEmailPreviewModal: SendEmailPreviewModalCallback,
   };
 }

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/delete-campaign-modal.tsx

@@ -142,7 +142,7 @@ export function useDeleteCampaignModal(
         campaign={campaign}
       />
     );
-  }, [showDeleteCampaignModal, setShowDeleteCampaignModal, campaign]);
+  }, [showDeleteCampaignModal, setShowDeleteCampaignModal]);
 
   return useMemo(
     () => ({