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.

Refine bulk partner deactivation logic and modal reset

Marcus Farrell87fac2eca0c0
diff --git a/apps/web/lib/actions/partners/bulk-deactivate-partners.ts b/apps/web/lib/actions/partners/bulk-deactivate-partners.ts
index 1ca9c266b0..66719161b7 100644
--- a/apps/web/lib/actions/partners/bulk-deactivate-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-deactivate-partners.ts
@@ -27,13 +27,24 @@ export const bulkDeactivatePartnersAction = authActionClient
},
programId,
status: {
- notIn: ["deactivated", "banned"],
+ in: ["approved", "archived"],
},
},
include: {
program: true,
- partner: true,
- links: true,
+ partner: {
+ select: {
+ id: true,
+ name: true,
+ email: true,
+ },
+ },
+ links: {
+ select: {
+ domain: true,
+ key: true,
+ },
+ },
discountCodes: true,
},
});
@@ -43,6 +54,7 @@ export const bulkDeactivatePartnersAction = authActionClient
}
const partnerIdsToDeactivate = programEnrollments.map((pe) => pe.partnerId);
+ const now = new Date();
await prisma.$transaction([
prisma.link.updateMany({
@@ -53,7 +65,7 @@ export const bulkDeactivatePartnersAction = authActionClient
},
},
data: {
- expiresAt: new Date(),
+ expiresAt: now,
},
}),
@@ -63,6 +75,9 @@ export const bulkDeactivatePartnersAction = authActionClient
in: partnerIdsToDeactivate,
},
programId,
+ status: {
+ in: ["approved", "archived"],
+ },
},
data: {
status: ProgramEnrollmentStatus.deactivated,
@@ -122,7 +137,10 @@ export const bulkDeactivatePartnersAction = authActionClient
{
type: "partner",
id: partner.id,
- metadata: partner,
+ metadata: {
+ id: partner.id,
+ name: partner.name,
+ },
},
],
})),
diff --git a/apps/web/ui/modals/bulk-deactivate-partners-modal.tsx b/apps/web/ui/modals/bulk-deactivate-partners-modal.tsx
index 45cb3d6f42..e2cbbc2b60 100644
--- a/apps/web/ui/modals/bulk-deactivate-partners-modal.tsx
+++ b/apps/web/ui/modals/bulk-deactivate-partners-modal.tsx
@@ -37,6 +37,7 @@ function BulkDeactivatePartnersModal({
register,
handleSubmit,
watch,
+ reset,
formState: { errors, isSubmitting, isSubmitSuccessful },
} = useForm<BulkDeactivatePartnersFormData>({
defaultValues: {
@@ -70,6 +71,7 @@ function BulkDeactivatePartnersModal({
}
setShowBulkDeactivatePartnersModal(false);
+ reset({ confirm: "" });
await onConfirm?.();
toast.success(
`${partners.length} ${partnerWord} deactivated successfully!`,
@@ -79,6 +81,7 @@ function BulkDeactivatePartnersModal({
partners,
workspaceId,
setShowBulkDeactivatePartnersModal,
+ reset,
onConfirm,
partnerWord,
]);
@@ -174,7 +177,10 @@ function BulkDeactivatePartnersModal({
<div className="flex items-center justify-end gap-2 bg-neutral-50 px-4 pb-5 sm:px-6">
<Button
- onClick={() => setShowBulkDeactivatePartnersModal(false)}
+ onClick={() => {
+ setShowBulkDeactivatePartnersModal(false);
+ reset({ confirm: "" });
+ }}
variant="secondary"
text="Cancel"
className="h-8 w-fit px-3"