Add support for page=1 and perPage=-1 to getMergedItemIds (#22707)

* Add support page=1 and perPage=-1 to getMergedItemIds * Add one more test case * short-circuit instead of looping through the data * Update test descriptions * Return a copy of nextItemIds instead of the original list * Update reducer.js * Update reducer.js * Update reducer.js
WordPress · May 28, 2020 · 5550a60 · 5550a60
1 parent fa47fd7
commit 5550a60
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/packages/core-data/src/queried-data/reducer.js b/packages/core-data/src/queried-data/reducer.js
@@ -32,6 +32,10 @@ import getQueryParts from './get-query-parts';
  * @return {number[]} Merged array of item IDs.
  */
 export function getMergedItemIds( itemIds, nextItemIds, page, perPage ) {
+	const receivedAllIds = page === 1 && perPage === -1;
+	if ( receivedAllIds ) {
+		return nextItemIds;
+	}
 	const nextItemIdsStartIndex = ( page - 1 ) * perPage;
 
 	// If later page has already been received, default to the larger known

diff --git a/packages/core-data/src/queried-data/test/reducer.js b/packages/core-data/src/queried-data/test/reducer.js
@@ -49,6 +49,20 @@ describe( 'getMergedItemIds', () => {
 
 		expect( result ).toEqual( [ 1, 2, 3, 4, 5, 6, 7 ] );
 	} );
+
+	it( 'should return a copy of nextItemIds if it represents all ids (single id removed) (page=1 and perPage=-1)', () => {
+		const original = deepFreeze( [ 1, 2, 3 ] );
+		const result = getMergedItemIds( original, [ 1, 3 ], 1, -1 );
+
+		expect( result ).toEqual( [ 1, 3 ] );
+	} );
+
+	it( 'should return a copy of nextItemIds if it represents all ids (single id removed and another one added) (page=1 and perPage=-1)', () => {
+		const original = deepFreeze( [ 1, 2, 3 ] );
+		const result = getMergedItemIds( original, [ 1, 3, 4 ], 1, -1 );
+
+		expect( result ).toEqual( [ 1, 3, 4 ] );
+	} );
 } );
 
 describe( 'reducer', () => {