Skip to content

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

UXW-4712 Fix non-applicable empty series tooltip values for funnel bar charts (#79602)

Denis Berezin24e36a9f0e78
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
index 9e351790078..217cc624bc9 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
@@ -520,7 +520,9 @@ const getSingleSeriesTooltipModel = (
);
const seriesToShow = chartModel.seriesModels.filter(
- (series) => series === hoveredSeries || !isBreakoutSeries(series),
+ (series) =>
+ series === hoveredSeries ||
+ (!isBreakoutSeries(series) && datum[series.dataKey] !== undefined),
);
const seriesTooltipRows = seriesToShow.map((series) => {
const isFocused =
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts
index 9da2c1ad36c..1a1443e953d 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts
@@ -23,6 +23,7 @@ import {
createMockColumn,
createMockDatetimeColumn,
createMockSingleSeries,
+ createMockVisualizationSettings,
} from "metabase-types/api/mocks";
import {
@@ -30,6 +31,7 @@ import {
getBrushClickObject,
getEventDimensions,
getSeriesClickData,
+ getTooltipModel,
normalizeDimensionValue,
} from "./events";
@@ -614,3 +616,59 @@ describe("getBrushClickObject", () => {
expect(clicked?.column).toBe(priceColumn);
});
});
+
+describe("getTooltipModel", () => {
+ // The shape produced by funnelToBarTransform and scalarsBarTransform:
+ // each series is a separate card with a datapoint at only its own category.
+ const createStepSeriesChartModel = (dataset: Datum[]) =>
+ createMockCartesianChartModel({
+ seriesModels: [
+ createMockSeriesModel({ dataKey: "Doohickey", name: "Doohickey" }),
+ createMockSeriesModel({ dataKey: "Gadget", name: "Gadget" }),
+ ],
+ dataset,
+ transformedDataset: dataset,
+ });
+
+ it("shows only series with a datapoint at the hovered position in the default tooltip (metabase#76933)", () => {
+ const chartModel = createStepSeriesChartModel([
+ { [X_AXIS_DATA_KEY]: "Doohickey", [INDEX_KEY]: 0, Doohickey: 3976 },
+ { [X_AXIS_DATA_KEY]: "Gadget", [INDEX_KEY]: 1, Gadget: 4939 },
+ ]);
+
+ const tooltipModel = getTooltipModel(
+ chartModel,
+ createMockVisualizationSettings({ "graph.tooltip_type": "default" }),
+ 0,
+ "bar",
+ "Doohickey",
+ );
+
+ expect(tooltipModel?.rows.map((row) => row.name)).toEqual(["Doohickey"]);
+ });
+
+ it("keeps series with explicit null values in the default tooltip", () => {
+ const chartModel = createStepSeriesChartModel([
+ {
+ [X_AXIS_DATA_KEY]: "Doohickey",
+ [INDEX_KEY]: 0,
+ Doohickey: 3976,
+ Gadget: null,
+ },
+ { [X_AXIS_DATA_KEY]: "Gadget", [INDEX_KEY]: 1, Gadget: 4939 },
+ ]);
+
+ const tooltipModel = getTooltipModel(
+ chartModel,
+ createMockVisualizationSettings({ "graph.tooltip_type": "default" }),
+ 0,
+ "bar",
+ "Doohickey",
+ );
+
+ expect(tooltipModel?.rows.map((row) => row.name)).toEqual([
+ "Doohickey",
+ "Gadget",
+ ]);
+ });
+});