Skip to content

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

fix content translations break visualization settings (#70054)

Aleksandr Lesnenko3c693179e40b
diff --git a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts
index 400b9b88250..05914cd5101 100644
--- a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts
@@ -850,6 +850,68 @@ describe("UXW-2696", () => {
});
});
+describe("issue 69882", () => {
+ const DOOHICKEY_BAR_COLOR = "#227FD2";
+ const GADGET_LINE_COLOR = "#689636";
+
+ const questionDetails: StructuredQuestionDetails = {
+ name: "69882",
+ display: "combo" as const,
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ breakout: [
+ ["field", PRODUCTS.CATEGORY, { "source-field": ORDERS.PRODUCT_ID }],
+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "year" }],
+ ],
+ },
+ visualization_settings: {
+ series_settings: {
+ Doohickey: {
+ color: DOOHICKEY_BAR_COLOR,
+ title: "_Doohickey",
+ display: "bar",
+ },
+ Gadget: {
+ color: GADGET_LINE_COLOR,
+ title: "_Gadget",
+ display: "line",
+ },
+ },
+ "graph.x_axis.scale": "timeseries",
+ "graph.dimensions": ["CREATED_AT", "CATEGORY"],
+ "graph.metrics": ["count"],
+ },
+ };
+
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ });
+
+ it("should apply per-series display type on a question and dashcard (metabase#69882)", () => {
+ H.createQuestion(questionDetails, { visitQuestion: true, wrapId: true });
+
+ H.echartsContainer().should("be.visible");
+ H.chartPathWithFillColor(DOOHICKEY_BAR_COLOR).should("exist");
+ H.cartesianChartCircleWithColor(GADGET_LINE_COLOR);
+
+ H.createDashboard({ name: "Test Dashboard" }, { wrapId: true });
+ cy.get<number>("@questionId").then((cardId) => {
+ cy.get<number>("@dashboardId").then((dashboardId) => {
+ H.addQuestionToDashboard({ dashboardId, cardId });
+ H.visitDashboard(dashboardId);
+ });
+ });
+
+ cy.findByTestId("dashcard").within(() => {
+ H.echartsContainer().should("be.visible");
+ H.chartPathWithFillColor(DOOHICKEY_BAR_COLOR).should("exist");
+ H.cartesianChartCircleWithColor(GADGET_LINE_COLOR);
+ });
+ });
+});
+
describe("issue #68819", () => {
beforeEach(() => {
H.restore();
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/use-translate-content.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/use-translate-content.ts
index 2788e2987fc..2787f4c67b0 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/use-translate-content.ts
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/use-translate-content.ts
@@ -24,12 +24,14 @@ export const useTranslateContent = (): ContentTranslationFunction => {
const tc = useCallback<ContentTranslationFunction>(
<T = string | null | undefined>(msgid: T) =>
- dictionary?.length
- ? translateContentString<T>(dictionary || [], locale, msgid)
- : leaveUntranslated(msgid),
+ translateContentString<T>(dictionary || [], locale, msgid),
[locale, dictionary],
);
+ if (!dictionary?.length) {
+ return leaveUntranslated;
+ }
+
return tc;
};
diff --git a/frontend/src/metabase-types/api/dataset.ts b/frontend/src/metabase-types/api/dataset.ts
index caf847653c7..9d670ab1c84 100644
--- a/frontend/src/metabase-types/api/dataset.ts
+++ b/frontend/src/metabase-types/api/dataset.ts
@@ -23,6 +23,12 @@ import type { TableId } from "./table";
export type RowValue = string | number | null | boolean | object;
export type RowValues = RowValue[];
+export function getRowsForStableKeys(
+ data: Pick<DatasetData, "rows" | "untranslatedRows">,
+): RowValues[] {
+ return data.untranslatedRows ?? data.rows;
+}
+
export type BinningMetadata = {
binning_strategy?: "default" | "bin-width" | "num-bins";
bin_width?: number;
@@ -102,6 +108,7 @@ export interface DatasetData {
"show-row-totals"?: boolean;
"show-column-totals"?: boolean;
};
+ untranslatedRows?: RowValues[];
}
export type JsonQuery = DatasetQuery & {
diff --git a/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx b/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx
index 3a910576eee..df86f220cae 100644
--- a/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/static-viz/components/RowChart/RowChart.tsx
@@ -75,7 +75,7 @@ export const StaticRowChart = ({
columnValueFormatter,
);
const groupedData = getGroupedDataset(
- data.rows,
+ data,
chartColumns,
settings,
columnValueFormatter,
diff --git a/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts b/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts
index a290ae9cdfd..9b5a415443a 100644
--- a/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/boxplot/model/index.ts
@@ -36,11 +36,12 @@ import type { ShowWarning } from "metabase/visualizations/echarts/types";
import type { CartesianChartColumns } from "metabase/visualizations/lib/graph/columns";
import { getCartesianChartColumns } from "metabase/visualizations/lib/graph/columns";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
-import type {
- DatasetColumn,
- RawSeries,
- RowValue,
- XAxisScale,
+import {
+ type DatasetColumn,
+ type RawSeries,
+ type RowValue,
+ type XAxisScale,
+ getRowsForStableKeys,
} from "metabase-types/api";
import { computeMultiSeriesBoxPlotData } from "./dataset";
@@ -110,14 +111,18 @@ const getBoxPlotDataset = (
const breakoutIndex = hasBreakout ? chartColumns.breakout.index : -1;
const dimensionIndex = chartColumns.dimension.index;
- return rawSeries.flatMap(({ card, data: { rows, cols } }) => {
+ return rawSeries.flatMap(({ card, data }) => {
+ const { rows, cols } = data;
+ const rowsForKeys = getRowsForStableKeys(data);
const precomputedKeys = hasBreakout
? null
: cols.map((col) => getDatasetKey(col, card.id));
- return rows.map((row) => {
+ return rows.map((row, rowIndex) => {
const datum: Datum = { [X_AXIS_DATA_KEY]: row[dimensionIndex] };
- const breakoutValue = hasBreakout ? row[breakoutIndex] : undefined;
+ const breakoutValue = hasBreakout
+ ? rowsForKeys[rowIndex][breakoutIndex]
+ : undefined;
for (let i = 0; i < cols.length; i++) {
const key = precomputedKeys
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
index a7a8acce56a..3e15507e946 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts
@@ -37,12 +37,13 @@ import {
} from "metabase/visualizations/lib/warnings";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import { isMetric } from "metabase-lib/v1/types/utils/isa";
-import type {
- DatasetColumn,
- RawSeries,
- RowValue,
- SingleSeries,
- XAxisScale,
+import {
+ type DatasetColumn,
+ type RawSeries,
+ type RowValue,
+ type SingleSeries,
+ type XAxisScale,
+ getRowsForStableKeys,
} from "metabase-types/api";
import type { ShowWarning } from "../../types";
@@ -102,6 +103,7 @@ const aggregateColumnValuesForDatum = (
cardId: number,
dimensionIndex: number,
breakoutIndex: number | undefined,
+ untranslatedBreakoutValue: RowValue | undefined,
showWarning?: ShowWarning,
): void => {
columns.forEach(({ column, isMetric }, columnIndex) => {
@@ -111,7 +113,7 @@ const aggregateColumnValuesForDatum = (
const seriesKey =
breakoutIndex == null
? getDatasetKey(column, cardId)
- : getDatasetKey(column, cardId, row[breakoutIndex]);
+ : getDatasetKey(column, cardId, untranslatedBreakoutValue);
// The dimension values should not be aggregated, only metrics
if (isMetric && !isDimensionColumn) {
@@ -161,8 +163,9 @@ export const getJoinedCardsDataset = (
const dimensionIndex = chartColumns.dimension.index;
const breakoutIndex =
"breakout" in chartColumns ? chartColumns.breakout.index : undefined;
+ const rowsForKeys = getRowsForStableKeys(cardSeries.data);
- for (const row of rows) {
+ rows.forEach((row, rowIndex) => {
const dimensionValue = row[dimensionIndex];
// Get the existing datum by the dimension value if exists
@@ -174,6 +177,11 @@ export const getJoinedCardsDataset = (
groupedData.set(dimensionValue, datum);
}
+ const untranslatedBreakoutValue =
+ breakoutIndex != null
+ ? rowsForKeys[rowIndex][breakoutIndex]
+ : undefined;
+
aggregateColumnValuesForDatum(
datum,
datasetColumns,
@@ -181,9 +189,10 @@ export const getJoinedCardsDataset = (
card.id,
dimensionIndex,
breakoutIndex,
+ untranslatedBreakoutValue,
showWarning,
);
- }
+ });
});
return Array.from(groupedData.values());
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 1a6ef2eaa28..6cf0e60cef5 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
@@ -252,6 +252,48 @@ describe("dataset transform functions", () => {
const result = getJoinedCardsDataset([], []);
expect(result).toEqual([]);
});
+
+ it("should use untranslatedRows for breakout dataset keys when present", () => {
+ const translatedSeries: SingleSeries = {
+ ...rawSeries2,
+ data: {
+ ...rawSeries2.data,
+ rows: [
+ [1, "Translated Type1", 100],
+ [2, "Translated Type1", 200],
+ [3, "Translated Type2", 300],
+ [3, "Translated Type3", 400],
+ ],
+ untranslatedRows: rawSeries2.data.rows,
+ },
+ };
+
+ const result = getJoinedCardsDataset([translatedSeries], [columns2]);
+
+ expect(result).toStrictEqual([
+ {
+ [X_AXIS_DATA_KEY]: 1,
+ "2:also_month:type1": 1,
+ "2:count:type1": 100,
+ "2:type:type1": "Translated Type1",
+ },
+ {
+ [X_AXIS_DATA_KEY]: 2,
+ "2:also_month:type1": 2,
+ "2:count:type1": 200,
+ "2:type:type1": "Translated Type1",
+ },
+ {
+ [X_AXIS_DATA_KEY]: 3,
+ "2:also_month:type2": 3,
+ "2:also_month:type3": 3,
+ "2:count:type2": 300,
+ "2:count:type3": 400,
+ "2:type:type2": "Translated Type2",
+ "2:type:type3": "Translated Type3",
+ },
+ ]);
+ });
});
describe("replaceValues", () => {
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts
index 00c36f8c8b9..73b38ba9305 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.ts
@@ -31,14 +31,15 @@ import type {
ComputedVisualizationSettings,
RenderingContext,
} from "metabase/visualizations/types";
-import type {
- CardId,
- DatasetColumn,
- DatasetData,
- RawSeries,
- RowValue,
- SeriesSettings,
- SingleSeries,
+import {
+ type CardId,
+ type DatasetColumn,
+ type DatasetData,
+ type RawSeries,
+ type RowValue,
+ type SeriesSettings,
+ type SingleSeries,
+ getRowsForStableKeys,
} from "metabase-types/api";
import {
@@ -93,7 +94,27 @@ const createLegacySeriesObjectKey = (
export const getBreakoutDistinctValues = (
data: DatasetData,
breakoutIndex: number,
-) => Array.from(new Set<RowValue>(data.rows.map((row) => row[breakoutIndex])));
+) => {
+ const rows = getRowsForStableKeys(data);
+ return Array.from(new Set<RowValue>(rows.map((row) => row[breakoutIndex])));
+};
+
+const getBreakoutDisplayValues = (
+ data: DatasetData,
+ breakoutIndex: number,
+): Map<RowValue, RowValue> => {
+ if (!data.untranslatedRows) {
+ return new Map();
+ }
+ const displayValues = new Map<RowValue, RowValue>();
+ data.untranslatedRows.forEach((untranslatedRow, index) => {
+ const key = untranslatedRow[breakoutIndex];
+ if (!displayValues.has(key)) {
+ displayValues.set(key, data.rows[index][breakoutIndex]);
+ }
+ });
+ return displayValues;
+};
const getDefaultSeriesName = (
columnDisplayNameOrFormattedBreakoutValue: string,
@@ -217,6 +238,10 @@ export const getCardSeriesModels = (
// Charts with breakout have one series per a unique breakout value. They can have only one metric in such cases.
const { metric, breakout } = columns;
const breakoutValues = getBreakoutDistinctValues(data, breakout.index);
+ const breakoutDisplayValueMap = getBreakoutDisplayValues(
+ data,
+ breakout.index,
+ );
return breakoutValues.map((breakoutValue) => {
// Unfortunately, breakout series include formatted breakout values in the key
@@ -230,6 +255,12 @@ export const getCardSeriesModels = (
)
: NULL_DISPLAY_VALUE;
+ const displayValue = breakoutDisplayValueMap.get(breakoutValue);
+ const formattedDisplayValue =
+ displayValue != null
+ ? String(formatValue(displayValue, { column: breakout.column }))
+ : formattedBreakoutValue;
+
const vizSettingsKey = getSeriesVizSettingsKey(
metric.column,
hasMultipleCards,
@@ -246,7 +277,7 @@ export const getCardSeriesModels = (
const name =
customName ??
getDefaultSeriesName(
- formattedBreakoutValue,
+ formattedDisplayValue,
hasMultipleCards,
1, // only one metric when a chart has a breakout
true,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.unit.spec.ts
index e93ae3bdd14..8e74ef27112 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/series.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/series.unit.spec.ts
@@ -12,7 +12,7 @@ import {
createMockVisualizationSettings,
} from "metabase-types/api/mocks";
-import { getCardsSeriesModels } from "./series";
+import { getBreakoutDistinctValues, getCardsSeriesModels } from "./series";
const createMockComputedVisualizationSettings = (
opts: Partial<ComputedVisualizationSettings> = {},
@@ -380,5 +380,117 @@ describe("series", () => {
});
});
});
+
+ describe("with untranslatedRows", () => {
+ it("should use untranslated breakout values for keys when rows are translated", () => {
+ const translatedSeries: SingleSeries = {
+ ...breakoutSeries,
+ data: {
+ ...breakoutSeries.data,
+ rows: [
+ [1, "Translated1", 100],
+ [2, "Translated1", 200],
+ [3, "Translated2", 300],
+ [3, "Translated2", 400],
+ ],
+ untranslatedRows: breakoutSeries.data.rows,
+ },
+ };
+
+ const rawSeries = [translatedSeries];
+ const cardsColumns = [breakoutColumns];
+
+ const result = getCardsSeriesModels(
+ rawSeries,
+ cardsColumns,
+ [],
+ createMockComputedVisualizationSettings(),
+ );
+
+ expect(result).toHaveLength(2);
+ expect(result[0]).toMatchObject({
+ dataKey: "2:count:type1",
+ vizSettingsKey: "type1",
+ name: "Translated1",
+ });
+ expect(result[1]).toMatchObject({
+ dataKey: "2:count:type2",
+ vizSettingsKey: "type2",
+ name: "Translated2",
+ });
+ });
+
+ it("should match series_settings using untranslated keys", () => {
+ const translatedSeries: SingleSeries = {
+ ...breakoutSeries,
+ data: {
+ ...breakoutSeries.data,
+ rows: [
+ [1, "Type One", 100],
+ [2, "Type One", 200],
+ [3, "Type Two", 300],
+ [3, "Type Two", 400],
+ ],
+ untranslatedRows: breakoutSeries.data.rows,
+ },
+ };
+
+ const rawSeries = [translatedSeries];
+ const cardsColumns = [breakoutColumns];
+
+ const result = getCardsSeriesModels(
+ rawSeries,
+ cardsColumns,
+ [],
+ createMockComputedVisualizationSettings({
+ series_settings: {
+ type1: { title: "Custom Name" },
+ },
+ }),
+ );
+
+ expect(result[0]).toMatchObject({
+ dataKey: "2:count:type1",
+ name: "Custom Name",
+ });
+ expect(result[1]).toMatchObject({
+ dataKey: "2:count:type2",
+ name: "Type Two",
+ });
+ });
+ });
+ });
+
+ describe("getBreakoutDistinctValues", () => {
+ it("should return distinct values from rows", () => {
+ const data = createMockDatasetData({
+ rows: [
+ [1, "a", 100],
+ [2, "b", 200],
+ [3, "a", 300],
+ ],
+ });
+
+ const result = getBreakoutDistinctValues(data, 1);
+ expect(result).toEqual(["a", "b"]);
+ });
+
+ it("should use untranslatedRows when present", () => {
+ const data = createMockDatasetData({
+ rows: [
+ [1, "Translated A", 100],
+ [2, "Translated B", 200],
+ [3, "Translated A", 300],
+ ],
+ untranslatedRows: [
+ [1, "a", 100],
+ [2, "b", 200],
+ [3, "a", 300],
+ ],
+ });
+
+ const result = getBreakoutDistinctValues(data, 1);
+ expect(result).toEqual(["a", "b"]);
+ });
});
});
diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.ts
index 6b0d97b3665..1a14dd0e17a 100644
--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.ts
+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.ts
@@ -3,7 +3,12 @@ import { getColumnDescriptors } from "metabase/visualizations/lib/graph/columns"
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import { getColumnKey } from "metabase-lib/v1/queries/utils/column-key";
import { isMetric } from "metabase-lib/v1/types/utils/isa";
-import type { DatasetColumn, RawSeries, RowValue } from "metabase-types/api";
+import {
+ type DatasetColumn,
+ type RawSeries,
+ type RowValue,
+ getRowsForStableKeys,
+} from "metabase-types/api";
import { NULL_CHAR } from "../../../cartesian/constants/dataset";
@@ -53,6 +58,7 @@ export const getSankeyData = (
data: { rows, cols },
},
] = rawSeries;
+ const rowsForKeys = getRowsForStableKeys(rawSeries[0].data);
// getColumnKey and isMetric are slow so we compute needed metadata here instead of when iterating through rows
const columnInfos = cols.map((column) => ({
@@ -60,6 +66,19 @@ export const getSankeyData = (
isMetric: isMetric(column),
}));
+ const displayNameMap = new Map<RowValue, RowValue>();
+ if (rawSeries[0].data.untranslatedRows) {
+ const untranslatedRows = rawSeries[0].data.untranslatedRows;
+ untranslatedRows.forEach((untranslatedRow, index) => {
+ for (const column of [sankeyColumns.source, sankeyColumns.target]) {
+ const key = untranslatedRow[column.index];
+ if (!displayNameMap.has(key)) {
+ displayNameMap.set(key, rows[index][column.index]);
+ }
+ }
+ });
+ }
+
const valueToNode = new Map<RowValue, SankeyNode>();
function updateNode(
@@ -70,6 +89,7 @@ export const getSankeyData = (
): SankeyNode {
const node = valueToNode.get(value) ?? {
rawName: value,
+ displayName: displayNameMap.get(value) ?? value,
level,
hasInputs: false,
hasOutputs: false,
@@ -114,9 +134,10 @@ export const getSankeyData = (
const linkMap = new Map<string, SankeyLink>();
- rows.forEach((row) => {
- const source = row[sankeyColumns.source.index];
- const target = row[sankeyColumns.target.index];
+ rows.forEach((row, rowIndex) => {
+ const keyRow = rowsForKeys[rowIndex];
+ const source = keyRow[sankeyColumns.source.index];
+ const target = keyRow[sankeyColumns.target.index];
const value = row[sankeyColumns.value.index];
const linkKey = `${NULL_CHAR}${source}->${target}`;
diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.unit.spec.ts
index d6202d455af..5d0996f1249 100644
--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/dataset.unit.spec.ts
@@ -222,4 +222,47 @@ describe("getSankeyData", () => {
expect(result.links[2].sourceNode).toBe(nodeA);
expect(result.links[2].targetNode).toBe(nodeC);
});
+
+ it("should use untranslatedRows for node and link keys when present", () => {
+ const rawSeries = [
+ {
+ card: createMockCard({
+ name: "Sankey card",
+ display: "sankey",
+ }),
+ data: createMockDatasetData({
+ rows: [
+ ["Source Translated", "Target Translated", 10, 100],
+ ["Source Translated", "Target Translated", 1, 10],
+ ["Target Translated", "Sink Translated", 20, 200],
+ ],
+ cols: columns,
+ untranslatedRows: [
+ ["A", "B", 10, 100],
+ ["A", "B", 1, 10],
+ ["B", "C", 20, 200],
+ ],
+ }),
+ },
+ ];
+
+ const result = getSankeyData(rawSeries, sankeyColumns);
+
+ expect(result.nodes).toHaveLength(3);
+ expect(result.nodes[0].rawName).toBe("A");
+ expect(result.nodes[1].rawName).toBe("B");
+ expect(result.nodes[2].rawName).toBe("C");
+
+ expect(result.links).toHaveLength(2);
+ expect(result.links[0]).toMatchObject({
+ source: "A",
+ target: "B",
+ value: 11,
+ });
+ expect(result.links[1]).toMatchObject({
+ source: "B",
+ target: "C",
+ value: 20,
+ });
+ });
});
diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/types.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/types.ts
index 96084df2f1c..6cb92bcab4d 100644
--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/model/types.ts
+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/model/types.ts
@@ -11,6 +11,7 @@ export interface SankeyChartColumns {
export interface SankeyNode {
rawName: RowValue;
+ displayName: RowValue;
level: number;
hasInputs: boolean;
hasOutputs: boolean;
diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/index.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/index.ts
index 79a5586f4f1..c84d8212c65 100644
--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/index.ts
@@ -18,13 +18,17 @@ export const getSankeyChartOption = (
renderingContext: RenderingContext,
): EChartsCoreOption => {
const { data, formatters } = chartModel;
+
const nodes = data.nodes.map((node) => {
const formattedName = formatters.node(node);
+ const formattedDisplayName = !node.hasOutputs
+ ? formatters.target(node.displayName)
+ : formatters.source(node.displayName);
return {
...node,
name: formattedName,
- value: formattedName,
+ value: formattedDisplayName,
itemStyle: {
color: chartModel.nodeColors[String(node.rawName)],
},
diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx
index 10984a98461..292271fa0f8 100644
--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx
+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/tooltip.tsx
@@ -36,10 +36,15 @@ const ChartItemTooltip = ({ chartModel, params }: ChartItemTooltipProps) => {
if (params.dataType === "node") {
node = chartModel.data.nodes.find((node) => node.rawName === data.rawName)!;
- header = formatters.node(node);
+ header = !node.hasOutputs
+ ? formatters.target(node.displayName)
+ : formatters.source(node.displayName);
} else if (params.dataType === "edge") {
node = chartModel.data.nodes.find((node) => node.rawName === data.source)!;
- header = `${formatters.source(data.source)} → ${formatters.target(data.target)}`;
+ const targetNode = chartModel.data.nodes.find(
+ (node) => node.rawName === data.target,
+ );
+ header = `${formatters.source(node.displayName)} → ${formatters.target(targetNode?.displayName ?? data.target)}`;
}
if (!node) {
@@ -58,7 +63,7 @@ const ChartItemTooltip = ({ chartModel, params }: ChartItemTooltipProps) => {
const isFocused = params.dataType === "edge" && data.target === link.target;
return {
isFocused,
- name: formatters.target(link.target),
+ name: formatters.target(link.targetNode.displayName),
values: [
formatters.value(link.value),
formatPercent(getPercent(nodeValue, link.value) ?? 0),
@@ -71,7 +76,7 @@ const ChartItemTooltip = ({ chartModel, params }: ChartItemTooltipProps) => {
if (isEndNode) {
rows = [
{
- name: formatters.target(node.rawName),
+ name: formatters.target(node.displayName),
markerColorClass: getMarkerColorClass(
chartModel.nodeColors[String(node.rawName)],
),
diff --git a/frontend/src/metabase/visualizations/echarts/pie/model/index.ts b/frontend/src/metabase/visualizations/echarts/pie/model/index.ts
index 418982c13e2..9cd0da746cb 100644
--- a/frontend/src/metabase/visualizations/echarts/pie/model/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/pie/model/index.ts
@@ -18,7 +18,11 @@ import type {
ComputedVisualizationSettings,
RenderingContext,
} from "metabase/visualizations/types";
-import type { RawSeries, RowValue } from "metabase-types/api";
+import {
+ type RawSeries,
+ type RowValue,
+ getRowsForStableKeys,
+} from "metabase-types/api";
import type { ShowWarning } from "../../types";
import {
@@ -254,20 +258,35 @@ export function getPieChartModel(
renderingContext: RenderingContext,
showWarning?: ShowWarning,
): PieChartModel {
- const [
- {
- data: { rows: dataRows },
- },
- ] = rawSeries;
+ const [{ data }] = rawSeries;
+ const { rows: dataRows, untranslatedRows } = data;
+ const stableKeyRows = getRowsForStableKeys(data);
const colDescs = getPieColumns(rawSeries, settings);
+ const dimensionIndex = colDescs.dimensionDesc.index;
+
+ const translatedNameByKey = new Map<string, string>();
+ if (untranslatedRows) {
+ const format = getDimensionFormatter(
+ settings,
+ colDescs.dimensionDesc.column,
+ );
+ for (let index = 0; index < untranslatedRows.length; index++) {
+ const key = getKeyFromDimensionValue(
+ untranslatedRows[index][dimensionIndex],
+ );
+ if (!translatedNameByKey.has(key)) {
+ translatedNameByKey.set(key, format(dataRows[index][dimensionIndex]));
+ }
+ }
+ }
const areAllNegative = dataRows.every(
(row) => getNumberOr(row[colDescs.metricDesc.index], 0) < 0,
);
const rowIndiciesByKey = new Map<string | number, number>();
- dataRows.forEach((row, index) => {
- const key = getKeyFromDimensionValue(row[colDescs.dimensionDesc.index]);
+ stableKeyRows.forEach((row, index) => {
+ const key = getKeyFromDimensionValue(row[dimensionIndex]);
if (rowIndiciesByKey.has(key)) {
return;
@@ -276,8 +295,8 @@ export function getPieChartModel(
});
const aggregatedRows = getAggregatedRows(
- dataRows,
- colDescs.dimensionDesc.index,
+ stableKeyRows,
+ dimensionIndex,
colDescs.metricDesc.index,
colDescs.middleDimensionDesc == null ? showWarning : undefined,
colDescs.dimensionDesc.column,
@@ -286,7 +305,7 @@ export function getPieChartModel(
const rowValuesByKey = new Map<string | number, number>();
aggregatedRows.map((row) =>
rowValuesByKey.set(
- getKeyFromDimensionValue(row[colDescs.dimensionDesc.index]),
+ getKeyFromDimensionValue(row[dimensionIndex]),
getNumberOr(row[colDescs.metricDesc.index], 0),
),
);
@@ -354,7 +373,7 @@ export function getPieChartModel(
const o = {
key,
- name,
+ name: translatedNameByKey.get(key) ?? name,
value: Math.abs(value),
rawValue: value,
normalizedPercentage,
@@ -425,7 +444,7 @@ export function getPieChartModel(
}
const dimensionNode = sliceTree.get(
- getKeyFromDimensionValue(row[colDescs.dimensionDesc.index]),
+ getKeyFromDimensionValue(stableKeyRows[index][dimensionIndex]),
);
const dimensionIsOther = dimensionNode == null;
if (dimensionIsOther) {
diff --git a/frontend/src/metabase/visualizations/shared/settings/pie.ts b/frontend/src/metabase/visualizations/shared/settings/pie.ts
index 4664d727fb3..4eede673fed 100644
--- a/frontend/src/metabase/visualizations/shared/settings/pie.ts
+++ b/frontend/src/metabase/visualizations/shared/settings/pie.ts
@@ -16,12 +16,13 @@ import type {
ComputedVisualizationSettings,
Formatter,
} from "metabase/visualizations/types";
-import type {
- DatasetColumn,
- MaybeTranslatedSeries,
- RawSeries,
- RowValue,
- RowValues,
+import {
+ type DatasetColumn,
+ type MaybeTranslatedSeries,
+ type RawSeries,
+ type RowValue,
+ type RowValues,
+ getRowsForStableKeys,
} from "metabase-types/api";
export function getPieDimensions(settings: ComputedVisualizationSettings) {
@@ -148,9 +149,10 @@ export function getColors(
) {
const [
{
- data: { rows, cols },
+ data: { cols },
},
] = rawSeries;
+ const rowsForKeys = getRowsForStableKeys(rawSeries[0].data);
const dimensionName = getPieDimensions(currentSettings)[0];
const dimensionIndex = cols.findIndex((col) => col.name === dimensionName);
@@ -158,7 +160,7 @@ export function getColors(
(col) => col.name === currentSettings["pie.metric"],
);
const sortedRows = getSortedRows(
- getAggregatedRows(rows, dimensionIndex, metricIndex),
+ getAggregatedRows(rowsForKeys, dimensionIndex, metricIndex),
metricIndex,
);
@@ -186,31 +188,6 @@ export function getPieRows(
},
] = rawSeries;
- const untranslatedKeysToTranslatedKeys = new Map<string, string>();
- if (untranslatedRows) {
- untranslatedRows.forEach((row, i) => {
- const untranslatedValue = row[0];
- const translatedValue = dataRows[i][0];
-
- if (
- typeof untranslatedValue === "string" &&
- typeof translatedValue === "string"
- ) {
- untranslatedKeysToTranslatedKeys.set(
- untranslatedValue,
- translatedValue,
- );
- }
- });
- } else {
- dataRows.forEach((row) => {
- if (typeof row[0] !== "string") {
- return;
- }
- untranslatedKeysToTranslatedKeys.set(row[0], row[0]);
- });
- }
-
if (!settings["pie.metric"] || !settings["pie.dimension"]) {
return [];
}
@@ -245,11 +222,32 @@ export function getPieRows(
colors = { ...colors, ...settings["pie.colors"] };
}
+ const rowsForKeys = getRowsForStableKeys(rawSeries[0].data);
const currentDataRows = getAggregatedRows(
- dataRows,
+ rowsForKeys,
dimensionDesc.index,
metricDesc.index,
);
+
+ // When translations are active, map untranslated keys to translated
+ // display values so labels show translated text while keys stay stable.
+ const translatedDisplayValues = new Map<string, RowValue>();
+ if (untranslatedRows) {
+ const seen = new Set<string>();
+ untranslatedRows.forEach((row, index) => {
+ const key = getKeyFromDimensionValue(row[dimensionDesc.index]);
+ if (!seen.has(key)) {
+ seen.add(key);
+ translatedDisplayValues.set(key, dataRows[index][dimensionDesc.index]);
+ }
+ });
+ }
+
+ const getDisplayValue = (dimensionValue: RowValue): RowValue => {
+ const key = getKeyFromDimensionValue(dimensionValue);
+ return translatedDisplayValues.get(key) ?? dimensionValue;
+ };
+
const keyToCurrentDataRow = new Map<PieRow["key"], RowValues>(
currentDataRows.map((dataRow) => [
getKeyFromDimensionValue(dataRow[dimensionDesc.index]),
@@ -261,13 +259,6 @@ export function getPieRows(
const savedPieRows = hasSortDimensionChanged
? []
: (settings["pie.rows"] ?? []);
- const savedColors = new Map<string, string>();
- savedPieRows.forEach((pieRow) => {
- savedColors.set(
- untranslatedKeysToTranslatedKeys.get(pieRow.key) ?? pieRow.key,
- pieRow.color,
- );
- });
const savedPieKeys = savedPieRows.map((pieRow) => pieRow.key);
@@ -303,13 +294,14 @@ export function getPieRows(
return newRow;
}
- const name = formatDimensionValue(dimensionValue);
+ const displayValue = getDisplayValue(dimensionValue);
+ const name = formatDimensionValue(displayValue);
return {
key,
name,
originalName: name,
- color: savedColors.get(key) ?? color,
+ color,
defaultColor: true,
enabled: true,
hidden: false,
@@ -349,13 +341,14 @@ export function getPieRows(
const color = Color(colors[String(dimensionValue)]).hex();
const key = getKeyFromDimensionValue(dimensionValue);
- const name = formatDimensionValue(dimensionValue);
+ const displayValue = getDisplayValue(dimensionValue);
+ const name = formatDimensionValue(displayValue);
return {
key,
name,
originalName: name,
- color: savedColors.get(key) ?? color,
+ color,
defaultColor: true,
enabled: true,
hidden: false,
diff --git a/frontend/src/metabase/visualizations/shared/utils/data.ts b/frontend/src/metabase/visualizations/shared/utils/data.ts
index 1ee9b74304d..78034b7177f 100644
--- a/frontend/src/metabase/visualizations/shared/utils/data.ts
+++ b/frontend/src/metabase/visualizations/shared/utils/data.ts
@@ -20,11 +20,11 @@ import type {
ComputedVisualizationSettings,
RemappingHydratedDatasetColumn,
} from "metabase/visualizations/types";
-import type {
- DatasetData,
- RowValue,
- RowValues,
- SeriesOrderSetting,
+import {
+ type DatasetData,
+ type RowValue,
+ type SeriesOrderSetting,
+ getRowsForStableKeys,
} from "metabase-types/api";
import { getChartMetrics } from "./series";
@@ -52,7 +52,7 @@ const sumMetrics = (left: MetricDatum, right: MetricDatum): MetricDatum => {
};
export const getGroupedDataset = (
- rows: RowValues[],
+ data: Pick<DatasetData, "rows" | "untranslatedRows">,
chartColumns: CartesianChartColumns,
settings: ComputedVisualizationSettings,
columnFormatter: ColumnFormatter,
@@ -60,8 +60,9 @@ export const getGroupedDataset = (
const { dimension } = chartColumns;
const groupedData = new Map<RowValue, GroupedDatum>();
+ const rowsForBreakoutKeys = getRowsForStableKeys(data);
- for (const row of rows) {
+ data.rows.forEach((row, rowIndex) => {
const dimensionValue = row[dimension.index];
const datum = groupedData.get(dimensionValue) ?? {
@@ -87,7 +88,7 @@ export const getGroupedDataset = (
if ("breakout" in chartColumns) {
const breakoutName = columnFormatter(
- row[chartColumns.breakout.index],
+ rowsForBreakoutKeys[rowIndex][chartColumns.breakout.index],
chartColumns.breakout.column,
);
@@ -111,7 +112,7 @@ export const getGroupedDataset = (
datum.rawRows.push(row);
groupedData.set(dimensionValue, datum);
- }
+ });
return Array.from(groupedData.values());
};
@@ -173,51 +174,57 @@ const getBreakoutDistinctValues = (
data: DatasetData,
breakout: ColumnDescriptor,
columnFormatter: ColumnFormatter,
-): string[] => {
- const formattedDistinctValues: string[] = [];
+): Map<string, string> => {
+ const result = new Map<string, string>();
const usedRawValues = new Set<RowValue>();
- for (const row of data.rows) {
- const rawValue = row[breakout.index];
+ const rowsForKeys = getRowsForStableKeys(data);
+ for (let index = 0; index < rowsForKeys.length; index++) {
+ const rawValue = rowsForKeys[index][breakout.index];
if (usedRawValues.has(rawValue)) {
continue;
}
usedRawValues.add(rawValue);
- formattedDistinctValues.push(columnFormatter(rawValue, breakout.column));
+ const formattedKey = columnFormatter(rawValue, breakout.column);
+ const displayValue = data.untranslatedRows
+ ? columnFormatter(data.rows[index][breakout.index], breakout.column)
+ : formattedKey;
+ result.set(formattedKey, displayValue);
}
- return formattedDistinctValues;
+ return result;
};
const getBreakoutSeries = (
- breakoutValues: RowValue[],
+ breakoutValues: Map<string, string>,
metric: ColumnDescriptor,
dimension: ColumnDescriptor,
settings: ComputedVisualizationSettings,
): Series<GroupedDatum, SeriesInfo>[] => {
- return breakoutValues.map((breakoutValue) => {
- const breakoutName = String(breakoutValue);
- const customName = settings?.series_settings?.[breakoutName]?.title;
- return {
- seriesKey: breakoutName,
- seriesName: customName ?? breakoutName,
- yAccessor: (datum: GroupedDatum) =>
- formatNullable(
- typeof datum.dimensionValue === "object"
- ? JSON.stringify(datum.dimensionValue)
- : datum.dimensionValue,
- ),
- xAccessor: (datum: GroupedDatum) =>
- datum.breakout?.[breakoutName]?.metrics[metric.column.name] ?? null,
- seriesInfo: {
- metricColumn: metric.column,
- dimensionColumn: dimension.column,
- breakoutValue,
- },
- };
- });
+ return Array.from(breakoutValues.entries()).map(
+ ([breakoutKey, displayValue]) => {
+ const customName = settings?.series_settings?.[breakoutKey]?.title;
+ return {
+ seriesKey: breakoutKey,
+ seriesName: customName ?? displayValue,
+ yAccessor: (datum: GroupedDatum) =>
+ formatNullable(
+ typeof datum.dimensionValue === "object"
+ ? JSON.stringify(datum.dimensionValue)
+ : datum.dimensionValue,
+ ),
+ xAccessor: (datum: GroupedDatum) =>
+ datum.breakout?.[breakoutKey]?.metrics[metric.column.name] ?? null,
+ seriesInfo: {
+ metricColumn: metric.column,
+ dimensionColumn: dimension.column,
+ breakoutValue: breakoutKey,
+ },
+ };
+ },
+ );
};
const getMultipleMetricSeries = (
diff --git a/frontend/src/metabase/visualizations/shared/utils/data.unit.spec.ts b/frontend/src/metabase/visualizations/shared/utils/data.unit.spec.ts
index 300ef473474..eb939d91dca 100644
--- a/frontend/src/metabase/visualizations/shared/utils/data.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/shared/utils/data.unit.spec.ts
@@ -68,7 +68,7 @@ describe("data utils", () => {
describe("chart with multiple metrics", () => {
it("should group dataset by dimension values", () => {
const groupedData = getGroupedDataset(
- rows,
+ { rows },
multipleMetricsChartColumns,
createMockVisualizationSettings({ column: () => {} }),
columnFormatter,
@@ -101,7 +101,7 @@ describe("data utils", () => {
describe("chart with a breakout", () => {
it("should group dataset by dimension values and breakout", () => {
const groupedData = getGroupedDataset(
- rows,
+ { rows },
breakoutChartColumns,
createMockVisualizationSettings({ column: () => {} }),
columnFormatter,
@@ -154,6 +154,43 @@ describe("data utils", () => {
},
]);
});
+
+ it("should use untranslatedRows for breakout keys when present", () => {
+ const translatedRows = [
+ [2020, "Appareil", 400, 90],
+ [2020, "Bidule", 450, 100],
+ [2021, "Appareil", 500, 110],
+ [2021, "Bidule", 550, 120],
+ ];
+
+ const groupedData = getGroupedDataset(
+ { rows: translatedRows, untranslatedRows: rows },
+ breakoutChartColumns,
+ createMockVisualizationSettings({ column: () => {} }),
+ columnFormatter,
+ );
+
+ expect(groupedData[0].breakout).toStrictEqual({
+ Doohickey: {
+ metrics: { count: 400 },
+ rawRows: [translatedRows[0]],
+ },
+ Gadget: {
+ metrics: { count: 450 },
+ rawRows: [translatedRows[1]],
+ },
+ });
+ expect(groupedData[1].breakout).toStrictEqual({
+ Doohickey: {
+ metrics: { count: 500 },
+ rawRows: [translatedRows[2]],
+ },
+ Gadget: {
+ metrics: { count: 550 },
+ rawRows: [translatedRows[3]],
+ },
+ });
+ });
});
describe("getSeries", () => {
@@ -232,6 +269,79 @@ describe("data utils", () => {
});
});
+ describe("with untranslatedRows", () => {
+ it("should use untranslated breakout values for series keys and translated for display", () => {
+ const data = createMockDatasetData({
+ cols: [dimensionColumn, breakoutColumn, countMetricColumn],
+ rows: [
+ [2020, "Appareil", 400, 90],
+ [2020, "Bidule", 450, 100],
+ [2021, "Appareil", 500, 110],
+ [2021, "Bidule", 550, 120],
+ ],
+ untranslatedRows: rows,
+ });
+
+ const series = getSeries(
+ data,
+ breakoutChartColumns,
+ columnFormatter,
+ createMockVisualizationSettings(),
+ );
+
+ expect(series).toHaveLength(2);
+ expect(series[0]).toMatchObject({
+ seriesKey: "Doohickey",
+ seriesName: "Appareil",
+ seriesInfo: {
+ breakoutValue: "Doohickey",
+ },
+ });
+ expect(series[1]).toMatchObject({
+ seriesKey: "Gadget",
+ seriesName: "Bidule",
+ seriesInfo: {
+ breakoutValue: "Gadget",
+ },
+ });
+ });
+
+ it("should apply custom title from settings using untranslated keys", () => {
+ const data = createMockDatasetData({
+ cols: [dimensionColumn, breakoutColumn, countMetricColumn],
+ rows: [
+ [2020, "Appareil", 400, 90],
+ [2020, "Bidule", 450, 100],
+ [2021, "Appareil", 500, 110],
+ [2021, "Bidule", 550, 120],
+ ],
+ untranslatedRows: rows,
+ });
+
+ const settings = createMockVisualizationSettings({
+ series_settings: {
+ Doohickey: { title: "Custom Name" },
+ },
+ });
+
+ const series = getSeries(
+ data,
+ breakoutChartColumns,
+ columnFormatter,
+ settings,
+ );
+
+ expect(series[0]).toMatchObject({
+ seriesKey: "Doohickey",
+ seriesName: "Custom Name",
+ });
+ expect(series[1]).toMatchObject({
+ seriesKey: "Gadget",
+ seriesName: "Bidule",
+ });
+ });
+ });
+
describe("custom series titles", () => {
it("should apply custom title from settings for breakout series", () => {
const data = createMockDatasetData({
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition-legacy.js b/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition-legacy.js
index d03ca512340..7c006327102 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition-legacy.js
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/chart-definition-legacy.js
@@ -5,6 +5,7 @@ import { formatValue } from "metabase/lib/formatting";
import { isEmpty } from "metabase/lib/validate";
import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";
import { MAX_SERIES } from "metabase/visualizations/lib/utils";
+import { getRowsForStableKeys } from "metabase-types/api";
// TODO: this series transformation is used only for the visualization settings computation which is excessive.
// Replace this with defining settings models per visualization type which will contain all necessary info
@@ -31,6 +32,7 @@ function transformSingleSeries(s, series, seriesIndex) {
}
const { cols, rows } = data;
+ const rowsForBreakoutKeys = getRowsForStableKeys(data);
const settings = getComputedSettingsForSeries([s]);
const dimensions = (settings["graph.dimensions"] || []).filter(
@@ -63,7 +65,7 @@ function transformSingleSeries(s, series, seriesIndex) {
for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
const row = rows[rowIndex];
- const seriesValue = row[seriesColumnIndex];
+ const seriesValue = rowsForBreakoutKeys[rowIndex][seriesColumnIndex];
let seriesRows = breakoutRowsByValue.get(seriesValue);
if (!seriesRows) {
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
index c70958742df..77d580b40ae 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.tsx
@@ -29,7 +29,12 @@ import type {
} from "metabase/visualizations/types";
import { BarChart } from "metabase/visualizations/visualizations/BarChart";
import { funnelToBarTransform } from "metabase/visualizations/visualizations/Funnel/funnel-bar-transform";
-import type { DatasetData, RawSeries, RowValue } from "metabase-types/api";
+import {
+ type DatasetData,
+ type RawSeries,
+ type RowValue,
+ getRowsForStableKeys,
+} from "metabase-types/api";
import { FunnelNormal } from "../../components/FunnelNormal";
@@ -99,13 +104,10 @@ Object.assign(Funnel, {
section: t`Data`,
widget: ChartSettingOrderedSimple,
getValue: (
- [
- {
- data: { cols, rows },
- },
- ]: RawSeries,
+ rawSeries: RawSeries,
settings: ComputedVisualizationSettings,
) => {
+ const { cols } = rawSeries[0].data;
const dimensionIndex = cols.findIndex(
(col) => col.name === settings["funnel.dimension"],
);
@@ -113,7 +115,10 @@ Object.assign(Funnel, {
const dimension = settings["funnel.dimension"];
const rowsOrder = settings["funnel.rows"];
- const rowsKeys = rows.map((row) => formatNullable(row[dimensionIndex]));
+ const rowsForKeys = getRowsForStableKeys(rawSeries[0].data);
+ const rowsKeys = rowsForKeys.map((row) =>
+ formatNullable(row[dimensionIndex]),
+ );
const getDefault = (keys: RowValue[]) =>
keys.map((key) => ({
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
index e3553234ffc..1388147099e 100644
--- a/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/RowChart.tsx
@@ -132,8 +132,7 @@ const RowChartVisualization = ({
);
const groupedData = useMemo(
- () =>
- getGroupedDataset(data.rows, chartColumns, settings, formatColumnValue),
+ () => getGroupedDataset(data, chartColumns, settings, formatColumnValue),
[chartColumns, data, settings, formatColumnValue],
);
const goal = useMemo(() => getChartGoal(settings), [settings]);
diff --git a/frontend/src/metabase/visualizations/visualizations/SankeyChart/events.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/SankeyChart/events.unit.spec.ts
index d35dfdd2841..c644c91df9b 100644
--- a/frontend/src/metabase/visualizations/visualizations/SankeyChart/events.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SankeyChart/events.unit.spec.ts
@@ -55,6 +55,7 @@ describe("createSankeyClickData", () => {
dataType: "node",
data: {
rawName: "A",
+ displayName: "A",
level: 0,
hasInputs: false,
hasOutputs: true,
@@ -96,6 +97,7 @@ describe("createSankeyClickData", () => {
dataType: "node",
data: {
rawName: "B",
+ displayName: "B",
level: 1,
hasInputs: true,
hasOutputs: false,
@@ -135,6 +137,7 @@ describe("createSankeyClickData", () => {
it("should create click data for edge events", () => {
const sourceNode = {
rawName: "A",
+ displayName: "A",
level: 0,
hasInputs: false,
hasOutputs: true,
@@ -145,6 +148,7 @@ describe("createSankeyClickData", () => {
const targetNode = {
rawName: "B",
+ displayName: "B",
level: 1,
hasInputs: true,
hasOutputs: false,