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.

Fix page settings (#1085)

Roman Pominov8259b42d357c
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 340e2f4fda..e0face8a38 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
@@ -342,9 +342,34 @@ export const PageSettings = ({
const fetcher = useFetcher<EditPageData>();
- const [pages] = usePages();
+ const [pages, setPages] = usePages();
const page = pages && findPageByIdOrPath(pages, pageId);
+ // Updating client side store like that is a temporary solution
+ // We want to switch pages to immerhin: https://github.com/webstudio-is/webstudio-builder/issues/1084
+ const updateOnClient = (page: Page) => {
+ if (pages === undefined) {
+ return;
+ }
+ if (pages.homePage.id === page.id) {
+ setPages({ homePage: page, pages: pages.pages });
+ return;
+ }
+ setPages({
+ homePage: pages.homePage,
+ pages: pages.pages.map((item) => (item.id === page.id ? page : item)),
+ });
+ };
+ const deleteOnClient = (pageId: Page["id"]) => {
+ if (pages === undefined) {
+ return;
+ }
+ setPages({
+ homePage: pages.homePage,
+ pages: pages.pages.filter((item) => item.id !== pageId),
+ });
+ };
+
const isHomePage = page?.id === pages?.homePage.id;
const [unsavedValues, setUnsavedValues] = useState<Partial<FormPage>>({});
@@ -396,6 +421,8 @@ export const PageSettings = ({
(data) => {
if (data.status === "error") {
toastUnknownFieldErrors(normalizeErrors(data.errors), []);
+ } else {
+ updateOnClient(data.page);
}
}
);
@@ -404,6 +431,8 @@ export const PageSettings = ({
useOnFetchEnd(fetcher, (data) => {
if (data.status === "error") {
setUnsavedValues({ ...submittedValues, ...unsavedValues });
+ } else {
+ updateOnClient(data.page);
}
setSubmittedValues({});
});
@@ -417,6 +446,8 @@ export const PageSettings = ({
(data) => {
if (data.status === "error") {
toastUnknownFieldErrors(normalizeErrors(data.errors), []);
+ } else {
+ deleteOnClient(pageId);
}
}
);
diff --git a/apps/builder/app/routes/rest/pages.$projectId.ts b/apps/builder/app/routes/rest/pages.$projectId.ts
index ca9fe25fe6..351d8a9385 100644
--- a/apps/builder/app/routes/rest/pages.$projectId.ts
+++ b/apps/builder/app/routes/rest/pages.$projectId.ts
@@ -110,14 +110,20 @@ const handlePost = async (
}
}
- await editPage({
+ const updatedBuild = await editPage({
projectId,
buildId: devBuild.id,
pageId: id,
data,
});
- return { status: "ok" };
+ const updatedPage = findPageByIdOrPath(updatedBuild.pages, id);
+
+ if (updatedPage === undefined) {
+ throw new Error("Updated page not found");
+ }
+
+ return { status: "ok", page: updatedPage };
};
const DeletePageInput = zfd.formData({ id: z.string() });
diff --git a/apps/builder/app/shared/pages/types.ts b/apps/builder/app/shared/pages/types.ts
index aed176b5f5..a2f8323258 100644
--- a/apps/builder/app/shared/pages/types.ts
+++ b/apps/builder/app/shared/pages/types.ts
@@ -3,8 +3,7 @@ import type { FetcherData } from "~/shared/form-utils";
export type CreatePageData = FetcherData<{ page: Page }>;
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type EditPageData = FetcherData<{}>;
+export type EditPageData = FetcherData<{ page: Page }>;
// eslint-disable-next-line @typescript-eslint/ban-types
export type DeletePageData = FetcherData<{}>;