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 share and publish buttons if not owner (#952)
Ivan Starkovd00c646b1063
diff --git a/apps/designer/app/designer/features/topbar/menu/menu.tsx b/apps/designer/app/designer/features/topbar/menu/menu.tsxindex 5374abf464..4b6b6ec290 100644--- a/apps/designer/app/designer/features/topbar/menu/menu.tsx+++ b/apps/designer/app/designer/features/topbar/menu/menu.tsx@@ -13,6 +13,7 @@ import {DropdownMenuCheckboxItem,DropdownMenuSeparator,DropdownMenuPortal,+ Tooltip,} from "@webstudio-is/design-system";import { type Publish } from "~/shared/pubsub";import { ShortcutHint } from "./shortcut-hint";@@ -33,6 +34,7 @@ import {} from "~/shared/nano-states";import { deleteInstance } from "~/shared/instance-utils";import { MenuButton } from "./menu-button";+import { useAuthPermit } from "~/shared/nano-states";const ThemeMenuItem = () => {if (isFeatureEnabled("dark") === false) {@@ -101,6 +103,18 @@ export const Menu = ({ publish }: MenuProps) => {const [, setIsPublishOpen] = useIsPublishDialogOpen();const [isPreviewMode, setIsPreviewMode] = useIsPreviewMode();const [isMenuOpen, setIsMenuOpen] = useState(false);+ const [authPermit] = useAuthPermit();++ const isPublishDisabled = authPermit !== "own";+ const isShareDisabled = authPermit !== "own";++ const disabledPublishTooltipContent = isPublishDisabled+ ? "Only owner can publish projects"+ : undefined;++ const disabledShareTooltipContent = isPublishDisabled+ ? "Only owner can share projects"+ : undefined;return (<DropdownMenu open={isMenuOpen} onOpenChange={setIsMenuOpen}>@@ -231,20 +245,28 @@ export const Menu = ({ publish }: MenuProps) => {<ShortcutHint value={["cmd", "shift", "p"]} /></DropdownMenuItemRightSlot></DropdownMenuItem>- <DropdownMenuItem- onSelect={() => {- setIsShareOpen(true);- }}- >- Share- </DropdownMenuItem>- <DropdownMenuItem- onSelect={() => {- setIsPublishOpen(true);- }}- >- Publish- </DropdownMenuItem>++ <Tooltip side="right" content={disabledShareTooltipContent}>+ <DropdownMenuItem+ onSelect={() => {+ setIsShareOpen(true);+ }}+ disabled={isShareDisabled}+ >+ Share+ </DropdownMenuItem>+ </Tooltip>++ <Tooltip side="right" content={disabledPublishTooltipContent}>+ <DropdownMenuItem+ onSelect={() => {+ setIsPublishOpen(true);+ }}+ disabled={isPublishDisabled}+ >+ Publish+ </DropdownMenuItem>+ </Tooltip></DropdownMenuContent></DropdownMenuPortal></DropdownMenu>diff --git a/apps/designer/app/designer/features/topbar/publish.tsx b/apps/designer/app/designer/features/topbar/publish.tsxindex e3efe39d41..818b797e9a 100644--- a/apps/designer/app/designer/features/topbar/publish.tsx+++ b/apps/designer/app/designer/features/topbar/publish.tsx@@ -2,22 +2,25 @@ import { useEffect, useState } from "react";import { useFetcher } from "@remix-run/react";import { ExternalLinkIcon } from "@webstudio-is/icons";import {- DeprecatedText2,+ Text,Button,Flex,- DeprecatedLabel,+ Label,Link,- DeprecatedPopover,- DeprecatedPopoverTrigger,- DeprecatedPopoverContent,- DeprecatedPopoverPortal,TextField,useId,+ Tooltip,+ FloatingPanelPopover,+ FloatingPanelAnchor,+ FloatingPanelPopoverTrigger,+ FloatingPanelPopoverContent,+ FloatingPanelPopoverTitle,} from "@webstudio-is/design-system";import { useIsPublishDialogOpen } from "../../shared/nano-states";import type { Project } from "@webstudio-is/project";import { getPublishedUrl, restPublishPath } from "~/shared/router-utils";import { theme } from "@webstudio-is/design-system";+import { useAuthPermit } from "~/shared/nano-states";type PublishButtonProps = { project: Project };const Content = ({ project }: PublishButtonProps) => {@@ -31,12 +34,10 @@ const Content = ({ project }: PublishButtonProps) => {}, [domain]);return (- <DeprecatedPopoverContent- css={{ padding: theme.spacing[9] }}- hideArrow={true}- onFocusOutside={(event) => {- // Used to prevent closing when opened from the main dropdown menu- event.preventDefault();+ <Flex+ direction="column"+ css={{+ padding: theme.spacing[9],}}><fetcher.Form method="post" action={restPublishPath()}>@@ -50,44 +51,58 @@ const Content = ({ project }: PublishButtonProps) => {gap: theme.spacing[0],}}>- <DeprecatedText2 truncate>- {new URL(getPublishedUrl(domain)).host}- </DeprecatedText2>+ <Text truncate>{new URL(getPublishedUrl(domain)).host}</Text><ExternalLinkIcon /></Link>)}<Flex gap="2" align="center"><input type="hidden" name="projectId" value={project.id} />- <DeprecatedLabel htmlFor={id}>Domain:</DeprecatedLabel>+ <Label htmlFor={id}>Domain:</Label><TextField id={id} name="domain" defaultValue={domain} /></Flex>{fetcher.data?.errors !== undefined && (- <DeprecatedText2 color="error">- {fetcher.data?.errors}- </DeprecatedText2>+ <Text color="destructive">{fetcher.data?.errors}</Text>)}- <Button- state={fetcher.state !== "idle" ? "pending" : "auto"}- type="submit"- >- {fetcher.state !== "idle" ? "Publishing" : "Publish"}- </Button>+ <Flex css={{ paddingTop: theme.spacing["2"] }}>+ <Button+ state={fetcher.state !== "idle" ? "pending" : "auto"}+ type="submit"+ css={{ flexGrow: 1 }}+ >+ {fetcher.state !== "idle" ? "Publishing" : "Publish"}+ </Button>+ </Flex></Flex></fetcher.Form>- </DeprecatedPopoverContent>+ </Flex>);};export const PublishButton = ({ project }: PublishButtonProps) => {const [isOpen, setIsOpen] = useIsPublishDialogOpen();+ const [authPermit] = useAuthPermit();++ const isPublishDisabled = authPermit !== "own";+ const tooltipContent = isPublishDisabled+ ? "Only owner can publish projects"+ : undefined;+return (- <DeprecatedPopover open={isOpen} onOpenChange={setIsOpen}>- <DeprecatedPopoverTrigger asChild aria-label="Publish">- <Button color="positive">Publish</Button>- </DeprecatedPopoverTrigger>- <DeprecatedPopoverPortal>+ <FloatingPanelPopover modal open={isOpen} onOpenChange={setIsOpen}>+ <FloatingPanelAnchor>+ <Tooltip side="bottom" content={tooltipContent}>+ <FloatingPanelPopoverTrigger asChild>+ <Button disabled={isPublishDisabled} color="positive">+ Publish+ </Button>+ </FloatingPanelPopoverTrigger>+ </Tooltip>+ </FloatingPanelAnchor>++ <FloatingPanelPopoverContent css={{ zIndex: theme.zIndices[1] }}><Content project={project} />- </DeprecatedPopoverPortal>- </DeprecatedPopover>+ <FloatingPanelPopoverTitle>Publish</FloatingPanelPopoverTitle>+ </FloatingPanelPopoverContent>+ </FloatingPanelPopover>);};diff --git a/apps/designer/app/designer/features/topbar/share.tsx b/apps/designer/app/designer/features/topbar/share.tsxindex 62784f7278..80c999fcdd 100644--- a/apps/designer/app/designer/features/topbar/share.tsx+++ b/apps/designer/app/designer/features/topbar/share.tsx@@ -4,17 +4,37 @@ import {FloatingPanelPopoverContent,FloatingPanelPopoverTitle,FloatingPanelPopoverTrigger,+ FloatingPanelAnchor,theme,+ Tooltip,} from "@webstudio-is/design-system";import type { Project } from "@webstudio-is/prisma-client";import { ShareProjectContainer } from "~/shared/share-project";+import { useAuthPermit } from "~/shared/nano-states";+import { useIsShareDialogOpen } from "~/designer/shared/nano-states";export const ShareButton = ({ projectId }: { projectId: Project["id"] }) => {+ const [isShareOpen, setIsShareOpen] = useIsShareDialogOpen();+ const [authPermit] = useAuthPermit();++ const isShareDisabled = authPermit !== "own";+ const tooltipContent = isShareDisabled+ ? "Only owner can share projects"+ : undefined;+return (- <FloatingPanelPopover modal>- <FloatingPanelPopoverTrigger asChild>- <Button>Share</Button>- </FloatingPanelPopoverTrigger>+ <FloatingPanelPopover+ modal+ open={isShareOpen}+ onOpenChange={setIsShareOpen}+ >+ <FloatingPanelAnchor>+ <Tooltip side="bottom" content={tooltipContent}>+ <FloatingPanelPopoverTrigger asChild>+ <Button disabled={isShareDisabled}>Share</Button>+ </FloatingPanelPopoverTrigger>+ </Tooltip>+ </FloatingPanelAnchor><FloatingPanelPopoverContent css={{ zIndex: theme.zIndices[1] }}><ShareProjectContainer projectId={projectId} />diff --git a/packages/design-system/src/components/floating-panel-popover.tsx b/packages/design-system/src/components/floating-panel-popover.tsxindex 8883f6eae1..684c7a1e4f 100644--- a/packages/design-system/src/components/floating-panel-popover.tsx+++ b/packages/design-system/src/components/floating-panel-popover.tsx@@ -58,3 +58,4 @@ export const FloatingPanelPopoverTitle = ({export const FloatingPanelPopoverTrigger = Primitive.Trigger;export const FloatingPanelPopoverClose = Primitive.Close;+export const FloatingPanelAnchor = Primitive.Anchor;