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.

Create page on client (#1232)

Bogdan Chadkin25d30967aa4c
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
index 4ffbdac8b5..b9b232cb5b 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
@@ -274,11 +274,10 @@ export const TabContent = (props: TabContentProps) => {
<SettingsPanel isOpen={editingPageId !== undefined}>
{editingPageId === newPageId && (
<NewPageSettings
- projectId={project.id}
onClose={() => setEditingPageId(undefined)}
- onSuccess={(page) => {
+ onSuccess={(pageId) => {
setEditingPageId(undefined);
- handleSelect(page.id);
+ handleSelect(pageId);
}}
/>
)}
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
index 6a0a976928..099efc3a61 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
@@ -1,4 +1,5 @@
import { z } from "zod";
+import store from "immerhin";
import { useState, useCallback, ComponentProps } from "react";
import { useStore } from "@nanostores/react";
import { useDebouncedCallback } from "use-debounce";
@@ -33,15 +34,12 @@ import {
toastUnknownFieldErrors,
useIds,
} from "~/shared/form-utils";
-import type {
- DeletePageData,
- EditPageData,
- CreatePageData,
-} from "~/shared/pages";
+import type { DeletePageData, EditPageData } from "~/shared/pages";
import { restPagesPath } from "~/shared/router-utils";
import { Header, HeaderSuffixSpacer } from "../../header";
import { deleteInstance } from "~/shared/instance-utils";
-import { pagesStore } from "~/shared/nano-states";
+import { instancesStore, pagesStore } from "~/shared/nano-states";
+import { nanoid } from "nanoid";
const Group = styled(Flex, {
marginBottom: theme.spacing[9],
@@ -221,30 +219,12 @@ const nameToPath = (pages: Pages | undefined, name: string) => {
export const NewPageSettings = ({
onClose,
onSuccess,
- projectId,
}: {
- onClose?: () => void;
- onSuccess?: (page: Page) => void;
- projectId: string;
+ onClose: () => void;
+ onSuccess: (pageId: Page["id"]) => void;
}) => {
const pages = useStore(pagesStore);
- const fetcher = useFetcher<CreatePageData>();
-
- useOnFetchEnd(fetcher, (data) => {
- if (data.status === "ok") {
- if (pages !== undefined) {
- pagesStore.set({
- homePage: pages.homePage,
- pages: [...pages.pages, data.page],
- });
- }
- onSuccess?.(data.page);
- }
- });
-
- const isSubmitting = fetcher.state !== "idle";
-
const [values, setValues] = useState<Values>({
name: "Untitled",
path: nameToPath(pages, "Untitled"),
@@ -255,10 +235,33 @@ export const NewPageSettings = ({
const handleSubmit = () => {
if (Object.keys(errors).length === 0) {
- fetcher.submit(values, {
- method: "put",
- action: restPagesPath({ projectId }),
- });
+ const pageId = nanoid();
+ store.createTransaction(
+ [pagesStore, instancesStore],
+ (pages, instances) => {
+ if (pages === undefined) {
+ return;
+ }
+ const rootInstanceId = nanoid();
+ pages.pages.push({
+ id: pageId,
+ name: values.name,
+ path: values.path,
+ title: values.title,
+ rootInstanceId,
+ meta: {
+ description: values.description,
+ },
+ });
+ instances.set(rootInstanceId, {
+ type: "instance",
+ id: rootInstanceId,
+ component: "Body",
+ children: [],
+ });
+ }
+ );
+ onSuccess(pageId);
}
};
@@ -266,9 +269,9 @@ export const NewPageSettings = ({
<NewPageSettingsView
onSubmit={handleSubmit}
onClose={onClose}
- isSubmitting={isSubmitting}
+ isSubmitting={false}
errors={errors}
- disabled={isSubmitting}
+ disabled={false}
values={values}
onChange={({ field, value }) => {
setValues((values) => {
diff --git a/apps/builder/app/routes/rest/pages.$projectId.ts b/apps/builder/app/routes/rest/pages.$projectId.ts
index 351d8a9385..bc915fa1c1 100644
--- a/apps/builder/app/routes/rest/pages.$projectId.ts
+++ b/apps/builder/app/routes/rest/pages.$projectId.ts
@@ -7,17 +7,12 @@ import {
findPageByIdOrPath,
} from "@webstudio-is/project-build";
import {
- addPage,
deletePage,
editPage,
loadBuildByProjectId,
} from "@webstudio-is/project-build/server";
import { sentryException } from "~/shared/sentry";
-import type {
- CreatePageData,
- DeletePageData,
- EditPageData,
-} from "~/shared/pages";
+import type { DeletePageData, EditPageData } from "~/shared/pages";
import { type FetcherData, makeFieldError } from "~/shared/form-utils";
const nonEmptyString = z
@@ -41,44 +36,6 @@ const commonPageInput = {
description: z.string().optional(),
} as const;
-const CreatePageInput = zfd.formData(commonPageInput);
-
-const handlePut = async (
- projectId: string,
- request: Request
-): Promise<CreatePageData> => {
- const result = CreatePageInput.safeParse(await request.formData());
- if (result.success === false) {
- return { status: "error", errors: result.error.formErrors };
- }
- const { description, ...restData } = result.data;
- const data = {
- ...restData,
- meta: description !== undefined ? { description } : undefined,
- };
-
- const devBuild = await loadBuildByProjectId(projectId, "dev");
-
- const existingPage = findPageByIdOrPath(devBuild.pages, data.path);
- if (existingPage !== undefined) {
- return makeFieldError("path", `Already used for "${existingPage.name}"`);
- }
-
- const updatedBuild = await addPage({
- projectId,
- buildId: devBuild.id,
- data,
- });
-
- const newPage = findPageByIdOrPath(updatedBuild.pages, data.path);
-
- if (newPage === undefined) {
- throw new Error("New page not found");
- }
-
- return { status: "ok", page: newPage };
-};
-
const EditPageInput = zfd.formData({
id: z.string(),
name: z.optional(commonPageInput.name),
@@ -162,10 +119,6 @@ export const action = async ({
throw new Error(`Project ID required`);
}
- if (request.method === "PUT") {
- return await handlePut(params.projectId, request);
- }
-
if (request.method === "POST") {
return await handlePost(params.projectId, request);
}
diff --git a/apps/builder/app/routes/rest/patch.ts b/apps/builder/app/routes/rest/patch.ts
index 5237fab8f6..2b0bc8ae24 100644
--- a/apps/builder/app/routes/rest/patch.ts
+++ b/apps/builder/app/routes/rest/patch.ts
@@ -8,6 +8,7 @@ import {
patchStyleSources,
patchStyleSourceSelections,
patchInstances,
+ patchPages,
} from "@webstudio-is/project-build/server";
import type { Project } from "@webstudio-is/project";
import { createContext } from "~/shared/context.server";
@@ -36,7 +37,9 @@ export const action = async ({ request }: ActionArgs) => {
for await (const change of transaction.changes) {
const { namespace, patches } = change;
- if (namespace === "instances") {
+ if (namespace === "pages") {
+ await patchPages({ buildId, projectId }, patches, context);
+ } else if (namespace === "instances") {
await patchInstances({ buildId, projectId }, patches, context);
} else if (namespace === "styleSourceSelections") {
await patchStyleSourceSelections(
diff --git a/apps/builder/app/shared/pages/types.ts b/apps/builder/app/shared/pages/types.ts
index a2f8323258..9a67d405de 100644
--- a/apps/builder/app/shared/pages/types.ts
+++ b/apps/builder/app/shared/pages/types.ts
@@ -1,8 +1,6 @@
import type { Page } from "@webstudio-is/project-build";
import type { FetcherData } from "~/shared/form-utils";
-export type CreatePageData = FetcherData<{ page: Page }>;
-
export type EditPageData = FetcherData<{ page: Page }>;
// eslint-disable-next-line @typescript-eslint/ban-types
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index dcb0358d25..6141e3dc67 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -131,52 +131,6 @@ const createNewPageInstances = (): Build["instances"] => {
];
};
-export const addPage = async ({
- projectId,
- buildId,
- data,
-}: {
- projectId: Project["id"];
- buildId: Build["id"];
- data: Pick<Page, "name" | "path"> &
- Partial<Omit<Page, "id" | "name" | "path">>;
-}) => {
- const build = await loadBuildById({ projectId, buildId });
- const currentPages = build.pages;
- const currentInstances = build.instances;
-
- const instances = createNewPageInstances();
- const [rootInstanceId] = instances[0];
-
- const updatedPages = Pages.parse({
- homePage: currentPages.homePage,
- pages: [
- ...currentPages.pages,
- {
- id: nanoid(),
- rootInstanceId,
- name: data.name,
- path: data.path,
- title: data.title ?? data.name,
- meta: data.meta ?? {},
- },
- ],
- } satisfies Pages);
-
- const updatedBuild = await prisma.build.update({
- where: {
- id_projectId: { projectId, id: buildId },
- },
- data: {
- pages: JSON.stringify(updatedPages),
- instances: serializeInstances(
- new Map([...currentInstances, ...instances])
- ),
- },
- });
- return parseBuild(updatedBuild);
-};
-
export const editPage = async ({
projectId,
buildId,
diff --git a/packages/project-build/src/db/pages.ts b/packages/project-build/src/db/pages.ts
new file mode 100644
index 0000000000..8446ed1e52
--- /dev/null
+++ b/packages/project-build/src/db/pages.ts
@@ -0,0 +1,42 @@
+import { applyPatches, type Patch } from "immer";
+import { type Project, type Build, prisma } from "@webstudio-is/prisma-client";
+import {
+ authorizeProject,
+ type AppContext,
+} from "@webstudio-is/trpc-interface/server";
+import { Pages } from "../schema/pages";
+
+export const patchPages = async (
+ { buildId, projectId }: { buildId: Build["id"]; projectId: Project["id"] },
+ patches: Array<Patch>,
+ context: AppContext
+) => {
+ const canEdit = await authorizeProject.hasProjectPermit(
+ { projectId, permit: "edit" },
+ context
+ );
+
+ if (canEdit === false) {
+ throw new Error("You don't have edit access to this project");
+ }
+
+ const build = await prisma.build.findUnique({
+ where: {
+ id_projectId: { projectId, id: buildId },
+ },
+ });
+ if (build === null) {
+ return;
+ }
+ const pages = Pages.parse(JSON.parse(build.pages));
+ const patchedPages = Pages.parse(applyPatches(pages, patches));
+
+ await prisma.build.update({
+ data: {
+ pages: JSON.stringify(patchedPages),
+ },
+ where: {
+ id_projectId: { projectId, id: buildId },
+ },
+ });
+};
diff --git a/packages/project-build/src/index.server.ts b/packages/project-build/src/index.server.ts
index b5df2e8062..793ba3dfb9 100644
--- a/packages/project-build/src/index.server.ts
+++ b/packages/project-build/src/index.server.ts
@@ -1,4 +1,5 @@
export * from "./db/build";
+export * from "./db/pages";
export * from "./db/breakpoints";
export * from "./db/styles";
export * from "./db/style-sources";