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.

Filter assigned partners and infer default vs additional rewards.

Kiran Ke563254112a9
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
index 173be9b9b4..1327399838 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
@@ -54,6 +54,9 @@ export const GroupDiscounts = () => {
setDiscountSheetState((s) => ({ ...s, open }) as typeof s)
}
{...(currentDiscount && { discount: currentDiscount })}
+ isDefault={
+ isNewDiscount || currentDiscount?.id === group?.discount?.id
+ }
/>
)}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx
index e455418399..65ee464626 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx
@@ -77,6 +77,10 @@ export default function GroupRewardsPage() {
setIsOpen={(open) =>
setRewardSheetState((s) => ({ ...s, open }) as any)
}
+ isDefault={
+ Boolean(isNewReward) ||
+ rewards.some((reward) => reward?.id === currentReward?.id)
+ }
/>
)}
@@ -127,11 +131,13 @@ const RewardSheetWrapper = ({
event,
isOpen,
setIsOpen,
+ isDefault,
}: {
reward?: RewardProps | null;
event?: EventType;
isOpen: boolean;
setIsOpen: (open: boolean) => void;
+ isDefault: boolean;
}) => {
return (
<RewardSheet
@@ -139,6 +145,7 @@ const RewardSheetWrapper = ({
setIsOpen={setIsOpen}
event={event || reward?.event || "sale"}
reward={reward || undefined}
+ isDefault={isDefault}
/>
);
};
diff --git a/apps/web/lib/api/partners/program-enrollment-query.ts b/apps/web/lib/api/partners/program-enrollment-query.ts
index 797a1c4c08..d2e35ed121 100644
--- a/apps/web/lib/api/partners/program-enrollment-query.ts
+++ b/apps/web/lib/api/partners/program-enrollment-query.ts
@@ -237,6 +237,8 @@ export function buildProgramEnrollmentWhereForList(
email,
partnerTagId,
referredByPartnerId,
+ rewardId,
+ discountId,
partnerTagIdOperator = "IN",
groupIdOperator = "IN",
countryOperator = "IN",
@@ -301,6 +303,16 @@ export function buildProgramEnrollmentWhereForList(
referredByPartnerId,
},
}),
+ ...(rewardId && {
+ OR: [
+ { clickRewardId: rewardId },
+ { leadRewardId: rewardId },
+ { saleRewardId: rewardId },
+ { referralRewardId: rewardId },
+ { customRewardId: rewardId },
+ ],
+ }),
+ ...(discountId && { discountId }),
...metricWhere,
};
}
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index c120335218..ea1ebce937 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -218,6 +218,8 @@ export const getPartnersQuerySchemaExtended = getPartnersQuerySchema.extend({
country: z.union([z.string(), z.array(z.string())]).optional(),
referredByPartnerId: z.string().optional(),
includePartnerPlatforms: booleanQuerySchema.optional(),
+ rewardId: z.string().optional(),
+ discountId: z.string().optional(),
// metric range query fields (TODO: Add to public API once we finalize the syntax)
totalClicksMin: z.coerce
.number()
diff --git a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
index df7b2d0491..3c1c7d71c9 100644
--- a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
+++ b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
@@ -31,21 +31,30 @@ let customDiscountId: string | undefined;
let partnerGroupId: string | undefined;
test.beforeAll(async ({ program }) => {
+ const group = await prisma.partnerGroup.create({
+ data: {
+ id: createId({ prefix: "grp_" }),
+ programId: program.id,
+ slug: `pw-dcode-${nanoid(8).toLowerCase()}`,
+ name: "Playwright Discount Codes",
+ maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+ },
+ });
+
const discount = await prisma.discount.create({
data: {
id: createId({ prefix: "disc_" }),
programId: program.id,
+ groupId: group.id,
...customDiscount,
},
});
- const group = await prisma.partnerGroup.create({
+ await prisma.partnerGroup.update({
+ where: {
+ id: group.id,
+ },
data: {
- id: createId({ prefix: "grp_" }),
- programId: program.id,
- slug: `pw-dcode-${nanoid(8).toLowerCase()}`,
- name: "Playwright Discount Codes",
- maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
discountId: discount.id,
},
});
diff --git a/apps/web/playwright/api/discounts/discounts.spec.ts b/apps/web/playwright/api/discounts/discounts.spec.ts
index 0e7bc4e4bd..4e4f343b60 100644
--- a/apps/web/playwright/api/discounts/discounts.spec.ts
+++ b/apps/web/playwright/api/discounts/discounts.spec.ts
@@ -52,21 +52,30 @@ let customDiscountId: string | undefined;
let partnerGroupId: string | undefined;
test.beforeAll(async ({ program }) => {
+ const group = await prisma.partnerGroup.create({
+ data: {
+ id: createId({ prefix: "grp_" }),
+ programId: program.id,
+ slug: `pw-disc-${nanoid(8).toLowerCase()}`,
+ name: "Playwright Custom Discounts",
+ maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+ },
+ });
+
const discount = await prisma.discount.create({
data: {
id: createId({ prefix: "disc_" }),
programId: program.id,
+ groupId: group.id,
...customDiscount,
},
});
- const group = await prisma.partnerGroup.create({
+ await prisma.partnerGroup.update({
+ where: {
+ id: group.id,
+ },
data: {
- id: createId({ prefix: "grp_" }),
- programId: program.id,
- slug: `pw-disc-${nanoid(8).toLowerCase()}`,
- name: "Playwright Custom Discounts",
- maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
discountId: discount.id,
},
});
@@ -199,13 +208,13 @@ test("GET /api/discounts – lists discounts with partnersCount", async ({
expect(discount).toEqual({
id: customDiscountId,
- groupId: null,
+ groupId: partnerGroupId,
...expectedCustomDiscount,
partnersCount: expect.any(Number),
});
});
-test("GET /api/discounts?groupId= – includes group default without groupId column", async ({
+test("GET /api/discounts?groupId= – includes group default", async ({
api,
}) => {
const { status, data } = await api.get<
@@ -213,7 +222,14 @@ test("GET /api/discounts?groupId= – includes group default without groupId col
>(`/api/discounts?groupId=${partnerGroupId}`);
expect(status).toEqual(200);
- expect(data.some((item) => item.id === customDiscountId)).toBe(true);
+ expect(data).toEqual([
+ {
+ id: customDiscountId,
+ groupId: partnerGroupId,
+ ...expectedCustomDiscount,
+ partnersCount: expect.any(Number),
+ },
+ ]);
});
test("GET /groups/{id} – nested custom discount", async ({ api }) => {
diff --git a/apps/web/playwright/api/setup-test-workspace.ts b/apps/web/playwright/api/setup-test-workspace.ts
index d1bd2ad461..79b06a7888 100644
--- a/apps/web/playwright/api/setup-test-workspace.ts
+++ b/apps/web/playwright/api/setup-test-workspace.ts
@@ -337,9 +337,13 @@ async function setupTestProgram({
create: {
id,
programId: program.id,
+ groupId: program.defaultGroupId,
...data,
},
- update: data,
+ update: {
+ ...data,
+ groupId: program.defaultGroupId,
+ },
});
},
),
diff --git a/apps/web/ui/modals/confirm-reward-change-modal.tsx b/apps/web/ui/modals/confirm-reward-change-modal.tsx
index 59b00c79c3..c64941b1e8 100644
--- a/apps/web/ui/modals/confirm-reward-change-modal.tsx
+++ b/apps/web/ui/modals/confirm-reward-change-modal.tsx
@@ -34,7 +34,7 @@ function shouldNotifyRewardChange({
return false;
}
- return partnerCount === undefined || partnerCount > 0;
+ return partnerCount == null || partnerCount > 0;
}
const TITLES: Record<RewardChangeAction, string> = {
@@ -197,45 +197,47 @@ export function ConfirmRewardChangeModal({
</div>
</div>
- <div className="mt-4">
- <div className="flex items-center justify-between">
- <label
- htmlFor="activityDescription"
- className="text-content-emphasis text-sm font-medium"
- >
- {messageLabel}
- <span className="ml-1 font-normal text-neutral-500">
- (optional)
- </span>
- </label>
- <MaxCharactersCounter
- name="activityDescription"
+ {(partnerCount == null || partnerCount > 0) && (
+ <div className="mt-4">
+ <div className="flex items-center justify-between">
+ <label
+ htmlFor="activityDescription"
+ className="text-content-emphasis text-sm font-medium"
+ >
+ {messageLabel}
+ <span className="ml-1 font-normal text-neutral-500">
+ (optional)
+ </span>
+ </label>
+ <MaxCharactersCounter
+ name="activityDescription"
+ maxLength={REWARD_CHANGE_DESCRIPTION_MAX_LENGTH}
+ control={control}
+ />
+ </div>
+ <textarea
+ id="activityDescription"
+ rows={3}
maxLength={REWARD_CHANGE_DESCRIPTION_MAX_LENGTH}
- control={control}
+ placeholder="Add context about this change..."
+ className={cn(
+ "mt-2 block w-full rounded-md border-neutral-300 text-sm text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500",
+ errors.activityDescription && "border-red-600",
+ )}
+ {...register("activityDescription", {
+ maxLength: {
+ value: REWARD_CHANGE_DESCRIPTION_MAX_LENGTH,
+ message: `Must be ${REWARD_CHANGE_DESCRIPTION_MAX_LENGTH} characters or fewer`,
+ },
+ })}
/>
- </div>
- <textarea
- id="activityDescription"
- rows={3}
- maxLength={REWARD_CHANGE_DESCRIPTION_MAX_LENGTH}
- placeholder="Add context about this change..."
- className={cn(
- "mt-2 block w-full rounded-md border-neutral-300 text-sm text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500",
- errors.activityDescription && "border-red-600",
+ {errors.activityDescription && (
+ <p className="mt-1 text-xs text-red-600">
+ {errors.activityDescription.message}
+ </p>
)}
- {...register("activityDescription", {
- maxLength: {
- value: REWARD_CHANGE_DESCRIPTION_MAX_LENGTH,
- message: `Must be ${REWARD_CHANGE_DESCRIPTION_MAX_LENGTH} characters or fewer`,
- },
- })}
- />
- {errors.activityDescription && (
- <p className="mt-1 text-xs text-red-600">
- {errors.activityDescription.message}
- </p>
- )}
- </div>
+ </div>
+ )}
</div>
<div className="border-border-subtle flex items-center justify-end gap-2 border-t px-5 py-4">
@@ -265,22 +267,20 @@ export function useConfirmRewardChangeModal() {
const confirmRewardChange = useCallback(
async (options: ConfirmRewardChangeOptions) => {
- const shouldNotify = shouldNotifyRewardChange({
- action: options.action,
- target: options.target,
- isDefault: options.isDefault,
- partnerCount: options.partnerCount,
- });
+ // Destructive deletes always use the modal, even when no partners are
+ // assigned (partnerCount === 0 would otherwise skip notification copy).
+ if (options.action !== "deleted") {
+ const shouldNotify = shouldNotifyRewardChange({
+ action: options.action,
+ target: options.target,
+ isDefault: options.isDefault,
+ partnerCount: options.partnerCount,
+ });
- if (!shouldNotify) {
- if (options.action === "deleted") {
- if (!window.confirm("Are you sure you want to delete this reward?")) {
- return;
- }
+ if (!shouldNotify) {
+ await options.onConfirm();
+ return;
}
-
- await options.onConfirm();
- return;
}
setState(options);
diff --git a/apps/web/ui/modals/edit-partner-discount-modal.tsx b/apps/web/ui/modals/edit-partner-discount-modal.tsx
index d64000c9b7..5c047107d1 100644
--- a/apps/web/ui/modals/edit-partner-discount-modal.tsx
+++ b/apps/web/ui/modals/edit-partner-discount-modal.tsx
@@ -94,7 +94,7 @@ function EditPartnerDiscountModal({
onSuccess: async () => {
setShowModal(false);
toast.success("Discount updated");
- await mutatePrefix("/api/partners");
+ await mutatePrefix(["/api/partners", "/api/discounts"]);
},
onError({ error }) {
toast.error(parseActionError(error, "Failed to update discount"));
diff --git a/apps/web/ui/modals/edit-partner-reward-modal.tsx b/apps/web/ui/modals/edit-partner-reward-modal.tsx
index 306140655a..8d9c75072c 100644
--- a/apps/web/ui/modals/edit-partner-reward-modal.tsx
+++ b/apps/web/ui/modals/edit-partner-reward-modal.tsx
@@ -114,7 +114,7 @@ function EditPartnerRewardModal({
onSuccess: async () => {
setShowModal(false);
toast.success("Reward updated");
- await mutatePrefix("/api/partners");
+ await mutatePrefix(["/api/partners", "/api/rewards"]);
},
onError({ error }) {
toast.error(parseActionError(error, "Failed to update reward"));
@@ -275,7 +275,7 @@ function EditPartnerRewardModal({
target: "group",
isDefault: reward.id === groupRewardId,
reward,
- partnerCount: reward.partnersCount ?? 0,
+ partnerCount: reward.partnersCount ?? undefined,
isPending: isDeleting,
onConfirm: async (activityDescription) => {
await deleteReward({
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 299556dbdf..81f9ea0528 100644
--- a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
+++ b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
@@ -99,8 +99,18 @@ function DiscountSheetContent({
plan,
} = useWorkspace();
const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);
+
+ // Infer when omitted (create via useDiscountSheet defaults true). Group pages
+ // pass isDefault from whether the discount is the group's default.
+ const effectiveIsDefault =
+ isDefault === false
+ ? false
+ : discount && group
+ ? discount.id === group.discount?.id
+ : isDefault;
+
const showPartnerAndLinkUpsell =
- !discount && !isDefault && !canUseAdvancedRewardLogic;
+ !discount && !effectiveIsDefault && !canUseAdvancedRewardLogic;
const isEdit = Boolean(discount?.id);
@@ -142,7 +152,7 @@ function DiscountSheetContent({
couponTestId: defaultValuesSource.couponTestId,
autoProvision: Boolean(defaultValuesSource.autoProvisionEnabledAt),
provider: discountProvider,
- isDefault,
+ isDefault: effectiveIsDefault,
},
});
@@ -266,7 +276,7 @@ function DiscountSheetContent({
amount: data.type === "flat" ? data.amount * 100 : data.amount || 0,
maxDuration:
Number(data.maxDuration) === Infinity ? null : data.maxDuration,
- isDefault,
+ isDefault: effectiveIsDefault,
});
};
@@ -596,10 +606,13 @@ function DiscountSheetContent({
</div>
</div>
- {isDefault && group && (
+ {group && (effectiveIsDefault || Boolean(discount)) && (
<>
<VerticalLine />
- <RewardDiscountPartnersCard groupId={group.id} />
+ <RewardDiscountPartnersCard
+ groupId={group.id}
+ discountId={discount?.id}
+ />
</>
)}
</div>
diff --git a/apps/web/ui/partners/groups/reward-discount-partners-card.tsx b/apps/web/ui/partners/groups/reward-discount-partners-card.tsx
index 46cb98394d..752cde5278 100644
--- a/apps/web/ui/partners/groups/reward-discount-partners-card.tsx
+++ b/apps/web/ui/partners/groups/reward-discount-partners-card.tsx
@@ -11,12 +11,26 @@ import { useParams } from "next/navigation";
import { useState } from "react";
import { RewardIconSquare } from "../rewards/reward-icon-square";
-export function RewardDiscountPartnersCard({ groupId }: { groupId: string }) {
+export function RewardDiscountPartnersCard({
+ groupId,
+ rewardId,
+ discountId,
+}: {
+ groupId: string;
+ rewardId?: string;
+ discountId?: string;
+}) {
const [isExpanded, setIsExpanded] = useState<boolean>(false);
+ const assignmentFilter = {
+ ...(rewardId && { rewardId }),
+ ...(discountId && { discountId }),
+ };
+
const { partnersCount } = usePartnersCount<number | undefined>({
groupId,
status: "approved",
+ ...assignmentFilter,
});
const { partners } = usePartners({
@@ -24,6 +38,7 @@ export function RewardDiscountPartnersCard({ groupId }: { groupId: string }) {
groupId,
status: "approved",
pageSize: 10,
+ ...assignmentFilter,
},
});
@@ -81,6 +96,8 @@ export function RewardDiscountPartnersCard({ groupId }: { groupId: string }) {
partners={partners}
partnersCount={partnersCount || 0}
groupId={groupId}
+ rewardId={rewardId}
+ discountId={discountId}
/>
</div>
</motion.div>
@@ -92,10 +109,14 @@ function PartnersCompactTable({
partners,
partnersCount,
groupId,
+ rewardId,
+ discountId,
}: {
partners?: EnrolledPartnerProps[];
partnersCount: number;
groupId: string;
+ rewardId?: string;
+ discountId?: string;
}) {
const { slug } = useParams<{ slug: string }>();
@@ -135,6 +156,16 @@ function PartnersCompactTable({
rowCount: partners?.length || 0,
});
+ const viewAllParams = new URLSearchParams({ groupId });
+
+ if (rewardId) {
+ viewAllParams.set("rewardId", rewardId);
+ }
+
+ if (discountId) {
+ viewAllParams.set("discountId", discountId);
+ }
+
return (
<div className="relative">
{partners?.length ? (
@@ -148,7 +179,7 @@ function PartnersCompactTable({
{partnersCount > 10 && (
<div className="mt-2 flex justify-end">
<Link
- href={`/${slug}/program/partners?groupId=${groupId}`}
+ href={`/${slug}/program/partners?${viewAllParams.toString()}`}
target="_blank"
>
<Button
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 2e5d665c16..e9599afcd2 100644
--- a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
+++ b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
@@ -230,9 +230,24 @@ function RewardSheetContent({
groupId: group?.id,
});
+ // Infer when omitted (create via useRewardSheet defaults true). Group pages
+ // pass isDefault from whether the reward is the group's default for that event.
+ const effectiveIsDefault =
+ isDefault === false
+ ? false
+ : reward && group
+ ? [
+ group.clickReward?.id,
+ group.leadReward?.id,
+ group.saleReward?.id,
+ group.referralReward?.id,
+ group.customReward?.id,
+ ].includes(reward.id)
+ : isDefault;
+
const partnerCountForConfirm = reward
- ? rewards?.find((item) => item.id === reward.id)?.partnersCount
- : isDefault
+ ? rewards?.find((item) => item.id === reward.id)?.partnersCount ?? undefined
+ : effectiveIsDefault
? undefined
: 0;
@@ -444,7 +459,7 @@ function RewardSheetContent({
const [showAdvancedUpsell, setShowAdvancedUpsell] = useState(false);
const showReferralUpsell = event === "referral" && !canCreateReferralReward;
const showPartnerAndLinkUpsell =
- !reward && !isDefault && !canUseAdvancedRewardLogic;
+ !reward && !effectiveIsDefault && !canUseAdvancedRewardLogic;
useEffect(() => {
if (modifiers?.length && !canUseAdvancedRewardLogic) {
@@ -488,7 +503,7 @@ function RewardSheetContent({
await confirmRewardChange({
action: reward ? "updated" : "created",
target: "group",
- isDefault,
+ isDefault: effectiveIsDefault,
reward: payload,
partnerCount: partnerCountForConfirm,
isPending: isCreating || isUpdating,
@@ -498,7 +513,7 @@ function RewardSheetContent({
...payload,
groupId: group.id,
activityDescription,
- isDefault,
+ isDefault: effectiveIsDefault,
});
} else {
await updateReward({
@@ -519,7 +534,7 @@ function RewardSheetContent({
await confirmRewardChange({
action: "deleted",
target: "group",
- isDefault,
+ isDefault: effectiveIsDefault,
reward,
partnerCount: partnerCountForConfirm,
isPending: isDeleting,
@@ -959,10 +974,13 @@ function RewardSheetContent({
<VerticalLine />
<RewardPreviewCard />
- {isDefault && group && (
+ {group && (effectiveIsDefault || Boolean(reward)) && (
<>
<VerticalLine />
- <RewardDiscountPartnersCard groupId={group.id} />
+ <RewardDiscountPartnersCard
+ groupId={group.id}
+ rewardId={reward?.id}
+ />
</>
)}
</div>