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.

Confirm hide-revenue toggles and optionally apply to all groups.

Kiran Kadf9863f9638
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
index a1174a09e4..21264edb59 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
@@ -65,6 +65,7 @@ export const PATCH = withWorkspace(
revenueDataSharingDisabled,
updateAutoApprovePartnersForAllGroups,
updateHoldingPeriodDaysForAllGroups,
+ updateRevenueDataSharingDisabledForAllGroups,
moveRules,
} = updateGroupSchema.parse(await parseRequestBody(req));
@@ -126,7 +127,7 @@ export const PATCH = withWorkspace(
moveRules,
});
- const [updatedGroup] = await Promise.all([
+ const [updatedGroup] = await prisma.$transaction([
prisma.partnerGroup.update({
where: {
id: group.id,
@@ -154,11 +155,12 @@ export const PATCH = withWorkspace(
? new Date()
: null,
}),
- ...(revenueDataSharingDisabled !== undefined && {
- revenueDataSharingDisabledAt: revenueDataSharingDisabled
- ? new Date()
- : null,
- }),
+ ...(revenueDataSharingDisabled !== undefined &&
+ !updateRevenueDataSharingDisabledForAllGroups && {
+ revenueDataSharingDisabledAt: revenueDataSharingDisabled
+ ? new Date()
+ : null,
+ }),
},
include: {
clickReward: true,
@@ -199,6 +201,22 @@ export const PATCH = withWorkspace(
}),
]
: []),
+ // Update revenue data sharing for all groups if selected
+ ...(revenueDataSharingDisabled !== undefined &&
+ updateRevenueDataSharingDisabledForAllGroups
+ ? [
+ prisma.partnerGroup.updateMany({
+ where: {
+ programId,
+ },
+ data: {
+ revenueDataSharingDisabledAt: revenueDataSharingDisabled
+ ? new Date()
+ : null,
+ },
+ }),
+ ]
+ : []),
]);
waitUntil(
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-additional-settings.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-additional-settings.tsx
index cea0df83b4..dad2e8f931 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-additional-settings.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-additional-settings.tsx
@@ -42,6 +42,10 @@ function GroupAdditionalSettingsForm({
useState(false);
const [showConfirmHoldingPeriodModal, setShowConfirmHoldingPeriodModal] =
useState(false);
+ const [
+ showConfirmRevenueDataSharingModal,
+ setShowConfirmRevenueDataSharingModal,
+ ] = useState(false);
const [selectedHoldingPeriodDays, setSelectedHoldingPeriodDays] = useState<
number | null
>(null);
@@ -64,18 +68,24 @@ function GroupAdditionalSettingsForm({
}
}, [group]);
- const handleRevenueDataSharingToggle = async () => {
+ const handleRevenueDataSharingConfirm = async ({
+ applyToAllGroups,
+ }: {
+ applyToAllGroups: boolean;
+ }) => {
if (!group) return;
const currentValue = Boolean(group.revenueDataSharingDisabledAt);
await updateGroup(`/api/groups/${group.id}`, {
method: "PATCH",
body: {
revenueDataSharingDisabled: !currentValue,
+ updateRevenueDataSharingDisabledForAllGroups: applyToAllGroups,
},
onSuccess: async () => {
await mutatePrefix(`/api/groups/${group.slug}`);
+ setShowConfirmRevenueDataSharingModal(false);
toast.success(
- `Partners in this group will ${currentValue ? "now see" : "no longer see"} sale amounts`,
+ `Partners ${applyToAllGroups ? "in all groups" : "in this group"} will ${currentValue ? "now see" : "no longer see"} sale amounts`,
);
},
});
@@ -87,7 +97,7 @@ function GroupAdditionalSettingsForm({
applyToAllGroups: boolean;
}) => {
if (!group) return;
- const currentValue = group.autoApprovePartnersEnabledAt ? true : false;
+ const currentValue = Boolean(group.autoApprovePartnersEnabledAt);
await updateGroup(`/api/groups/${group.id}`, {
method: "PATCH",
body: {
@@ -179,25 +189,40 @@ function GroupAdditionalSettingsForm({
};
const isLoading = loading || !group;
+ const autoApproveEnabled = Boolean(group?.autoApprovePartnersEnabledAt);
+ const revenueDataSharingDisabled = Boolean(
+ group?.revenueDataSharingDisabledAt,
+ );
return (
<>
{group && (
<>
- <ConfirmAutoApproveModal
+ <ConfirmGroupSettingModal
isOpen={showConfirmAutoApproveModal}
setIsOpen={setShowConfirmAutoApproveModal}
onConfirm={handleAutoApproveConfirm}
isSubmitting={isSubmitting}
- currentValue={group.autoApprovePartnersEnabledAt ? true : false}
+ title={`Confirm ${autoApproveEnabled ? "disable" : "enable"} auto-approve`}
+ description={`New applications will ${autoApproveEnabled ? "not" : ""} be approved automatically.`}
/>
- <ConfirmHoldingPeriodModal
- isOpen={showConfirmHoldingPeriodModal}
- setIsOpen={handleHoldingPeriodCancel}
- onConfirm={handleHoldingPeriodConfirm}
+ {selectedHoldingPeriodDays !== null && (
+ <ConfirmGroupSettingModal
+ isOpen={showConfirmHoldingPeriodModal}
+ setIsOpen={handleHoldingPeriodCancel}
+ onConfirm={handleHoldingPeriodConfirm}
+ isSubmitting={isSubmitting}
+ title="Confirm payout holding period change"
+ description={`Change holding period from ${group.holdingPeriodDays} days to ${selectedHoldingPeriodDays} days.`}
+ />
+ )}
+ <ConfirmGroupSettingModal
+ isOpen={showConfirmRevenueDataSharingModal}
+ setIsOpen={setShowConfirmRevenueDataSharingModal}
+ onConfirm={handleRevenueDataSharingConfirm}
isSubmitting={isSubmitting}
- currentValue={group.holdingPeriodDays}
- newValue={selectedHoldingPeriodDays}
+ title={`Confirm ${revenueDataSharingDisabled ? "show" : "hide"} sale amounts`}
+ description={`Partners will ${revenueDataSharingDisabled ? "see" : "not see"} sale amounts.`}
/>
</>
)}
@@ -253,9 +278,7 @@ function GroupAdditionalSettingsForm({
<label>
<div className="flex select-none items-center gap-2">
<Switch
- checked={
- group!.autoApprovePartnersEnabledAt ? true : false
- }
+ checked={autoApproveEnabled}
fn={() => setShowConfirmAutoApproveModal(true)}
trackDimensions="radix-state-checked:bg-black focus-visible:ring-black/20"
/>
@@ -277,8 +300,8 @@ function GroupAdditionalSettingsForm({
<label>
<div className="flex select-none items-center gap-2">
<Switch
- checked={Boolean(group!.revenueDataSharingDisabledAt)}
- fn={handleRevenueDataSharingToggle}
+ checked={revenueDataSharingDisabled}
+ fn={() => setShowConfirmRevenueDataSharingModal(true)}
disabled={isSubmitting}
trackDimensions="radix-state-checked:bg-black focus-visible:ring-black/20"
/>
@@ -321,18 +344,20 @@ function GroupAdditionalSettingsForm({
);
}
-function ConfirmAutoApproveModal({
+function ConfirmGroupSettingModal({
isOpen,
setIsOpen,
onConfirm,
isSubmitting,
- currentValue,
+ title,
+ description,
}: {
isOpen: boolean;
setIsOpen: (isOpen: boolean) => void;
onConfirm: ({ applyToAllGroups }: { applyToAllGroups: boolean }) => void;
isSubmitting: boolean;
- currentValue: boolean;
+ title: string;
+ description: string;
}) {
const [applyToAllGroups, setApplyToAllGroups] = useState(false);
@@ -346,82 +371,9 @@ function ConfirmAutoApproveModal({
<Modal showModal={isOpen} setShowModal={setIsOpen}>
<div className="p-5 text-left">
<h3 className="text-content-emphasis text-base font-semibold">
- Confirm {currentValue ? "disable" : "enable"} auto-approve
- </h3>
- <p className="text-content-subtle mt-1 text-sm">
- New applications will {currentValue ? "not" : ""} be approved
- automatically.
- </p>
- </div>
- <div className="border-border-subtle flex items-center justify-between gap-2 border-t px-5 py-4">
- <label className="flex w-full items-center gap-2.5 text-sm font-medium leading-none">
- <Checkbox
- checked={applyToAllGroups}
- className="border-border-default size-4 rounded focus:border-[var(--brand)] focus:ring-[var(--brand)] focus-visible:border-[var(--brand)] focus-visible:ring-[var(--brand)] data-[state=checked]:bg-black data-[state=indeterminate]:bg-black"
- onCheckedChange={(checked) => setApplyToAllGroups(Boolean(checked))}
- />
-
- <span className="text-content-emphasis text-sm">
- Apply to all groups
- </span>
- </label>
- <div className="flex items-center gap-2">
- <Button
- variant="secondary"
- className="h-8 w-fit px-3"
- text="Cancel"
- onClick={() => setIsOpen(false)}
- disabled={isSubmitting}
- />
- <Button
- variant="primary"
- className="h-8 w-fit px-3"
- text="Confirm"
- loading={isSubmitting}
- onClick={() => {
- onConfirm({ applyToAllGroups });
- }}
- />
- </div>
- </div>
- </Modal>
- );
-}
-
-function ConfirmHoldingPeriodModal({
- isOpen,
- setIsOpen,
- onConfirm,
- isSubmitting,
- currentValue,
- newValue,
-}: {
- isOpen: boolean;
- setIsOpen: (isOpen: boolean) => void;
- onConfirm: ({ applyToAllGroups }: { applyToAllGroups: boolean }) => void;
- isSubmitting: boolean;
- currentValue: number;
- newValue: number | null;
-}) {
- const [applyToAllGroups, setApplyToAllGroups] = useState(false);
-
- useEffect(() => {
- if (!isOpen) {
- setApplyToAllGroups(false);
- }
- }, [isOpen]);
-
- if (newValue === null) return null;
-
- return (
- <Modal showModal={isOpen} setShowModal={setIsOpen}>
- <div className="p-5 text-left">
- <h3 className="text-content-emphasis text-base font-semibold">
- Confirm payout holding period change
+ {title}
</h3>
- <p className="text-content-subtle mt-1 text-sm">
- Change holding period from {currentValue} days to {newValue} days.
- </p>
+ <p className="text-content-subtle mt-1 text-sm">{description}</p>
</div>
<div className="border-border-subtle flex items-center justify-between gap-2 border-t px-5 py-4">
<label className="flex w-full items-center gap-2.5 text-sm font-medium leading-none">
diff --git a/apps/web/lib/zod/schemas/groups.ts b/apps/web/lib/zod/schemas/groups.ts
index 3150ac208c..f7f29226e7 100644
--- a/apps/web/lib/zod/schemas/groups.ts
+++ b/apps/web/lib/zod/schemas/groups.ts
@@ -155,9 +155,10 @@ export const updateGroupSchema = createGroupSchema.partial().extend({
)
.optional(),
autoApprovePartners: z.coerce.boolean().optional(),
- revenueDataSharingDisabled: z.coerce.boolean().optional(),
+ revenueDataSharingDisabled: z.boolean().optional(),
updateAutoApprovePartnersForAllGroups: z.coerce.boolean().optional(),
updateHoldingPeriodDaysForAllGroups: z.coerce.boolean().optional(),
+ updateRevenueDataSharingDisabledForAllGroups: z.coerce.boolean().optional(),
moveRules: workflowConditionsSchema.optional(),
});