Issue #3507866 by plopesc, m4olivei, ckrina, berdir, catch: Enable the Navigation Top Bar when Navigation is enabled

Author: catch

modules/navigation/modules/navigation_top_bar/navigation_top_bar.info.yml

@@ -1,8 +1,9 @@
 name: Navigation Top Bar
 type: module
-description: 'When enabled, this module provides relevant administrative information and tasks for the current page on a top bar. It is not feature complete nor fully functional so enabling it could lead to possible inconsistencies.'
+description: 'Obsolete. All the functionality has been moved to the navigation module.'
 package: Core (Experimental)
-lifecycle: experimental
+lifecycle: obsolete
+lifecycle_link: 'https://www.drupal.org/docs/core-modules-and-themes/deprecated-and-obsolete#s-understanding-obsolete-extensions'
 version: VERSION
 dependencies:
   - navigation:navigation

modules/navigation/modules/navigation_top_bar/src/Hook/NavigationTopBarHooks.php

@@ -60,3 +60,14 @@ function navigation_post_update_navigation_user_links_menu(array &$sandbox): voi
       'locked' => TRUE,
     ])->save();
 }
+
+/**
+ * Uninstall the navigation_top_bar module if installed.
+ *
+ * @see https://www.drupal.org/project/drupal/issues/3507866
+ */
+function navigation_post_update_uninstall_navigation_top_bar(): void {
+  if (\Drupal::moduleHandler()->moduleExists('navigation_top_bar')) {
+    \Drupal::service('module_installer')->uninstall(['navigation_top_bar'], FALSE);
+  }
+}

modules/navigation/modules/navigation_top_bar/tests/src/Functional/GenericTest.php

@@ -204,10 +204,6 @@ protected function getContentTop(): array {
    * @see hook_page_top()
    */
   public function buildTopBar(array &$page_top): void {
-    if (!$this->moduleHandler->moduleExists('navigation_top_bar')) {
-      return;
-    }
-
     $page_top['top_bar'] = [
       '#type' => 'top_bar',
       '#access' => $this->currentUser->hasPermission('access navigation'),
@@ -236,7 +232,7 @@ public function removeLocalTasks(array &$build, BlockPluginInterface $block): vo
     if ($block->getPluginId() !== 'local_tasks_block') {
       return;
     }
-    if ($this->hasLocalTasks() && $this->moduleHandler->moduleExists('navigation_top_bar')) {
+    if ($this->hasLocalTasks()) {
       $build['#access'] = FALSE;
     }
   }

modules/navigation/navigation.post_update.php

@@ -116,13 +116,13 @@ public function testNavigationBlock(): void {
     $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', 'session']);
+    $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format', 'session', 'route']);
     $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', 'session']);
+    $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format', 'session', 'route']);
     $this->assertSession()->pageTextContains('Shortcuts');
     $this->assertSession()->linkExists('Cron');
 

modules/navigation/src/NavigationRenderer.php

@@ -25,7 +25,7 @@ class NavigationTopBarContentModerationTest extends ModerationStateTestBase {
   protected static $modules = [
     'content_moderation',
     'node',
-    'navigation_top_bar',
+    'navigation',
   ];
 
   /**

modules/navigation/tests/src/Functional/NavigationShortcutsBlockTest.php

@@ -26,7 +26,6 @@ class NavigationTopBarPageContextTest extends BrowserTestBase {
   protected static $modules = [
     'node',
     'navigation',
-    'navigation_top_bar',
     'test_page_test',
   ];
 

modules/navigation/tests/src/Functional/NavigationTopBarContentModerationTest.php

@@ -85,21 +85,7 @@ public function testTopBarVisibility(): void {
     $this->verifyDynamicPageCache($test_page_url, 'HIT');
     $this->assertSession()->elementNotExists('xpath', "//div[contains(@class, 'top-bar__content')]/div[contains(@class, 'top-bar__actions')]/button");
 
-    $this->verifyDynamicPageCache($this->node->toUrl(), 'MISS');
-    $this->verifyDynamicPageCache($this->node->toUrl(), 'HIT');
-    // Top Bar is not visible if the feature flag module is disabled.
-    $this->assertSession()->elementNotExists('xpath', "//div[contains(@class, 'top-bar__content')]/div[contains(@class, 'top-bar__actions')]/button");
-    $this->assertSession()->elementExists('xpath', '//div[@id="block-tabs"]');
-
-    \Drupal::service('module_installer')->install(['navigation_top_bar']);
-
-    // Test page does not include the Top Bar.
-    $test_page_url = Url::fromRoute('test_page_test.test_page');
-    $this->verifyDynamicPageCache($test_page_url, 'MISS');
-    $this->verifyDynamicPageCache($test_page_url, 'HIT');
-    $this->assertSession()->elementNotExists('xpath', "//div[contains(@class, 'top-bar__content')]/div[contains(@class, 'top-bar__actions')]/button");
-
-    // Top Bar is visible once the feature flag module is enabled.
+    // Top Bar is visible on node pages.
     $this->verifyDynamicPageCache($this->node->toUrl(), 'MISS');
     $this->verifyDynamicPageCache($this->node->toUrl(), 'HIT');
     $this->assertSession()->elementExists('xpath', "(//div[contains(@class, 'top-bar__content')]/div[contains(@class, 'top-bar__actions')]/button)[1]");

modules/navigation/tests/src/Functional/NavigationTopBarPageContextTest.php

@@ -73,14 +73,14 @@ public function testLogin(): void {
 
     $expected = [
       'QueryCount' => 4,
-      'CacheGetCount' => 58,
+      'CacheGetCount' => 60,
       'CacheGetCountByBin' => [
         'config' => 11,
         'data' => 5,
         'discovery' => 10,
         'bootstrap' => 6,
         'dynamic_page_cache' => 2,
-        'render' => 23,
+        'render' => 25,
         'menu' => 1,
       ],
       'CacheSetCount' => 2,

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

@@ -108,7 +108,6 @@
       <directory>modules/config/tests/config_test/tests/src/Functional</directory>
       <directory>modules/system/tests/modules/entity_test/tests/src/Functional</directory>
       <directory>modules/layout_builder/modules/layout_builder_expose_all_field_blocks/tests/src/Functional</directory>
-      <directory>modules/navigation/modules/navigation_top_bar/tests/src/Functional</directory>
       <directory>profiles/**/tests/src/Functional</directory>
       <directory>profiles/demo_umami/modules/demo_umami_content/tests/src/Functional</directory>
       <directory>recipes/*/tests/src/Functional</directory>