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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Update pages with store (#1288)
Bogdan Chadkin92342a22a44a
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.tsxindex a8c4b33a08..07ba1c8917 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@@ -5,7 +5,6 @@ import { useStore } from "@nanostores/react";import { useDebouncedCallback } from "use-debounce";import { useUnmount } from "react-use";import slugify from "slugify";-import { useFetcher } from "@remix-run/react";import {type Page,type Pages,@@ -28,13 +27,13 @@ import {Tooltip,} from "@webstudio-is/design-system";import { ChevronDoubleLeftIcon, TrashIcon } from "@webstudio-is/icons";-import { useOnFetchEnd, usePersistentFetcher } from "~/shared/fetcher";+import { usePersistentFetcher } from "~/shared/fetcher";import {normalizeErrors,toastUnknownFieldErrors,useIds,} from "~/shared/form-utils";-import type { DeletePageData, EditPageData } from "~/shared/pages";+import type { DeletePageData } from "~/shared/pages";import { restPagesPath } from "~/shared/router-utils";import { Header, HeaderSuffixSpacer } from "../../header";import { deleteInstance } from "~/shared/instance-utils";@@ -70,13 +69,47 @@ const PageValues = z.object({description: z.string().optional(),});-const getErrors = (values: Values, isHomePage: boolean): Errors => {+const isPathUnique = (+ pages: Pages,+ // undefined page id means new page+ pageId: undefined | Page["id"],+ path: string+) => {+ const list = [];+ const set = new Set();+ list.push(path);+ set.add(path);+ for (const page of pages.pages) {+ if (page.id !== pageId) {+ list.push(page.path);+ set.add(page.path);+ }+ }+ return list.length === set.size;+};++const validateValues = (+ pages: undefined | Pages,+ // undefined page id means new page+ pageId: undefined | Page["id"],+ values: Values,+ isHomePage: boolean+): Errors => {const Validator = isHomePage ? HomePageValues : PageValues;const parsedResult = Validator.safeParse(values);- if (parsedResult.success) {- return {};+ const errors: Errors = {};+ if (parsedResult.success === false) {+ return parsedResult.error.formErrors.fieldErrors;+ }+ if (+ pages !== undefined &&+ values.path !== undefined &&+ isPathUnique(pages, pageId, values.path) === false+ ) {+ errors.path = errors.path ?? [];+ errors.path.push("All paths must be unique");}- return parsedResult.error.formErrors.fieldErrors;+ return errors;};const toFormPage = (page?: Page): Values => {@@ -231,7 +264,7 @@ export const NewPageSettings = ({title: "Untitled",description: "",});- const errors = getErrors(values, false);+ const errors = validateValues(pages, undefined, values, false);const handleSubmit = () => {if (Object.keys(errors).length === 0) {@@ -351,15 +384,34 @@ const NewPageSettingsView = ({);};-const toFormData = (page: Partial<Values> & { id: string }): FormData => {- const formData = new FormData();- for (const [key, value] of Object.entries(page)) {- // @todo: handle "meta"- if (typeof value === "string") {- formData.append(key, value);+const updatePage = (pageId: Page["id"], values: Partial<Values>) => {+ const updatePageMutable = (page: Page, values: Partial<Values>) => {+ if (values.name !== undefined) {+ page.name = values.name;}- }- return formData;+ if (values.path !== undefined) {+ page.path = values.path;+ }+ if (values.title !== undefined) {+ page.title = values.title;+ }+ if (values.description !== undefined) {+ page.meta.description = values.description;+ }+ };+ store.createTransaction([pagesStore], (pages) => {+ if (pages === undefined) {+ return;+ }+ if (pages.homePage.id === pageId) {+ updatePageMutable(pages.homePage, values);+ }+ for (const page of pages.pages) {+ if (page.id === pageId) {+ updatePageMutable(page, values);+ }+ }+ });};export const PageSettings = ({@@ -375,26 +427,9 @@ export const PageSettings = ({}) => {const submitPersistently = usePersistentFetcher();- const fetcher = useFetcher<EditPageData>();-const pages = useStore(pagesStore);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) {- pagesStore.set({ homePage: page, pages: pages.pages });- return;- }- pagesStore.set({- homePage: pages.homePage,- pages: pages.pages.map((item) => (item.id === page.id ? page : item)),- });- };const deleteOnClient = (pageId: Page["id"]) => {if (pages === undefined) {return;@@ -412,14 +447,12 @@ export const PageSettings = ({const isHomePage = page?.id === pages?.homePage.id;const [unsavedValues, setUnsavedValues] = useState<Partial<Values>>({});- const [submittedValues, setSubmittedValues] = useState<Partial<Values>>({});const values: Values = {...toFormPage(page),- ...submittedValues,...unsavedValues,};- const errors = getErrors(values, isHomePage);+ const errors = validateValues(pages, pageId, values, isHomePage);const handleSubmitDebounced = useDebouncedCallback(() => {if (@@ -428,17 +461,7 @@ export const PageSettings = ({) {return;}-- // We're re-submitting the submittedValues because previous submit is going to be cancelled- // (normally, submittedValues are empty at this point)- const valuesToSubmit = { ...submittedValues, ...unsavedValues };-- fetcher.submit(toFormData({ id: pageId, ...valuesToSubmit }), {- method: "post",- action: restPagesPath({ projectId }),- });-- setSubmittedValues(valuesToSubmit);+ updatePage(pageId, unsavedValues);setUnsavedValues({});}, 1000);@@ -454,31 +477,13 @@ export const PageSettings = ({);useUnmount(() => {- if (Object.keys(unsavedValues).length === 0) {+ if (+ Object.keys(unsavedValues).length === 0 ||+ Object.keys(errors).length !== 0+ ) {return;}- // We use submitPersistently instead of fetcher.submit- // because we don't want the request to be canceled when the component unmounts- submitPersistently<EditPageData>(- toFormData({ id: pageId, ...submittedValues, ...unsavedValues }),- { method: "post", action: restPagesPath({ projectId }) },- (data) => {- if (data.status === "error") {- toastUnknownFieldErrors(normalizeErrors(data.errors), []);- } else {- updateOnClient(data.page);- }- }- );- });-- useOnFetchEnd(fetcher, (data) => {- if (data.status === "error") {- setUnsavedValues({ ...submittedValues, ...unsavedValues });- } else {- updateOnClient(data.page);- }- setSubmittedValues({});+ updatePage(pageId, unsavedValues);});const hanldeDelete = () => {diff --git a/apps/builder/app/routes/rest/pages.$projectId.ts b/apps/builder/app/routes/rest/pages.$projectId.tsindex bc915fa1c1..87250ba613 100644--- a/apps/builder/app/routes/rest/pages.$projectId.ts+++ b/apps/builder/app/routes/rest/pages.$projectId.ts@@ -1,88 +1,15 @@import { zfd } from "zod-form-data";import { z } from "zod";import type { LoaderArgs, ActionArgs } from "@remix-run/node";-import {- type Pages,- pathValidators,- findPageByIdOrPath,-} from "@webstudio-is/project-build";+import type { Pages } from "@webstudio-is/project-build";import {deletePage,- editPage,loadBuildByProjectId,} from "@webstudio-is/project-build/server";import { sentryException } from "~/shared/sentry";-import type { DeletePageData, EditPageData } from "~/shared/pages";+import type { DeletePageData } from "~/shared/pages";import { type FetcherData, makeFieldError } from "~/shared/form-utils";-const nonEmptyString = z- .string({- invalid_type_error: "Can't be empty", // eslint-disable-line camelcase- required_error: "Can't be empty", // eslint-disable-line camelcase- })- .transform((value) => value.trim())- .refine((value) => value !== "", "Can't be empty");--const commonPageInput = {- name: nonEmptyString,- path: pathValidators(- nonEmptyString- .transform((path) =>- path.endsWith("/") && path !== "/" ? path.slice(0, -1) : path- )- .transform((path) => path.replace(/\/\//g, "/"))- ),- title: z.string().optional(),- description: z.string().optional(),-} as const;--const EditPageInput = zfd.formData({- id: z.string(),- name: z.optional(commonPageInput.name),- path: z.optional(commonPageInput.path),- title: z.optional(commonPageInput.title),- description: z.optional(commonPageInput.description),-});--const handlePost = async (- projectId: string,- request: Request-): Promise<EditPageData> => {- const result = EditPageInput.safeParse(await request.formData());- if (result.success === false) {- return { status: "error", errors: result.error.formErrors };- }- const { id, description, ...restData } = result.data;- const data = {- ...restData,- meta: description !== undefined ? { description } : undefined,- };-- const devBuild = await loadBuildByProjectId(projectId, "dev");-- if (data.path !== undefined) {- const existingPage = findPageByIdOrPath(devBuild.pages, data.path);- if (existingPage !== undefined && existingPage.id !== id) {- return makeFieldError("path", `Already used for "${existingPage.name}"`);- }- }-- const updatedBuild = await editPage({- projectId,- buildId: devBuild.id,- pageId: id,- data,- });-- 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() });const handleDelete = async (@@ -119,10 +46,6 @@ export const action = async ({throw new Error(`Project ID required`);}- if (request.method === "POST") {- return await handlePost(params.projectId, request);- }-if (request.method === "DELETE") {return await handleDelete(params.projectId, request);}diff --git a/apps/builder/app/shared/pages/types.ts b/apps/builder/app/shared/pages/types.tsindex 9a67d405de..18b33d04d8 100644--- a/apps/builder/app/shared/pages/types.ts+++ b/apps/builder/app/shared/pages/types.ts@@ -1,7 +1,4 @@-import type { Page } from "@webstudio-is/project-build";import type { FetcherData } from "~/shared/form-utils";-export type EditPageData = FetcherData<{ page: Page }>;-// eslint-disable-next-line @typescript-eslint/ban-typesexport type DeletePageData = FetcherData<{}>;diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.tsindex 6141e3dc67..a745c4a2a2 100644--- a/packages/project-build/src/db/build.ts+++ b/packages/project-build/src/db/build.ts@@ -131,44 +131,6 @@ const createNewPageInstances = (): Build["instances"] => {];};-export const editPage = async ({- projectId,- buildId,- pageId,- data,-}: {- projectId: Project["id"];- buildId: Build["id"];- pageId: Page["id"];- data: Partial<Omit<Page, "id">>;-}) => {- return updatePages({ projectId, buildId }, async (currentPages) => {- const currentPage = findPageByIdOrPath(currentPages, pageId);- if (currentPage === undefined) {- throw new Error(`Page with id "${pageId}" not found`);- }-- const updatedPage: Page = {- id: currentPage.id,- rootInstanceId: currentPage.rootInstanceId,- name: data.name ?? currentPage.name,- path: data.path ?? currentPage.path,- title: data.title ?? currentPage.title,- meta: { ...currentPage.meta, ...data.meta },- };-- return {- homePage:- updatedPage.id === currentPages.homePage.id- ? updatedPage- : currentPages.homePage,- pages: currentPages.pages.map((page) =>- page.id === updatedPage.id ? updatedPage : page- ),- };- });-};-export const deletePage = async ({projectId,buildId,