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
Disable sync for user/token with "view" permit and show view mode icon (#941)
Ivan Starkov5af9c4e5d4aa
diff --git a/apps/designer/app/designer/designer.tsx b/apps/designer/app/designer/designer.tsxindex d0f09154bf..80bb83e515 100644--- a/apps/designer/app/designer/designer.tsx+++ b/apps/designer/app/designer/designer.tsx@@ -33,6 +33,7 @@ import { usePublishShortcuts } from "./shared/shortcuts";import {useDragAndDropState,useIsPreviewMode,+ useSetAuthPermit,useSetIsPreviewMode,} from "~/shared/nano-states";import { useClientSettings } from "./shared/client-settings";@@ -40,6 +41,7 @@ import { Navigator } from "./features/sidebar-left";import { getBuildUrl } from "~/shared/router-utils";import { useCopyPasteInstance } from "~/shared/copy-paste";import { AssetsProvider } from "./shared/assets";+import type { AuthPermit } from "@webstudio-is/trpc-interface";registerContainers();export const links = () => {@@ -247,7 +249,7 @@ export type DesignerProps = {buildOrigin: string;authReadToken: string;authToken?: string;- authPermit: "view" | "build" | "own";+ authPermit: AuthPermit;};export const Designer = ({@@ -261,13 +263,20 @@ export const Designer = ({authToken,authPermit,}: DesignerProps) => {+ useSetAuthPermit(authPermit);useSubscribeBreakpoints();useSetProject(project);useSetPages(pages);useSetCurrentPageId(pageId);const [publish, publishRef] = usePublish();useDesignerStore(publish);- useSyncServer({ buildId, treeId, projectId: project.id, authToken });+ useSyncServer({+ buildId,+ treeId,+ projectId: project.id,+ authToken,+ authPermit,+ });useSharedShortcuts();useSetIsPreviewMode(authPermit === "view");const [isPreviewMode] = useIsPreviewMode();diff --git a/apps/designer/app/designer/features/topbar/topbar.tsx b/apps/designer/app/designer/features/topbar/topbar.tsxindex 402bf6dacb..3711805044 100644--- a/apps/designer/app/designer/features/topbar/topbar.tsx+++ b/apps/designer/app/designer/features/topbar/topbar.tsx@@ -9,6 +9,7 @@ import { Breakpoints } from "../breakpoints";import type { Page, Project } from "@webstudio-is/project";import { theme } from "@webstudio-is/design-system";import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import { ViewMode } from "./view-mode";const topbarContainerStyle = css({background: theme.colors.backgroundTopbar,@@ -53,6 +54,7 @@ export const Topbar = ({ gridArea, project, page, publish }: TopbarProps) => {gap="2"css={{ width: theme.spacing[30] }}>+ <ViewMode /><SyncStatus /><PreviewButton />{isFeatureEnabled("share2") && <ShareButton projectId={project.id} />}diff --git a/apps/designer/app/designer/features/topbar/view-mode.tsx b/apps/designer/app/designer/features/topbar/view-mode.tsxnew file mode 100644index 0000000000..93d1c6471e--- /dev/null+++ b/apps/designer/app/designer/features/topbar/view-mode.tsx@@ -0,0 +1,30 @@+import {+ Flex,+ AccessibleIcon,+ rawTheme,+ Tooltip,+} from "@webstudio-is/design-system";+import { CloudIcon } from "@webstudio-is/icons";+import { useAuthPermit } from "~/shared/nano-states";++export const ViewMode = () => {+ const [authPermit] = useAuthPermit();++ if (authPermit !== "view") {+ return null;+ }++ return (+ <Flex align="center" justify="center">+ <AccessibleIcon label={`View mode`}>+ <Tooltip+ variant="wrapped"+ content={<>View mode. Your changes will not be saved</>}+ >+ {/* @todo replace the icon, waiting for figma */}+ <CloudIcon width={20} height={20} color={rawTheme.colors.yellow10} />+ </Tooltip>+ </AccessibleIcon>+ </Flex>+ );+};diff --git a/apps/designer/app/designer/shared/sync/sync-server.ts b/apps/designer/app/designer/shared/sync/sync-server.tsindex 983ab02cea..29ed90e17c 100644--- a/apps/designer/app/designer/shared/sync/sync-server.ts+++ b/apps/designer/app/designer/shared/sync/sync-server.ts@@ -5,6 +5,7 @@ import { restPatchPath } from "~/shared/router-utils";import { useEffect } from "react";import { enqueue, dequeue, queueStatus } from "./queue";import { useBeforeUnload } from "react-use";+import { AuthPermit } from "@webstudio-is/trpc-interface";// Periodic check for new entries to group them into one job/call in sync queue.const NEW_ENTRIES_INTERVAL = 1000;@@ -44,8 +45,13 @@ const useNewEntriesCheck = ({buildId,projectId,authToken,+ authPermit,}: UserSyncServerProps) => {useEffect(() => {+ if (authPermit === "view") {+ return;+ }+// @todo setInterval can be completely avoided.// Right now prisma can't do atomic updates yet with sandbox documents// and backend fetches and updates big objects, so if we send quickly,@@ -71,7 +77,7 @@ const useNewEntriesCheck = ({}, NEW_ENTRIES_INTERVAL);return () => clearInterval(intervalId);- }, [treeId, buildId, projectId, authToken]);+ }, [treeId, buildId, projectId, authToken, authPermit]);};type UserSyncServerProps = {@@ -79,6 +85,7 @@ type UserSyncServerProps = {treeId: Tree["id"];projectId: Project["id"];authToken: string | undefined;+ authPermit: AuthPermit;};export const useSyncServer = (props: UserSyncServerProps) => {diff --git a/apps/designer/app/routes/designer/$projectId.tsx b/apps/designer/app/routes/designer/$projectId.tsxindex 88ceb7e735..467f0241d6 100644--- a/apps/designer/app/routes/designer/$projectId.tsx+++ b/apps/designer/app/routes/designer/$projectId.tsx@@ -26,13 +26,13 @@ export const loader = async ({const project = await db.project.loadById(params.projectId, context);- // At this point we already knew that if project loaded we have at least "view" permit- // having that getProjectPermit is heavy operation we can skip check "view" permitconst authPermit =(await authorizeProject.getProjectPermit({projectId: project.id,- permits: ["own", "build"],+ // At this point we already knew that if project loaded we have at least "view" permit+ // having that getProjectPermit is heavy operation we can skip check "view" permit+ permits: ["own", "build"] as const,},context)) ?? "view";diff --git a/apps/designer/app/shared/nano-states/nano-states.ts b/apps/designer/app/shared/nano-states/nano-states.tsindex c978b2a95a..b9f5e2a157 100644--- a/apps/designer/app/shared/nano-states/nano-states.ts+++ b/apps/designer/app/shared/nano-states/nano-states.ts@@ -21,6 +21,7 @@ import type {} from "~/designer/shared/assets";import { useSyncInitializeOnce } from "../hook-utils";import { shallowComputed } from "../store-utils";+import type { AuthPermit } from "@webstudio-is/trpc-interface";const useValue = <T>(atom: WritableAtom<T>) => {const value = useStore(atom);@@ -265,6 +266,14 @@ export const useSetIsPreviewMode = (isPreviewMode: boolean) => {});};+const authPermitStore = atom<AuthPermit>("view");+export const useAuthPermit = () => useValue(authPermitStore);+export const useSetAuthPermit = (authPermit: AuthPermit) => {+ useSyncInitializeOnce(() => {+ authPermitStore.set(authPermit);+ });+};+const selectedInstanceOutlineContainer = atom<{visible: boolean;rect?: DOMRect;diff --git a/packages/trpc-interface/src/authorize/project.server.ts b/packages/trpc-interface/src/authorize/project.server.tsindex bcdf6c237f..3e66567790 100644--- a/packages/trpc-interface/src/authorize/project.server.ts+++ b/packages/trpc-interface/src/authorize/project.server.ts@@ -1,4 +1,5 @@import type { Project } from "@webstudio-is/prisma-client";+import { AuthPermit } from "../shared/authorization-router";import type { AppContext } from "../context/context.server";/**@@ -29,12 +30,10 @@ export const registerProjectOwner = async (});};-type Permit = "view" | "edit" | "build" | "own";-export const hasProjectPermit = async (props: {projectId: Project["id"];- permit: Permit;+ permit: AuthPermit;},context: AppContext) => {@@ -114,10 +113,10 @@ export const hasProjectPermit = async (* @todo think about caching to authorizeTrpc.check.query* batching check queries would help too https://github.com/ory/keto/issues/812*/-export const getProjectPermit = async <T extends Permit>(+export const getProjectPermit = async <T extends AuthPermit>(props: {projectId: string;- permits: T[];+ permits: readonly T[];},context: AppContext): Promise<T | undefined> => {diff --git a/packages/trpc-interface/src/index.server.ts b/packages/trpc-interface/src/index.server.tsindex 8da2650aef..ac8eb627c7 100644--- a/packages/trpc-interface/src/index.server.ts+++ b/packages/trpc-interface/src/index.server.ts@@ -4,3 +4,4 @@ export { createTrpcProxyServiceClient } from "./shared/client";export type { AppContext } from "./context/context.server";export * as authorizeProject from "./authorize/project.server";export * as authorizeAuthorizationToken from "./authorize/authorization-token.server";+export type { AuthPermit } from "./shared/authorization-router";diff --git a/packages/trpc-interface/src/shared/authorization-router.ts b/packages/trpc-interface/src/shared/authorization-router.tsindex 8646398f1a..76960d5151 100644--- a/packages/trpc-interface/src/shared/authorization-router.ts+++ b/packages/trpc-interface/src/shared/authorization-router.ts@@ -4,7 +4,8 @@ import { router, procedure } from "./trpc";import { prisma } from "@webstudio-is/prisma-client";const Relation = z.enum(["viewers", "editors", "builders", "owners"]);-const Permit = z.enum(["view", "edit", "build", "own"]);+const AuthPermit = z.enum(["view", "edit", "build", "own"]);+export type AuthPermit = z.infer<typeof AuthPermit>;const DeleteCreateInput = z.discriminatedUnion("namespace", [z.object({@@ -123,7 +124,7 @@ export const authorizationRouter = router({namespace: z.enum(["Project"]),id: z.string(),- permit: Permit,+ permit: AuthPermit,subjectSet: z.object({namespace: z.enum(["User", "Token"]),