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.

Fix invite teammates form stuck in loading state on error (#4011)

Kiran K73c6137bce38
diff --git a/apps/web/ui/workspaces/invite-teammates-form.tsx b/apps/web/ui/workspaces/invite-teammates-form.tsx
index a469e9bae5..5a09cb2efe 100644
--- a/apps/web/ui/workspaces/invite-teammates-form.tsx
+++ b/apps/web/ui/workspaces/invite-teammates-form.tsx
@@ -34,7 +34,7 @@ export function InviteTeammatesForm({
invites?: Invite[];
className?: string;
}) {
- const { id, slug, plan, usersLimit, trialEndsAt } = useWorkspace();
+ const { id, plan, usersLimit, trialEndsAt } = useWorkspace();
const { isMobile } = useMediaQuery();
const { queryParams } = useRouterStuff();
const { openTrialLimitModal, TrialLimitActivateModal } =
@@ -66,16 +66,19 @@ export function InviteTeammatesForm({
<form
onSubmit={handleSubmit(async (data) => {
const teammates = data.teammates.filter(({ email }) => email);
- const res = await fetch(`/api/workspaces/${id}/invites`, {
+
+ const rawResponse = await fetch(`/api/workspaces/${id}/invites`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ teammates }),
});
- if (res.ok) {
- await mutatePrefix(`/api/workspaces/${id}/invites`);
+ const response = await rawResponse.json();
+ if (rawResponse.ok) {
+ await mutatePrefix(`/api/workspaces/${id}/invites`);
toast.success(`${pluralize("Invitation", teammates.length)} sent!`);
+
queryParams({
set: {
status: "invited",
@@ -84,13 +87,14 @@ export function InviteTeammatesForm({
onSuccess?.();
} else {
- const body = await res.json().catch(() => null);
- const error = body?.error;
- if (trialActive && error?.code === "exceeded_limit") {
+ const { code, message } = response.error;
+
+ if (trialActive && code === "exceeded_limit") {
openTrialLimitModal("users");
- return;
+ throw new Error(message);
}
- if (error?.message?.includes("upgrade")) {
+
+ if (message.includes("upgrade")) {
if (trialActive) {
openTrialLimitModal("users");
} else {
@@ -104,10 +108,11 @@ export function InviteTeammatesForm({
{ duration: 4000 },
);
}
- return;
+ throw new Error(message);
}
- toast.error(error?.message ?? "Something went wrong");
- if (error) throw error;
+
+ toast.error(message);
+ throw new Error(message);
}
})}
className={cn("flex flex-col gap-8 text-left", className)}