From b33c9f935baae72d00ca4e6f372b1d240f0655ba Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 29 Apr 2024 18:30:00 +0100
Subject: [PATCH] Issue #3444040 by plopesc: Navigation render array is
completely generated, even if the navigation bar is not rendered
---
core/modules/navigation/navigation.module | 4 ++++
core/modules/navigation/navigation.services.yml | 1 -
core/modules/navigation/src/NavigationRenderer.php | 12 ++++--------
.../src/Functional/ShortcutsNavigationBlockTest.php | 4 ++--
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/core/modules/navigation/navigation.module b/core/modules/navigation/navigation.module
index b3fd8c493820..b5907091fd6b 100644
--- a/core/modules/navigation/navigation.module
+++ b/core/modules/navigation/navigation.module
@@ -42,6 +42,10 @@ function navigation_help($route_name, RouteMatchInterface $route_match) {
* Implements hook_page_top().
*/
function navigation_page_top(array &$page_top) {
+ if (!\Drupal::currentUser()->hasPermission('access navigation')) {
+ return;
+ }
+
$navigation_renderer = \Drupal::service('navigation.renderer');
assert($navigation_renderer instanceof NavigationRenderer);
$navigation_renderer->removeToolbar($page_top);
diff --git a/core/modules/navigation/navigation.services.yml b/core/modules/navigation/navigation.services.yml
index cde62f21acbd..a0f986aa1491 100644
--- a/core/modules/navigation/navigation.services.yml
+++ b/core/modules/navigation/navigation.services.yml
@@ -7,7 +7,6 @@ services:
'@module_handler',
'@current_route_match',
'@plugin.manager.menu.local_task',
- '@current_user',
'@entity_type.manager',
'@image.factory',
'@file_url_generator',
diff --git a/core/modules/navigation/src/NavigationRenderer.php b/core/modules/navigation/src/NavigationRenderer.php
index e8ad59136509..5f37f689a15b 100644
--- a/core/modules/navigation/src/NavigationRenderer.php
+++ b/core/modules/navigation/src/NavigationRenderer.php
@@ -18,7 +18,6 @@
use Drupal\Core\Plugin\Context\Context;
use Drupal\Core\Plugin\Context\ContextDefinition;
use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Session\AccountInterface;
use Drupal\file\Entity\File;
use Drupal\layout_builder\SectionStorage\SectionStorageManagerInterface;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -67,7 +66,6 @@ public function __construct(
private ModuleHandlerInterface $moduleHandler,
private RouteMatchInterface $routeMatch,
private LocalTaskManagerInterface $localTaskManager,
- private AccountInterface $currentUser,
private EntityTypeManagerInterface $entityTypeManager,
private ImageFactory $imageFactory,
private FileUrlGeneratorInterface $fileUrlGenerator,
@@ -128,7 +126,6 @@ public function buildNavigation(array &$page_top): void {
$defaults = [
'#hide_logo' => $logo_provider === self::LOGO_PROVIDER_HIDE,
- '#access' => $this->currentUser->hasPermission('access navigation'),
'#attached' => [
'html_head_link' => [
[
@@ -173,6 +170,10 @@ public function buildNavigation(array &$page_top): void {
* @see hook_page_top()
*/
public function buildTopBar(array &$page_top): void {
+ if (!$this->moduleHandler->moduleExists('navigation_top_bar')) {
+ return;
+ }
+
$page_top['top_bar'] = [
'#theme' => 'top_bar',
'#attached' => [
@@ -186,13 +187,8 @@ public function buildTopBar(array &$page_top): void {
'user.permissions',
],
],
- '#access' => $this->currentUser->hasPermission('access navigation'),
];
- if (!$this->moduleHandler->moduleExists('navigation_top_bar')) {
- return;
- }
-
// Local tasks for content entities.
if ($this->hasLocalTasks()) {
$local_tasks = $this->getLocalTasks();
diff --git a/core/modules/navigation/tests/src/Functional/ShortcutsNavigationBlockTest.php b/core/modules/navigation/tests/src/Functional/ShortcutsNavigationBlockTest.php
index fe771a9f6e82..1ae8307d9e06 100644
--- a/core/modules/navigation/tests/src/Functional/ShortcutsNavigationBlockTest.php
+++ b/core/modules/navigation/tests/src/Functional/ShortcutsNavigationBlockTest.php
@@ -118,14 +118,14 @@ public function testNavigationBlock() {
$this->drupalLogin($site_configuration_user1);
$this->verifyDynamicPageCache($test_page_url, 'MISS');
$this->verifyDynamicPageCache($test_page_url, 'HIT');
- $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format', 'url.path', 'session']);
+ $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format', 'session']);
$this->assertSession()->elementExists('css', '#menu--shortcuts');
$this->assertSession()->pageTextContains('Shortcuts');
$this->assertSession()->linkExists('Cron');
$this->drupalLogin($site_configuration_user2);
$this->verifyDynamicPageCache($test_page_url, 'HIT');
- $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format', 'url.path', 'session']);
+ $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format', 'session']);
$this->assertSession()->pageTextContains('Shortcuts');
$this->assertSession()->linkExists('Cron');
--
GitLab