Fix getEntityRecordsTotalPages when per_page is not provided and …

…relies on the defaults from REST API (#59983) Co-authored-by: ntsekouras <[email protected]> Co-authored-by: Mamaduka <[email protected]>
WordPress · Mar 19, 2024 · dbfed70 · dbfed70
1 parent 19cd137
commit dbfed70
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/packages/core-data/src/queried-data/selectors.js b/packages/core-data/src/queried-data/selectors.js
@@ -126,3 +126,9 @@ export function getQueriedTotalItems( state, query = {} ) {
 
 	return state.queries?.[ context ]?.[ stableKey ]?.meta?.totalItems ?? null;
 }
+
+export function getQueriedTotalPages( state, query = {} ) {
+	const { stableKey, context } = getQueryParts( query );
+
+	return state.queries?.[ context ]?.[ stableKey ]?.meta?.totalPages ?? null;
+}
diff --git a/packages/core-data/src/resolvers.js b/packages/core-data/src/resolvers.js
@@ -238,6 +238,9 @@ export const getEntityRecords =
 					totalItems: parseInt(
 						response.headers.get( 'X-WP-Total' )
 					),
+					totalPages: parseInt(
+						response.headers.get( 'X-WP-TotalPages' )
+					),
 				};
 			} else {
 				records = Object.values( await apiFetch( { path } ) );

diff --git a/packages/core-data/src/selectors.ts b/packages/core-data/src/selectors.ts
@@ -14,7 +14,11 @@ import deprecated from '@wordpress/deprecated';
  * Internal dependencies
  */
 import { STORE_NAME } from './name';
-import { getQueriedItems, getQueriedTotalItems } from './queried-data';
+import {
+	getQueriedItems,
+	getQueriedTotalItems,
+	getQueriedTotalPages,
+} from './queried-data';
 import { DEFAULT_ENTITY_KEY } from './entities';
 import {
 	getNormalizedCommaSeparable,
@@ -623,6 +627,11 @@ export const getEntityRecordsTotalPages = (
 	if ( query.per_page === -1 ) return 1;
 	const totalItems = getQueriedTotalItems( queriedState, query );
 	if ( ! totalItems ) return totalItems;
+	// If `per_page` is not set and the query relies on the defaults of the
+	// REST endpoint, get the info from query's meta.
+	if ( ! query.per_page ) {
+		return getQueriedTotalPages( queriedState, query );
+	}
 	return Math.ceil( totalItems / query.per_page );
 };