This is an automated email from the ASF dual-hosted git repository.
vavila 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 5222f940cc fix(echarts): Sort series by name using naturalCompare
(#32850)
5222f940cc is described below
commit 5222f940cc6675d3c78217be77304f2bd2f5fb6c
Author: Vitor Avila <[email protected]>
AuthorDate: Wed Mar 26 08:17:43 2025 -0300
fix(echarts): Sort series by name using naturalCompare (#32850)
---
.../plugins/plugin-chart-echarts/package.json | 4 +-
.../plugin-chart-echarts/src/utils/series.ts | 12 ++-
.../plugin-chart-echarts/test/utils/series.test.ts | 111 +++++++++++++++++++++
3 files changed, 122 insertions(+), 5 deletions(-)
diff --git a/superset-frontend/plugins/plugin-chart-echarts/package.json
b/superset-frontend/plugins/plugin-chart-echarts/package.json
index 64da86afdc..01763f3078 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/package.json
+++ b/superset-frontend/plugins/plugin-chart-echarts/package.json
@@ -24,10 +24,10 @@
"lib"
],
"dependencies": {
+ "@types/react-redux": "^7.1.10",
"d3-array": "^1.2.0",
- "lodash": "^4.17.21",
"dayjs": "^1.11.13",
- "@types/react-redux": "^7.1.10"
+ "lodash": "^4.17.21"
},
"peerDependencies": {
"@superset-ui/chart-controls": "*",
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 ef10fb9d3b..157ab46f48 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/utils/series.ts
@@ -156,9 +156,15 @@ export function sortAndFilterSeries(
case SortSeriesType.Avg:
aggregator = name => ({ name, value: meanBy(rows, name) });
break;
- default:
- aggregator = name => ({ name, value: name.toLowerCase() });
- break;
+ default: {
+ const collator = new Intl.Collator(undefined, {
+ numeric: true,
+ sensitivity: 'base',
+ });
+ return seriesNames.sort((a, b) =>
+ sortSeriesAscending ? collator.compare(a, b) : collator.compare(b, a),
+ );
+ }
}
const sortedValues = seriesNames.map(aggregator);
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 7054f6019a..67a0bab9e6 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
@@ -67,6 +67,39 @@ const sortData: DataRecord[] = [
{ my_x_axis: null, x: 4, y: 3, z: 7 },
];
+const sortDataWithNumbers: DataRecord[] = [
+ {
+ my_x_axis: 'my_axis',
+ '9. September': 6,
+ 6: 1,
+ '11. November': 8,
+ 8: 2,
+ '10. October': 1,
+ 10: 4,
+ '3. March': 2,
+ '8. August': 6,
+ 2: 1,
+ 12: 3,
+ 9: 1,
+ '1. January': 1,
+ '4. April': 12,
+ '2. February': 9,
+ 5: 4,
+ 3: 1,
+ 11: 2,
+ '12. December': 4,
+ 1: 7,
+ '6. June': 1,
+ 4: 5,
+ 7: 2,
+ c: 0,
+ '7. July': 2,
+ d: 0,
+ '5. May': 4,
+ a: 1,
+ },
+];
+
const totalStackedValues = [3, 15, 14];
test('sortRows by name ascending', () => {
@@ -288,6 +321,84 @@ test('sortAndFilterSeries by name descending', () => {
sortAndFilterSeries(sortData, 'my_x_axis', [], SortSeriesType.Name, false),
).toEqual(['z', 'y', 'x']);
});
+test('sortAndFilterSeries by name with numbers asc', () => {
+ expect(
+ sortAndFilterSeries(
+ sortDataWithNumbers,
+ 'my_x_axis',
+ [],
+ SortSeriesType.Name,
+ true,
+ ),
+ ).toEqual([
+ '1',
+ '1. January',
+ '2',
+ '2. February',
+ '3',
+ '3. March',
+ '4',
+ '4. April',
+ '5',
+ '5. May',
+ '6',
+ '6. June',
+ '7',
+ '7. July',
+ '8',
+ '8. August',
+ '9',
+ '9. September',
+ '10',
+ '10. October',
+ '11',
+ '11. November',
+ '12',
+ '12. December',
+ 'a',
+ 'c',
+ 'd',
+ ]);
+});
+test('sortAndFilterSeries by name with numbers desc', () => {
+ expect(
+ sortAndFilterSeries(
+ sortDataWithNumbers,
+ 'my_x_axis',
+ [],
+ SortSeriesType.Name,
+ false,
+ ),
+ ).toEqual([
+ 'd',
+ 'c',
+ 'a',
+ '12. December',
+ '12',
+ '11. November',
+ '11',
+ '10. October',
+ '10',
+ '9. September',
+ '9',
+ '8. August',
+ '8',
+ '7. July',
+ '7',
+ '6. June',
+ '6',
+ '5. May',
+ '5',
+ '4. April',
+ '4',
+ '3. March',
+ '3',
+ '2. February',
+ '2',
+ '1. January',
+ '1',
+ ]);
+});
describe('extractSeries', () => {
it('should generate a valid ECharts timeseries series object', () => {
