Simplify useNavigationMenu

WordPress · May 18, 2022 · 160f5f7 · 160f5f7
1 parent 31de2ce
commit 160f5f7
Showing 1 changed file with 23 additions and 26 deletions.
diff --git a/packages/block-library/src/navigation/use-navigation-menu.js b/packages/block-library/src/navigation/use-navigation-menu.js
@@ -1,19 +1,21 @@
 /**
  * WordPress dependencies
  */
-import { store as coreStore } from '@wordpress/core-data';
+import {
+	store as coreStore,
+	useResourcePermissions,
+} from '@wordpress/core-data';
 import { useSelect } from '@wordpress/data';
 
 export default function useNavigationMenu( ref ) {
-	return useSelect(
+	const entityDetails = useSelect(
 		( select ) => {
 			const {
 				getEntityRecord,
 				getEditedEntityRecord,
 				getEntityRecords,
 				hasFinishedResolution,
 				isResolving,
-				canUser,
 			} = select( coreStore );
 
 			const navigationMenuSingleArgs = [
@@ -70,31 +72,26 @@ export default function useNavigationMenu( ref ) {
 				),
 				navigationMenu,
 				navigationMenus,
-				canUserUpdateNavigationMenu: ref
-					? canUser( 'update', 'navigation', ref )
-					: undefined,
-				hasResolvedCanUserUpdateNavigationMenu: hasFinishedResolution(
-					'canUser',
-					[ 'update', 'navigation', ref ]
-				),
-				canUserDeleteNavigationMenu: ref
-					? canUser( 'delete', 'navigation', ref )
-					: undefined,
-				hasResolvedCanUserDeleteNavigationMenu: hasFinishedResolution(
-					'canUser',
-					[ 'delete', 'navigation', ref ]
-				),
-				canUserCreateNavigationMenu: canUser( 'create', 'navigation' ),
-				isResolvingCanUserCreateNavigationMenu: isResolving(
-					'canUser',
-					[ 'create', 'navigation' ]
-				),
-				hasResolvedCanUserCreateNavigationMenu: hasFinishedResolution(
-					'canUser',
-					[ 'create', 'navigation' ]
-				),
 			};
 		},
 		[ ref ]
 	);
+
+	const [
+		hasResolvedPermissions,
+		{ canCreate, canUpdate, canDelete, isResolving },
+	] = useResourcePermissions( 'navigation', ref );
+
+	return {
+		...entityDetails,
+		canUserCreateNavigationMenu: canCreate,
+		hasResolvedCanUserCreateNavigationMenu: hasResolvedPermissions,
+		isResolvingCanUserCreateNavigationMenu: isResolving,
+
+		canUserDeleteNavigationMenu: canDelete,
+		hasResolvedCanUserDeleteNavigationMenu: hasResolvedPermissions,
+
+		canUserUpdateNavigationMenu: canUpdate,
+		hasResolvedCanUserUpdateNavigationMenu: hasResolvedPermissions,
+	};
 }