Skip to content

filterSortAndPaginate: extract sortBy and groupBy logic #70822

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

Merged
merged 1 commit into from
Jul 22, 2025
Merged

filterSortAndPaginate: extract sortBy and groupBy logic #70822

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions packages/dataviews/src/filter-and-sort-data-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,13 +375,19 @@ export function filterSortAndPaginate< Item >(
}

// Handle sorting.
if ( view.sort || view.groupByField ) {
filteredData.sort( ( a, b ) => {
// Sort by the group by field.
const groupByField = _fields.find( ( field ) => {
const sortByField = view.sort?.field
? _fields.find( ( field ) => {
return field.id === view.sort?.field;
} )
: null;
const groupByField = view.groupByField
? _fields.find( ( field ) => {
return field.id === view.groupByField;
} );
if ( view.groupByField && groupByField ) {
} )
: null;
if ( sortByField || groupByField ) {
filteredData.sort( ( a, b ) => {
if ( groupByField ) {
const groupCompare = groupByField.sort( a, b, 'asc' );

// If items are in different groups, return the group comparison result.
Expand All @@ -391,11 +397,7 @@ export function filterSortAndPaginate< Item >(
}
}

// Sort by the sort field.
const sortByField = _fields.find( ( field ) => {
return field.id === view?.sort?.field;
} );
if ( view.sort && sortByField ) {
if ( sortByField ) {
return sortByField.sort( a, b, view.sort?.direction ?? 'desc' );
}

Expand Down
Loading