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 empty dashcard menu on visualizer cards whose source card cannot be downloaded (#80113)

Anderson3b6a98b66bc1
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx
index 8b81fe33efe..5a7b9f1feaa 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.tsx
@@ -31,7 +31,7 @@ interface DashCardMenuProps {
dashcard: DashboardCard;
position?: MenuProps["position"];
onEditVisualization?: () => void;
- openUnderlyingQuestionItems?: React.ReactNode;
+ openUnderlyingQuestionItems?: React.ReactNode[];
canEdit?: boolean;
}
@@ -124,7 +124,7 @@ export const DashCardMenu = ({
onEditVisualization={onEditVisualization}
canEdit={canEdit}
/>
- {openUnderlyingQuestionItems && (
+ {!!openUnderlyingQuestionItems?.length && (
<Menu.Sub position="right" shadow="md">
<Menu.Sub.Target>
<Menu.Sub.Item
@@ -169,13 +169,16 @@ export const DashCardMenu = ({
type ShouldRenderDashcardMenuProps = {
question: Question | null;
result?: Dataset;
-} & Pick<DashboardContextReturned, "dashboard" | "dashcardMenu">;
+} & Pick<DashboardContextReturned, "dashboard" | "dashcardMenu"> &
+ Pick<DashCardMenuProps, "canEdit" | "openUnderlyingQuestionItems">;
DashCardMenu.shouldRender = ({
question,
dashboard,
dashcardMenu,
result,
+ canEdit,
+ openUnderlyingQuestionItems,
}: ShouldRenderDashcardMenuProps) => {
if (!question || !dashboard || dashcardMenu === null) {
return null;
@@ -189,6 +192,8 @@ DashCardMenu.shouldRender = ({
return (
!isInternalQuery &&
- (canEditQuestion(question) || canDownloadResults(result))
+ ((canEdit && canEditQuestion(question)) ||
+ canDownloadResults(result) ||
+ !!openUnderlyingQuestionItems?.length)
);
};
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
index f5f58a15bcb..fd45ec4997a 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardMenu/DashCardMenu.unit.spec.tsx
@@ -310,3 +310,62 @@ describe("DashCardMenu", () => {
expect(screen.queryByText("Download results")).not.toBeInTheDocument();
});
});
+
+describe("DashCardMenu.shouldRender", () => {
+ const dashboard = createMockDashboard();
+ const metadata = getMetadata(
+ createMockState({
+ entities: createMockEntitiesState({
+ databases: [createSampleDatabase()],
+ questions: [TEST_CARD],
+ }),
+ }),
+ );
+ const question = checkNotNull(metadata.question(TEST_CARD.id));
+
+ it("should render when the question is editable", () => {
+ expect(
+ DashCardMenu.shouldRender({
+ question,
+ dashboard,
+ result: TEST_RESULT_ERROR,
+ canEdit: true,
+ }),
+ ).toBe(true);
+ });
+
+ it("should not render when editing is disabled and results cannot be downloaded (#64333)", () => {
+ expect(
+ DashCardMenu.shouldRender({
+ question,
+ dashboard,
+ result: TEST_RESULT_ERROR,
+ canEdit: false,
+ }),
+ ).toBe(false);
+ });
+
+ it("should render when editing is disabled but underlying questions can be opened", () => {
+ expect(
+ DashCardMenu.shouldRender({
+ question,
+ dashboard,
+ result: TEST_RESULT_ERROR,
+ canEdit: false,
+ openUnderlyingQuestionItems: [<div key="question" />],
+ }),
+ ).toBe(true);
+ });
+
+ it("should not render when there are no underlying questions to open", () => {
+ expect(
+ DashCardMenu.shouldRender({
+ question,
+ dashboard,
+ result: TEST_RESULT_ERROR,
+ canEdit: false,
+ openUnderlyingQuestionItems: [],
+ }),
+ ).toBe(false);
+ });
+});
diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
index 3bcda27bb60..80a0dcbdb03 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx
@@ -459,6 +459,9 @@ export function DashCardVisualization({
const cardResult = cardId ? datasets?.[cardId] : undefined;
// Unjustified type cast. FIXME
const result = cardResult ?? (series[0] as unknown as Dataset);
+ const isVisualizerCard = isVisualizerDashboardCard(dashcard);
+ const openUnderlyingQuestionItems =
+ onChangeCardAndRun && !cardTitle ? titleMenuItems : undefined;
const showMenu =
question &&
@@ -467,6 +470,8 @@ export function DashCardVisualization({
dashboard,
dashcardMenu,
result,
+ canEdit: !isVisualizerCard,
+ openUnderlyingQuestionItems,
});
const errorStatus =
@@ -499,15 +504,11 @@ export function DashCardVisualization({
question={question}
result={result}
dashcard={dashcard}
- canEdit={!isVisualizerDashboardCard(dashcard)}
+ canEdit={!isVisualizerCard}
onEditVisualization={
- isVisualizerDashboardCard(dashcard)
- ? onEditVisualization
- : undefined
- }
- openUnderlyingQuestionItems={
- onChangeCardAndRun && (cardTitle ? undefined : titleMenuItems)
+ isVisualizerCard ? onEditVisualization : undefined
}
+ openUnderlyingQuestionItems={openUnderlyingQuestionItems}
/>
)}
</Group>
diff --git a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
index d192562e6b2..a9c7b2360df 100644
--- a/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashCard/Dashcard.unit.spec.tsx
@@ -1,7 +1,9 @@
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
+import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import { setupLastDownloadFormatEndpoints } from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
import { createMockEntitiesState } from "__support__/store";
import {
act,
@@ -19,13 +21,18 @@ import {
} from "metabase/dashboard/context/mock-context";
import * as dashboardSelectors from "metabase/dashboard/selectors";
import { registerDashboardVisualizations } from "metabase/dashboard/visualizations/register";
+import { reinitialize } from "metabase/plugins";
import {
createMockDashboardState,
createMockState,
} from "metabase/redux/store/mocks";
import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
import { registerVisualizations } from "metabase/visualizations/register";
-import type { DashCardDataMap } from "metabase-types/api";
+import {
+ type DashCardDataMap,
+ DataPermissionValue,
+ type DownloadPermission,
+} from "metabase-types/api";
import {
createMockActionDashboardCard,
createMockCard,
@@ -44,6 +51,7 @@ import {
createMockStructuredDatasetQuery,
createMockTable,
createMockTextDashboardCard,
+ createMockTokenFeatures,
} from "metabase-types/api/mocks";
import type { DashCardProps } from "./DashCard";
@@ -542,6 +550,114 @@ describe("DashCard", () => {
]);
});
+ describe("visualizer dashcard download permissions", () => {
+ const sourceCard = createMockCard({
+ id: 42,
+ name: "Products by Category",
+ display: "table",
+ dataset_query: {
+ type: "query",
+ database: TEST_DATABASE_ID,
+ query: {
+ "source-table": TEST_TABLE_ID,
+ },
+ },
+ });
+ const visualizerDashcard = createMockDashboardCard({
+ card_id: sourceCard.id,
+ card: sourceCard,
+ visualization_settings: {
+ visualization: {
+ display: "bar",
+ columnValuesMapping: {
+ COLUMN_1: [
+ {
+ sourceId: `card:${sourceCard.id}`,
+ originalName: "CATEGORY",
+ name: "COLUMN_1",
+ },
+ ],
+ COLUMN_2: [
+ {
+ sourceId: `card:${sourceCard.id}`,
+ originalName: "count",
+ name: "COLUMN_2",
+ },
+ ],
+ },
+ settings: {
+ "graph.dimensions": ["COLUMN_1"],
+ "graph.metrics": ["COLUMN_2"],
+ },
+ },
+ },
+ });
+
+ function setupWithDownloadPermission(downloadPerms: DownloadPermission) {
+ mockSettings({
+ "token-features": createMockTokenFeatures({
+ advanced_permissions: true,
+ }),
+ });
+ setupEnterpriseOnlyPlugin("feature_level_permissions");
+
+ setup({
+ dashboard: {
+ ...testDashboard,
+ dashcards: [visualizerDashcard],
+ },
+ dashcard: visualizerDashcard,
+ dashcardData: {
+ [visualizerDashcard.id]: {
+ [sourceCard.id]: createMockDataset({
+ data: createMockDatasetData({
+ cols: [
+ createMockColumn({
+ name: "CATEGORY",
+ display_name: "Category",
+ }),
+ createMockColumn({
+ name: "count",
+ display_name: "Count",
+ base_type: "type/Integer",
+ }),
+ ],
+ rows: [["Gadget", 53]],
+ download_perms: downloadPerms,
+ }),
+ status: "completed",
+ }),
+ },
+ },
+ withMetadata: true,
+ });
+ }
+
+ afterEach(() => {
+ reinitialize();
+ });
+
+ it("should not render the dashcard menu when the source card cannot be downloaded (#64333)", async () => {
+ setupWithDownloadPermission(DataPermissionValue.NONE);
+
+ expect(
+ await screen.findByText("Products by Category"),
+ ).toBeInTheDocument();
+ expect(screen.queryByTestId("dashcard-menu")).not.toBeInTheDocument();
+ });
+
+ it("should offer downloading results when the source card can be downloaded", async () => {
+ const user = userEvent.setup({
+ advanceTimers: jest.advanceTimersByTime,
+ });
+ setupWithDownloadPermission(DataPermissionValue.FULL);
+
+ await user.click(getIcon("ellipsis"));
+
+ expect(await screen.findByText("Download results")).toBeInTheDocument();
+ });
+ });
+
describe("edit mode", () => {
it("should not show the info icon", () => {
setup({ isEditing: true });