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

Jump to bottom

fix(sqllab): Floating numbers not sorting correctly in result column #17573

Merged
merged 7 commits into from
Dec 4, 2021
Merged

fix(sqllab): Floating numbers not sorting correctly in result column #17573

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a57cf70
Floating nums now sorting correctly with parseFloatingNums function
lyndsiWilliams Nov 29, 2021
43742de
Floating numbers AND strings now sorting correctly, +locale comparison
lyndsiWilliams Nov 30, 2021
580f9d9
Added NULL handling back to sort function
lyndsiWilliams Nov 30, 2021
628a549
Moved parseFloatingNums outside of sortResults
lyndsiWilliams Nov 30, 2021
8be6346
Removed localeCompare and added testing
lyndsiWilliams Dec 2, 2021
4904ef1
Add equality check back to sort function
lyndsiWilliams Dec 2, 2021
d1d0751
Added floatValue nit
lyndsiWilliams Dec 2, 2021
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
9 changes: 7 additions & 2 deletions superset-frontend/src/components/FilterableTable/FilterableTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,11 @@ export default class FilterableTable extends PureComponent<
return (a: Datum, b: Datum) => {
const aValue = a[sortBy];
const bValue = b[sortBy];

// Parse any floating numbers so they'll sort correctly
const parseFloatingNums = (value: any) =>
value.isNan ? value : parseFloat(value);
Copy link
Member

Choose a reason for hiding this comment

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

that's cool, didn't know that isNan was a function!

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, it's Number.isNan 😅


if (aValue === bValue) {
// equal items sort equally
return 0;
Expand All @@ -337,9 +342,9 @@ export default class FilterableTable extends PureComponent<
return -1;
}
if (descending) {
return aValue < bValue ? 1 : -1;
return parseFloatingNums(aValue) < parseFloatingNums(bValue) ? 1 : -1;
betodealmeida marked this conversation as resolved.
Show resolved Hide resolved
}
return aValue < bValue ? -1 : 1;
return parseFloatingNums(aValue) < parseFloatingNums(bValue) ? -1 : 1;
};
}

Expand Down