Skip to content

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

Hide the separator in breakout menu if not needed (#71937)

Nick Fitzpatrick05a0cd9db271
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
index a6839123f18..4f679ccb686 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
@@ -230,9 +230,11 @@ export function MetricPill({
>
{breakoutDimension ? t`Change breakout` : t`Break out`}
</Menu.Item>
- <Menu.Divider />
</>
)}
+ {(hasDataStudioAccess || metric.sourceType === "metric") && (
+ <Menu.Divider role="separator" />
+ )}
{hasDataStudioAccess && (
<Menu.Item
leftSection={<Icon name="pencil" />}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.unit.spec.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.unit.spec.tsx
new file mode 100644
index 00000000000..7a4cbeab48a
--- /dev/null
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.unit.spec.tsx
@@ -0,0 +1,85 @@
+import { fireEvent, screen } from "@testing-library/react";
+
+import { renderWithProviders } from "__support__/ui";
+import { createMockUser } from "metabase-types/api/mocks";
+import { createMockState } from "metabase-types/store/mocks";
+
+import type {
+ MetricsViewerDefinitionEntry,
+ SelectedMetric,
+} from "../../../types/viewer-state";
+
+import { MetricPill } from "./MetricPill";
+
+const defaultDefinitionEntry: MetricsViewerDefinitionEntry = {
+ id: "measure:1",
+ definition: null,
+};
+
+function setup({
+ metric,
+ hasDataStudioAccess = false,
+}: {
+ metric: SelectedMetric;
+ hasDataStudioAccess?: boolean;
+}) {
+ const state = createMockState({
+ currentUser: createMockUser({
+ is_superuser: hasDataStudioAccess,
+ }),
+ });
+
+ renderWithProviders(
+ <MetricPill
+ metric={metric}
+ definitionEntry={defaultDefinitionEntry}
+ selectedMetricIds={new Set()}
+ selectedMeasureIds={new Set()}
+ onSwap={jest.fn()}
+ onRemove={jest.fn()}
+ onSetBreakout={jest.fn()}
+ />,
+ { storeInitialState: state },
+ );
+}
+
+function openContextMenu() {
+ const pill = screen.getByTestId("metrics-viewer-search-pill");
+ fireEvent.contextMenu(pill);
+}
+
+describe("MetricPill context menu", () => {
+ it("should not show bottom menu items for a measure without data studio access", () => {
+ setup({
+ metric: { id: 1, name: "Revenue", sourceType: "measure" },
+ });
+ openContextMenu();
+
+ expect(screen.queryByRole("separatar")).not.toBeInTheDocument();
+
+ expect(screen.queryByText("Edit in Data Studio")).not.toBeInTheDocument();
+ expect(
+ screen.queryByText("Go to metric home page"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should show 'Go to metric home page' for metric source type", () => {
+ setup({
+ metric: { id: 1, name: "Revenue", sourceType: "metric" },
+ });
+ openContextMenu();
+
+ expect(screen.getByRole("separator")).toBeInTheDocument();
+ expect(screen.getByText("Go to metric home page")).toBeInTheDocument();
+ });
+
+ it("should show 'Edit in Data Studio' when user has data studio access", () => {
+ setup({
+ metric: { id: 1, name: "Revenue", sourceType: "measure" },
+ hasDataStudioAccess: true,
+ });
+ openContextMenu();
+ expect(screen.getByRole("separator")).toBeInTheDocument();
+ expect(screen.getByText("Edit in Data Studio")).toBeInTheDocument();
+ });
+});