From 433204085dde6ec2aaae9afeac0a20bc5a865b8b Mon Sep 17 00:00:00 2001 From: Marin Atanasov Date: Tue, 11 Apr 2023 19:51:18 +0300 Subject: [PATCH] Lodash: Remove _.mapValues() from core-data package --- .../core-data/src/queried-data/reducer.js | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/packages/core-data/src/queried-data/reducer.js b/packages/core-data/src/queried-data/reducer.js index 5d272eae40dec..8dfdca404e1a8 100644 --- a/packages/core-data/src/queried-data/reducer.js +++ b/packages/core-data/src/queried-data/reducer.js @@ -1,8 +1,3 @@ -/** - * External dependencies - */ -import { mapValues } from 'lodash'; - /** * WordPress dependencies */ @@ -126,8 +121,11 @@ export function items( state = {}, action ) { }; } case 'REMOVE_ITEMS': - return mapValues( state, ( contextState ) => - removeEntitiesById( contextState, action.itemIds ) + return Object.fromEntries( + Object.entries( state ).map( ( [ itemId, contextState ] ) => [ + itemId, + removeEntitiesById( contextState, action.itemIds ), + ] ) ); } return state; @@ -179,8 +177,11 @@ export function itemIsComplete( state = {}, action ) { }; } case 'REMOVE_ITEMS': - return mapValues( state, ( contextState ) => - removeEntitiesById( contextState, action.itemIds ) + return Object.fromEntries( + Object.entries( state ).map( ( [ itemId, contextState ] ) => [ + itemId, + removeEntitiesById( contextState, action.itemIds ), + ] ) ); } @@ -254,13 +255,23 @@ const queries = ( state = {}, action ) => { return result; }, {} ); - return mapValues( state, ( contextQueries ) => { - return mapValues( contextQueries, ( queryItems ) => { - return queryItems.filter( ( queryId ) => { - return ! removedItems[ queryId ]; - } ); - } ); - } ); + return Object.fromEntries( + Object.entries( state ).map( + ( [ queryGroup, contextQueries ] ) => [ + queryGroup, + Object.fromEntries( + Object.entries( contextQueries ).map( + ( [ query, queryItems ] ) => [ + query, + queryItems.filter( + ( queryId ) => ! removedItems[ queryId ] + ), + ] + ) + ), + ] + ) + ); default: return state; }