(superset) branch master updated: fix(histogram): compare groupby membership using column labels (#43219)

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 91c1135c054 fix(histogram): compare groupby membership using column labels (#43219)
91c1135c054 is described below

commit 91c1135c054d76edad336d664984e886e9d3aafb
Author: David Dallakyan <13...@users.noreply.github.com>
AuthorDate: Thu Sep 17 01:04:15 2026 +0400

    fix(histogram): compare groupby membership using column labels (#43219)
---
 .../src/Histogram/transformProps.ts                |   2 +-
 .../test/Histogram/transformProps.test.ts          | 112 +++++++++++++++++++++
 2 files changed, 113 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts
index f562e46fb58..9d0e13eadc9 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Histogram/transformProps.ts
@@ -79,7 +79,7 @@ export default function transformProps(
   const yAxisFormatter = formatter(yAxisFormat);
 
   const percentFormatter = getPercentFormatter(NumberFormats.PERCENT_2_POINT);
-  const groupbySet = new Set(groupby);
+  const groupbySet = new Set(groupby.map(getColumnLabel));
   const xAxisData: string[] = Object.keys(data[0])
     .filter(key => !groupbySet.has(key))
     .map(key => {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Histogram/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Histogram/transformProps.test.ts
new file mode 100644
index 00000000000..ee4d50ba8a6
--- /dev/null
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Histogram/transformProps.test.ts
@@ -0,0 +1,112 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ChartProps } from '@superset-ui/core';
+import { supersetTheme } from '@apache-superset/core/theme';
+import { BarSeriesOption } from 'echarts/charts';
+import transformProps from '../../src/Histogram/transformProps';
+import {
+  HistogramChartProps,
+  HistogramFormData,
+} from '../../src/Histogram/types';
+
+const formData: HistogramFormData = {
+  datasource: '5__table',
+  granularity_sqla: 'ds',
+  viz_type: 'histogram',
+  column: 'price',
+  groupby: [],
+  bins: 2,
+  cumulative: false,
+  normalize: false,
+  sliceId: 1,
+  showLegend: true,
+  showValue: false,
+  xAxisFormat: '',
+  xAxisTitle: '',
+  yAxisFormat: '',
+  yAxisTitle: '',
+};
+
+const createChartProps = (
+  data: Record<string, unknown>[],
+  overrides: Partial<HistogramFormData> = {},
+) =>
+  new ChartProps({
+    formData: { ...formData, ...overrides },
+    width: 800,
+    height: 600,
+    queriesData: [{ data }],
+    theme: supersetTheme,
+  });
+
+const readChart = (props: ChartProps) => {
+  const transformed = transformProps(props as HistogramChartProps);
+  const { xAxis, series } = transformed.echartOptions as {
+    xAxis: { data: string[] };
+    series: BarSeriesOption[];
+  };
+  return { xAxis, series };
+};
+
+test('transforms bin columns into an axis category and a bar series', () => {
+  const { xAxis, series } = readChart(
+    createChartProps([{ '0 - 5': 3, '5 - 10': 7 }]),
+  );
+
+  expect(xAxis.data).toHaveLength(2);
+  expect(series).toHaveLength(1);
+  expect(series[0].data).toEqual([3, 7]);
+});
+
+test('keeps physical groupby columns off the x-axis', () => {
+  const { xAxis, series } = readChart(
+    createChartProps([{ region: 'WEST', '0 - 5': 3, '5 - 10': 7 }], {
+      groupby: ['region'],
+    }),
+  );
+
+  expect(xAxis.data).toHaveLength(2);
+  expect(xAxis.data.every(label => !label.includes('NaN'))).toBe(true);
+  expect(series[0].name).toBe('WEST');
+  expect(series[0].data).toEqual([3, 7]);
+});
+
+test('does not treat adhoc groupby labels as histogram bin edges', () => {
+  /**
+   * Query results key groupby columns by getColumnLabel(), but groupby
+   * membership was checked against the raw form-data entries. Adhoc columns
+   * are objects, so they fail that filter, get parsed as bin edges, and
+   * show up as a NaN bin label on the x-axis.
+   */
+  const adhocGroupby = {
+    expressionType: 'SQL' as const,
+    sqlExpression: 'UPPER(region)',
+    label: 'region_upper',
+  };
+  const { xAxis, series } = readChart(
+    createChartProps([{ region_upper: 'WEST', '0 - 5': 3, '5 - 10': 7 }], {
+      groupby: [adhocGroupby],
+    }),
+  );
+
+  expect(xAxis.data).toHaveLength(2);
+  expect(xAxis.data.every(label => !label.includes('NaN'))).toBe(true);
+  expect(series[0].name).toBe('WEST');
+  expect(series[0].data).toEqual([3, 7]);
+});