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
fix: Disallow home page inside folder (#3044)
Ivan Starkov5e943bb96772
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsxindex ed758e95b4..8055ef7cbd 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx@@ -1,6 +1,12 @@import { nanoid } from "nanoid";import { z } from "zod";-import { type FocusEventHandler, useState, useCallback, useId } from "react";+import {+ type FocusEventHandler,+ useState,+ useCallback,+ useId,+ useEffect,+} from "react";import { useStore } from "@nanostores/react";import { useDebouncedCallback } from "use-debounce";import { useUnmount } from "react-use";@@ -88,6 +94,8 @@ import {deletePageMutable,$pageRootScope,duplicatePage,+ isRootId,+ toTreeData,} from "./page-utils";import { Form } from "./form";import { type System, $publishedOrigin } from "~/builder/features/address-bar";@@ -641,31 +649,54 @@ const FormFields = ({<Grid flow={"column"} gap={1} justify={"start"} align={"center"}>{values.isHomePage ? (- <HomeIcon />+ <>+ <HomeIcon />+ <Text+ css={{+ overflowWrap: "anywhere",+ wordBreak: "break-all",+ }}+ >+ “{values.name}” is the home page+ </Text>+ </>+ ) : isRootId(values.parentFolderId) === false ? (+ <>+ <HomeIcon color={rawTheme.colors.foregroundSubtle} />+ <Text+ css={{+ overflowWrap: "anywhere",+ wordBreak: "break-all",+ }}+ color="subtle"+ >+ Move this page to the “{toTreeData(pages).root.name}” folder+ to set it as your home page+ </Text>+ </>) : (- <Checkbox- id={fieldIds.isHomePage}- onCheckedChange={() => {- onChange({ field: "path", value: "" });- onChange({- field: "isHomePage",- value: !values.isHomePage,- });- }}- />+ <>+ <Checkbox+ id={fieldIds.isHomePage}+ onCheckedChange={() => {+ onChange({ field: "path", value: "" });+ onChange({+ field: "isHomePage",+ value: !values.isHomePage,+ });+ }}+ />+ <Label+ css={{+ overflowWrap: "anywhere",+ wordBreak: "break-all",+ }}+ htmlFor={fieldIds.isHomePage}+ >+ Make “{values.name}” the home page+ </Label>+ </>)}-- <Label- css={{- overflowWrap: "anywhere",- wordBreak: "break-all",- }}- htmlFor={fieldIds.isHomePage}- >- {values.isHomePage- ? `“${values.name}” is the home page`- : `Make “${values.name}” the home page`}- </Label></Grid></Grid>@@ -1293,13 +1324,38 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {throw new Error(`Page with id ${pageId} not found`);}- const tmp = pages.homePage;+ const oldHomePage = pages.homePage;pages.homePage = pages.pages[newHomePageIndex];pages.homePage.path = "";- pages.pages[newHomePageIndex] = tmp;- tmp.path = nameToPath(pages, tmp.name);+ pages.homePage.name = "Home";++ pages.pages[newHomePageIndex] = oldHomePage;++ // For simplicity skip logic in case of names are same i.e. Old Home 1, Old Home 2+ oldHomePage.name = "Old Home";+ oldHomePage.path = nameToPath(pages, oldHomePage.name);++ const rootFolder = pages.folders.find((folder) => isRootId(folder.id));++ if (rootFolder === undefined) {+ throw new Error("Root folder not found");+ }++ if (rootFolder.children === undefined) {+ throw new Error("Root folder must have children");+ }++ // Swap home to the first position in the root folder+ const childIndexOfHome = rootFolder?.children.indexOf(pages.homePage.id);++ if (childIndexOfHome === -1) {+ throw new Error("Both pages must be children of Root folder");+ }++ rootFolder.children[childIndexOfHome] = rootFolder.children[0];+ rootFolder.children[0] = pages.homePage.id;}if (pages.homePage.id === pageId) {@@ -1362,6 +1418,13 @@ export const PageSettings = ({const handleSubmitDebounced = useDebouncedCallback(debouncedFn, 1000);+ const [refreshDebounce, setRefreshDebounce] = useState(0);++ useEffect(() => {+ // we can't flush immediately as setState haven't propagated at that time+ handleSubmitDebounced.flush();+ }, [refreshDebounce, handleSubmitDebounced]);+const handleChange = useCallback(<Name extends FieldName>(event: { field: Name; value: Values[Name] }) => {setUnsavedValues((values) => ({@@ -1369,6 +1432,10 @@ export const PageSettings = ({[event.field]: event.value,}));handleSubmitDebounced();++ if (event.field === "isHomePage") {+ setRefreshDebounce((prev) => prev + 1);+ }},[handleSubmitDebounced]);diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.tsindex 02cb94c0b4..d99b3ebe3a 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts@@ -51,6 +51,10 @@ export type TreeData = TreeFolder | TreePage;type Index = Map<string, TreeData>;+const PAGES_ROOT_ID = "root";++export const isRootId = (id: string) => id === PAGES_ROOT_ID;+/*** Return a nested tree structure from flat pages and folders.* To be used for rendering.@@ -60,6 +64,7 @@ export const toTreeData = (): { root: TreeFolder; index: Index } => {const pagesMap = new Map(pages.pages.map((page) => [page.id, page]));pagesMap.set(pages.homePage.id, pages.homePage);+const foldersMap = new Map(pages.folders.map((folder) => [folder.id, folder]));@@ -89,6 +94,7 @@ export const toTreeData = (continue;}}+return {type: "folder",id: folder.id,@@ -97,7 +103,7 @@ export const toTreeData = (children: Array.from(children.values()),} satisfies TreeFolder;};- const rootFolder = foldersMap.get("root");+ const rootFolder = foldersMap.get(PAGES_ROOT_ID);if (rootFolder === undefined) {throw new Error("Root folder not found");}