refactoring according to review

- removes superfluous actions from deleteEntityRecords
- treats invalidateCache properly
- attempts to make lookups faster for items when removing querries

packages/core-data/src/actions.js

@@ -153,16 +153,7 @@ export function* deleteEntityRecord( kind, name, recordId ) {
 		return;
 	}
 
-	yield {
-		type: 'DELETE_ENTITY_RECORD_START',
-		kind,
-		name,
-		recordId,
-	};
-
-	yield removeItems( kind, name, Number( recordId ) );
-
-	let error;
+	yield removeItems( kind, name, recordId, true );
 
 	try {
 		let path = `${ entity.baseURL }/${ recordId }`;
@@ -176,10 +167,8 @@ export function* deleteEntityRecord( kind, name, recordId ) {
 			method: 'DELETE',
 		} );
 	} catch ( _error ) {
-		error = _error;
-
 		const persistedRecord = yield select(
-			'getEntityRecord',
+			'getEditedEntityRecord',
 			kind,
 			name,
 			recordId
@@ -193,14 +182,6 @@ export function* deleteEntityRecord( kind, name, recordId ) {
 			false
 		);
 	}
-
-	yield {
-		type: 'DELETE_ENTITY_RECORD_FINISH',
-		kind,
-		name,
-		recordId,
-		error,
-	};
 }
 
 /**

packages/core-data/src/queried-data/actions.js

@@ -21,18 +21,19 @@ export function receiveItems( items ) {
  * Returns an action object used in signalling that entity records have been
  * deleted and they need to be removed from entities state.
  *
- * @param {string} kind            Kind of the removed entities.
- * @param {string} name            Name of the removed entities.
- * @param {Array|Object} records   Records removed.
+ * @param {string} kind             Kind of the removed entities.
+ * @param {string} name             Name of the removed entities.
+ * @param {Array|Object} records    Records removed.
+ * @param {boolean} invalidateCache Controls whether we want to invalidate the cache.
  * @return {Object} Action object.
  */
-export function removeItems( kind, name, records ) {
+export function removeItems( kind, name, records, invalidateCache = false ) {
 	return {
 		type: 'REMOVE_ITEMS',
 		items: castArray( records ),
 		kind,
 		name,
-		invalidateCache: false,
+		invalidateCache,
 	};
 }
 

packages/core-data/src/queried-data/reducer.js

@@ -1,7 +1,15 @@
 /**
  * External dependencies
  */
-import { map, flowRight, omit, forEach, filter } from 'lodash';
+import {
+	map,
+	flowRight,
+	omit,
+	forEach,
+	filter,
+	keyBy,
+	toPlainObject,
+} from 'lodash';
 
 /**
  * WordPress dependencies
@@ -154,10 +162,11 @@ const queries = ( state = {}, action ) => {
 			return receiveQueries( state, action );
 		case 'REMOVE_ITEMS':
 			const newState = { ...state };
+			const removedItems = keyBy( toPlainObject( action.items ) );
 			forEach( newState, ( queryItems, key ) => {
 				if ( newState[ key ] ) {
 					newState[ key ] = filter( queryItems, ( queryId ) => {
-						return ! action.items.includes( queryId );
+						return !! removedItems[ queryId ] === false;
 					} );
 				}
 			} );

packages/core-data/src/resolvers.js

@@ -102,7 +102,7 @@ export function* getEntityRecords( kind, name, query = {} ) {
 
 getEntityRecords.shouldInvalidate = ( action, kind, name ) => {
 	return (
-		action.type === 'RECEIVE_ITEMS' &&
+		( action.type === 'RECEIVE_ITEMS' || action.type === 'REMOVE_ITEMS' ) &&
 		action.invalidateCache &&
 		kind === action.kind &&
 		name === action.name