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 build permission not work on page change inside builder (#1064)
Ivan Starkov7e76a1d4080c
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex bf361c74dc..3a1152060b 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -29,6 +29,7 @@ import {useDragAndDropState,useIsPreviewMode,useSetAuthPermit,+ useSetAuthToken,useSetIsPreviewMode,useSetTreeId,} from "~/shared/nano-states";@@ -256,6 +257,7 @@ export const Builder = ({authToken,authPermit,}: BuilderProps) => {+ useSetAuthToken(authToken);useSetAuthPermit(authPermit);useSetProject(project);useSetTreeId(treeId);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.tsxindex c613edfc7e..b97b42afd3 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@@ -31,6 +31,7 @@ import type { TabName } from "../../types";import { CloseButton, Header } from "../../header";import { SettingsPanel } from "./settings-panel";import { NewPageSettings, PageSettings } from "./settings";+import { useAuthToken } from "~/shared/nano-states";type TabContentProps = {onSetActiveTab: (tabName: TabName) => void;@@ -232,6 +233,7 @@ const PagesPanel = ({export const TabContent = (props: TabContentProps) => {const [currentPageId] = useCurrentPageId();const [project] = useProject();+ const [authToken] = useAuthToken();const navigate = useNavigate();const handleSelect = (pageId: "home" | Page["id"]) => {@@ -242,6 +244,7 @@ export const TabContent = (props: TabContentProps) => {builderPath({projectId: project.id,pageId: pageId === "home" ? undefined : pageId,+ authToken,}));};diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 4cbfae2471..88eda5bcf6 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -326,6 +326,14 @@ export const useSetAuthPermit = (authPermit: AuthPermit) => {});};+const authTokenStore = atom<string | undefined>(undefined);+export const useAuthToken = () => useValue(authTokenStore);+export const useSetAuthToken = (authToken: string | undefined) => {+ useSyncInitializeOnce(() => {+ authTokenStore.set(authToken);+ });+};+const selectedInstanceOutlineContainer = atom<{visible: boolean;rect?: DOMRect;diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex df577a93de..ccd8037324 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -19,10 +19,14 @@ const searchParams = (params: Record<string, string | undefined | null>) => {export const builderPath = ({projectId,pageId,+ authToken,}: {projectId: string;pageId?: string;-}) => `/builder/${projectId}${searchParams({ pageId })}`;+ authToken?: string;+}) => {+ return `/builder/${projectId}${searchParams({ pageId, authToken })}`;+};export const builderUrl = (props: {projectId: string;@@ -31,12 +35,11 @@ export const builderUrl = (props: {authToken?: string;mode?: "edit" | "preview";}) => {- const { projectId, pageId } = props;- const url = new URL(builderPath({ projectId, pageId }), props.origin);-- if (props.authToken !== undefined) {- url.searchParams.set("authToken", props.authToken);- }+ const { projectId, pageId, authToken } = props;+ const url = new URL(+ builderPath({ projectId, pageId, authToken }),+ props.origin+ );if (props.mode !== undefined) {url.searchParams.set("mode", props.mode);