adds check for permissions on the manage menus link; removes rogue sh…

…owManageActions
WordPress · Aug 30, 2022 · 754811f · 754811f
1 parent 3449647
commit 754811f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 30 deletions.
diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
@@ -426,6 +426,8 @@ function Navigation( {
 		ref,
 	] );
 
+	const hasManagePermissions =
+		canUserCreateNavigationMenu || canUserUpdateNavigationMenu;
 	const navigationSelectorRef = useRef();
 	const [ shouldFocusNavigationSelector, setShouldFocusNavigationSelector ] =
 		useState( false );
@@ -628,16 +630,17 @@ function Navigation( {
 							onCreateNew={ () => createNavigationMenu( '', [] ) }
 							/* translators: %s: The name of a menu. */
 							actionLabel={ __( "Switch to '%s'" ) }
-							showManageActions
 						/>
-						<Button
-							variant="link"
-							href={ addQueryArgs( 'edit.php', {
-								post_type: 'wp_navigation',
-							} ) }
-						>
-							{ __( 'Manage menus' ) }
-						</Button>
+						{ hasManagePermissions && (
+							<Button
+								variant="link"
+								href={ addQueryArgs( 'edit.php', {
+									post_type: 'wp_navigation',
+								} ) }
+							>
+								{ __( 'Manage menus' ) }
+							</Button>
+						) }
 					</PanelBody>
 				</InspectorControls>
 				{ stylingInspectorControls }
@@ -702,16 +705,17 @@ function Navigation( {
 							onCreateNew={ () => createNavigationMenu( '', [] ) }
 							/* translators: %s: The name of a menu. */
 							actionLabel={ __( "Switch to '%s'" ) }
-							showManageActions
 						/>
-						<Button
-							variant="link"
-							href={ addQueryArgs( 'edit.php', {
-								post_type: 'wp_navigation',
-							} ) }
-						>
-							{ __( 'Manage menus' ) }
-						</Button>
+						{ hasManagePermissions && (
+							<Button
+								variant="link"
+								href={ addQueryArgs( 'edit.php', {
+									post_type: 'wp_navigation',
+								} ) }
+							>
+								{ __( 'Manage menus' ) }
+							</Button>
+						) }
 					</PanelBody>
 				</InspectorControls>
 				<Warning>
@@ -810,16 +814,17 @@ function Navigation( {
 							onCreateNew={ () => createNavigationMenu( '', [] ) }
 							/* translators: %s: The name of a menu. */
 							actionLabel={ __( "Switch to '%s'" ) }
-							showManageActions
 						/>
-						<Button
-							variant="link"
-							href={ addQueryArgs( 'edit.php', {
-								post_type: 'wp_navigation',
-							} ) }
-						>
-							{ __( 'Manage menus' ) }
-						</Button>
+						{ hasManagePermissions && (
+							<Button
+								variant="link"
+								href={ addQueryArgs( 'edit.php', {
+									post_type: 'wp_navigation',
+								} ) }
+							>
+								{ __( 'Manage menus' ) }
+							</Button>
+						) }
 					</PanelBody>
 				</InspectorControls>
 				{ stylingInspectorControls }

diff --git a/packages/block-library/src/navigation/edit/navigation-menu-selector.js b/packages/block-library/src/navigation/edit/navigation-menu-selector.js
@@ -24,7 +24,6 @@ function NavigationMenuSelector(
 		onSelectNavigationMenu,
 		onSelectClassicMenu,
 		onCreateNew,
-		showManageActions = false,
 		actionLabel,
 		toggleProps = {},
 	},
@@ -98,7 +97,7 @@ function NavigationMenuSelector(
 	const showSelectMenus =
 		( ( canSwitchNavigationMenu || canUserCreateNavigationMenu ) &&
 			( hasNavigationMenus || hasClassicMenus ) ) ||
-		( hasManagePermissions && showManageActions );
+		hasManagePermissions;
 
 	if ( ! showSelectMenus ) {
 		return null;
@@ -150,7 +149,7 @@ function NavigationMenuSelector(
 						</MenuGroup>
 					) }
 
-					{ showManageActions && hasManagePermissions && (
+					{ hasManagePermissions && (
 						<MenuGroup label={ __( 'Tools' ) }>
 							{ canUserCreateNavigationMenu && (
 								<MenuItem onClick={ onCreateNew }>