iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Stacked charts with numerical columns (#26264)

This commit is contained in:
Michael S. Molina 2023-12-13 17:10:51 -03:00 committed by GitHub
parent 334e15997f
commit 429e2a33c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
View File

@ -223,7 +223,7 @@ export default function transformProps(
const dataTypes = getColtypesMapping(queriesData[0]);
const xAxisDataType = dataTypes?.[xAxisLabel] ?? dataTypes?.[xAxisOrig];
const xAxisType = getAxisType(xAxisDataType);
const xAxisType = getAxisType(stack, xAxisDataType);
const series: SeriesOption[] = [];
const formatter = contributionMode
? getNumberFormatter(',.0%')

2
superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
View File

@ -247,7 +247,7 @@ export default function transformProps(
const isAreaExpand = stack === StackControlsValue.Expand;
const xAxisDataType = dataTypes?.[xAxisLabel] ?? dataTypes?.[xAxisOrig];
const xAxisType = getAxisType(xAxisDataType);
const xAxisType = getAxisType(stack, xAxisDataType);
const series: SeriesOption[] = [];
const forcePercentFormatter = Boolean(contributionMode || isAreaExpand);

7
superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
View File

@ -508,11 +508,14 @@ export function sanitizeHtml(text: string): string {
return format.encodeHTML(text);
}
export function getAxisType(dataType?: GenericDataType): AxisType {
export function getAxisType(
stack: StackType,
dataType?: GenericDataType,
): AxisType {
if (dataType === GenericDataType.TEMPORAL) {
return AxisType.time;
}
if (dataType === GenericDataType.NUMERIC) {
if (dataType === GenericDataType.NUMERIC && !stack) {
return AxisType.value;
}
return AxisType.category;

11
superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
View File

@ -875,10 +875,13 @@ test('calculateLowerLogTick', () => {
});
test('getAxisType', () => {
expect(getAxisType(GenericDataType.TEMPORAL)).toEqual(AxisType.time);
expect(getAxisType(GenericDataType.NUMERIC)).toEqual(AxisType.value);
expect(getAxisType(GenericDataType.BOOLEAN)).toEqual(AxisType.category);
expect(getAxisType(GenericDataType.STRING)).toEqual(AxisType.category);
expect(getAxisType(false, GenericDataType.TEMPORAL)).toEqual(AxisType.time);
expect(getAxisType(false, GenericDataType.NUMERIC)).toEqual(AxisType.value);
expect(getAxisType(true, GenericDataType.NUMERIC)).toEqual(AxisType.category);
expect(getAxisType(false, GenericDataType.BOOLEAN)).toEqual(
AxisType.category,
);
expect(getAxisType(false, GenericDataType.STRING)).toEqual(AxisType.category);
});
test('getMinAndMaxFromBounds returns empty object when not truncating', () => {