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.

Only show link override icons when assignment differs from partner. (#4540)

Kiran K256001c76d58
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.tsx
index c64c4e9164..92d40787db 100644
--- 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.tsx
@@ -61,17 +61,40 @@ type PartnerForOverrides = Pick<
const LINK_REWARD_OVERRIDE_EVENTS = ["click", "lead", "sale"] as const;
+function hasLinkRewardOverride({
+ linkAssignedId,
+ partnerAssignedId,
+}: {
+ linkAssignedId: string | null | undefined;
+ partnerAssignedId: string | null | undefined;
+}) {
+ return Boolean(linkAssignedId) && linkAssignedId !== partnerAssignedId;
+}
+
function getLinkRewardOverride(
link: Pick<PartnerLink, "clickReward" | "leadReward" | "saleReward">,
+ partner: Pick<
+ PartnerForOverrides,
+ "clickRewardId" | "leadRewardId" | "saleRewardId"
+ >,
) {
return LINK_REWARD_OVERRIDE_EVENTS.filter((event) => {
- const reward = {
+ const linkAssignedId = {
click: link.clickReward,
lead: link.leadReward,
sale: link.saleReward,
}[event];
- return Boolean(reward);
+ const partnerAssignedId = {
+ click: partner.clickRewardId,
+ lead: partner.leadRewardId,
+ sale: partner.saleRewardId,
+ }[event];
+
+ return hasLinkRewardOverride({
+ linkAssignedId,
+ partnerAssignedId,
+ });
});
}
@@ -268,7 +291,14 @@ function PartnerLinkCard({
group,
link,
});
- const rewardEvents = getLinkRewardOverride(link);
+
+ const rewardEvents = getLinkRewardOverride(link, partner);
+
+ const hasDiscountOverride = hasLinkRewardOverride({
+ linkAssignedId: link.discount,
+ partnerAssignedId: partner.discountId,
+ });
+
const [rewardEvent, setRewardEvent] = useState<"sale" | "lead" | "click">(
"sale",
);
@@ -337,7 +367,7 @@ function PartnerLinkCard({
})}
</OverrideIndicatorGroup>
)}
- {link.discount && (
+ {hasDiscountOverride && (
<OverrideIndicatorGroup disabled={Boolean(overrideDisabledTooltip)}>
<OverrideIndicator
tooltip="This link has a discount override"
diff --git a/apps/web/lib/actions/partners/delete-reward.ts b/apps/web/lib/actions/partners/delete-reward.ts
index f342ed5025..629abe7c11 100644
--- a/apps/web/lib/actions/partners/delete-reward.ts
+++ b/apps/web/lib/actions/partners/delete-reward.ts
@@ -61,6 +61,15 @@ export const deleteRewardAction = authActionClient
},
});
+ await tx.linkReward.updateMany({
+ where: {
+ [rewardIdColumn]: reward.id,
+ },
+ data: {
+ [rewardIdColumn]: null,
+ },
+ });
+
// soft delete reward, we will hard delete it in the cron job
await tx.reward.update({
where: {