updates and fixes according to review

packages/core-data/CHANGELOG.md

@@ -5,6 +5,7 @@
 ### New Feature
 
 - The `deleteEntityRecord` and `removeItems` actions have been added.
+- The `isDeletingEntityRecord` and `getLastEntityDeleteError` selectors have been added.
 - A `delete<entity.name>` helper is created for every registered entity.
 
 ## 2.3.0 (2019-05-21)

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

@@ -23,7 +23,7 @@ export function receiveItems( items ) {
  *
  * @param {string} kind             Kind of the removed entities.
  * @param {string} name             Name of the removed entities.
- * @param {Array|Object} records    Records removed.
+ * @param {Array|number} records    Records removed.
  * @param {boolean} invalidateCache Controls whether we want to invalidate the cache.
  * @return {Object} Action object.
  */

packages/core-data/src/reducer.js

@@ -288,7 +288,6 @@ function entity( entityConfig ) {
 									action.type ===
 									'DELETE_ENTITY_RECORD_START',
 								error: action.error,
-								isAutosave: action.isAutosave,
 							},
 						};
 				}

packages/edit-navigation/src/components/menus-editor/index.js

@@ -28,17 +28,25 @@ export default function MenusEditor( { blockEditorSettings } ) {
 		false
 	);
 
-	const { menus, hasLoadedMenus } = useSelect( ( select ) => {
-		const { getMenus, hasFinishedResolution } = select( 'core' );
-		const query = { per_page: -1 };
-		return {
-			menus: getMenus( query ),
-			hasLoadedMenus: hasFinishedResolution( 'getMenus', [ query ] ),
-		};
-	}, [] );
-
-	const menuDeleteError = useSelect( ( select ) =>
-		select( 'core' ).getLastEntityDeleteError( 'root', 'menu', menuId )
+	const { menus, hasLoadedMenus, menuDeleteError } = useSelect(
+		( select ) => {
+			const {
+				getMenus,
+				hasFinishedResolution,
+				getLastEntityDeleteError,
+			} = select( 'core' );
+			const query = { per_page: -1 };
+			return {
+				menus: getMenus( query ),
+				hasLoadedMenus: hasFinishedResolution( 'getMenus', [ query ] ),
+				menuDeleteError: getLastEntityDeleteError(
+					'root',
+					'menu',
+					menuId
+				),
+			};
+		},
+		[]
 	);
 
 	const { deleteMenu } = useDispatch( 'core' );
@@ -48,7 +56,7 @@ export default function MenusEditor( { blockEditorSettings } ) {
 		if ( ! hasCompletedFirstLoad && hasLoadedMenus ) {
 			setHasCompletedFirstLoad( true );
 		}
-	}, [ menus, hasLoadedMenus ] );
+	}, [ hasLoadedMenus ] );
 
 	// Handle REST API Error messages.
 	useEffect( () => {