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
UXW-2597 fix row bar charts' tooltip (#67617)
Egor Grushin2b97f841bcc1
diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.tsindex 1deb107ac21..f15bbd6de60 100644--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.ts@@ -55,12 +55,7 @@ const getMetricColumnData = (});};-const getColumnData = (- columns: ColumnDescriptor[],- datum: GroupedDatum,- rawRows: RowValues[],- seriesIndex: number,-) => {+const getColumnData = (columns: ColumnDescriptor[], rawRows: RowValues[]) => {return columns.map((columnDescriptor) => {const { column, index } = columnDescriptor;@@ -75,7 +70,7 @@ const getColumnData = (value = formatNullable(metricSum);} else {- value = datum.rawRows[seriesIndex][index];+ value = rawRows[0]?.[index];}return value != null@@ -91,8 +86,7 @@ const getColumnData = (const getColumnsData = (chartColumns: CartesianChartColumns,- series: Series<GroupedDatum, unknown>,- seriesIndex: number,+ series: Series<GroupedDatum>,datum: GroupedDatum,datasetColumns: DatasetColumn[],visualizationSettings: VisualizationSettings,@@ -133,9 +127,7 @@ const getColumnsData = (datasetColumns,);- data.push(- ...getColumnData(otherColumnsDescriptors, datum, rawRows, seriesIndex),- );+ data.push(...getColumnData(otherColumnsDescriptors, rawRows));return data;};@@ -145,11 +137,10 @@ export const getClickData = (chartColumns: CartesianChartColumns,datasetColumns: DatasetColumn[],): ClickObject => {- const { series, seriesIndex, datum } = bar;+ const { series, datum } = bar;const data = getColumnsData(chartColumns,series,- seriesIndex,datum,datasetColumns,visualizationSettings,@@ -314,7 +305,6 @@ export const getHoverData = (const data = getColumnsData(chartColumns,bar.series,- bar.seriesIndex,bar.datum,datasetColumns,settings,diff --git a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.unit.spec.tsindex 0383bcd94fb..3fbc748b766 100644--- a/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.unit.spec.ts+++ b/frontend/src/metabase/visualizations/visualizations/RowChart/utils/events.unit.spec.ts@@ -187,6 +187,117 @@ describe("events utils", () => {expect(tooltipModel).not.toBeDefined();});+ it("handles breakout where datum has fewer rawRows than seriesIndex (UXW-2597)", () => {+ // Simulates: SELECT 'Production' as stage, 'App1' as application, 'Finished' as status, 2000000 as x+ // UNION SELECT 'Development', 'App2', 'Finished', 2000000+ // Each dimension value has only one breakout value, but series are created for all breakout values+ const dataWithSparseBreakout: GroupedDatum[] = [+ {+ dimensionValue: "Production",+ metrics: { x: 2000000 },+ isClickable: true,+ rawRows: [["Production", "App1", "Finished", 2000000]],+ breakout: {+ App1: {+ metrics: { x: 2000000 },+ rawRows: [["Production", "App1", "Finished", 2000000]],+ },+ },+ },+ {+ dimensionValue: "Development",+ metrics: { x: 2000000 },+ isClickable: true,+ rawRows: [["Development", "App2", "Finished", 2000000]],+ breakout: {+ App2: {+ metrics: { x: 2000000 },+ rawRows: [["Development", "App2", "Finished", 2000000]],+ },+ },+ },+ ];++ const datasetColumns = [+ createMockColumn({ name: "stage", display_name: "Stage" }),+ createMockColumn({ name: "application", display_name: "Application" }),+ createMockColumn({ name: "status", display_name: "Status" }),+ createMockNumericColumn({ name: "x", display_name: "X" }),+ ];++ const columnsMap = {+ stage: datasetColumns[0],+ application: datasetColumns[1],+ status: datasetColumns[2],+ x: datasetColumns[3],+ };++ const chartColumns: BreakoutChartColumns = {+ dimension: { index: 0, column: columnsMap.stage },+ breakout: { index: 1, column: columnsMap.application },+ metric: { index: 3, column: columnsMap.x },+ };++ const seriesApp1: Series<GroupedDatum, SeriesInfo> = {+ seriesKey: "App1",+ seriesName: "App1",+ seriesInfo: {+ metricColumn: columnsMap.x,+ dimensionColumn: columnsMap.stage,+ breakoutValue: "App1",+ },+ xAccessor: (datum: GroupedDatum) => datum.metrics["x"],+ yAccessor: SERIES_Y_ACCESSOR,+ };++ const seriesApp2: Series<GroupedDatum, SeriesInfo> = {+ seriesKey: "App2",+ seriesName: "App2",+ seriesInfo: {+ metricColumn: columnsMap.x,+ dimensionColumn: columnsMap.stage,+ breakoutValue: "App2",+ },+ xAccessor: (datum: GroupedDatum) => datum.metrics["x"],+ yAccessor: SERIES_Y_ACCESSOR,+ };++ const seriesColors = {+ App1: "#509EE3",+ App2: "#88BF4D",+ };++ // Hover on Development/App2 bar - seriesIndex is 1 but datum.rawRows.length is 1+ const barData: BarData<GroupedDatum> = {+ isNegative: false,+ xStartValue: 0,+ xEndValue: 2000000,+ yValue: "Development",+ datum: dataWithSparseBreakout[1],+ datumIndex: 1,+ series: seriesApp2,+ seriesIndex: 1, // Second series, but datum only has 1 rawRow+ };++ // Should not throw and should return correct status value from breakout-specific rawRows+ const tooltipData = getHoverData(+ barData,+ { "graph.dimensions": ["stage", "application"] },+ chartColumns,+ datasetColumns,+ [seriesApp1, seriesApp2],+ seriesColors,+ );++ expect(tooltipData.data).toBeDefined();+ expect(+ tooltipData.data?.find(({ col }) => col?.name === "status")?.value,+ ).toBe("Finished");+ expect(+ tooltipData.data?.find(({ col }) => col?.name === "x")?.value,+ ).toBe(2000000);+ });+it("does handle data with breakout correctly (metabase#64931)", () => {const dataWithBreakout: GroupedDatum[] = [{