Verified Commit e92d9ce3 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3444745 by fjgarlin, plopesc, m4olivei: Navigation Top Bar hides entity... 

Issue #3444745 by fjgarlin, plopesc, m4olivei: Navigation Top Bar hides entity local tasks even if the user has no access to the bar

(cherry picked from commit 9177c489)
parent 7ba9c195

core/modules/navigation/src/Hook/NavigationHooks.php

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
use Drupal\navigation\NavigationRenderer;

use Drupal\Core\Routing\RouteMatchInterface;

use Drupal\Core\Hook\Attribute\Hook;

use Drupal\navigation\TopBarItemManagerInterface;



/**

 * Hook implementations for navigation.
@@ -120,8 +121,12 @@ public function menuLinksDiscoveredAlter(&$links): void { 
  public function blockBuildLocalTasksBlockAlter(array &$build, BlockPluginInterface $block): void {

    $navigation_renderer = \Drupal::service('navigation.renderer');

    assert($navigation_renderer instanceof NavigationRenderer);

    if (\Drupal::currentUser()->hasPermission('access navigation') &&

      array_key_exists('page_actions', \Drupal::service(TopBarItemManagerInterface::class)->getDefinitions())

    ) {

      $navigation_renderer->removeLocalTasks($build, $block);

    }

  }



  /**

   * Implements hook_plugin_filter_TYPE__CONSUMER_alter().

core/modules/navigation/tests/src/Functional/NavigationTopBarTest.php

+9 −0
Original line number Diff line number Diff line
@@ -99,6 +99,15 @@ public function testTopBarVisibility(): void { 
      $this->assertSession()->elementTextEquals('xpath', "//div[contains(@class, 'top-bar__content')]/div[contains(@class, 'top-bar__actions')]/button/span", 'More actions');

      $this->assertSession()->elementNotExists('xpath', '//div[@id="block-tabs"]');

    }



    // Regular tabs are visible for user that cannot access to navigation.

    $this->drupalLogin($this->drupalCreateUser([

      'bypass node access',

    ]));



    $this->drupalGet($this->node->toUrl());

    $this->assertSession()->elementNotExists('xpath', "//div[contains(@class, 'top-bar__content')]/div[contains(@class, 'top-bar__actions')]/button/span");

    $this->assertSession()->elementExists('xpath', '//div[@id="block-tabs"]');

  }



}