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] place null values at the end when sorting table #2391

Merged
merged 1 commit into from
Oct 23, 2023
Merged

[fix] place null values at the end when sorting table #2391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/table/src/kepler-table.ts
View file
Open in desktop
Expand Up @@ -59,7 +59,8 @@ import {
getLogDomain,
getOrdinalDomain,
getQuantileDomain,
DataContainerInterface
DataContainerInterface,
notNullorUndefined
} from '@kepler.gl/utils';

export type GpuFilter = {
Expand Down Expand Up @@ -583,11 +584,16 @@ export function sortDatasetByColumn(
}

const sortFunction = sortBy === SORT_ORDER.ASCENDING ? ascending : descending;
const sortOrder = allIndexes
.slice()
.sort((a, b) =>
sortFunction(dataContainer.valueAt(a, fieldIndex), dataContainer.valueAt(b, fieldIndex))
);
const sortOrder = allIndexes.slice().sort((a, b) => {
const value1 = dataContainer.valueAt(a, fieldIndex);
const value2 = dataContainer.valueAt(b, fieldIndex);
if (!notNullorUndefined(value1) && notNullorUndefined(value2)) {
return 1;
} else if (notNullorUndefined(value1) && !notNullorUndefined(value2)) {
return -1;
}
return sortFunction(value1, value2);
});

dataset.sortColumn = {
[column]: sortBy
Expand Down