Skip to content

fix(echarts): Display NULL values in categorical x-axis for bar charts #34761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rusackas merged 1 commit into from
Sep 2, 2025
Merged

fix(echarts): Display NULL values in categorical x-axis for bar charts #34761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,18 @@ export default function transformProps(
const MetricDisplayNameA = getMetricDisplayName(metrics[0], verboseMap);
const MetricDisplayNameB = getMetricDisplayName(metricsB[0], verboseMap);

const dataTypes = getColtypesMapping(queriesData[0]);
const xAxisDataType = dataTypes?.[xAxisLabel] ?? dataTypes?.[xAxisOrig];
const xAxisType = getAxisType(stack, xAxisForceCategorical, xAxisDataType);

const [rawSeriesA, sortedTotalValuesA] = extractSeries(rebasedDataA, {
fillNeighborValue: stack ? 0 : undefined,
xAxis: xAxisLabel,
sortSeriesType,
sortSeriesAscending,
stack,
totalStackedValues,
xAxisType,
});
const rebasedDataB = rebaseForecastDatum(data2, verboseMap);
const {
Expand All @@ -267,11 +272,8 @@ export default function transformProps(
sortSeriesAscending: sortSeriesAscendingB,
stack: Boolean(stackB),
totalStackedValues: totalStackedValuesB,
xAxisType,
});

const dataTypes = getColtypesMapping(queriesData[0]);
const xAxisDataType = dataTypes?.[xAxisLabel] ?? dataTypes?.[xAxisOrig];
const xAxisType = getAxisType(stack, xAxisForceCategorical, xAxisDataType);
const series: SeriesOption[] = [];
const formatter = contributionMode
? getNumberFormatter(',.0%')
Expand Down
6 changes: 3 additions & 3 deletions superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ export default function transformProps(
);

const isMultiSeries = groupBy.length || metrics?.length > 1;
const xAxisDataType = dataTypes?.[xAxisLabel] ?? dataTypes?.[xAxisOrig];
const xAxisType = getAxisType(stack, xAxisForceCategorical, xAxisDataType);

const [rawSeries, sortedTotalValues, minPositiveValue] = extractSeries(
rebasedData,
Expand All @@ -247,6 +249,7 @@ export default function transformProps(
sortSeriesAscending,
xAxisSortSeries: isMultiSeries ? xAxisSort : undefined,
xAxisSortSeriesAscending: isMultiSeries ? xAxisSortAsc : undefined,
xAxisType,
},
);
const showValueIndexes = extractShowValueIndexes(rawSeries, {
Expand All @@ -259,9 +262,6 @@ export default function transformProps(
rawSeries.map(series => series.name as string),
);
const isAreaExpand = stack === StackControlsValue.Expand;
const xAxisDataType = dataTypes?.[xAxisLabel] ?? dataTypes?.[xAxisOrig];

const xAxisType = getAxisType(stack, xAxisForceCategorical, xAxisDataType);
const series: SeriesOption[] = [];

const forcePercentFormatter = Boolean(contributionMode || isAreaExpand);
Expand Down
7 changes: 6 additions & 1 deletion superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ export function extractSeries(
sortSeriesAscending?: boolean;
xAxisSortSeries?: SortSeriesType;
xAxisSortSeriesAscending?: boolean;
xAxisType?: AxisType;
} = {},
): [SeriesOption[], number[], number | undefined] {
const {
Expand All @@ -286,11 +287,15 @@ export function extractSeries(
sortSeriesAscending,
xAxisSortSeries,
xAxisSortSeriesAscending,
xAxisType,
} = opts;
if (data.length === 0) return [[], [], undefined];
const rows: DataRecord[] = data.map(datum => ({
...datum,
[xAxis]: datum[xAxis],
[xAxis]:
datum[xAxis] === null && xAxisType === AxisType.Category
? NULL_STRING
: datum[xAxis],
}));
const sortedSeries = sortAndFilterSeries(
rows,
Expand Down
37 changes: 37 additions & 0 deletions superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,43 @@ describe('extractSeries', () => {
]);
});

it('should convert NULL x-values to NULL_STRING for categorical axis', () => {
const data = [
{
browser: 'Firefox',
count: 5,
},
{
browser: null,
count: 10,
},
{
browser: 'Chrome',
count: 8,
},
];
expect(
extractSeries(data, {
xAxis: 'browser',
xAxisType: AxisType.Category,
}),
).toEqual([
[
{
id: 'count',
name: 'count',
data: [
['Firefox', 5],
[NULL_STRING, 10],
['Chrome', 8],
],
},
],
[],
5,
]);
});

it('should do missing value imputation', () => {
const data = [
{
Expand Down
Loading