Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Restyle the sharing popover with Copy link and Embed buttons above the actions list (#78584)

Andrei Chernykhf275c0735d19
diff --git a/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js b/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
index 18b1264644b..e2cf5926afd 100644
--- a/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
+++ b/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
@@ -30,7 +30,7 @@ const { H } = cy;
H.openSharingMenu();
H.sharingMenu()
- .findByRole("menuitem", { name: "Embed" })
+ .findByRole("button", { name: "Embed" })
.should("be.visible")
.and("be.enabled")
.click();
@@ -153,7 +153,7 @@ const { H } = cy;
cy.findByText("Enable").should("not.exist");
});
- H.sharingMenu().findByRole("menuitem", { name: "Embed" }).click();
+ H.sharingMenu().findByRole("button", { name: "Embed" }).click();
});
});
diff --git a/e2e/test/scenarios/sharing/subscriptions.cy.spec.js b/e2e/test/scenarios/sharing/subscriptions.cy.spec.js
index 9d4310d046f..daa7c0625c6 100644
--- a/e2e/test/scenarios/sharing/subscriptions.cy.spec.js
+++ b/e2e/test/scenarios/sharing/subscriptions.cy.spec.js
@@ -906,7 +906,7 @@ describe("scenarios > dashboard > subscriptions", () => {
H.visitDashboard(ORDERS_DASHBOARD_ID);
H.openSharingMenu();
- H.sharingMenu().findByRole("menuitem", { name: "Embed" }).click();
+ H.sharingMenu().findByRole("button", { name: "Embed" }).click();
cy.findByLabelText("Metabase account (SSO)").click();
embedModalEnableEmbedding();
cy.findByLabelText("Allow subscriptions").check().should("be.checked");
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx
index 6a737e3b84d..dfb8385d3d8 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx
@@ -7,12 +7,10 @@ import {
getIsDashCardsRunning,
getSelectedTabId,
} from "metabase/dashboard/selectors";
+import { CopyLinkButton } from "metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton";
+import { EmbedButton } from "metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton";
import { InviteToViewModal } from "metabase/embedding/components/SharingMenu/InviteToViewModal";
-import {
- CopyLinkMenuItem,
- CopyPublicLinkMenuItem,
-} from "metabase/embedding/components/SharingMenu/MenuItems/CopyLinkMenuItem";
-import { EmbedMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem";
+import { CopyPublicLinkMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/CopyPublicLinkMenuItem";
import { ExportPdfMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/ExportPdfMenuItem";
import { InviteToViewMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/InviteToViewMenuItem";
import { PublicLinkMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem";
@@ -47,7 +45,7 @@ export function DashboardSharingMenu({ dashboard }: { dashboard: Dashboard }) {
}
// Copies the app link, pointing at the tab the user is looking at when there is one.
-function CopyDashboardLinkMenuItem({ dashboard }: { dashboard: Dashboard }) {
+function CopyDashboardLinkButton({ dashboard }: { dashboard: Dashboard }) {
const siteUrl = useSetting("site-url");
const selectedTabId = useSelector(getSelectedTabId);
const hasMultipleTabs = (dashboard.tabs?.length ?? 0) > 1;
@@ -55,7 +53,7 @@ function CopyDashboardLinkMenuItem({ dashboard }: { dashboard: Dashboard }) {
hasMultipleTabs && selectedTabId != null ? selectedTabId : undefined;
return (
- <CopyLinkMenuItem
+ <CopyLinkButton
url={`${siteUrl}${getDashboardUrl(dashboard, { tabId })}`}
/>
);
@@ -89,21 +87,26 @@ function AdminDashboardSharingMenu({ dashboard }: { dashboard: Dashboard }) {
return (
<Flex>
- <SharingMenu>
+ <SharingMenu
+ actions={
+ <>
+ <CopyDashboardLinkButton dashboard={dashboard} />
+ {canShare && (
+ <EmbedButton
+ onClick={() => setModalType(GUEST_EMBED_EMBEDDING_TYPE)}
+ />
+ )}
+ </>
+ }
+ >
<InviteToViewMenuItem onClick={openInvite} />
- <CopyDashboardLinkMenuItem dashboard={dashboard} />
+ <ExportPdfMenuItem dashboard={dashboard} loading={isDashCardsRunning} />
{canShare && isPublicSharingEnabled && (hasPublicLink || canWrite) && (
<PublicLinkMenuItem
hasPublicLink={hasPublicLink}
onClick={() => setModalType("dashboard-public-link")}
/>
)}
- {canShare && (
- <EmbedMenuItem
- onClick={() => setModalType(GUEST_EMBED_EMBEDDING_TYPE)}
- />
- )}
- <ExportPdfMenuItem dashboard={dashboard} loading={isDashCardsRunning} />
</SharingMenu>
{modalType === "dashboard-public-link" && (
<DashboardPublicLinkPopover
@@ -133,15 +136,14 @@ function NonAdminDashboardSharingMenu({ dashboard }: { dashboard: Dashboard }) {
const publicUuid = dashboard.public_uuid;
return (
- <SharingMenu>
- <CopyDashboardLinkMenuItem dashboard={dashboard} />
+ <SharingMenu actions={<CopyDashboardLinkButton dashboard={dashboard} />}>
+ <ExportPdfMenuItem dashboard={dashboard} loading={isDashCardsRunning} />
{publicUuid && (
<CopyPublicLinkMenuItem
url={getPublicDashboardUrl(publicUuid)}
onCopied={() => trackPublicLinkCopied({ artifact: "dashboard" })}
/>
)}
- <ExportPdfMenuItem dashboard={dashboard} loading={isDashCardsRunning} />
</SharingMenu>
);
}
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.unit.spec.tsx
index 18601c04024..f0b3fa4e03f 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.unit.spec.tsx
@@ -258,9 +258,8 @@ describe("DashboardSharingMenu", () => {
"http://localhost:3000/dashboard/1-my-cool-dashboard",
),
);
- expect(
- await screen.findByText("Link copied to clipboard"),
- ).toBeInTheDocument();
+ expect(await screen.findByText("Copied")).toBeInTheDocument();
+ expect(screen.queryByText("Copy link")).not.toBeInTheDocument();
});
it("should copy the public link when clicking 'Copy public link'", async () => {
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.module.css b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.module.css
new file mode 100644
index 00000000000..bd3ec5ea5ec
--- /dev/null
+++ b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.module.css
@@ -0,0 +1,26 @@
+/* The hidden pseudo-elements hold both label texts in the same grid cell as
+ the visible label, so the button keeps the width of the wider label and the
+ popover doesn't resize when the label swaps. */
+.labelStack {
+ display: inline-grid;
+ text-align: center;
+}
+
+.labelStack > span,
+.labelStack::before,
+.labelStack::after {
+ grid-area: 1 / 1;
+}
+
+.labelStack::before,
+.labelStack::after {
+ visibility: hidden;
+}
+
+.labelStack::before {
+ content: attr(data-copy-label);
+}
+
+.labelStack::after {
+ content: attr(data-copied-label);
+}
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.tsx b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.tsx
new file mode 100644
index 00000000000..7475fc467ae
--- /dev/null
+++ b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.tsx
@@ -0,0 +1,34 @@
+import { t } from "ttag";
+
+import { Button, CopyButton, Icon } from "metabase/ui";
+
+import { COPY_TIMEOUT_MS } from "../LinkCopiedTooltipLabel";
+
+import S from "./CopyLinkButton.module.css";
+
+export function CopyLinkButton({ url }: { url: string }) {
+ return (
+ <CopyButton value={url} timeout={COPY_TIMEOUT_MS}>
+ {({ copied, copy }) => (
+ <Button
+ variant="filled"
+ h="2rem"
+ px="md"
+ py="sm"
+ leftSection={
+ <Icon name={copied ? "verified_round" : "link"} aria-hidden />
+ }
+ onClick={copy}
+ >
+ <span
+ className={S.labelStack}
+ data-copy-label={t`Copy link`}
+ data-copied-label={t`Copied`}
+ >
+ <span>{copied ? t`Copied` : t`Copy link`}</span>
+ </span>
+ </Button>
+ )}
+ </CopyButton>
+ );
+}
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.unit.spec.tsx b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.unit.spec.tsx
new file mode 100644
index 00000000000..74ab003630d
--- /dev/null
+++ b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton.unit.spec.tsx
@@ -0,0 +1,19 @@
+import { renderWithProviders, screen } from "__support__/ui";
+
+import { CopyLinkButton } from "./CopyLinkButton";
+
+describe("CopyLinkButton", () => {
+ // The label needs an element of its own to share the grid cell with the hidden
+ // pseudo-elements that reserve the button width. A bare text node becomes an
+ // anonymous grid item, which lands on a second row inside the fixed-height button.
+ it("should wrap the label in an element nested in the width-reserving span", () => {
+ renderWithProviders(
+ <CopyLinkButton url="http://localhost:3000/dashboard/1" />,
+ );
+
+ expect(screen.getByText("Copy link").parentElement).toHaveAttribute(
+ "data-copy-label",
+ "Copy link",
+ );
+ });
+});
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton.tsx b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton.tsx
new file mode 100644
index 00000000000..30276980b2b
--- /dev/null
+++ b/frontend/src/metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton.tsx
@@ -0,0 +1,25 @@
+import { t } from "ttag";
+
+import { Button, Icon } from "metabase/ui";
+
+import { useCloseSharingMenu } from "../SharingMenu";
+
+export function EmbedButton({ onClick }: { onClick: () => void }) {
+ const closeMenu = useCloseSharingMenu();
+
+ return (
+ <Button
+ variant="default"
+ h="2rem"
+ px="md"
+ py="sm"
+ leftSection={<Icon name="embed" aria-hidden />}
+ onClick={() => {
+ closeMenu();
+ onClick();
+ }}
+ >
+ {t`Embed`}
+ </Button>
+ );
+}
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/LinkCopiedTooltipLabel.tsx b/frontend/src/metabase/embedding/components/SharingMenu/LinkCopiedTooltipLabel.tsx
index 98e2b1b4e19..3ea49b4c319 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/LinkCopiedTooltipLabel.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/LinkCopiedTooltipLabel.tsx
@@ -2,6 +2,9 @@ import { t } from "ttag";
import { Flex, Icon, Text } from "metabase/ui";
+// how long the copied-confirmation feedback stays visible
+export const COPY_TIMEOUT_MS = 2000;
+
export function LinkCopiedTooltipLabel({ message }: { message?: string }) {
return (
<Flex gap="sm" align="center">
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/CopyLinkMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/CopyLinkMenuItem.tsx
deleted file mode 100644
index 45af1252f47..00000000000
--- a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/CopyLinkMenuItem.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { t } from "ttag";
-
-import { CopyButton, Icon, Menu, Tooltip } from "metabase/ui";
-import type { IconName } from "metabase-types/api";
-
-import { LinkCopiedTooltipLabel } from "../LinkCopiedTooltipLabel";
-
-// how long the copied-confirmation feedback stays visible
-export const COPY_TIMEOUT_MS = 2000;
-
-function CopyMenuItem({
- url,
- icon,
- label,
- copiedMessage,
- onCopied,
-}: {
- url: string;
- icon: IconName;
- label: string;
- copiedMessage: string;
- onCopied?: () => void;
-}) {
- return (
- <CopyButton value={url} timeout={COPY_TIMEOUT_MS}>
- {({ copied, copy }) => (
- <Tooltip
- label={<LinkCopiedTooltipLabel message={copiedMessage} />}
- opened={copied}
- >
- <Menu.Item
- leftSection={<Icon name={icon} aria-hidden />}
- closeMenuOnClick={false}
- onClick={() => {
- copy();
- onCopied?.();
- }}
- >
- {label}
- </Menu.Item>
- </Tooltip>
- )}
- </CopyButton>
- );
-}
-
-export function CopyLinkMenuItem({ url }: { url: string }) {
- return (
- <CopyMenuItem
- url={url}
- icon="link"
- label={t`Copy link`}
- copiedMessage={t`Link copied to clipboard`}
- />
- );
-}
-
-export function CopyPublicLinkMenuItem({
- url,
- onCopied,
-}: {
- url: string;
- onCopied?: () => void;
-}) {
- return (
- <CopyMenuItem
- url={url}
- icon="globe"
- label={t`Copy public link`}
- copiedMessage={t`Public link copied to clipboard`}
- onCopied={onCopied}
- />
- );
-}
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/CopyPublicLinkMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/CopyPublicLinkMenuItem.tsx
new file mode 100644
index 00000000000..4a01a45b400
--- /dev/null
+++ b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/CopyPublicLinkMenuItem.tsx
@@ -0,0 +1,42 @@
+import { t } from "ttag";
+
+import { CopyButton, Icon, Menu, Tooltip } from "metabase/ui";
+
+import {
+ COPY_TIMEOUT_MS,
+ LinkCopiedTooltipLabel,
+} from "../LinkCopiedTooltipLabel";
+
+export function CopyPublicLinkMenuItem({
+ url,
+ onCopied,
+}: {
+ url: string;
+ onCopied?: () => void;
+}) {
+ return (
+ <CopyButton value={url} timeout={COPY_TIMEOUT_MS}>
+ {({ copied, copy }) => (
+ <Tooltip
+ label={
+ <LinkCopiedTooltipLabel
+ message={t`Public link copied to clipboard`}
+ />
+ }
+ opened={copied}
+ >
+ <Menu.Item
+ leftSection={<Icon name="globe" aria-hidden />}
+ closeMenuOnClick={false}
+ onClick={() => {
+ copy();
+ onCopied?.();
+ }}
+ >
+ {t`Copy public link`}
+ </Menu.Item>
+ </Tooltip>
+ )}
+ </CopyButton>
+ );
+}
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx b/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx
deleted file mode 100644
index ad8bc0a6b2f..00000000000
--- a/frontend/src/metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { t } from "ttag";
-
-import { Icon, Menu } from "metabase/ui";
-
-export function EmbedMenuItem({ onClick }: { onClick: () => void }) {
- return (
- <Menu.Item
- data-testid="embed-menu-embed-modal-item"
- leftSection={<Icon name="embed" aria-hidden />}
- onClick={onClick}
- >
- {t`Embed`}
- </Menu.Item>
- );
-}
diff --git a/frontend/src/metabase/embedding/components/SharingMenu/SharingMenu.tsx b/frontend/src/metabase/embedding/components/SharingMenu/SharingMenu.tsx
index 0bcc2a9d72b..aa3bf1a0ed1 100644
--- a/frontend/src/metabase/embedding/components/SharingMenu/SharingMenu.tsx
+++ b/frontend/src/metabase/embedding/components/SharingMenu/SharingMenu.tsx
@@ -1,24 +1,60 @@
-import React from "react";
+import React, { createContext, useCallback, useContext, useState } from "react";
import { t } from "ttag";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
-import { Menu } from "metabase/ui";
+import { Group, Menu } from "metabase/ui";
-export function SharingMenu({ children }: { children: React.ReactNode }) {
- const hasNoChildren = !children || !React.Children.count(children);
+const SharingMenuCloseContext = createContext<() => void>(() => {});
+
+// Buttons in the actions row aren't Menu.Items, so they close the popover through this.
+export function useCloseSharingMenu() {
+ return useContext(SharingMenuCloseContext);
+}
+
+export function SharingMenu({
+ actions,
+ children,
+}: {
+ actions?: React.ReactNode;
+ children?: React.ReactNode;
+}) {
+ const [opened, setOpened] = useState(false);
+ const closeMenu = useCallback(() => setOpened(false), []);
+
+ const hasActions = React.Children.toArray(actions).length > 0;
+ const hasMenuItems = React.Children.toArray(children).length > 0;
return (
- <Menu withinPortal position="bottom-end">
+ <Menu
+ opened={opened}
+ onChange={setOpened}
+ withinPortal
+ position="bottom-end"
+ >
<Menu.Target>
<ToolbarButton
icon="share"
data-testid="sharing-menu-button"
tooltipLabel={t`Share`}
aria-label={t`Share`}
- disabled={hasNoChildren}
+ disabled={!hasActions && !hasMenuItems}
/>
</Menu.Target>
- <Menu.Dropdown data-testid="sharing-menu">{children}</Menu.Dropdown>
+ <Menu.Dropdown data-testid="sharing-menu">
+ <SharingMenuCloseContext.Provider value={closeMenu}>
+ {hasActions && (
+ <Group gap="md" p="sm" grow wrap="nowrap">
+ {actions}
+ </Group>
+ )}
+ {/* mx cancels the 0.75rem dropdown padding so the divider runs edge to edge;
+ mt mirrors it so the buttons get the same gap below as above */}
+ {hasActions && hasMenuItems && (
+ <Menu.Divider mx="-0.75rem" mt="0.75rem" />
+ )}
+ {children}
+ </SharingMenuCloseContext.Provider>
+ </Menu.Dropdown>
</Menu>
);
}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx
index cc6e1ed827a..d71b97150f9 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx
@@ -4,14 +4,14 @@ import { t } from "ttag";
import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";
import { useSetting } from "metabase/common/hooks";
+import { CopyLinkButton } from "metabase/embedding/components/SharingMenu/ActionButtons/CopyLinkButton";
+import { EmbedButton } from "metabase/embedding/components/SharingMenu/ActionButtons/EmbedButton";
import { InviteToViewModal } from "metabase/embedding/components/SharingMenu/InviteToViewModal";
-import { LinkCopiedTooltipLabel } from "metabase/embedding/components/SharingMenu/LinkCopiedTooltipLabel";
import {
COPY_TIMEOUT_MS,
- CopyLinkMenuItem,
- CopyPublicLinkMenuItem,
-} from "metabase/embedding/components/SharingMenu/MenuItems/CopyLinkMenuItem";
-import { EmbedMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/EmbedMenuItem";
+ LinkCopiedTooltipLabel,
+} from "metabase/embedding/components/SharingMenu/LinkCopiedTooltipLabel";
+import { CopyPublicLinkMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/CopyPublicLinkMenuItem";
import { InviteToViewMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/InviteToViewMenuItem";
import { PublicLinkMenuItem } from "metabase/embedding/components/SharingMenu/MenuItems/PublicLinkMenuItem";
import {
@@ -79,10 +79,6 @@ function useQuestionAppUrl(question: Question) {
);
}
-function CopyQuestionLinkMenuItem({ question }: { question: Question }) {
- return <CopyLinkMenuItem url={useQuestionAppUrl(question)} />;
-}
-
function AdminQuestionSharingMenu({ question }: { question: Question }) {
const { modalType, setModalType } = useSharingModal<QuestionSharingModalType>(
{
@@ -103,18 +99,23 @@ function AdminQuestionSharingMenu({ question }: { question: Question }) {
return (
<Flex>
- <SharingMenu>
+ <SharingMenu
+ actions={
+ <>
+ <CopyLinkButton url={shareUrl} />
+ <EmbedButton
+ onClick={() => setModalType(GUEST_EMBED_EMBEDDING_TYPE)}
+ />
+ </>
+ }
+ >
<InviteToViewMenuItem onClick={openInvite} />
- <CopyQuestionLinkMenuItem question={question} />
{isPublicSharingEnabled && (hasPublicLink || canWrite) && (
<PublicLinkMenuItem
hasPublicLink={hasPublicLink}
onClick={() => setModalType("question-public-link")}
/>
)}
- <EmbedMenuItem
- onClick={() => setModalType(GUEST_EMBED_EMBEDDING_TYPE)}
- />
</SharingMenu>
{modalType === "question-public-link" && (
<QuestionPublicLinkPopover
@@ -141,18 +142,18 @@ function AdminQuestionSharingMenu({ question }: { question: Question }) {
);
}
-// Non-admins can't create public links. When one already exists they get a
-// menu with both copy options; otherwise the button copies the app link directly.
+// Non-admins can't create public links. When one already exists they get the
+// popover with both copy options; otherwise the button copies the app link directly.
function NonAdminQuestionSharingMenu({ question }: { question: Question }) {
+ const appUrl = useQuestionAppUrl(question);
const publicUuid = question.publicUUID?.();
if (!publicUuid) {
- return <CopyQuestionLinkButton question={question} />;
+ return <CopyQuestionLinkButton url={appUrl} />;
}
return (
- <SharingMenu>
- <CopyQuestionLinkMenuItem question={question} />
+ <SharingMenu actions={<CopyLinkButton url={appUrl} />}>
<CopyPublicLinkMenuItem
url={getPublicQuestionUrl({ uuid: publicUuid })}
onCopied={() =>
@@ -163,9 +164,7 @@ function NonAdminQuestionSharingMenu({ question }: { question: Question }) {
);
}
-function CopyQuestionLinkButton({ question }: { question: Question }) {
- const url = useQuestionAppUrl(question);
-
+function CopyQuestionLinkButton({ url }: { url: string }) {
return (
<CopyButton value={url} timeout={COPY_TIMEOUT_MS}>
{({ copied, copy }) => (
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.unit.spec.tsx
index 2d2f44cd717..d38d98ab97d 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.unit.spec.tsx
@@ -171,9 +171,8 @@ describe("QuestionSharingMenu", () => {
"http://localhost:3000/question/1-my-cool-question",
),
);
- expect(
- await screen.findByText("Link copied to clipboard"),
- ).toBeInTheDocument();
+ expect(await screen.findByText("Copied")).toBeInTheDocument();
+ expect(screen.queryByText("Copy link")).not.toBeInTheDocument();
});
it("should copy the public link from the menu", async () => {