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.

Coderabbit critical fixes

Marcus Farrell8c08cbe28f85
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-sheet.tsx
index 249997bf28..869ded4d36 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-sheet.tsx
@@ -215,13 +215,27 @@ function InvitePartnerSheetContent({ setIsOpen }: InvitePartnerSheetProps) {
const { executeAsync, isPending } = useAction(invitePartnerAction, {
onSuccess: ({ data }) => {
- const invitedCount = data?.invitedCount || 1;
- toast.success(
- invitedCount > 1
- ? `Invitations sent to ${invitedCount} partners!`
- : "Invitation sent to partner!",
- );
- setIsOpen(false);
+ const invitedCount = data?.invitedCount ?? 0;
+ const errorsCount = data?.errors?.length ?? 0;
+
+ if (errorsCount === 0) {
+ toast.success(
+ invitedCount > 1
+ ? `Invitations sent to ${invitedCount} partners!`
+ : "Invitation sent to partner!",
+ );
+ setIsOpen(false);
+ return;
+ }
+
+ if (invitedCount > 0) {
+ toast.warning(
+ `Sent ${invitedCount} invite${invitedCount === 1 ? "" : "s"}, ${errorsCount} failed.`,
+ );
+ return;
+ }
+
+ toast.error(data?.errors?.[0]?.error || "Failed to send invites");
},
onError({ error }) {
toast.error(error.serverError);
@@ -463,7 +477,8 @@ function InvitePartnerSheetContent({ setIsOpen }: InvitePartnerSheetProps) {
type="button"
variant="outline"
icon={<X className="size-3" strokeWidth={2.5} />}
- onClick={() => {
+ onClick={(e) => {
+ e.stopPropagation();
setSelectedRecipientEmail((prev) =>
prev === recipientEmail ? null : prev,
);
diff --git a/apps/web/lib/actions/partners/invite-partner.ts b/apps/web/lib/actions/partners/invite-partner.ts
index f4e465a44b..6b6fb623ac 100644
--- a/apps/web/lib/actions/partners/invite-partner.ts
+++ b/apps/web/lib/actions/partners/invite-partner.ts
@@ -86,6 +86,9 @@ export const invitePartnerAction = authActionClient
rejected: "was rejected from",
declined: "declined the invite to",
pending: "has a pending application to join",
+ banned: "is banned from",
+ archived: "is archived in",
+ deactivated: "is deactivated in",
} as const;
for (const recipientEmail of uniqueRecipientEmails) {
@@ -109,6 +112,7 @@ export const invitePartnerAction = authActionClient
enrolledPartner: Awaited<ReturnType<typeof createAndEnrollPartner>>;
recipientEmail: string;
}[] = [];
+ const errors: { recipientEmail: string; error: string }[] = [];
// Use saved invite email data from program if available
const inviteEmailData = program.inviteEmailData;
@@ -180,8 +184,8 @@ export const invitePartnerAction = authActionClient
return [...sendPartnerInvitePromises, ...recordAuditLogPromises];
};
- try {
- for (const recipientEmail of uniqueRecipientEmails) {
+ for (const recipientEmail of uniqueRecipientEmails) {
+ try {
const enrolledPartner = await createAndEnrollPartner({
workspace,
program,
@@ -196,18 +200,22 @@ export const invitePartnerAction = authActionClient
});
enrolledPartners.push({ enrolledPartner, recipientEmail });
+ } catch (error) {
+ errors.push({
+ recipientEmail,
+ error: error instanceof Error ? error.message : "Failed to invite",
+ });
}
- } catch (error) {
- if (enrolledPartners.length > 0) {
- waitUntil(Promise.allSettled(createPostInvitePromises()));
- }
-
- throw error;
}
- const postInvitePromises = createPostInvitePromises();
-
- waitUntil(Promise.allSettled(postInvitePromises));
+ if (enrolledPartners.length > 0) {
+ const postInvitePromises = createPostInvitePromises();
+ waitUntil(Promise.allSettled(postInvitePromises));
+ }
- return { invitedCount: enrolledPartners.length };
+ return {
+ invitedCount: enrolledPartners.length,
+ invited: enrolledPartners,
+ errors,
+ };
});