Skip to content

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

Fix stacked chart total labels for combo charts (#74247)

Andersonc63b8ad8b8ba
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Breakout_With_Line_Series_Stacked_Right_Axis_Only.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Breakout_With_Line_Series_Stacked_Right_Axis_Only.png
index 2a0b49f6137..254118fde40 100644
Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Breakout_With_Line_Series_Stacked_Right_Axis_Only.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Bar_Breakout_With_Line_Series_Stacked_Right_Axis_Only.png differ
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
index d475b72d7ad..48c9f4c2e16 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
@@ -807,7 +807,10 @@ export const applyVisualizationSettingsDataTransformations = (
: value;
}),
},
- getStackedDataLabelTransform(settings, seriesDataKeys),
+ getStackedDataLabelTransform(
+ settings,
+ stackModels.flatMap((stackModel) => stackModel.seriesKeys),
+ ),
getBarSeriesDataLabelTransform(barSeriesModels),
{
condition:
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts
index 44b9d58213e..42dd7eaa106 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts
@@ -344,7 +344,13 @@ describe("dataset transform functions", () => {
it("should populate dataset with min numeric values for positive and negative stack totals", () => {
const result = applyVisualizationSettingsDataTransformations(
originalDataset,
- [],
+ [
+ {
+ seriesKeys: seriesModels.map((seriesModel) => seriesModel.dataKey),
+ display: "bar",
+ axis: "left",
+ },
+ ],
xAxisModel,
seriesModels,
[],
@@ -378,6 +384,57 @@ describe("dataset transform functions", () => {
]);
});
+ it("should not use line series to create stacked bar total labels (UXW-3433)", () => {
+ const dataset = [
+ {
+ [X_AXIS_DATA_KEY]: "A",
+ dimensionKey: "A",
+ barSeries: null,
+ lineSeries: 100,
+ },
+ {
+ [X_AXIS_DATA_KEY]: "B",
+ dimensionKey: "B",
+ barSeries: 200,
+ lineSeries: 300,
+ },
+ ];
+ const barSeriesModel = createMockSeriesModel({ dataKey: "barSeries" });
+ const lineSeriesModel = createMockSeriesModel({ dataKey: "lineSeries" });
+
+ const result = applyVisualizationSettingsDataTransformations(
+ dataset,
+ [{ seriesKeys: ["barSeries"], display: "bar", axis: "left" }],
+ xAxisModel,
+ [barSeriesModel, lineSeriesModel],
+ [],
+ yAxisScaleTransforms,
+ createMockComputedVisualizationSettings({
+ "stackable.stack_type": "stacked",
+ }),
+ );
+
+ expect(result).toEqual([
+ {
+ [INDEX_KEY]: 0,
+ [X_AXIS_DATA_KEY]: "A",
+ [X_AXIS_RAW_VALUE_DATA_KEY]: "A",
+ dimensionKey: "A",
+ barSeries: null,
+ lineSeries: 100,
+ },
+ {
+ [INDEX_KEY]: 1,
+ [X_AXIS_DATA_KEY]: "B",
+ [X_AXIS_RAW_VALUE_DATA_KEY]: "B",
+ [POSITIVE_STACK_TOTAL_DATA_KEY]: Number.MIN_VALUE,
+ dimensionKey: "B",
+ barSeries: 200,
+ lineSeries: 300,
+ },
+ ]);
+ });
+
it("should return an array of normalized datasets", () => {
const result = applyVisualizationSettingsDataTransformations(
originalDataset,