Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Don't delete group defaults from partner dialogs and remap additional discount codes first.

Kiran K12d119ef4805
diff --git a/apps/web/lib/actions/partners/delete-discount.ts b/apps/web/lib/actions/partners/delete-discount.ts
index fdc4e67767..7e86f67db7 100644
--- a/apps/web/lib/actions/partners/delete-discount.ts
+++ b/apps/web/lib/actions/partners/delete-discount.ts
@@ -4,6 +4,7 @@ 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 { 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";
@@ -35,28 +36,18 @@ export const deleteDiscountAction = authActionClient
discountId,
});
- // Cache discount codes to delete them later
- const discountCodes = await prisma.discountCode.findMany({
- where: {
- discountId: discount.id,
- },
- include: {
- discount: true,
- },
- });
-
- const enrollments = await prisma.programEnrollment.findMany({
- where: {
- discountId: discount.id,
- },
- select: {
- partnerId: true,
- },
- });
+ const [enrollments, partnerGroup] = await Promise.all([
+ prisma.programEnrollment.findMany({
+ where: {
+ discountId: discount.id,
+ },
+ select: {
+ partnerId: true,
+ },
+ }),
- await prisma.$transaction(async (tx) => {
- const partnerGroup = discount.groupId
- ? await tx.partnerGroup.findUnique({
+ discount.groupId
+ ? prisma.partnerGroup.findUnique({
where: {
id: discount.groupId,
},
@@ -64,8 +55,31 @@ export const deleteDiscountAction = authActionClient
discountId: true,
},
})
+ : null,
+ ]);
+
+ const partnerIds = pluck(enrollments, "partnerId");
+
+ // 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 restoredDiscountId =
+ partnerGroup?.discountId !== discount.id
+ ? partnerGroup?.discountId
+ : null;
+
+ const discountCodes =
+ restoredDiscountId == null
+ ? await prisma.discountCode.findMany({
+ where: {
+ discountId: discount.id,
+ },
+ include: {
+ discount: true,
+ },
+ })
: null;
+ await prisma.$transaction(async (tx) => {
await tx.partnerGroup.updateMany({
where: {
discountId: discount.id,
@@ -81,18 +95,35 @@ export const deleteDiscountAction = authActionClient
discountId: discount.id,
},
data: {
- discountId: partnerGroup?.discountId ?? null,
+ discountId: restoredDiscountId,
},
});
- await tx.discount.delete({
- where: {
- id: discount.id,
- },
- });
+ if (restoredDiscountId == null) {
+ await tx.discount.delete({
+ where: {
+ id: discount.id,
+ },
+ });
+ }
});
- const partnerIds = pluck(enrollments, "partnerId");
+ if (restoredDiscountId != null) {
+ await deleteDiscountJob.dispatch(
+ {
+ programId,
+ discountId: discount.id,
+ partnerIds,
+ },
+ {
+ label: discount.id,
+ flowControl: {
+ key: `delete-discount-${discount.id}`,
+ parallelism: 1,
+ },
+ },
+ );
+ }
waitUntil(
Promise.allSettled([
@@ -111,7 +142,7 @@ export const deleteDiscountAction = authActionClient
]
: []),
- deleteDiscountCodes(discountCodes),
+ ...(discountCodes != null ? [deleteDiscountCodes(discountCodes)] : []),
recordAuditLog({
workspaceId: workspace.id,
diff --git a/apps/web/lib/api/partners/program-enrollment-query.ts b/apps/web/lib/api/partners/program-enrollment-query.ts
index d2e35ed121..09dcddf424 100644
--- a/apps/web/lib/api/partners/program-enrollment-query.ts
+++ b/apps/web/lib/api/partners/program-enrollment-query.ts
@@ -287,6 +287,24 @@ export function buildProgramEnrollmentWhereForList(
groupIdNotIn,
);
+ const and: Prisma.ProgramEnrollmentWhereInput[] = [];
+
+ if (rewardId) {
+ and.push({
+ OR: [
+ { clickRewardId: rewardId },
+ { leadRewardId: rewardId },
+ { saleRewardId: rewardId },
+ { referralRewardId: rewardId },
+ { customRewardId: rewardId },
+ ],
+ });
+ }
+
+ if (Array.isArray(metricWhere.AND)) {
+ and.push(...metricWhere.AND);
+ }
+
return {
tenantId,
programId,
@@ -303,16 +321,7 @@ export function buildProgramEnrollmentWhereForList(
referredByPartnerId,
},
}),
- ...(rewardId && {
- OR: [
- { clickRewardId: rewardId },
- { leadRewardId: rewardId },
- { saleRewardId: rewardId },
- { referralRewardId: rewardId },
- { customRewardId: rewardId },
- ],
- }),
...(discountId && { discountId }),
- ...metricWhere,
+ ...(and.length ? { AND: and } : {}),
};
}
diff --git a/apps/web/lib/jobs/handlers/delete-discount-job.ts b/apps/web/lib/jobs/handlers/delete-discount-job.ts
new file mode 100644
index 0000000000..b34d1d989e
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/delete-discount-job.ts
@@ -0,0 +1,74 @@
+import { remapDiscountCodes } from "@/lib/discounts/remap-discount-codes";
+import { prisma } from "@/lib/prisma";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const BATCH_SIZE = 25;
+
+const inputSchema = z.object({
+ programId: z.string(),
+ discountId: z.string(),
+ partnerIds: z.array(z.string()),
+});
+
+// Remap partner discount codes onto the restored group default, then delete
+// the additional discount. Equivalence checks need both discount rows to exist.
+export const deleteDiscountJob = defineJob({
+ name: "delete-discount-job",
+ schema: inputSchema,
+ async handle(input) {
+ const { programId, discountId, partnerIds } = input;
+
+ const discount = await prisma.discount.findUnique({
+ where: {
+ id: discountId,
+ },
+ select: {
+ id: true,
+ },
+ });
+
+ if (!discount) {
+ console.info(
+ `[deleteDiscountJob] Discount ${discountId} not found. Skipping...`,
+ );
+ return;
+ }
+
+ for (const partnerId of partnerIds.slice(0, BATCH_SIZE)) {
+ await remapDiscountCodes({
+ programId,
+ partnerId,
+ });
+ }
+
+ const remainingPartnerIds = partnerIds.slice(BATCH_SIZE);
+
+ if (remainingPartnerIds.length > 0) {
+ await deleteDiscountJob.dispatch(
+ {
+ programId,
+ discountId,
+ partnerIds: remainingPartnerIds,
+ },
+ {
+ delay: 1,
+ label: discountId,
+ flowControl: {
+ key: `delete-discount-${discountId}`,
+ parallelism: 1,
+ },
+ },
+ );
+ return;
+ }
+
+ await prisma.discount.deleteMany({
+ where: {
+ id: discountId,
+ },
+ });
+
+ console.info(`[deleteDiscountJob] Deleted discount ${discountId}.`);
+ },
+});
diff --git a/apps/web/lib/jobs/registry.ts b/apps/web/lib/jobs/registry.ts
index 5a439833c3..4364cf3371 100644
--- a/apps/web/lib/jobs/registry.ts
+++ b/apps/web/lib/jobs/registry.ts
@@ -80,6 +80,9 @@ const jobLoaders = {
import("./handlers/remap-discount-codes-for-partner-job").then(
(m) => m.remapDiscountCodesForPartnerJob,
),
+
+ "delete-discount-job": () =>
+ import("./handlers/delete-discount-job").then((m) => m.deleteDiscountJob),
} as const satisfies Record<string, () => Promise<JobDefinition>>;
const jobCache = new Map<string, JobDefinition>();
diff --git a/apps/web/ui/modals/edit-partner-discount-modal.tsx b/apps/web/ui/modals/edit-partner-discount-modal.tsx
index 5c047107d1..dbabca66d5 100644
--- a/apps/web/ui/modals/edit-partner-discount-modal.tsx
+++ b/apps/web/ui/modals/edit-partner-discount-modal.tsx
@@ -18,7 +18,6 @@ import { Discount } from "@dub/ui/icons";
import { useAction } from "next-safe-action/hooks";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { toast } from "sonner";
-import { mutate } from "swr";
type PartnerDiscountOverridePartner = Pick<
EnrolledPartnerProps,
@@ -106,10 +105,7 @@ function EditPartnerDiscountModal({
{
onSuccess: async () => {
toast.success("Discount deleted!");
- await mutate(
- (key) => typeof key === "string" && key.startsWith("/api/discounts"),
- );
- await mutatePrefix("/api/partners");
+ await mutatePrefix(["/api/discounts", "/api/partners", "/api/groups"]);
},
onError({ error }) {
toast.error(error.serverError ?? "Failed to delete discount");
@@ -215,7 +211,7 @@ function EditPartnerDiscountModal({
const handleDelete = useCallback(
async (discountId: string) => {
- if (!workspaceId) {
+ if (!workspaceId || discountId === groupDefaultDiscountId) {
return;
}
@@ -254,7 +250,7 @@ function EditPartnerDiscountModal({
}
}}
discount={activeSheet.discount ?? undefined}
- isDefault={false}
+ isDefault={activeSheet.discount ? undefined : false}
groupIdOrSlug={partner.groupId}
onCreated={setSelectedDiscountId}
/>
@@ -295,7 +291,7 @@ function EditPartnerDiscountModal({
openDiscountSheet(discount);
}
}}
- onDelete={handleDelete}
+ onDelete={group ? handleDelete : undefined}
searchPlaceholder="Search discounts..."
emptyLabel={
options.length === 0
diff --git a/apps/web/ui/modals/edit-partner-reward-modal.tsx b/apps/web/ui/modals/edit-partner-reward-modal.tsx
index 8d9c75072c..28730add7b 100644
--- a/apps/web/ui/modals/edit-partner-reward-modal.tsx
+++ b/apps/web/ui/modals/edit-partner-reward-modal.tsx
@@ -20,7 +20,6 @@ import { Button, Modal } from "@dub/ui";
import { useAction } from "next-safe-action/hooks";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { toast } from "sonner";
-import { mutate } from "swr";
type OverrideRewardEvent = "sale" | "lead" | "click";
@@ -126,10 +125,7 @@ function EditPartnerRewardModal({
{
onSuccess: async () => {
toast.success("Reward deleted!");
- await mutate(
- (key) => typeof key === "string" && key.startsWith("/api/rewards"),
- );
- await mutatePrefix("/api/partners");
+ await mutatePrefix(["/api/rewards", "/api/partners", "/api/groups"]);
},
onError({ error }) {
toast.error(error.serverError ?? "Failed to delete reward");
@@ -266,14 +262,14 @@ function EditPartnerRewardModal({
const handleDelete = useCallback(
async (rewardId: string) => {
const reward = eventRewards.find((item) => item.id === rewardId);
- if (!reward || !workspaceId) {
+ if (!reward || !workspaceId || reward.id === groupRewardId) {
return;
}
await confirmRewardChange({
action: "deleted",
target: "group",
- isDefault: reward.id === groupRewardId,
+ isDefault: false,
reward,
partnerCount: reward.partnersCount ?? undefined,
isPending: isDeleting,
@@ -317,7 +313,7 @@ function EditPartnerRewardModal({
setIsOpen={setIsRewardSheetOpen}
event={rewardSheet.reward?.event ?? event}
reward={rewardSheet.reward ?? undefined}
- isDefault={false}
+ isDefault={rewardSheet.reward ? undefined : false}
groupIdOrSlug={partner.groupId}
onCreated={setSelectedId}
/>
@@ -358,7 +354,7 @@ function EditPartnerRewardModal({
openRewardSheet(reward);
}
}}
- onDelete={handleDelete}
+ onDelete={group ? handleDelete : undefined}
searchPlaceholder="Search rewards..."
emptyLabel={
options.length === 0
diff --git a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
index 81f9ea0528..a6c78ac636 100644
--- a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
+++ b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
@@ -85,7 +85,10 @@ function DiscountSheetContent({
groupIdOrSlug,
isDefault = true,
onCreated,
-}: DiscountSheetProps) {
+ nested,
+}: DiscountSheetProps & {
+ nested?: boolean;
+}) {
const formRef = useRef<HTMLFormElement>(null);
const { group, mutateGroup } = useGroup({
@@ -619,7 +622,7 @@ function DiscountSheetContent({
<div className="flex items-center justify-between border-t border-neutral-200 p-5">
<div>
- {discount && (
+ {discount && !(nested && effectiveIsDefault) && (
<Button
type="button"
variant="outline"
@@ -746,7 +749,7 @@ export function DiscountSheet({
return (
<Sheet open={isOpen} onOpenChange={setIsOpen} nested={nested}>
- <DiscountSheetContent {...rest} setIsOpen={setIsOpen} />
+ <DiscountSheetContent {...rest} nested={nested} setIsOpen={setIsOpen} />
</Sheet>
);
}
diff --git a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
index e9599afcd2..eb0a2e31a2 100644
--- a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
+++ b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
@@ -219,8 +219,10 @@ function RewardSheetContent({
groupIdOrSlug,
isDefault = true,
onCreated,
+ nested,
hasPendingChangesRef,
}: RewardSheetProps & {
+ nested?: boolean;
hasPendingChangesRef: MutableRefObject<boolean>;
}) {
const { group, mutateGroup } = useGroup({
@@ -987,7 +989,7 @@ function RewardSheetContent({
<div className="flex items-center justify-between border-t border-neutral-200 p-5">
<div>
- {reward && (
+ {reward && !(nested && effectiveIsDefault) && (
<Button
type="button"
variant="outline"
@@ -1228,6 +1230,7 @@ export function RewardSheet({
>
<RewardSheetContent
{...rest}
+ nested={nested}
setIsOpen={setIsOpen}
hasPendingChangesRef={hasPendingChangesRef}
/>
diff --git a/apps/web/ui/partners/rewards/additional-reward-option-list.tsx b/apps/web/ui/partners/rewards/additional-reward-option-list.tsx
index 28b74447c0..337309eaf2 100644
--- a/apps/web/ui/partners/rewards/additional-reward-option-list.tsx
+++ b/apps/web/ui/partners/rewards/additional-reward-option-list.tsx
@@ -196,7 +196,8 @@ function AdditionalRewardOptionRow({
onDelete?: (id: string) => void;
}) {
const [openPopover, setOpenPopover] = useState(false);
- const showActions = Boolean(onEdit || onDelete);
+ const canDelete = Boolean(onDelete) && !option.isGroup;
+ const showActions = Boolean(onEdit || canDelete);
return (
<div
@@ -252,13 +253,13 @@ function AdditionalRewardOptionRow({
Edit
</MenuItem>
)}
- {onDelete && (
+ {canDelete && (
<MenuItem
variant="danger"
onClick={(e) => {
e.stopPropagation();
setOpenPopover(false);
- onDelete(option.id);
+ onDelete?.(option.id);
}}
icon={<Trash className="size-4" />}
>