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.

deactivated and banned only

Pedro Ladeirafb60f88eb3cd
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
index fb4ca7f6aa..e5b7bcfc30 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
@@ -249,7 +249,7 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {
});
const canPermanentlyDelete =
- ["deactivated", "rejected", "banned", "pending"].includes(partner.status) &&
+ ["deactivated", "banned"].includes(partner.status) &&
partner.totalClicks === 0 &&
partner.totalLeads === 0 &&
partner.totalSales === 0;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
index da6255a169..42c0e39e2b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
@@ -16,6 +16,7 @@ import { useBulkBanPartnersModal } from "@/ui/modals/bulk-ban-partners-modal";
import { useBulkDeactivatePartnersModal } from "@/ui/modals/bulk-deactivate-partners-modal";
import { useChangeGroupModal } from "@/ui/modals/change-group-modal";
import { useDeactivatePartnerModal } from "@/ui/modals/deactivate-partner-modal";
+import { useDeletePartnerModal } from "@/ui/modals/delete-partner-modal";
import { useReactivatePartnerModal } from "@/ui/modals/reactivate-partner-modal";
import { useUnbanPartnerModal } from "@/ui/modals/unban-partner-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
@@ -724,6 +725,17 @@ function RowMenuButton({
partner: row.original,
});
+ const { DeletePartnerModal, setShowDeletePartnerModal } =
+ useDeletePartnerModal({
+ partner: row.original,
+ });
+
+ const canPermanentlyDelete =
+ ["deactivated", "banned"].includes(row.original.status) &&
+ row.original.totalClicks === 0 &&
+ row.original.totalLeads === 0 &&
+ row.original.totalSales === 0;
+
const { executeAsync: resendInvite, isPending: isResendingInvite } =
useAction(resendProgramInviteAction, {
onSuccess: async () => {
@@ -762,6 +774,7 @@ function RowMenuButton({
<UnbanPartnerModal />
<DeactivatePartnerModal />
<ReactivatePartnerModal />
+ <DeletePartnerModal />
<Popover
openPopover={isOpen}
setOpenPopover={setIsOpen}
@@ -902,6 +915,18 @@ function RowMenuButton({
}}
/>
)}
+
+ {canPermanentlyDelete && (
+ <MenuItem
+ icon={Trash}
+ label="Permanently delete"
+ variant="danger"
+ onSelect={() => {
+ setShowDeletePartnerModal(true);
+ setIsOpen(false);
+ }}
+ />
+ )}
</Command.Group>
</>
)}
diff --git a/apps/web/lib/actions/partners/delete-partner.ts b/apps/web/lib/actions/partners/delete-partner.ts
index 6134cfb7d2..32432551d5 100644
--- a/apps/web/lib/actions/partners/delete-partner.ts
+++ b/apps/web/lib/actions/partners/delete-partner.ts
@@ -11,17 +11,7 @@ import { waitUntil } from "@vercel/functions";
import { authActionClient } from "../safe-action";
import { throwIfNoPermission } from "../throw-if-no-permission";
-const DELETABLE_STATUSES: ProgramEnrollmentStatus[] = [
- "deactivated",
- "rejected",
- "banned",
- "pending",
-];
-
-const STATUSES_COUNTED_IN_USAGE: ProgramEnrollmentStatus[] = [
- "banned",
- "deactivated",
-];
+const DELETABLE_STATUSES: ProgramEnrollmentStatus[] = ["deactivated", "banned"];
// Permanently delete a partner from a program (zero stats only)
export const deletePartnerAction = authActionClient
@@ -53,7 +43,7 @@ export const deletePartnerAction = authActionClient
if (!DELETABLE_STATUSES.includes(programEnrollment.status)) {
throw new Error(
- "Only deactivated, rejected, banned, or pending partners can be permanently deleted.",
+ "Only deactivated or banned partners can be permanently deleted.",
);
}
@@ -120,30 +110,22 @@ export const deletePartnerAction = authActionClient
}),
]);
- const shouldDecrementUsage = STATUSES_COUNTED_IN_USAGE.includes(
- enrollment.status,
- );
-
await prisma.$transaction([
prisma.programEnrollment.delete({
where: {
id: enrollment.id,
},
}),
- ...(shouldDecrementUsage
- ? [
- prisma.project.update({
- where: {
- id: workspace.id,
- },
- data: {
- partnersUsage: {
- decrement: 1,
- },
- },
- }),
- ]
- : []),
+ prisma.project.update({
+ where: {
+ id: workspace.id,
+ },
+ data: {
+ partnersUsage: {
+ decrement: 1,
+ },
+ },
+ }),
]);
waitUntil(