Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

chore: fix workspaces seats counter (#5693)

Oleg Isonen09c89376fb86
diff --git a/apps/builder/.env b/apps/builder/.env
index 20af7f231d..53c8d18477 100644
--- a/apps/builder/.env
+++ b/apps/builder/.env
@@ -74,7 +74,7 @@ PLANS='[
"extends": "Pro",
"features": {
"maxWorkspaces": 20,
- "minSeats": 5,
+ "minSeats": 4,
"maxSeatsPerWorkspace": 20
}
}
diff --git a/apps/builder/app/dashboard/workspace/manage-members-dialog.tsx b/apps/builder/app/dashboard/workspace/manage-members-dialog.tsx
index 576693826b..e1cf7d4660 100644
--- a/apps/builder/app/dashboard/workspace/manage-members-dialog.tsx
+++ b/apps/builder/app/dashboard/workspace/manage-members-dialog.tsx
@@ -473,22 +473,25 @@ export const ManageMembersDialog = ({
const performInvite = async (emails: string[], relation: Role) => {
setErrors(undefined);
setInviting(true);
- const optimistic: OptimisticPendingInvite[] = emails.map((email) => ({
- notificationId: crypto.randomUUID(),
- email,
- relation,
- }));
- setOptimisticPending((prev) => [...prev, ...optimistic]);
const failed = await inviteMembers(emails, workspace.id, relation);
setInviting(false);
+ // Add optimistic entries only for emails that actually succeeded so that
+ // non-existent or already-member emails never flicker into the list.
+ const failedEmails = new Set(failed.map((f) => f.split(":")[0].trim()));
+ const succeeded = emails.filter((e) => !failedEmails.has(e));
+ if (succeeded.length > 0) {
+ const optimistic: OptimisticPendingInvite[] = succeeded.map((email) => ({
+ notificationId: crypto.randomUUID(),
+ email,
+ relation,
+ }));
+ setOptimisticPending((prev) => [...prev, ...optimistic]);
+ }
+
if (failed.length > 0) {
setErrors(failed);
- const failedEmails = new Set(failed.map((f) => f.split(":")[0].trim()));
- setOptimisticPending((prev) =>
- prev.filter((o) => !failedEmails.has(o.email))
- );
} else {
formRef.current?.reset();
}
diff --git a/apps/builder/app/services/workspace-router.server.ts b/apps/builder/app/services/workspace-router.server.ts
index 8ac3c48e1a..9966d036e6 100644
--- a/apps/builder/app/services/workspace-router.server.ts
+++ b/apps/builder/app/services/workspace-router.server.ts
@@ -249,7 +249,7 @@ export const workspaceRouter = router({
}
if (inviteeResult.data === null) {
throw new Error(
- `No Webstudio account found for "${input.email}". The user needs to sign up first.`
+ "No Webstudio account found. The user needs to sign up first."
);
}
const existingMemberResult = await ctx.postgrest.client
@@ -263,9 +263,7 @@ export const workspaceRouter = router({
throw existingMemberResult.error;
}
if (existingMemberResult.data !== null) {
- throw new Error(
- `${input.email} is already a member of this workspace.`
- );
+ throw new Error("Already a member of this workspace.");
}
try {
diff --git a/packages/design-system/src/components/tooltip.tsx b/packages/design-system/src/components/tooltip.tsx
index 0dcafb6eac..a0b172f4d5 100644
--- a/packages/design-system/src/components/tooltip.tsx
+++ b/packages/design-system/src/components/tooltip.tsx
@@ -274,6 +274,7 @@ export const InputErrorsTooltip = ({
collisionBoundary={collisionBoundary as never}
collisionPadding={-8}
hideWhenDetached={true}
+ variant="wrapped"
content={
errors !== undefined && errors.length !== 0
? (content ?? " ")
diff --git a/packages/project/src/db/workspace.test.ts b/packages/project/src/db/workspace.test.ts
index 6159e40aca..3d419899e2 100644
--- a/packages/project/src/db/workspace.test.ts
+++ b/packages/project/src/db/workspace.test.ts
@@ -266,7 +266,7 @@ describe("addMember (msw)", () => {
{ workspaceId: "ws-1", email: "[email protected]", relation: "editors" },
createContext()
)
- ).rejects.toThrow('No Webstudio account found for "[email protected]"');
+ ).rejects.toThrow("No Webstudio account found");
});
test("throws when inviting yourself", async () => {
@@ -299,7 +299,7 @@ describe("addMember (msw)", () => {
{ workspaceId: "ws-1", email: "[email protected]", relation: "editors" },
createContext()
)
- ).rejects.toThrow("[email protected] is already a member");
+ ).rejects.toThrow("Already a member");
});
});
diff --git a/packages/project/src/db/workspace.ts b/packages/project/src/db/workspace.ts
index aae6ccf253..26a798100f 100644
--- a/packages/project/src/db/workspace.ts
+++ b/packages/project/src/db/workspace.ts
@@ -370,7 +370,7 @@ export const addMember = async (
if (user.data === null) {
throw new Error(
- `No Webstudio account found for "${email}". The user needs to sign up first.`
+ "No Webstudio account found. The user needs to sign up first."
);
}
@@ -394,7 +394,7 @@ export const addMember = async (
}
if (existing.data !== null) {
- throw new Error(`${email} is already a member of this workspace.`);
+ throw new Error("Already a member of this workspace.");
}
// Create a pending notification instead of inserting directly