The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix dashboard click actions after changing a table visualization to a bar chart (#83164)
Andersonb915d34220a5
diff --git a/e2e/test/scenarios/dashboard-cards/click-behavior-reproductions.cy.spec.ts b/e2e/test/scenarios/dashboard-cards/click-behavior-reproductions.cy.spec.tsindex c0012e9137e..f26f3ef9d26 100644--- a/e2e/test/scenarios/dashboard-cards/click-behavior-reproductions.cy.spec.ts+++ b/e2e/test/scenarios/dashboard-cards/click-behavior-reproductions.cy.spec.ts@@ -251,9 +251,7 @@ describe("issue 64368", () => {});});-describe("issue 73448", () => {- const productCategories = ["Doohickey", "Gadget", "Gizmo", "Widget"];-+describe("table and chart click behavior", () => {const categoryParameter = createMockActionParameter({id: "category",name: "Category",@@ -267,7 +265,7 @@ describe("issue 73448", () => {display: "bar",query: {"source-table": ORDERS_ID,- aggregation: [["count"]],+ aggregation: [["count"], ["sum", ["field", ORDERS.TOTAL, null]]],breakout: [["field",@@ -275,21 +273,15 @@ describe("issue 73448", () => {{ "base-type": "type/Text", "source-field": ORDERS.PRODUCT_ID },],],- limit: 5,},};beforeEach(() => {H.restore();cy.signInAsAdmin();- });-- it("updates a dashboard filter from a bar chart dimension click behavior (#73448)", () => {H.createQuestionAndDashboard({questionDetails,- dashboardDetails: {- parameters: [categoryParameter],- },+ dashboardDetails: { parameters: [categoryParameter] },}).then(({ body: dashcard }) => {H.addOrUpdateDashboardCard({dashboard_id: dashcard.dashboard_id,@@ -313,60 +305,119 @@ describe("issue 73448", () => {],},],- visualization_settings: {- column_settings: {- '["name","CATEGORY"]': {- click_behavior: {- type: "crossfilter",- parameterMapping: {- [categoryParameter.id]: {- id: categoryParameter.id,- source: {- type: "column",- id: "CATEGORY",- name: "Product → Category",- },- target: {- type: "parameter",- id: categoryParameter.id,- },- },- },- },- },- },- },},});+ H.visitDashboard(dashcard.dashboard_id);+ H.editDashboard();+ H.clickBehaviorSidebar().findByText("Go to a custom destination").click();+ H.sidebar().findByText("URL").click();+ H.modal().within(() => {+ cy.findByRole("textbox").type(`/question/${dashcard.card_id}`);+ cy.button("Done").click();+ });+ H.sidebar().button("Done").click();+ H.saveDashboard();++ H.chartPathWithFillColor("#509EE3")+ .should("have.length", 4)+ .first()+ .click();+ cy.location("pathname").should(+ "include",+ `/question/${dashcard.card_id}`,+ );++ cy.log(+ "Change the saved question to a table, retaining the chart action",+ );+ H.openVizTypeSidebar();+ H.vizTypeSidebar().findByTestId("Table-button").click();+ H.vizTypeSidebar().button("Done").click();+ H.tableInteractive().should("be.visible");+ cy.intercept("PUT", `/api/card/${dashcard.card_id}`).as("updateQuestion");+ H.saveQuestion(null, { shouldReplaceOriginalQuestion: true });+ cy.wait("@updateQuestion");H.visitDashboard(dashcard.dashboard_id);});- cy.location("pathname").as("dashboardPath");+ H.editDashboard();+ H.clickBehaviorSidebar().findByText("Product → Category").click();+ configureCategoryFilter();+ H.saveDashboard();+ });++ it("respects click behavior when changing between table and bar visualizations (#82956, #73448)", () => {+ for (const value of ["3,976", "297,270.99"]) {+ H.getDashboardCard().findByText(value).click();+ H.popover()+ .should("contain", "See these Orders")+ .and("contain", "Break out by…");+ H.filterWidget().should("not.contain", "Doohickey");+ cy.realPress("Escape");+ }++ H.getDashboardCard().findByText("Doohickey").click();+ H.filterWidget().should("contain", "Doohickey");+ H.assertTableRowsCount(1);+ cy.get(H.POPOVER_ELEMENT).should("not.exist");++ H.getDashboardCard().findByText("Doohickey").click();+ H.filterWidget().should("not.contain", "Doohickey");+ H.assertTableRowsCount(4);++ cy.log(+ "Convert the dashboard visualization, keeping the saved question a table",+ );+ H.editDashboard();+ H.showDashcardVisualizerModal(0, { isVisualizerCard: false });+ H.modal().findByRole("button", { name: "Save", exact: true }).click();+ H.modal().should("not.exist");+ H.clickBehaviorSidebar()+ .should("not.contain", "On-click behavior for each column")+ .findByText("Update a dashboard filter")+ .should("be.visible");+ configureCategoryFilter();+ H.saveDashboard();H.chartPathWithFillColor("#509EE3").should("have.length", 4).first().click();+ H.filterWidget().should("contain", "Doohickey");+ cy.location("search").should("eq", "?category=Doohickey");+ cy.get(H.POPOVER_ELEMENT).should("not.exist");+ H.chartPathWithFillColor("#509EE3").should("have.length", 1).click();+ H.filterWidget().should("not.contain", "Doohickey");+ H.chartPathWithFillColor("#509EE3").should("have.length", 4);- cy.log("dashboard filter updates with the clicked category value");- H.filterWidget()- .invoke("text")- .should((text) => {- expect(- productCategories.some((category) => text.includes(category)),- ).to.equal(true);- });- cy.location("search").should((search) => {- expect(new URLSearchParams(search).get("category")).to.be.oneOf(- productCategories,- );+ cy.log(+ "Clearing the chart action must not revive the old URL or table column action",+ );+ H.editDashboard();+ H.clickBehaviorSidebar().within(() => {+ cy.findByRole("button", {+ name: "filter icon Update a dashboard filter",+ }).click();+ cy.findByText("Open the Metabase drill-through menu").click();+ cy.button("Done").click();});+ H.saveDashboard();+ cy.reload();+ H.chartPathWithFillColor("#509EE3")+ .should("have.length", 4)+ .first()+ .click();+ H.popover().findByText("See these Orders").should("be.visible");+ H.filterWidget().should("not.contain", "Doohickey");+ });- cy.log("drill-through popover is not shown and navigation stays put");- cy.get(H.POPOVER_ELEMENT).should("not.exist");- cy.get("@dashboardPath").then((dashboardPath) => {- cy.location("pathname").should("eq", dashboardPath);+ function configureCategoryFilter() {+ cy.findByTestId("click-behavior-sidebar").within(() => {+ cy.findByText("Update a dashboard filter").click();+ cy.findByText(categoryParameter.name).click();});- });+ H.popover().findByText("Product → Category").click();+ cy.findByTestId("click-behavior-sidebar").button("Done").click();+ }});diff --git a/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js b/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.jsindex 3ca9a9b6a58..74aedc0d7b6 100644--- a/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js+++ b/e2e/test/scenarios/dashboard-cards/click-behavior.cy.spec.js@@ -2607,9 +2607,13 @@ describe("scenarios > dashboard > dashboard cards > click behavior", () => {size_x: 12,size_y: 6,visualization_settings: {- click_behavior: {- ...baseClickBehavior,- tabId: firstTab.id,+ column_settings: {+ '["name","PRODUCT_ID"]': {+ click_behavior: {+ ...baseClickBehavior,+ tabId: firstTab.id,+ },+ },},},}),@@ -2619,9 +2623,13 @@ describe("scenarios > dashboard > dashboard cards > click behavior", () => {size_x: 12,size_y: 6,visualization_settings: {- click_behavior: {- ...baseClickBehavior,- tabId: secondTab.id,+ column_settings: {+ '["name","PRODUCT_ID"]': {+ click_behavior: {+ ...baseClickBehavior,+ tabId: secondTab.id,+ },+ },},},}),diff --git a/e2e/test/scenarios/data-studio/data-model/source-replacement.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/source-replacement.cy.spec.tsindex a99b570c226..e869f555025 100644--- a/e2e/test/scenarios/data-studio/data-model/source-replacement.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/data-model/source-replacement.cy.spec.ts@@ -1333,7 +1333,11 @@ function buildClickBehaviorDashboard({},],visualization_settings: {- click_behavior: crossfilterClickBehavior(CATEGORY_FILTER_ID),+ column_settings: {+ '["name","category"]': {+ click_behavior: crossfilterClickBehavior(CATEGORY_FILTER_ID),+ },+ },},},});diff --git a/e2e/test/scenarios/embedding/interactive-embedding.cy.spec.js b/e2e/test/scenarios/embedding/interactive-embedding.cy.spec.jsindex 28e585d87dd..fb7879810da 100644--- a/e2e/test/scenarios/embedding/interactive-embedding.cy.spec.js+++ b/e2e/test/scenarios/embedding/interactive-embedding.cy.spec.js@@ -2006,10 +2006,14 @@ const addLinkClickBehavior = ({ dashboardId, linkTemplate }) => {dashcards: body.dashcards.map((card) => ({...card,visualization_settings: {- click_behavior: {- type: "link",- linkType: "url",- linkTemplate,+ column_settings: {+ '["name","ID"]': {+ click_behavior: {+ type: "link",+ linkType: "url",+ linkTemplate,+ },+ },},},})),diff --git a/frontend/src/metabase/dashboard/click-behavior/DashboardClickAction.tsx b/frontend/src/metabase/dashboard/click-behavior/DashboardClickAction.tsxindex b219469d321..333857f4edf 100644--- a/frontend/src/metabase/dashboard/click-behavior/DashboardClickAction.tsx+++ b/frontend/src/metabase/dashboard/click-behavior/DashboardClickAction.tsx@@ -83,13 +83,9 @@ function getAction(export const DashboardClickAction: LegacyDrill = ({question,- settings,clicked = {},}): AlwaysDefaultClickAction[] => {- const clickObject: ClickObject = clicked.settings- ? clicked- : { ...clicked, settings };- const type = getDashboardDrillType(clickObject);+ const type = getDashboardDrillType(clicked);if (!type) {return [];@@ -99,7 +95,7 @@ export const DashboardClickAction: LegacyDrill = ({{name: "click_behavior",defaultAlways: true,- ...getAction(type, question, clickObject),+ ...getAction(type, question, clicked),},];};diff --git a/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.ts b/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.tsindex 9efc8e872e4..d83e4649364 100644--- a/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.ts+++ b/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.ts@@ -1,5 +1,6 @@import querystring from "querystring";+import { hasColumnLevelClickBehavior } from "metabase/dashboard/utils";import type { ClickBehaviorExtraData } from "metabase/dashboard/utils/click-behavior";import {formatSourceForTarget,@@ -17,13 +18,11 @@ import type { ComputedVisualizationSettings } from "metabase/viz-core";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { ParameterWithTarget } from "metabase-lib/v1/parameters/types";-import { getObjectColumnSettings } from "metabase-lib/v1/queries/utils/column-key";import { isDate } from "metabase-lib/v1/types/utils/isa";import type {ClickBehavior,ClickBehaviorParameterMapping,ClickBehaviorSource,- DatasetColumn,ParameterValueOrArray,} from "metabase-types/api";@@ -192,29 +191,19 @@ export function getClickBehavior(clicked: ClickBehaviorClickObject,): ClickBehavior | undefined {const settings: ComputedVisualizationSettings = clicked?.settings || {};- const columnClickBehavior = getColumnClickBehavior(settings, clicked?.column);- if (columnClickBehavior) {- return columnClickBehavior;+ const dashcard = clicked?.extraData?.dashcard;+ const columnSettings = clicked?.column+ ? settings.column?.(clicked.column)+ : undefined;++ if (dashcard) {+ return hasColumnLevelClickBehavior(dashcard)+ ? columnSettings?.click_behavior+ : settings.click_behavior;}- const dimensionClickBehavior = (clicked?.dimensions || [])- .map((dimension) => getColumnClickBehavior(settings, dimension.column))- .find(Boolean);-- return dimensionClickBehavior || settings.click_behavior;-}--function getColumnClickBehavior(- settings: ComputedVisualizationSettings,- column: DatasetColumn | undefined,-): ClickBehavior | undefined {- if (!column) {- return undefined;- }- return (- getObjectColumnSettings(settings.column_settings, column)?.click_behavior ??- settings.column?.(column)?.click_behavior- );+ // Standalone SDK questions can have column links without a dashboard card.+ return columnSettings?.click_behavior || settings.click_behavior;}export function getClickBehaviorData(diff --git a/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.unit.spec.ts b/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.unit.spec.tsindex 6f882fe78bf..22ae69364e5 100644--- a/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.unit.spec.ts+++ b/frontend/src/metabase/dashboard/click-behavior/dashboard-click-drill.unit.spec.ts@@ -5,7 +5,9 @@ import {createMockCard,createMockColumn,createMockDashboard,+ createMockDashboardCard,createMockParameter,+ createMockVisualizerDashboardCard,} from "metabase-types/api/mocks";import { DashboardClickAction } from "./DashboardClickAction";@@ -44,9 +46,7 @@ function buildSettings({);const settings: ComputedVisualizationSettings = {column_settings,- // Computed column() does NOT surface click_behavior (#73448). Returning the- // formatter-only shape mirrors the production behavior we have to handle.- column: () => ({}),+ column: ({ name }) => ({ click_behavior: columns[name] }),};if (root) {settings.click_behavior = root;@@ -55,51 +55,76 @@ function buildSettings({}describe("getClickBehavior", () => {- it("uses click behavior configured on the clicked column", () => {- const clickBehavior = getClickBehavior({- column: metricColumn,- settings: buildSettings({ columns: { count: metricClickBehavior } }),- });-- expect(clickBehavior).toBe(metricClickBehavior);- });-- it("falls back to the click behavior configured on a clicked dimension (#73448)", () => {+ it("does not inherit another table column's click behavior through row dimensions (#82956)", () => {const clickBehavior = getClickBehavior({column: metricColumn,dimensions: [{ column: dimensionColumn, value: "Gadget" }],settings: buildSettings({columns: { CATEGORY: dimensionClickBehavior },}),+ extraData: { dashcard: createMockDashboardCard() },});- expect(clickBehavior).toBe(dimensionClickBehavior);+ expect(clickBehavior).toBeUndefined();});- it("prefers a clicked column behavior over a dimension behavior", () => {- const clickBehavior = getClickBehavior({- column: metricColumn,- dimensions: [{ column: dimensionColumn, value: "Gadget" }],- settings: buildSettings({- columns: {- count: metricClickBehavior,- CATEGORY: dimensionClickBehavior,+ it.each([+ { description: "explicit", behavior: rootClickBehavior },+ { description: "default", behavior: undefined },+ ])(+ "uses the chart's $description behavior instead of retained table column actions (#73448)",+ ({ behavior }) => {+ const clickBehavior = getClickBehavior({+ column: metricColumn,+ dimensions: [{ column: dimensionColumn, value: "Gadget" }],+ extraData: {+ dashcard: createMockVisualizerDashboardCard({+ card: createMockCard({ display: "table" }),+ visualization_settings: {+ visualization: {+ display: "bar",+ settings: {},+ columnValuesMapping: {},+ },+ },+ }),},- }),- });+ settings: {+ ...buildSettings({+ root: behavior,+ columns: {+ count: metricClickBehavior,+ CATEGORY: dimensionClickBehavior,+ },+ }),+ // Charts' computed column settings do not expose retained table click actions.+ column: () => ({}),+ },+ });- expect(clickBehavior).toBe(metricClickBehavior);- });+ expect(clickBehavior).toBe(behavior);+ },+ );- it("falls back to the root click behavior when neither column nor dimension has one", () => {- const clickBehavior = getClickBehavior({- column: metricColumn,- dimensions: [{ column: dimensionColumn, value: "Gadget" }],- settings: buildSettings({ root: rootClickBehavior }),- });+ it.each([+ { description: "configured", behavior: metricClickBehavior },+ { description: "default", behavior: undefined },+ ])(+ "uses only the table column's $description behavior when a card action remains",+ ({ behavior }) => {+ const clickBehavior = getClickBehavior({+ column: metricColumn,+ dimensions: [{ column: dimensionColumn, value: "Gadget" }],+ extraData: { dashcard: createMockDashboardCard() },+ settings: {+ ...buildSettings({ root: rootClickBehavior }),+ column: () => ({ click_behavior: behavior }),+ },+ });- expect(clickBehavior).toBe(rootClickBehavior);- });+ expect(clickBehavior).toBe(behavior);+ },+ );});const stateColumn = createMockColumn({ name: "STATE" });@@ -283,17 +308,17 @@ describe("getDashboardDrillLinkUrl", () => {});describe("DashboardClickAction", () => {- it("creates a click-behavior action for a chart click with a dimension-scoped behavior (#73448)", () => {+ it("creates a click-behavior action for the configured chart behavior", () => {const actions = DashboardClickAction({question: new Question(createMockCard()),clicked: {column: metricColumn,dimensions: [{ column: dimensionColumn, value: "Gadget" }],extraData: { dashboard: {}, parameters: [] },+ settings: buildSettings({+ root: { type: "crossfilter", parameterMapping: {} },+ }),},- settings: buildSettings({- columns: { CATEGORY: { type: "crossfilter", parameterMapping: {} } },- }),});expect(actions).toHaveLength(1);diff --git a/frontend/src/metabase/dashboard/click-behavior/types.ts b/frontend/src/metabase/dashboard/click-behavior/types.tsindex cd7f3ae0ef2..646272729e0 100644--- a/frontend/src/metabase/dashboard/click-behavior/types.ts+++ b/frontend/src/metabase/dashboard/click-behavior/types.ts@@ -8,6 +8,7 @@ import type {ClickBehavior,ClickBehaviorParameterMapping,ClickBehaviorType,+ DashboardCard,DashboardId,DashboardTabId,ParameterId,@@ -22,6 +23,7 @@ export type DashboardDrillType =| "dashboard-reset";export interface DrillExtraData extends ClickBehaviorExtraData {+ dashcard?: DashboardCard;questions?: Record<CardId, Card>;}diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsxindex a66273179d6..de447d3b55e 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.tsx@@ -8,7 +8,7 @@ import {type DashboardContextReturned,useDashboardContext,} from "metabase/dashboard/context";-import { isTableDisplay } from "metabase/dashboard/utils";+import { hasColumnLevelClickBehavior } from "metabase/dashboard/utils";import { canSaveClickBehavior } from "metabase/dashboard/utils/click-behavior";import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";import type {@@ -63,7 +63,7 @@ export function ClickBehaviorSidebarInner({const hasSelectedColumn = selectedColumn != null;const clickBehavior: ClickBehavior | undefined = useMemo(() => {- if (isTableDisplay(dashcard) && !hasSelectedColumn) {+ if (hasColumnLevelClickBehavior(dashcard) && !hasSelectedColumn) {return;}if (hasSelectedColumn) {diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsxindex bb0378d8ed5..adf4658ffd1 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarContent.tsx@@ -2,7 +2,7 @@ import { getIn } from "icepick";import { useMemo } from "react";import { getDashcardData } from "metabase/dashboard/selectors";-import { isTableDisplay } from "metabase/dashboard/utils";+import { hasColumnLevelClickBehavior } from "metabase/dashboard/utils";import { useSelector } from "metabase/redux";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {@@ -52,7 +52,11 @@ export function ClickBehaviorSidebarContent({getDashcardData(state, dashcard.id),);- if (isTableDisplay(dashcard) && !hasSelectedColumn && dashcard.card_id) {+ if (+ hasColumnLevelClickBehavior(dashcard) &&+ !hasSelectedColumn &&+ dashcard.card_id+ ) {const columns = getIn(dashcardData, [dashcard.card_id, "data", "cols"]);return (<TableClickBehaviorViewdiff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader.tsxindex ccbd3ab0eb0..8b47a02e6f0 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebarHeader/ClickBehaviorSidebarHeader.tsx@@ -1,6 +1,6 @@import { jt, t } from "ttag";-import { isTableDisplay } from "metabase/dashboard/utils";+import { hasColumnLevelClickBehavior } from "metabase/dashboard/utils";import { Box, Icon } from "metabase/ui";import type { DashboardCard, DatasetColumn } from "metabase-types/api";@@ -26,7 +26,7 @@ interface Props {}function HeaderContent({ dashcard, selectedColumn, onUnsetColumn }: Props) {- if (isTableDisplay(dashcard)) {+ if (hasColumnLevelClickBehavior(dashcard)) {if (selectedColumn) {return (<Boxdiff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsxindex 43412b84991..ec9816c1129 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomURLPicker.tsx@@ -4,7 +4,7 @@ import { useCallback, useState } from "react";import { t } from "ttag";import CS from "metabase/css/core/index.css";-import { isTableDisplay } from "metabase/dashboard/utils";+import { hasColumnLevelClickBehavior } from "metabase/dashboard/utils";import {Button,Flex,@@ -110,7 +110,7 @@ export function CustomURLPicker({onChange={handleLinkTemplateChange}className={cx(CS.block, CS.full)}/>- {isTableDisplay(dashcard) && (+ {hasColumnLevelClickBehavior(dashcard) && (<CustomLinkTextupdateSettings={updateSettings}clickBehavior={clickBehavior}diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.tsxindex 490f08cb101..1f5cd6829f0 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.tsx@@ -3,7 +3,7 @@ import { useCallback } from "react";import { t } from "ttag";import CS from "metabase/css/core/index.css";-import { isTableDisplay } from "metabase/dashboard/utils";+import { hasColumnLevelClickBehavior } from "metabase/dashboard/utils";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type {ArbitraryCustomDestinationClickBehavior,@@ -96,7 +96,7 @@ export function LinkOptions({clickBehavior={clickBehavior}updateSettings={updateSettings}/>- {isTableDisplay(dashcard) && (+ {hasColumnLevelClickBehavior(dashcard) && (<div><CustomLinkTextupdateSettings={updateSettings}diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsxindex c30bd0c8118..98e6d61518a 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx@@ -295,7 +295,7 @@ export function DashCardVisualization({name: dashcard.card.name,description: dashcard.card.description,display: display ?? DEFAULT_VISUALIZER_DISPLAY,- visualization_settings: settings,+ visualization_settings: _.omit(settings, "click_behavior"),dataset_query: STRUCTURED_QUERY_TEMPLATE,},_.omit(dashcard.visualization_settings, "visualization"),diff --git a/frontend/src/metabase/dashboard/utils.ts b/frontend/src/metabase/dashboard/utils.tsindex 62b65e9de5b..18759791d56 100644--- a/frontend/src/metabase/dashboard/utils.ts+++ b/frontend/src/metabase/dashboard/utils.ts@@ -512,7 +512,7 @@ export function getClickBehaviorDescription(dashcard: DashboardCard) {const noBehaviorMessage = hasActionsMenu(dashcard)? t`Open the drill-through menu`: t`Do nothing`;- if (isTableDisplay(dashcard)) {+ if (hasColumnLevelClickBehavior(dashcard)) {const columnSettings: Record<string, ColumnSettings> =getIn(dashcard, ["visualization_settings", "column_settings"]) || {};@@ -574,6 +574,9 @@ export function hasActionsMenu(dashcard: DashboardCard) {return !question.isNative();}-export function isTableDisplay(dashcard: DashboardCard) {+export function hasColumnLevelClickBehavior(dashcard: DashboardCard) {+ if (isVisualizerDashboardCard(dashcard)) {+ return dashcard.visualization_settings.visualization.display === "table";+ }return dashcard?.card?.display === "table";}diff --git a/frontend/src/metabase/embedding-sdk/lib/links.ts b/frontend/src/metabase/embedding-sdk/lib/links.tsindex cef7aba6219..56e5e00ea43 100644--- a/frontend/src/metabase/embedding-sdk/lib/links.ts+++ b/frontend/src/metabase/embedding-sdk/lib/links.ts@@ -1,4 +1,4 @@-import type { ClickBehavior, VisualizationSettings } from "metabase-types/api";+import type { VisualizationSettings } from "metabase-types/api";/*** In modular embedding (react sdk and embed-js) we disable internal click behaviors@@ -8,62 +8,12 @@ import type { ClickBehavior, VisualizationSettings } from "metabase-types/api";export function removeInternalClickBehaviors(computedSettings: VisualizationSettings,): VisualizationSettings {- const { click_behavior, column_settings } = computedSettings;-- const nextClickBehavior = stripIfInternal(click_behavior);- const nextColumnSettings = mapColumnSettings(column_settings);-- if (- nextClickBehavior === click_behavior &&- nextColumnSettings === column_settings- ) {- return computedSettings;- }-- return {- ...computedSettings,- click_behavior: nextClickBehavior,- column_settings: nextColumnSettings,- };-}--function mapColumnSettings(- columnSettings: VisualizationSettings["column_settings"],-): VisualizationSettings["column_settings"] {- if (!columnSettings) {- return columnSettings;+ const { click_behavior } = computedSettings;+ if (click_behavior?.type === "link" && click_behavior.linkType !== "url") {+ return { ...computedSettings, click_behavior: undefined };}- const entries = Object.entries(columnSettings);- const hasInternal = entries.some(([, settings]) =>- isInternalLinkClickBehavior(settings?.click_behavior),- );-- if (!hasInternal) {- return columnSettings;- }-- return Object.fromEntries(- entries.map(([key, settings]) => {- if (!isInternalLinkClickBehavior(settings?.click_behavior)) {- return [key, settings];- }-- return [key, { ...settings, click_behavior: undefined }];- }),- );-}--function stripIfInternal(clickBehavior: ClickBehavior | undefined) {- return isInternalLinkClickBehavior(clickBehavior) ? undefined : clickBehavior;-}--function isInternalLinkClickBehavior(clickBehavior: ClickBehavior | undefined) {- return (- clickBehavior?.type === "link" &&- "linkType" in clickBehavior &&- clickBehavior.linkType !== "url"- );+ return computedSettings;}/**diff --git a/frontend/src/metabase/embedding-sdk/lib/links.unit.spec.ts b/frontend/src/metabase/embedding-sdk/lib/links.unit.spec.tsindex 206e940d675..b1e3e18a396 100644--- a/frontend/src/metabase/embedding-sdk/lib/links.unit.spec.ts+++ b/frontend/src/metabase/embedding-sdk/lib/links.unit.spec.ts@@ -24,38 +24,16 @@ describe("removeInternalClickBehaviors", () => {expect(removeInternalClickBehaviors(settings)).toBe(settings);});- it("removes internal link click behaviors from column settings", () => {- const result = removeInternalClickBehaviors({- column_settings: {- '["name","TOTAL"]': {- click_behavior: {- type: "link",- linkType: "dashboard",- targetId: 1,- },- },- '["name","SUBTOTAL"]': {- click_behavior: {- type: "link",- linkType: "url",- linkTemplate: "https://metabase.com",- },- },- },- });+ it.each(["dashboard", "question"] as const)(+ "removes internal %s link click behaviors from computed settings",+ (linkType) => {+ const result = removeInternalClickBehaviors({+ click_behavior: { type: "link", linkType, targetId: 1 },+ });- expect(result.column_settings?.['["name","TOTAL"]'].click_behavior).toBe(- undefined,- );- expect(result.column_settings?.['["name","SUBTOTAL"]'].click_behavior)- .toMatchInlineSnapshot(`- {- "linkTemplate": "https://metabase.com",- "linkType": "url",- "type": "link",- }- `);- });+ expect(result.click_behavior).toBeUndefined();+ },+ );it("does not crash on undefined column settings entries (EMB-1940)", () => {// Unjustified type cast. FIXME@@ -75,8 +53,6 @@ describe("removeInternalClickBehaviors", () => {const result = removeInternalClickBehaviors(settings);- expect(- result.column_settings?.['["name","SUBTOTAL"]'].click_behavior,- ).toBeUndefined();+ expect(result).toBe(settings);});});diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.tsindex 11e0633a43a..3f859901e22 100644--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts@@ -149,7 +149,7 @@ export const getEventDimensions = (? dimensionModel.columnByCardId[seriesModel.cardId]: dimensionModel.column;- const hasDimensionValue = sameCardDatumColumns.length > 0;+ const hasDimensionValue = sameCardDatumColumns.includes(dimensionColumn);const dimensions: ClickObjectDimension[] = [];if (hasDimensionValue) {diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.tsindex ef50904a312..cceecbe7b2e 100644--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts@@ -225,57 +225,6 @@ describe("getEventDimensions", () => {{ column: sourceColumn, value: "Affiliate" },]);});-- it("includes the x-axis breakout when clicking a bar with only metric data (#73448)", () => {- const categoryColumn = createMockColumn({- name: "CATEGORY",- display_name: "Product → Category",- source: "breakout",- base_type: "type/Text",- effective_type: "type/Text",- });- const countColumn = createMockColumn({- name: "count",- display_name: "Count",- source: "aggregation",- base_type: "type/BigInteger",- effective_type: "type/BigInteger",- });- const countKey = `${CARD_ID}:count`;- const datum: Datum = {- [X_AXIS_DATA_KEY]: "Doohickey",- [countKey]: 3976,- };- const chartModel = createMockCartesianChartModel({- columnByDataKey: {- [countKey]: countColumn,- },- });- const categoryDimensionModel: DimensionModel = {- column: categoryColumn,- columnIndex: 0,- columnByCardId: { [CARD_ID]: categoryColumn },- columns: [categoryColumn],- };- const seriesModel = createMockSeriesModel({- dataKey: countKey,- column: countColumn,- columnIndex: 1,- cardId: CARD_ID,- vizSettingsKey: "count",- });-- const dimensions = getEventDimensions(- chartModel,- datum,- categoryDimensionModel,- seriesModel,- );-- expect(dimensions).toEqual([- { column: categoryColumn, value: "Doohickey" },- ]);- });});describe("getSeriesClickData", () => {@@ -372,9 +321,11 @@ describe("getSeriesClickData", () => {source: "breakout",});const sourceKey = getDatasetKey(sourceColumn, CARD_ID);+ const categoryKey = getDatasetKey(categoryColumn, CARD_ID);const sumKey = dataKey;const datum: Datum = {[X_AXIS_DATA_KEY]: "Gadget",+ [categoryKey]: "Gadget",[sourceKey]: "Affiliate",[sumKey]: 12,};@@ -396,6 +347,7 @@ describe("getSeriesClickData", () => {{ [X_AXIS_DATA_KEY]: "", [INDEX_KEY]: 0 },] as Datum[],columnByDataKey: {+ [categoryKey]: categoryColumn,[sourceKey]: sourceColumn,[sumKey]: sumColumn,},