You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2023/12/15 16:18:36 UTC
(superset) 03/05: fix: Stacked charts with numerical columns (#26264)
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 5f92c2f0dc2302c6e6a8e3703cc9fd4608f4ab03
Author: Michael S. Molina <70...@users.noreply.github.com>
AuthorDate: Wed Dec 13 17:10:51 2023 -0300
fix: Stacked charts with numerical columns (#26264)
(cherry picked from commit 429e2a33c3ac5a4b035e0cb113bc6e1e63a39e4c)
---
.../src/MixedTimeseries/transformProps.ts | 2 +-
.../plugin-chart-echarts/src/Timeseries/transformProps.ts | 2 +-
.../plugins/plugin-chart-echarts/src/utils/series.ts | 7 +++++--
.../plugins/plugin-chart-echarts/test/utils/series.test.ts | 11 +++++++----
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
index 00466c607a..8e5a230fcf 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -221,7 +221,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%')
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
index e81f13b784..02abd23c1a 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -245,7 +245,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);
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
index aa353f66d1..69c0ccbe1b 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
@@ -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;
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
index b445dceabb..b309bf6f3c 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/utils/series.test.ts
@@ -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', () => {