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.

feat: Allow owners to use Content mode (#6619)

Oleg Isonen6bfc8a80a79b
diff --git a/apps/builder/app/builder/features/builder-mode.test.tsx b/apps/builder/app/builder/features/builder-mode.test.tsx
new file mode 100644
index 0000000000..925a16c543
--- /dev/null
+++ b/apps/builder/app/builder/features/builder-mode.test.tsx
@@ -0,0 +1,105 @@
+import { createRoot, type Root } from "react-dom/client";
+import { act } from "react-dom/test-utils";
+import { userEvent } from "@vitest/browser/context";
+import { afterEach, expect, test } from "vitest";
+import { TooltipProvider } from "@webstudio-is/design-system";
+import { defaultPlanFeatures } from "@webstudio-is/plans";
+import {
+ $authPermit,
+ $builderMode,
+ $planFeatures,
+ setBuilderMode,
+} from "~/shared/nano-states";
+import { BuilderModeDropDown } from "./builder-mode";
+
+(
+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+).IS_REACT_ACT_ENVIRONMENT = true;
+
+let root: Root | undefined;
+
+afterEach(() => {
+ act(() => root?.unmount());
+ root = undefined;
+ document.body.innerHTML = "";
+ $authPermit.set("view");
+ $planFeatures.set(defaultPlanFeatures);
+});
+
+const openModeMenu = async () => {
+ $builderMode.set("design");
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ root = createRoot(container);
+ await act(async () =>
+ root?.render(
+ <TooltipProvider>
+ <BuilderModeDropDown />
+ </TooltipProvider>
+ )
+ );
+ await act(async () =>
+ userEvent.click(
+ container.querySelector('button[aria-label="Choose mode"]')!
+ )
+ );
+ return Array.from(
+ document.querySelectorAll<HTMLElement>('[role="menuitemradio"]')
+ ).find((item) => item.textContent?.includes("Content"));
+};
+
+test("shows the Content shortcut for an owned free project", async () => {
+ $authPermit.set("own");
+ $planFeatures.set(defaultPlanFeatures);
+
+ const contentItem = await openModeMenu();
+
+ expect(contentItem).toBeDefined();
+ expect(contentItem?.hasAttribute("data-disabled")).toBe(false);
+ expect(contentItem?.textContent).not.toContain("Pro");
+ expect(contentItem?.querySelector("kbd")).not.toBeNull();
+});
+
+test("shows the shortcut without the Pro badge when Content is allowed", async () => {
+ $authPermit.set("own");
+ $planFeatures.set({ ...defaultPlanFeatures, allowContentMode: true });
+
+ const contentItem = await openModeMenu();
+
+ expect(contentItem).toBeDefined();
+ expect(contentItem?.hasAttribute("data-disabled")).toBe(false);
+ expect(contentItem?.querySelector("kbd")).not.toBeNull();
+ expect(contentItem?.textContent).not.toContain("Pro");
+});
+
+test("shows Content as a disabled Pro option on a shared free project", async () => {
+ $authPermit.set("build");
+ $planFeatures.set(defaultPlanFeatures);
+
+ const contentItem = await openModeMenu();
+
+ expect(contentItem).toBeDefined();
+ expect(contentItem?.hasAttribute("data-disabled")).toBe(true);
+ expect(contentItem?.textContent).toContain("Pro");
+ expect(contentItem?.querySelector("kbd")).toBeNull();
+});
+
+test("shows the shortcut on a shared Pro project", async () => {
+ $authPermit.set("build");
+ $planFeatures.set({ ...defaultPlanFeatures, allowContentMode: true });
+
+ const contentItem = await openModeMenu();
+
+ expect(contentItem).toBeDefined();
+ expect(contentItem?.hasAttribute("data-disabled")).toBe(false);
+ expect(contentItem?.querySelector("kbd")).not.toBeNull();
+});
+
+test("opens a free Content-only share link in Preview mode", () => {
+ $authPermit.set("edit");
+ $planFeatures.set(defaultPlanFeatures);
+
+ setBuilderMode("content");
+
+ expect($builderMode.get()).toBe("preview");
+});
diff --git a/apps/builder/app/builder/features/builder-mode.tsx b/apps/builder/app/builder/features/builder-mode.tsx
index 972e990d3b..4dffc3b932 100644
--- a/apps/builder/app/builder/features/builder-mode.tsx
+++ b/apps/builder/app/builder/features/builder-mode.tsx
@@ -8,6 +8,7 @@ import {
} from "@webstudio-is/icons";
import {
Box,
+ Chip,
DropdownMenuItemRightSlot,
DropdownMenuRadioGroup,
DropdownMenuRadioItem,
@@ -107,11 +108,12 @@ export const BuilderModeDropDown = () => {
}}
>
{Object.entries(menuItems)
- .filter(([_, { enabled }]) => enabled)
- .map(([mode, { icon, title, shortcut }]) => (
+ .filter(([mode, { enabled }]) => mode === "content" || enabled)
+ .map(([mode, { icon, title, shortcut, enabled }]) => (
<DropdownMenuRadioItem
key={mode}
value={mode}
+ disabled={!enabled}
onFocus={handleFocus(mode as keyof typeof menuItems)}
onBlur={handleBlur}
icon={<MenuCheckedIcon />}
@@ -121,7 +123,7 @@ export const BuilderModeDropDown = () => {
<Box>{title}</Box>
</Flex>
<DropdownMenuItemRightSlot>
- <Kbd value={shortcut} />
+ {enabled ? <Kbd value={shortcut} /> : <Chip>Pro</Chip>}
</DropdownMenuItemRightSlot>
&nbsp;
</DropdownMenuRadioItem>
diff --git a/apps/builder/app/shared/nano-states/misc.test.ts b/apps/builder/app/shared/nano-states/misc.test.ts
index b1e3d3144e..4e2a72e08a 100644
--- a/apps/builder/app/shared/nano-states/misc.test.ts
+++ b/apps/builder/app/shared/nano-states/misc.test.ts
@@ -1,9 +1,13 @@
import { afterEach, describe, expect, test } from "vitest";
+import { defaultPlanFeatures } from "@webstudio-is/plans";
import {
$authPermit,
$builderMode,
$canOpenPageTemplates,
+ $planFeatures,
$propsIndex,
+ setBuilderMode,
+ toggleBuilderMode,
type BuilderMode,
} from "./misc";
import { $props } from "../sync/data-stores";
@@ -11,9 +15,27 @@ import { $props } from "../sync/data-stores";
afterEach(() => {
$builderMode.set("design");
$authPermit.set("view");
+ $planFeatures.set(defaultPlanFeatures);
$props.set(new Map());
});
+test.each(["link", "shortcut"] as const)(
+ "keeps a Free Content-only %s in Preview when Design is requested",
+ (entry) => {
+ $authPermit.set("edit");
+ $planFeatures.set(defaultPlanFeatures);
+ $builderMode.set("preview");
+
+ if (entry === "link") {
+ setBuilderMode("design");
+ } else {
+ toggleBuilderMode("design");
+ }
+
+ expect($builderMode.get()).toBe("preview");
+ }
+);
+
test("keeps the public tag index limited to static string values", () => {
$props.set(
new Map([
diff --git a/apps/builder/app/shared/nano-states/misc.ts b/apps/builder/app/shared/nano-states/misc.ts
index a413e7542e..ba1478af41 100644
--- a/apps/builder/app/shared/nano-states/misc.ts
+++ b/apps/builder/app/shared/nano-states/misc.ts
@@ -436,8 +436,12 @@ export const setBuilderMode = (mode: BuilderMode | null) => {
if (mode === "design" && !$isDesignModeAllowed.get()) {
toast.info("Design mode is not available for content edit links.");
- $builderMode.set("content");
- lastEditableBuilderMode = "content";
+ if ($isContentModeAllowed.get()) {
+ $builderMode.set("content");
+ lastEditableBuilderMode = "content";
+ } else {
+ $builderMode.set("preview");
+ }
return;
}
diff --git a/apps/builder/app/shared/permissions.test.ts b/apps/builder/app/shared/permissions.test.ts
index 4b4d836ace..d19fe33e77 100644
--- a/apps/builder/app/shared/permissions.test.ts
+++ b/apps/builder/app/shared/permissions.test.ts
@@ -255,57 +255,57 @@ describe("getPermissions", () => {
});
describe("allowContentMode with authPermit", () => {
- test("content mode allowed for shared project (view permit)", () => {
+ test("content mode denied for free shared project (view permit)", () => {
const result = getPermissions({
role: "own",
authPermit: "view",
planFeatures: freePlan,
workspaces: [],
});
- expect(result.allowContentMode).toBe(true);
+ expect(result.allowContentMode).toBe(false);
});
- test("content mode allowed for shared project (edit permit)", () => {
+ test("content mode denied for free shared project (edit permit)", () => {
const result = getPermissions({
role: "own",
authPermit: "edit",
planFeatures: freePlan,
workspaces: [],
});
- expect(result.allowContentMode).toBe(true);
+ expect(result.allowContentMode).toBe(false);
});
- test("content mode allowed for shared project (build permit)", () => {
+ test("content mode denied for free shared project (build permit)", () => {
const result = getPermissions({
role: "own",
authPermit: "build",
planFeatures: freePlan,
workspaces: [],
});
- expect(result.allowContentMode).toBe(true);
+ expect(result.allowContentMode).toBe(false);
});
- test("content mode allowed for shared project (admin permit)", () => {
+ test("content mode denied for free shared project (admin permit)", () => {
const result = getPermissions({
role: "own",
authPermit: "admin",
planFeatures: freePlan,
workspaces: [],
});
- expect(result.allowContentMode).toBe(true);
+ expect(result.allowContentMode).toBe(false);
});
- test("content mode allowed for shared project with free plan", () => {
+ test("content mode allowed for shared project with Pro plan", () => {
const result = getPermissions({
role: "own",
authPermit: "edit",
- planFeatures: freePlan,
+ planFeatures: proPlan,
workspaces: [],
});
expect(result.allowContentMode).toBe(true);
});
- test("content mode depends on plan for own project", () => {
+ test("content mode is allowed for own project on any plan", () => {
expect(
getPermissions({
role: "own",
@@ -313,7 +313,7 @@ describe("getPermissions", () => {
planFeatures: freePlan,
workspaces: [],
}).allowContentMode
- ).toBe(false);
+ ).toBe(true);
expect(
getPermissions({
role: "own",
@@ -512,7 +512,7 @@ describe("getPermissions", () => {
});
describe("all three parameters combined", () => {
- test("viewer + free plan + shared project enables only content mode", () => {
+ test("viewer + free plan + shared project does not enable content mode", () => {
const result = getPermissions({
role: "viewers",
planFeatures: freePlan,
@@ -527,9 +527,9 @@ describe("getPermissions", () => {
expect(result.canDelete).toBe(false);
expect(result.canEditTags).toBe(false);
expect(result.canOpenSettings).toBe(false);
- // plan: all false except content mode overridden by shared project access
+ // plan: all false
expect(result.allowDynamicData).toBe(false);
- expect(result.allowContentMode).toBe(true);
+ expect(result.allowContentMode).toBe(false);
expect(result.allowStagingPublish).toBe(false);
expect(result.allowAdditionalPermissions).toBe(false);
});
diff --git a/apps/builder/app/shared/permissions.ts b/apps/builder/app/shared/permissions.ts
index 54171458c6..72bf369367 100644
--- a/apps/builder/app/shared/permissions.ts
+++ b/apps/builder/app/shared/permissions.ts
@@ -39,11 +39,6 @@ export const getPermissions = ({
const isAdmin = role === "administrators";
const isBuilder = role === "builders" || isAdmin;
const isEditor = role === "editors" || isBuilder;
- // Content mode is always available in shared projects (non-owner access)
- // because content mode is a safe/restricted editing mode.
- // authPermit is server-validated, so we trust it here.
- const isSharedProject = authPermit !== undefined && authPermit !== "own";
-
return {
// Workspace role permissions
canCreateProject: isOwn || isBuilder,
@@ -63,7 +58,7 @@ export const getPermissions = ({
canRestoreBackups: planFeatures.canRestoreBackups,
allowDynamicData: planFeatures.allowDynamicData,
allowAuth: planFeatures.allowAuth,
- allowContentMode: isSharedProject || planFeatures.allowContentMode,
+ allowContentMode: authPermit === "own" || planFeatures.allowContentMode,
allowStagingPublish: planFeatures.allowStagingPublish,
allowAdditionalPermissions: planFeatures.allowAdditionalPermissions,
maxContactEmailsPerProject: planFeatures.maxContactEmailsPerProject,
diff --git a/apps/builder/e2e/tests/content-mode-assets.[shard-6].e2e.ts b/apps/builder/e2e/tests/content-mode-assets.[shard-6].e2e.ts
index 178a876a35..0cb2825f56 100644
--- a/apps/builder/e2e/tests/content-mode-assets.[shard-6].e2e.ts
+++ b/apps/builder/e2e/tests/content-mode-assets.[shard-6].e2e.ts
@@ -34,13 +34,14 @@ import { createContentModeProject } from "../fixtures/content-mode-suite";
import type { SeededContentModeProject } from "../fixtures/content-mode-project";
import { test, withBrowserContext } from "../test";
import { measure } from "../perf";
+import { e2ePaidPlanName } from "../plans";
import { loadDevBuild } from "../db";
let fixture: SeededContentModeProject;
test.beforeAll(async ({ browser }) => {
fixture = await withBrowserContext(browser, (context) =>
- createContentModeProject({ context })
+ createContentModeProject({ context, devPlan: e2ePaidPlanName })
);
});
test("Editor can insert content templates with assets and styles", async ({
@@ -419,6 +420,7 @@ test("Builder copy/paste preserves image asset references after reload", async (
}) => {
const fixture = await createContentModeProject({
context: context,
+ devPlan: e2ePaidPlanName,
title: "Asset Copy E2E",
assetNamePrefix: "asset-copy-",
diff --git a/apps/builder/e2e/tests/content-mode-content-editing.[shard-10].e2e.ts b/apps/builder/e2e/tests/content-mode-content-editing.[shard-10].e2e.ts
index 8601de715b..942595b3e1 100644
--- a/apps/builder/e2e/tests/content-mode-content-editing.[shard-10].e2e.ts
+++ b/apps/builder/e2e/tests/content-mode-content-editing.[shard-10].e2e.ts
@@ -35,6 +35,7 @@ import { createContentModeProject } from "../fixtures/content-mode-suite";
import type { SeededContentModeProject } from "../fixtures/content-mode-project";
import { test, withBrowserContext } from "../test";
import { measure } from "../perf";
+import { e2ePaidPlanName } from "../plans";
import { loadDevBuild } from "../db";
const getElementTagWithTextCount = async ({
@@ -154,7 +155,7 @@ let fixture: SeededContentModeProject;
test.beforeAll(async ({ browser }) => {
fixture = await withBrowserContext(browser, (context) =>
- createContentModeProject({ context })
+ createContentModeProject({ context, devPlan: e2ePaidPlanName })
);
});
test("Editor can delete direct children but not protected containers", async ({
diff --git a/apps/builder/e2e/tests/content-mode-pages.[shard-1].e2e.ts b/apps/builder/e2e/tests/content-mode-pages.[shard-1].e2e.ts
index d54fbb7e82..b98ce51732 100644
--- a/apps/builder/e2e/tests/content-mode-pages.[shard-1].e2e.ts
+++ b/apps/builder/e2e/tests/content-mode-pages.[shard-1].e2e.ts
@@ -21,12 +21,13 @@ import { createContentModeProject } from "../fixtures/content-mode-suite";
import type { SeededContentModeProject } from "../fixtures/content-mode-project";
import { newIsolatedPage, test, withBrowserContext } from "../test";
import { measure } from "../perf";
+import { e2ePaidPlanName } from "../plans";
let fixture: SeededContentModeProject;
test.beforeAll(async ({ browser }) => {
fixture = await withBrowserContext(browser, (context) =>
- createContentModeProject({ context })
+ createContentModeProject({ context, devPlan: e2ePaidPlanName })
);
});
test("Editor can create styled page from template in content mode", async ({
diff --git a/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts b/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts
index 2193605a7d..8e94d8769a 100644
--- a/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts
+++ b/apps/builder/e2e/tests/mdx-content-block.[shard-4].e2e.ts
@@ -37,6 +37,7 @@ import { selectNavigatorItem } from "../flows/navigator";
import { selectCanvasTextInstanceForProps } from "../flows/canvas-selection";
import { fillSelectedStringProperty } from "../flows/props-panel";
import { getProjectBuilderUrl, test } from "../test";
+import { e2ePaidPlanName } from "../plans";
test.describe.configure({ mode: "parallel" });
@@ -188,6 +189,7 @@ test("Content Block MDX source lifecycle persists edits and resets to empty", as
test.setTimeout(180_000);
const fixture = await createContentModeProject({
context: context,
+ devPlan: e2ePaidPlanName,
title: "MDX Content Source E2E",
});
@@ -468,6 +470,7 @@ test("Empty MDX content supports slash menu keyboard and mouse insertion", async
});
const fixture = await createContentModeProject({
context: context,
+ devPlan: e2ePaidPlanName,
title: "Empty MDX Content Source E2E",
});
@@ -677,6 +680,7 @@ test("Content Block requires a Builder reload after a stale file revision", asyn
}) => {
const fixture = await createContentModeProject({
context: context,
+ devPlan: e2ePaidPlanName,
title: "MDX Content Conflict E2E",
});
@@ -898,6 +902,7 @@ test("Dynamic detail source follows the selected route parameter", async ({
}) => {
const fixture = await createContentModeProject({
context: context,
+ devPlan: e2ePaidPlanName,
title: "MDX Content Detail E2E",
});
@@ -956,6 +961,7 @@ test("Repeated Content Block scopes edit distinct MDX files without leakage", as
}) => {
const fixture = await createContentModeProject({
context: context,
+ devPlan: e2ePaidPlanName,
title: "MDX Content Repeated E2E",
});
diff --git a/apps/builder/e2e/tests/pages-actions-bridge.[shard-4].e2e.ts b/apps/builder/e2e/tests/pages-actions-bridge.[shard-4].e2e.ts
index 411d00ca5a..c88e972a3e 100644
--- a/apps/builder/e2e/tests/pages-actions-bridge.[shard-4].e2e.ts
+++ b/apps/builder/e2e/tests/pages-actions-bridge.[shard-4].e2e.ts
@@ -15,6 +15,7 @@ import { createContentModeProject } from "../fixtures/content-mode-suite";
import type { SeededContentModeProject } from "../fixtures/content-mode-project";
import { test, withBrowserContext } from "../test";
import { measure } from "../perf";
+import { e2ePaidPlanName } from "../plans";
import { loadDevBuild } from "../db";
let fixture: SeededContentModeProject;
@@ -197,6 +198,7 @@ test.beforeAll(async ({ browser }) => {
fixture = await withBrowserContext(browser, (context) =>
createContentModeProject({
context,
+ devPlan: e2ePaidPlanName,
title: "Pages Actions E2E",
assetNamePrefix: "pages-actions-",