Skip to content
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

fix(explore): Dashboard list is unsorted in save modal #21317

Merged
merged 7 commits into from
Oct 3, 2022
Merged

fix(explore): Dashboard list is unsorted in save modal #21317

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9938996
Sort dashboard list alphabetically when saving a chart
Sep 3, 2022
cb470a4
Merge branch 'master' into FIX-54905
Sep 26, 2022
2938bda
When strings start with numbers sort by numeric order
Sep 27, 2022
7bd19da
Use localeCompare with Natural Sorting
Sep 27, 2022
4f4d7d8
Solve merge conflict
Sep 30, 2022
51b7e12
Merge branch 'master' into FIX-54905
Sep 30, 2022
c90e223
Small refactor
Sep 30, 2022
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
11 changes: 11 additions & 0 deletions superset-frontend/src/explore/actions/saveModalActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ export function fetchDashboards(userId) {
value: id,
label: (json.result[index] || {}).dashboard_title,
}));
choices.sort((a, b) => {
const labelA = a.label.toUpperCase();
const labelB = b.label.toUpperCase();
if (labelA < labelB) {
return -1;
}
if (labelA > labelB) {
return 1;
}
return 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (labelA < labelB) {
return -1;
}
if (labelA > labelB) {
return 1;
}
return 0;
return labelA.localeCompare(labelB);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michael-s-molina @geido Made a change so that when a string begins with a number it sorts numerically instead. Does not fix all the cases but addresses several.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@agl-developer What you're trying to achieve is a concept called Natural Sorting. This is already supported natively by localeCompare using { sensitivity: 'base', numeric: true }

});

return dispatch(fetchDashboardsSucceeded(choices));
})
Expand Down