Update Nav block permissions variable naming accuracy (WordPress#59882)

* Rename vars for increased clarity * Pluralise canCreate permission * Update tests * Improve comments * Fix resolver naming * Update tests Co-authored-by: getdave <[email protected]> Co-authored-by: scruffian <[email protected]>
carstingaxion · Mar 27, 2024 · 9b06bf7 · 9b06bf7
1 parent 99286d8
commit 9b06bf7
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 67 deletions.
diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
@@ -187,9 +187,9 @@ function Navigation( {
 		hasResolvedCanUserUpdateNavigationMenu,
 		canUserDeleteNavigationMenu,
 		hasResolvedCanUserDeleteNavigationMenu,
-		canUserCreateNavigationMenu,
-		isResolvingCanUserCreateNavigationMenu,
-		hasResolvedCanUserCreateNavigationMenu,
+		canUserCreateNavigationMenus,
+		isResolvingCanUserCreateNavigationMenus,
+		hasResolvedCanUserCreateNavigationMenus,
 	} = useNavigationMenu( ref );
 
 	const navMenuResolvedButMissing =
@@ -467,8 +467,8 @@ function Navigation( {
 
 			if (
 				! ref &&
-				hasResolvedCanUserCreateNavigationMenu &&
-				! canUserCreateNavigationMenu
+				hasResolvedCanUserCreateNavigationMenus &&
+				! canUserCreateNavigationMenus
 			) {
 				showNavigationMenuPermissionsNotice(
 					__(
@@ -482,16 +482,16 @@ function Navigation( {
 		isInnerBlockSelected,
 		canUserUpdateNavigationMenu,
 		hasResolvedCanUserUpdateNavigationMenu,
-		canUserCreateNavigationMenu,
-		hasResolvedCanUserCreateNavigationMenu,
+		canUserCreateNavigationMenus,
+		hasResolvedCanUserCreateNavigationMenus,
 		ref,
 		hideNavigationMenuPermissionsNotice,
 		showNavigationMenuPermissionsNotice,
 		navMenuResolvedButMissing,
 	] );
 
 	const hasManagePermissions =
-		canUserCreateNavigationMenu || canUserUpdateNavigationMenu;
+		canUserCreateNavigationMenus || canUserUpdateNavigationMenu;
 
 	const overlayMenuPreviewClasses = classnames(
 		'wp-block-navigation__overlay-menu-preview',
@@ -801,9 +801,11 @@ function Navigation( {
 					isSelected={ isSelected }
 					currentMenuId={ ref }
 					clientId={ clientId }
-					canUserCreateNavigationMenu={ canUserCreateNavigationMenu }
-					isResolvingCanUserCreateNavigationMenu={
-						isResolvingCanUserCreateNavigationMenu
+					canUserCreateNavigationMenus={
+						canUserCreateNavigationMenus
+					}
+					isResolvingCanUserCreateNavigationMenus={
+						isResolvingCanUserCreateNavigationMenus
 					}
 					onSelectNavigationMenu={ onSelectNavigationMenu }
 					onSelectClassicMenu={ onSelectClassicMenu }

diff --git a/packages/block-library/src/navigation/edit/navigation-menu-selector.js b/packages/block-library/src/navigation/edit/navigation-menu-selector.js
@@ -59,7 +59,7 @@ function NavigationMenuSelector( {
 		navigationMenus,
 		isResolvingNavigationMenus,
 		hasResolvedNavigationMenus,
-		canUserCreateNavigationMenu,
+		canUserCreateNavigationMenus,
 		canSwitchNavigationMenu,
 	} = useNavigationMenu();
 
@@ -100,7 +100,7 @@ function NavigationMenuSelector( {
 	const hasNavigationMenus = !! navigationMenus?.length;
 	const hasClassicMenus = !! classicMenus?.length;
 	const showNavigationMenus = !! canSwitchNavigationMenu;
-	const showClassicMenus = !! canUserCreateNavigationMenu;
+	const showClassicMenus = !! canUserCreateNavigationMenus;
 
 	const noMenuSelected = hasNavigationMenus && ! currentMenuId;
 	const noBlockMenus = ! hasNavigationMenus && hasResolvedNavigationMenus;
@@ -129,7 +129,7 @@ function NavigationMenuSelector( {
 	}, [
 		hasResolvedNavigationMenus,
 		createNavigationMenuIsSuccess,
-		canUserCreateNavigationMenu,
+		canUserCreateNavigationMenus,
 		createNavigationMenuIsError,
 		isUpdatingMenuRef,
 		menuUnavailable,
@@ -187,7 +187,7 @@ function NavigationMenuSelector( {
 						</MenuGroup>
 					) }
 
-					{ canUserCreateNavigationMenu && (
+					{ canUserCreateNavigationMenus && (
 						<MenuGroup label={ __( 'Tools' ) }>
 							<MenuItem
 								onClick={ async () => {

diff --git a/packages/block-library/src/navigation/edit/placeholder/index.js b/packages/block-library/src/navigation/edit/placeholder/index.js
@@ -18,8 +18,8 @@ export default function NavigationPlaceholder( {
 	isSelected,
 	currentMenuId,
 	clientId,
-	canUserCreateNavigationMenu = false,
-	isResolvingCanUserCreateNavigationMenu,
+	canUserCreateNavigationMenus = false,
+	isResolvingCanUserCreateNavigationMenus,
 	onSelectNavigationMenu,
 	onSelectClassicMenu,
 	onCreateEmpty,
@@ -41,7 +41,7 @@ export default function NavigationPlaceholder( {
 	}, [ hasResolvedMenus, isResolvingMenus, isSelected ] );
 
 	const isResolvingActions =
-		isResolvingMenus && isResolvingCanUserCreateNavigationMenu;
+		isResolvingMenus && isResolvingCanUserCreateNavigationMenus;
 
 	return (
 		<>
@@ -74,7 +74,7 @@ export default function NavigationPlaceholder( {
 
 						<hr />
 
-						{ canUserCreateNavigationMenu && (
+						{ canUserCreateNavigationMenus && (
 							<Button
 								variant="tertiary"
 								onClick={ onCreateEmpty }

diff --git a/packages/block-library/src/navigation/edit/test/navigation-menu-selector.js b/packages/block-library/src/navigation/edit/test/navigation-menu-selector.js
@@ -93,7 +93,7 @@ describe( 'NavigationMenuSelector', () => {
 			useNavigationMenu.mockReturnValue( {
 				navigationMenus: [],
 				hasResolvedNavigationMenus: true,
-				canUserCreateNavigationMenu: true,
+				canUserCreateNavigationMenus: true,
 				canSwitchNavigationMenu: true,
 			} );
 
@@ -115,7 +115,7 @@ describe( 'NavigationMenuSelector', () => {
 				navigationMenus: [],
 				isResolvingNavigationMenus: true,
 				hasResolvedNavigationMenus: false,
-				canUserCreateNavigationMenu: false,
+				canUserCreateNavigationMenus: false,
 				canSwitchNavigationMenu: true,
 			} );
 
@@ -152,7 +152,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -203,7 +203,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: false,
+					canUserCreateNavigationMenus: false,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -226,7 +226,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -254,7 +254,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -278,7 +278,7 @@ describe( 'NavigationMenuSelector', () => {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: false,
 					isResolvingNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -303,7 +303,7 @@ describe( 'NavigationMenuSelector', () => {
 					navigationMenus: [],
 					hasResolvedNavigationMenus: true,
 					isResolvingNavigationMenus: false,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -331,7 +331,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: navigationMenusFixture,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: false,
 				} );
 
@@ -352,7 +352,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: navigationMenusFixture,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: false,
+					canUserCreateNavigationMenus: false,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -391,7 +391,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: menusWithNoTitle,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -425,7 +425,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: navigationMenusFixture,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -453,7 +453,7 @@ describe( 'NavigationMenuSelector', () => {
 				useNavigationMenu.mockReturnValue( {
 					navigationMenus: navigationMenusFixture,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 					canSwitchNavigationMenu: true,
 				} );
 
@@ -504,7 +504,7 @@ describe( 'NavigationMenuSelector', () => {
 				const user = userEvent.setup();
 
 				useNavigationMenu.mockReturnValue( {
-					canUserCreateNavigationMenu: false,
+					canUserCreateNavigationMenus: false,
 				} );
 
 				useNavigationEntities.mockReturnValue( {
@@ -526,7 +526,7 @@ describe( 'NavigationMenuSelector', () => {
 				const user = userEvent.setup();
 
 				useNavigationMenu.mockReturnValue( {
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 				} );
 
 				useNavigationEntities.mockReturnValue( {
@@ -563,7 +563,7 @@ describe( 'NavigationMenuSelector', () => {
 					isResolvingNavigationMenus: false,
 					hasResolvedNavigationMenus: true,
 					canSwitchNavigationMenu: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 				} );
 
 				useNavigationEntities.mockReturnValue( {
@@ -595,7 +595,7 @@ describe( 'NavigationMenuSelector', () => {
 					navigationMenus: [],
 					isResolvingNavigationMenus: true,
 					hasResolvedNavigationMenus: false,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 				} );
 
 				useNavigationEntities.mockReturnValue( {
@@ -628,7 +628,7 @@ describe( 'NavigationMenuSelector', () => {
 					navigationMenus: [],
 					isResolvingNavigationMenus: false,
 					hasResolvedNavigationMenus: true,
-					canUserCreateNavigationMenu: true,
+					canUserCreateNavigationMenus: true,
 				} );
 
 				useNavigationEntities.mockReturnValue( {