Issue #3415572: Adjust how Help link and Content links are removed from the Administration menu for the Navigation bar

Issue #3415572: Adjust how Help link and Content links are removed from the Administration menu for the Navigation bar

Closes #3415572

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

@@ -153,8 +153,6 @@ public function menuLinksDiscoveredAlter(&$links): void {
     $navigation_links = \Drupal::classResolver(NavigationContentLinks::class);
     assert($navigation_links instanceof NavigationContentLinks);
     $navigation_links->addMenuLinks($links);
-    $navigation_links->removeAdminContentLink($links);
-    $navigation_links->removeHelpLink($links);
   }
 
   /**
@@ -307,4 +305,24 @@ public function modulesInstalled(array $modules, bool $is_syncing): void {
     }
   }
 
+  /**
+   * Implements hook_navigation_menu_link_tree_alter().
+   */
+  #[Hook('navigation_menu_link_tree_alter')]
+  public function navigationMenuLinkTreeAlter(array &$tree): void {
+    foreach ($tree as $key => $item) {
+      // Skip elements where menu is not the 'admin' one.
+      $menu_name = $item->link->getMenuName();
+      if ($menu_name != 'admin') {
+        continue;
+      }
+
+      // Remove unwanted Help and Content menu links.
+      $plugin_id = $item->link->getPluginId();
+      if ($plugin_id == 'help.main' || $plugin_id == 'system.admin_content') {
+        unset($tree[$key]);
+      }
+    }
+  }
+
 }