Get records total pages as derived data

WordPress · Oct 12, 2023 · f496132 · f496132
1 parent 0c3b9ab
commit f496132
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/packages/core-data/src/queried-data/selectors.js b/packages/core-data/src/queried-data/selectors.js
@@ -124,9 +124,3 @@ 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
@@ -233,9 +233,6 @@ export const getEntityRecords =
 				const response = await apiFetch( { path, parse: false } );
 				records = Object.values( await response.json() );
 				meta = {
-					totalPages: parseInt(
-						response.headers.get( 'X-WP-TotalPages' )
-					),
 					totalItems: parseInt(
 						response.headers.get( 'X-WP-Total' )
 					),

diff --git a/packages/core-data/src/selectors.ts b/packages/core-data/src/selectors.ts
@@ -14,11 +14,7 @@ import deprecated from '@wordpress/deprecated';
  * Internal dependencies
  */
 import { STORE_NAME } from './name';
-import {
-	getQueriedItems,
-	getQueriedTotalItems,
-	getQueriedTotalPages,
-} from './queried-data';
+import { getQueriedItems, getQueriedTotalItems } from './queried-data';
 import { DEFAULT_ENTITY_KEY } from './entities';
 import {
 	getNormalizedCommaSeparable,
@@ -578,7 +574,10 @@ export const getEntityRecordsTotalPages = (
 	if ( ! queriedState ) {
 		return null;
 	}
-	return getQueriedTotalPages( queriedState, query );
+	if ( query.per_page === -1 ) return 1;
+	const totalItems = getQueriedTotalItems( queriedState, query );
+	if ( ! totalItems ) return totalItems;
+	return Math.ceil( totalItems / query.per_page );
 };
 
 type DirtyEntityRecord = {