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.

Add option to disable future group move rules for partners

Kiran Kdffcf76f4d6c
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts
index 81889c0232..c15834ff3d 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts
@@ -9,6 +9,7 @@ import * as z from "zod/v4";
const addPartnersToGroupSchema = z.object({
partnerIds: z.array(z.string()).min(1).max(100), // max move 100 partners at a time
+ groupMoveDisabledAt: z.coerce.date().nullish(),
});
// POST /api/groups/[groupIdOrSlug]/partners - add partners to group
@@ -22,7 +23,7 @@ export const POST = withWorkspace(
includeExpandedFields: true,
});
- let { partnerIds } = addPartnersToGroupSchema.parse(
+ let { partnerIds, groupMoveDisabledAt } = addPartnersToGroupSchema.parse(
await parseRequestBody(req),
);
@@ -41,6 +42,7 @@ export const POST = withWorkspace(
partnerIds,
userId: session.user.id,
group,
+ groupMoveDisabledAt,
});
return NextResponse.json({
diff --git a/apps/web/lib/actions/partners/update-partner-enrollment.ts b/apps/web/lib/actions/partners/update-partner-enrollment.ts
index 916618cd03..a5dd589bfa 100644
--- a/apps/web/lib/actions/partners/update-partner-enrollment.ts
+++ b/apps/web/lib/actions/partners/update-partner-enrollment.ts
@@ -18,6 +18,7 @@ const updatePartnerEnrollmentSchema = z.object({
partnerId: z.string(),
tenantId: z.string().nullable(),
customerDataSharingEnabledAt: z.coerce.date().nullable(),
+ groupMoveDisabledAt: z.coerce.date().nullable(),
});
// Update a partner's program enrollment data
@@ -25,7 +26,12 @@ export const updatePartnerEnrollmentAction = authActionClient
.inputSchema(updatePartnerEnrollmentSchema)
.action(async ({ parsedInput, ctx }) => {
const { workspace, user } = ctx;
- const { partnerId, tenantId, customerDataSharingEnabledAt } = parsedInput;
+ const {
+ partnerId,
+ tenantId,
+ customerDataSharingEnabledAt,
+ groupMoveDisabledAt,
+ } = parsedInput;
throwIfNoPermission({
role: workspace.role,
@@ -70,10 +76,14 @@ export const updatePartnerEnrollmentAction = authActionClient
data: {
tenantId,
customerDataSharingEnabledAt,
+ groupMoveDisabledAt,
},
include: {
links: {
- include: { ...includeTags, ...includeProgramEnrollment },
+ include: {
+ ...includeTags,
+ ...includeProgramEnrollment,
+ },
},
},
});
diff --git a/apps/web/lib/api/groups/move-partners-to-group.ts b/apps/web/lib/api/groups/move-partners-to-group.ts
index 5828bf1a56..efc7a8ddc6 100644
--- a/apps/web/lib/api/groups/move-partners-to-group.ts
+++ b/apps/web/lib/api/groups/move-partners-to-group.ts
@@ -30,6 +30,7 @@ interface MovePartnersToGroupParams {
| "discountId"
>;
isGroupDeleted?: boolean;
+ groupMoveDisabledAt?: Date | null;
}
export async function movePartnersToGroup({
@@ -39,6 +40,7 @@ export async function movePartnersToGroup({
userId,
group,
isGroupDeleted = false,
+ groupMoveDisabledAt,
}: MovePartnersToGroupParams): Promise<number> {
if (partnerIds.length === 0) {
return 0;
@@ -82,6 +84,7 @@ export async function movePartnersToGroup({
leadRewardId: group.leadRewardId,
saleRewardId: group.saleRewardId,
discountId: group.discountId,
+ ...(groupMoveDisabledAt !== undefined && { groupMoveDisabledAt }),
},
});
diff --git a/apps/web/lib/api/workflows/execute-move-group-workflow.ts b/apps/web/lib/api/workflows/execute-move-group-workflow.ts
index ca7b2c9a86..b3c2dc7921 100644
--- a/apps/web/lib/api/workflows/execute-move-group-workflow.ts
+++ b/apps/web/lib/api/workflows/execute-move-group-workflow.ts
@@ -43,6 +43,7 @@ export const executeMoveGroupWorkflow = async ({
},
select: {
groupId: true,
+ groupMoveDisabledAt: true,
},
});
@@ -53,6 +54,14 @@ export const executeMoveGroupWorkflow = async ({
return;
}
+ // If the partner has group move rules disabled, skip the workflow
+ if (programEnrollment.groupMoveDisabledAt) {
+ console.log(
+ `Partner ${partnerId} has group move rules disabled. Skipping..`,
+ );
+ return;
+ }
+
const attributes: Partial<Record<WorkflowConditionAttribute, number | null>> =
{
totalLeads: metrics?.aggregated?.leads ?? 0,
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index f4b6f7d45c..6c61f91c75 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -392,6 +392,7 @@ export const EnrolledPartnerSchema = PartnerSchema.pick({
discount: true,
group: true,
customerDataSharingEnabledAt: true,
+ groupMoveDisabledAt: true,
}).shape,
)
.extend({
@@ -479,6 +480,7 @@ export const EnrolledPartnerSchemaExtended = EnrolledPartnerSchema.extend({
lastLeadAt: z.date().nullish(),
lastConversionAt: z.date().nullish(),
customerDataSharingEnabledAt: z.date().nullish(),
+ groupMoveDisabledAt: z.date().nullish(),
platforms: z.array(partnerPlatformSchema).nullable(),
})
.extend(
diff --git a/apps/web/lib/zod/schemas/programs.ts b/apps/web/lib/zod/schemas/programs.ts
index 56f0c42c59..342c80d36a 100644
--- a/apps/web/lib/zod/schemas/programs.ts
+++ b/apps/web/lib/zod/schemas/programs.ts
@@ -147,6 +147,7 @@ export const ProgramEnrollmentSchema = z.object({
linkStructure: true,
}).nullish(),
customerDataSharingEnabledAt: z.date().nullable(),
+ groupMoveDisabledAt: z.date().nullable(),
referralFormData: referralFormSchema.nullish(),
});
diff --git a/apps/web/ui/modals/change-group-modal.tsx b/apps/web/ui/modals/change-group-modal.tsx
index 102c47aebb..24461b4cd9 100644
--- a/apps/web/ui/modals/change-group-modal.tsx
+++ b/apps/web/ui/modals/change-group-modal.tsx
@@ -2,8 +2,8 @@ import { mutatePrefix } from "@/lib/swr/mutate";
import { useApiMutation } from "@/lib/swr/use-api-mutation";
import useWorkspace from "@/lib/swr/use-workspace";
import { EnrolledPartnerProps } from "@/lib/types";
-import { Button, Modal } from "@dub/ui";
-import { cn, OG_AVATAR_URL } from "@dub/utils";
+import { Button, Modal, Switch } from "@dub/ui";
+import { cn, OG_AVATAR_URL, pluralize } from "@dub/utils";
import {
Dispatch,
SetStateAction,
@@ -34,6 +34,7 @@ function ChangeGroupModal({
const { id: workspaceId } = useWorkspace();
const [selectedGroupId, setSelectedGroupId] = useState<string | null>(null);
+ const [groupMoveDisabled, setGroupMoveDisabled] = useState(false);
useEffect(() => {
if (partners.length === 1) {
@@ -49,6 +50,9 @@ function ChangeGroupModal({
body: {
workspaceId,
partnerIds: partners.map((p) => p.id),
+ groupMoveDisabledAt: groupMoveDisabled
+ ? new Date().toISOString()
+ : null,
},
onSuccess: () => {
mutatePrefix("/api/partners");
@@ -56,7 +60,14 @@ function ChangeGroupModal({
setShowChangeGroupModal(false);
},
});
- }, [changeGroup, selectedGroupId, partners]);
+ }, [
+ changeGroup,
+ selectedGroupId,
+ partners,
+ groupMoveDisabled,
+ workspaceId,
+ setShowChangeGroupModal,
+ ]);
return (
<Modal
@@ -121,6 +132,20 @@ function ChangeGroupModal({
/>
</div>
</div>
+
+ <div className="flex items-start gap-4">
+ <Switch
+ fn={setGroupMoveDisabled}
+ checked={groupMoveDisabled}
+ trackDimensions="w-8 h-4"
+ thumbDimensions="w-3 h-3"
+ thumbTranslate="translate-x-4"
+ />
+ <h3 className="text-sm font-medium leading-none text-neutral-700">
+ Disable future group move rules for{" "}
+ {pluralize("partner", partners.length)}
+ </h3>
+ </div>
</div>
<div className="flex items-center justify-end gap-2 bg-neutral-50 px-4 pb-5 sm:px-6">
diff --git a/apps/web/ui/partners/partner-advanced-settings-modal.tsx b/apps/web/ui/partners/partner-advanced-settings-modal.tsx
index 37552ae53a..b21f08e66f 100644
--- a/apps/web/ui/partners/partner-advanced-settings-modal.tsx
+++ b/apps/web/ui/partners/partner-advanced-settings-modal.tsx
@@ -22,6 +22,7 @@ import { toast } from "sonner";
type FormData = {
tenantId: string | null;
customerDataSharingEnabledAt: Date | null;
+ groupMoveDisabledAt: Date | null;
};
function PartnerAdvancedSettingsModal({
@@ -33,7 +34,7 @@ function PartnerAdvancedSettingsModal({
setShowPartnerAdvancedSettingsModal: Dispatch<SetStateAction<boolean>>;
partner: Pick<
EnrolledPartnerExtendedProps,
- "id" | "tenantId" | "customerDataSharingEnabledAt"
+ "id" | "tenantId" | "customerDataSharingEnabledAt" | "groupMoveDisabledAt"
>;
}) {
const { id: workspaceId } = useWorkspace();
@@ -42,6 +43,10 @@ function PartnerAdvancedSettingsModal({
!!partner.customerDataSharingEnabledAt,
);
+ const [hasGroupMoveDisabled, setHasGroupMoveDisabled] = useState(
+ !!partner.groupMoveDisabledAt,
+ );
+
const { executeAsync } = useAction(updatePartnerEnrollmentAction, {
onSuccess: async () => {
toast.success(`Partner updated successfully!`);
@@ -60,6 +65,7 @@ function PartnerAdvancedSettingsModal({
defaultValues: {
tenantId: partner.tenantId,
customerDataSharingEnabledAt: partner.customerDataSharingEnabledAt,
+ groupMoveDisabledAt: partner.groupMoveDisabledAt ?? null,
},
});
@@ -71,6 +77,14 @@ function PartnerAdvancedSettingsModal({
});
};
+ const handleGroupMoveDisabledToggle = (checked: boolean) => {
+ setHasGroupMoveDisabled(checked);
+ setValue("groupMoveDisabledAt", checked ? new Date() : null, {
+ shouldDirty: true,
+ shouldValidate: true,
+ });
+ };
+
return (
<Modal
showModal={showPartnerAdvancedSettingsModal}
@@ -89,6 +103,7 @@ function PartnerAdvancedSettingsModal({
partnerId: partner.id,
tenantId: data.tenantId || null,
customerDataSharingEnabledAt: data.customerDataSharingEnabledAt,
+ groupMoveDisabledAt: data.groupMoveDisabledAt,
});
if (result?.serverError || result?.validationErrors) {
@@ -133,7 +148,7 @@ function PartnerAdvancedSettingsModal({
{/* Customer Data Sharing */}
<div className="mt-6">
- <div className="flex items-center gap-4">
+ <div className="flex items-start gap-4">
<Switch
fn={handleCustomerDataSharingToggle}
checked={hasCustomerDataSharing}
@@ -141,8 +156,8 @@ function PartnerAdvancedSettingsModal({
thumbDimensions="w-3 h-3"
thumbTranslate="translate-x-4"
/>
- <div className="flex flex-col gap-1">
- <h3 className="text-sm font-medium text-neutral-700">
+ <div className="flex flex-col gap-1.5">
+ <h3 className="text-sm font-medium leading-none text-neutral-700">
Enable customer data sharing
</h3>
<p className="text-xs text-neutral-500">
@@ -151,6 +166,27 @@ function PartnerAdvancedSettingsModal({
</div>
</div>
</div>
+
+ <div className="mt-6">
+ <div className="flex items-start gap-4">
+ <Switch
+ fn={handleGroupMoveDisabledToggle}
+ checked={hasGroupMoveDisabled}
+ trackDimensions="w-8 h-4"
+ thumbDimensions="w-3 h-3"
+ thumbTranslate="translate-x-4"
+ />
+ <div className="flex flex-col gap-1.5">
+ <h3 className="text-sm font-medium leading-none text-neutral-700">
+ Disable future group move rules for partner
+ </h3>
+ <p className="text-xs text-neutral-500">
+ Prevent this partner from being automatically moved between
+ groups
+ </p>
+ </div>
+ </div>
+ </div>
</div>
<div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 px-4 py-5 sm:px-6">
diff --git a/packages/prisma/schema/program.prisma b/packages/prisma/schema/program.prisma
index b4b406f034..3cef77fa04 100644
--- a/packages/prisma/schema/program.prisma
+++ b/packages/prisma/schema/program.prisma
@@ -129,6 +129,7 @@ model ProgramEnrollment {
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
customerDataSharingEnabledAt DateTime?
+ groupMoveDisabledAt DateTime?
bannedAt DateTime?
bannedReason PartnerBannedReason?