DataViews: filterSortAndPaginate should ignore sorting on non-sortable field

fushar · fushar · commit 44c345c6c2a8 · 2025-12-12T13:24:20.000+07:00
diff --git a/packages/dataviews/CHANGELOG.md b/packages/dataviews/CHANGELOG.md
@@ -12,6 +12,7 @@
 - DataViews: Apply primary style to first column if there is no title field. [#73729](https://github.com/WordPress/gutenberg/pull/73729)
 - DataViews: Combined field alignment in table layout. [#73908](https://github.com/WordPress/gutenberg/pull/73908)
 - DataViews: Fix table row multiselection in Firefox [#73945](https://github.com/WordPress/gutenberg/pull/73945)
+- DataViews: `filterSortAndPaginate()` will ignore sorting on non-sortable fields [#73950](https://github.com/WordPress/gutenberg/pull/73950)
 
 ### Enhancements
 
diff --git a/packages/dataviews/src/test/filter-sort-and-paginate.js b/packages/dataviews/src/test/filter-sort-and-paginate.js
@@ -1136,6 +1136,30 @@ describe( 'sorting', () => {
 
 		expect( groupCount ).toBe( 5 );
 	} );
+
+	it( 'should NOT sort the data if the field is not sortable', () => {
+		const { data: result } = filterSortAndPaginate(
+			data,
+			{
+				sort: { field: 'description', direction: 'asc' },
+				filters: [
+					{
+						field: 'type',
+						operator: 'is',
+						value: 'Terrestrial',
+					},
+				],
+			},
+			fields
+		);
+
+		expect( result.map( ( r ) => r.name.description ) ).toEqual( [
+			'Terrestrial planet in the Solar system',
+			'La planète Vénus',
+			'Terrestrial planet in the Solar system',
+			'Terrestrial planet in the Solar system',
+		] );
+	} );
 } );
 
 describe( 'pagination', () => {
diff --git a/packages/dataviews/src/utils/filter-sort-and-paginate.ts b/packages/dataviews/src/utils/filter-sort-and-paginate.ts
@@ -389,7 +389,10 @@ export default function filterSortAndPaginate< Item >(
 	// Handle sorting.
 	const sortByField = view.sort?.field
 		? _fields.find( ( field ) => {
-				return field.id === view.sort?.field;
+				return (
+					field.enableSorting !== false &&
+					field.id === view.sort?.field
+				);
 		  } )
 		: null;
 	const groupByField = view.groupBy?.field
