generalize creation of 'add ENTITY' and 'add BUNDLE' links

The patch works great.

This is a good idea, but for me, it's adding unwanted links, for example for feeds and a custom entity type, symbol, and for brightcove videos. These types are types for which I wouldn't want an editor to try to add them manually.

So if we do this, I think we'd need a way to configure it by entity type, so it doesn't require an alter hook to suppress the links for certain entity types. I mean, I guess I could add an alter hook. But for me, right now, media and content are the only ones I want there.

I think this combined with a config would be ideal, where out of the box, only content and media are checked.

Now that I think about it, roles and permissions do handle this for every user except for the super user (user 1). This makes it more feasible without a custom config. But I still don't like the idea of requiring an alter to hook to suppress the add links for the super user. A config would be nicer.

git apply -v 3028213-2.admin_toolbar.generalize-creation-of-add-ENTITY-and-add-BUNDLE-links.patch

Checking patch admin_toolbar_tools/admin_toolbar_tools.module...
Hunk #1 succeeded at 93 (offset 1 line).
error: while searching for:
    ];
  }

  // If module Media enabled.
  if ($moduleHandler->moduleExists('media')) {
    $links['admin_toolbar_tools.add_media'] = [
      'title' => t('Add media'),
      'provider' => 'admin_toolbar_tools',
      'route_name' => 'entity.media.add_page',
      'menu_name' => 'admin',
      'parent' => 'system.admin_content',
    ];
    // Add node links for each media type.
    foreach ($entityTypeManager->getStorage('media_type')->loadMultiple() as $type) {
      $links['media.add.' . $type->id()] = [
        'title' => t($type->label()),
        'provider' => 'admin_toolbar_tools',
        'route_name' => 'entity.media.add_form',
        'parent' => 'admin_toolbar_tools.add_media',
        'route_parameters' => ['media_type' => $type->id()],
      ];
    }
  }

  // If module Config enabled.
  if ($moduleHandler->moduleExists('config')) {
    $links['admin_toolbar_tools.config.import'] = [

error: patch failed: admin_toolbar_tools/admin_toolbar_tools.module:619
error: admin_toolbar_tools/admin_toolbar_tools.module: patch does not apply

After Apply the patch here is the difference, the Media menu item is different, should we keed the actual behavior or change to the new one comin in this patch?

Before:

After:

I can reproduce what is shown in #9. On a fresh install of Drupal with admin toolbar and media, the admin toolbar has a nested menu to directly add media bundles. After applying the patch it does not.

I'll mention as an aside that the patch in #8 doesn't apply to the 3.0.0 release. Probably not a surprise, but it would be great to have a patch for the recommended release.

Also worth noting that in my testing install I was using a different content entity type, storage entities installed via the quick links module. After the patch the menu includes n "Add storage" menu item, but not nested under the "Storage data" menu item as I would have expected. Also, no links were generated for the storage bundles.

Here's a new patch for the 8.x-2.x branch that should restore the current media structure, and add the same for other content entity types:

Please review.

This patch is it also necessary for version 3.0.0 of "admin_toolbar", because it does not apply on this version.

Here is patch for 3.x branch.

Changing target branch and re-adding tests.

This patch for 3.x broke the storage module: Admin Toolbar 3.0.3 + Storage 1.1.0-beta2

Updated to 1.1.0-beta2 and getting this error when attempting to re-save storage bundle or creating a new storage bundle.

After disabling the 'Admin Toolbar Extra Tools' submodule (provided by Admin Toolbar module), error goes away.

Steps to reproduce
1. Install/enable admin_toolbar and admin_toolbar_tools.
2. Re-save existing storage bundle or create new storage type bundle.

TypeError: Argument 6 passed to Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks::__construct() must be an instance of Drupal\admin_toolbar_tools\Plugin\Derivative\EntityTypeBundleInfoInterface, instance of Drupal\Core\Entity\EntityTypeBundleInfo given, called in /web/modules/contrib/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php on line 87 in Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks->__construct() (line 68 of /web/modules/contrib/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php)

#0 /web/modules/contrib/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php(87): Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks->__construct()
#1 /web/core/lib/Drupal/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecorator.php(25): Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks::create()
#2 /web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php(99): Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator->getDeriver()
#3 /web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php(87): Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator->getDerivatives()
#4 /web/core/lib/Drupal/Core/Menu/MenuLinkManager.php(164): Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator->getDefinitions()
#5 /web/core/lib/Drupal/Core/Menu/MenuLinkManager.php(189): Drupal\Core\Menu\MenuLinkManager->getDefinitions()
#6 /web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php(82): Drupal\Core\Menu\MenuLinkManager->rebuild()
#7 /web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php(70): Drupal\Core\EventSubscriber\MenuRouterRebuildSubscriber->menuLinksRebuild()
#8 [internal function]: Drupal\Core\EventSubscriber\MenuRouterRebuildSubscriber->onRouterRebuild()
#9 /web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php(142): call_user_func()
#10 /web/core/lib/Drupal/Core/Routing/RouteBuilder.php(197): Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher->dispatch()
#11 /web/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php(83): Drupal\Core\Routing\RouteBuilder->rebuild()
#12 /web/core/lib/Drupal/Core/Extension/ModuleInstaller.php(363): Drupal\Core\ProxyClass\Routing\RouteBuilder->rebuild()
#13 /web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php(83): Drupal\Core\Extension\ModuleInstaller->install()
#14 /web/core/modules/system/src/Form/ModulesListForm.php(473): Drupal\Core\ProxyClass\Extension\ModuleInstaller->install()
#15 [internal function]: Drupal\system\Form\ModulesListForm->submitForm()
#16 /web/core/lib/Drupal/Core/Form/FormSubmitter.php(113): call_user_func_array()
#17 /web/core/lib/Drupal/Core/Form/FormSubmitter.php(51): Drupal\Core\Form\FormSubmitter->executeSubmitHandlers()
#18 /web/core/lib/Drupal/Core/Form/FormBuilder.php(593): Drupal\Core\Form\FormSubmitter->doSubmitForm()
#19 /web/core/lib/Drupal/Core/Form/FormBuilder.php(321): Drupal\Core\Form\FormBuilder->processForm()
#20 /web/core/lib/Drupal/Core/Controller/FormController.php(73): Drupal\Core\Form\FormBuilder->buildForm()
#21 [internal function]: Drupal\Core\Controller\FormController->getContentResult()
#22 /web/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php(123): call_user_func_array()
#23 /web/core/lib/Drupal/Core/Render/Renderer.php(578): Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber->Drupal\Core\EventSubscriber\{closure}()
#24 /web/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php(124): Drupal\Core\Render\Renderer->executeInRenderContext()
#25 /web/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php(97): Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber->wrapControllerExecutionInRenderContext()
#26 /vendor/symfony/http-kernel/HttpKernel.php(158): Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber->Drupal\Core\EventSubscriber\{closure}()
#27 /vendor/symfony/http-kernel/HttpKernel.php(80): Symfony\Component\HttpKernel\HttpKernel->handleRaw()
#28 /web/core/lib/Drupal/Core/StackMiddleware/Session.php(57): Symfony\Component\HttpKernel\HttpKernel->handle()
#29 /web/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php(47): Drupal\Core\StackMiddleware\Session->handle()
#30 /web/core/modules/page_cache/src/StackMiddleware/PageCache.php(106): Drupal\Core\StackMiddleware\KernelPreHandle->handle()
#31 /web/core/modules/page_cache/src/StackMiddleware/PageCache.php(85): Drupal\page_cache\StackMiddleware\PageCache->pass()
#32 /web/core/modules/ban/src/BanMiddleware.php(50): Drupal\page_cache\StackMiddleware\PageCache->handle()
#33 /web/modules/contrib/shield/src/ShieldMiddleware.php(91): Drupal\ban\BanMiddleware->handle()
#34 /web/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php(47): Drupal\shield\ShieldMiddleware->handle()
#35 /web/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php(52): Drupal\Core\StackMiddleware\ReverseProxyMiddleware->handle()
#36 /vendor/stack/builder/src/Stack/StackedHttpKernel.php(23): Drupal\Core\StackMiddleware\NegotiationMiddleware->handle()
#37 /web/core/lib/Drupal/Core/DrupalKernel.php(717): Stack\StackedHttpKernel->handle()
#38 /web/index.php(19): Drupal\Core\DrupalKernel->handle()
#39 {main}

I believe the problem reported in #16 happened because the previous patch wouldn't apply cleanly. When I manually applied the changes to admin_toolbar 3.0.3 it appeared to work as expected. Here's a re-roll of the previous patch.

I've applied the patch in #17 to admin_toolbar 3.x-dev@dev on a Drupal 9.4.x-dev installation with admin_toolbar, admin_toolbar_tools and admin_toolbar_links_access_filter enabled. after applying the patch, while performing a drush cr i already got the following error in the terminal:

$> ddev . drush cr
PHP Fatal error:  Uncaught Error: Call to a member function getBundleInfo() on null in /var/www/html/web/modules/contrib/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php:143
Stack trace:
#0 /var/www/html/web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php(101): Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks->getDerivativeDefinitions(Array)
#1 /var/www/html/web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php(87): Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator->getDerivatives(Array)
#2 /var/www/html/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php(164): Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator->getDefinitions()
#3 /var/www/html/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php(189): Drupal\Core\Menu\MenuLinkManager->getDefinitions()
#4 /var/www/html/web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php(82): Drupal\Core\Menu\MenuLinkManager->rebuild()
#5 /var/www/html/web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php(70): Drupal\Core\EventSubscriber\MenuRouterRebuildSubscriber->menuLinksRebuild()
#6 [internal function]: Drupal\Core\EventSubscriber\MenuRouterRebuildSubscriber->onRouterRebuild(Object(Drupal\Component\EventDispatcher\Event), 'routing.route_f...', Object(Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher))
#7 /var/www/html/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php(142): call_user_func(Array, Object(Drupal\Component\EventDispatcher\Event), 'routing.route_f...', Object(Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher))
#8 /var/www/html/web/core/lib/Drupal/Core/Routing/RouteBuilder.php(197): Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher->dispatch(Object(Drupal\Component\EventDispatcher\Event), 'routing.route_f...')
#9 /var/www/html/web/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php(83): Drupal\Core\Routing\RouteBuilder->rebuild()
#10 /var/www/html/web/core/includes/common.inc(585): Drupal\Core\ProxyClass\Routing\RouteBuilder->rebuild()
#11 /var/www/html/web/core/includes/utility.inc(41): drupal_flush_all_caches(Object(Drupal\Core\DrupalKernel))
#12 /var/www/html/vendor/drush/drush/src/Commands/core/CacheCommands.php(232): drupal_rebuild(Object(Composer\Autoload\ClassLoader), Object(Symfony\Component\HttpFoundation\Request))
#13 [internal function]: Drush\Commands\core\CacheCommands->rebuild(Array)
#14 /var/www/html/vendor/consolidation/annotated-command/src/CommandProcessor.php(257): call_user_func_array(Array, Array)
#15 /var/www/html/vendor/consolidation/annotated-command/src/CommandProcessor.php(212): Consolidation\AnnotatedCommand\CommandProcessor->runCommandCallback(Array, Object(Consolidation\AnnotatedCommand\CommandData))
#16 /var/www/html/vendor/consolidation/annotated-command/src/CommandProcessor.php(176): Consolidation\AnnotatedCommand\CommandProcessor->validateRunAndAlter(Array, Array, Object(Consolidation\AnnotatedCommand\CommandData))
#17 /var/www/html/vendor/consolidation/annotated-command/src/AnnotatedCommand.php(350): Consolidation\AnnotatedCommand\CommandProcessor->process(Object(Symfony\Component\Console\Output\ConsoleOutput), Array, Array, Object(Consolidation\AnnotatedCommand\CommandData))
#18 /var/www/html/vendor/symfony/console/Command/Command.php(255): Consolidation\AnnotatedCommand\AnnotatedCommand->execute(Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#19 /var/www/html/vendor/symfony/console/Application.php(1027): Symfony\Component\Console\Command\Command->run(Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#20 /var/www/html/vendor/symfony/console/Application.php(273): Symfony\Component\Console\Application->doRunCommand(Object(Consolidation\AnnotatedCommand\AnnotatedCommand), Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#21 /var/www/html/vendor/symfony/console/Application.php(149): Symfony\Component\Console\Application->doRun(Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#22 /var/www/html/vendor/drush/drush/src/Runtime/Runtime.php(121): Symfony\Component\Console\Application->run(Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#23 /var/www/html/vendor/drush/drush/src/Runtime/Runtime.php(51): Drush\Runtime\Runtime->doRun(Array, Object(Symfony\Component\Console\Output\ConsoleOutput))
#24 /var/www/html/vendor/drush/drush/drush.php(72): Drush\Runtime\Runtime->run(Array)
#25 /var/www/html/vendor/drush/drush/drush(4): require('/var/www/html/v...')
#26 /var/www/html/vendor/bin/drush(117): include('/var/www/html/v...')
#27 {main}
  thrown in /var/www/html/web/modules/contrib/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php on line 143

Fatal error: Uncaught Error: Call to a member function getBundleInfo() on null in /var/www/html/web/modules/contrib/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php:143
Stack trace:
#0 /var/www/html/web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php(101): Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks->getDerivativeDefinitions(Array)
#1 /var/www/html/web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php(87): Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator->getDerivatives(Array)
#2 /var/www/html/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php(164): Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator->getDefinitions()
#3 /var/www/html/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php(189): Drupal\Core\Menu\MenuLinkManager->getDefinitions()
#4 /var/www/html/web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php(82): Drupal\Core\Menu\MenuLinkManager->rebuild()
#5 /var/www/html/web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php(70): Drupal\Core\EventSubscriber\MenuRouterRebuildSubscriber->menuLinksRebuild()
#6 [internal function]: Drupal\Core\EventSubscriber\MenuRouterRebuildSubscriber->onRouterRebuild(Object(Drupal\Component\EventDispatcher\Event), 'routing.route_f...', Object(Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher))
#7 /var/www/html/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php(142): call_user_func(Array, Object(Drupal\Component\EventDispatcher\Event), 'routing.route_f...', Object(Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher))
#8 /var/www/html/web/core/lib/Drupal/Core/Routing/RouteBuilder.php(197): Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher->dispatch(Object(Drupal\Component\EventDispatcher\Event), 'routing.route_f...')
#9 /var/www/html/web/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php(83): Drupal\Core\Routing\RouteBuilder->rebuild()
#10 /var/www/html/web/core/includes/common.inc(585): Drupal\Core\ProxyClass\Routing\RouteBuilder->rebuild()
#11 /var/www/html/web/core/includes/utility.inc(41): drupal_flush_all_caches(Object(Drupal\Core\DrupalKernel))
#12 /var/www/html/vendor/drush/drush/src/Commands/core/CacheCommands.php(232): drupal_rebuild(Object(Composer\Autoload\ClassLoader), Object(Symfony\Component\HttpFoundation\Request))
#13 [internal function]: Drush\Commands\core\CacheCommands->rebuild(Array)
#14 /var/www/html/vendor/consolidation/annotated-command/src/CommandProcessor.php(257): call_user_func_array(Array, Array)
#15 /var/www/html/vendor/consolidation/annotated-command/src/CommandProcessor.php(212): Consolidation\AnnotatedCommand\CommandProcessor->runCommandCallback(Array, Object(Consolidation\AnnotatedCommand\CommandData))
#16 /var/www/html/vendor/consolidation/annotated-command/src/CommandProcessor.php(176): Consolidation\AnnotatedCommand\CommandProcessor->validateRunAndAlter(Array, Array, Object(Consolidation\AnnotatedCommand\CommandData))
#17 /var/www/html/vendor/consolidation/annotated-command/src/AnnotatedCommand.php(350): Consolidation\AnnotatedCommand\CommandProcessor->process(Object(Symfony\Component\Console\Output\ConsoleOutput), Array, Array, Object(Consolidation\AnnotatedCommand\CommandData))
#18 /var/www/html/vendor/symfony/console/Command/Command.php(255): Consolidation\AnnotatedCommand\AnnotatedCommand->execute(Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#19 /var/www/html/vendor/symfony/console/Application.php(1027): Symfony\Component\Console\Command\Command->run(Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#20 /var/www/html/vendor/symfony/console/Application.php(273): Symfony\Component\Console\Application->doRunCommand(Object(Consolidation\AnnotatedCommand\AnnotatedCommand), Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#21 /var/www/html/vendor/symfony/console/Application.php(149): Symfony\Component\Console\Application->doRun(Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#22 /var/www/html/vendor/drush/drush/src/Runtime/Runtime.php(121): Symfony\Component\Console\Application->run(Object(Drush\Symfony\DrushArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
#23 /var/www/html/vendor/drush/drush/src/Runtime/Runtime.php(51): Drush\Runtime\Runtime->doRun(Array, Object(Symfony\Component\Console\Output\ConsoleOutput))
#24 /var/www/html/vendor/drush/drush/drush.php(72): Drush\Runtime\Runtime->run(Array)
#25 /var/www/html/vendor/drush/drush/drush(4): require('/var/www/html/v...')
#26 /var/www/html/vendor/bin/drush(117): include('/var/www/html/v...')
#27 {main}
  thrown in /var/www/html/web/modules/contrib/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php on line 143
 [warning] Drush command terminated abnormally.
Failed to execute command drush cr: exit status 1

performed a patch-ignore afterwards. cleared caches and reapplied the patch and then triggered the clear caches command from within the admin menu. ran into a white screen with a slightly different stack trace:

The website encountered an unexpected error. Please try again later.
Error: Call to a member function getBundleInfo() on null in Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks->getDerivativeDefinitions() (line 143 of modules/contrib/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php).
Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks->getDerivativeDefinitions(Array) (Line: 101)
Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator->getDerivatives(Array) (Line: 87)
Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator->getDefinitions() (Line: 164)
Drupal\Core\Menu\MenuLinkManager->getDefinitions() (Line: 189)
Drupal\Core\Menu\MenuLinkManager->rebuild() (Line: 82)
Drupal\Core\EventSubscriber\MenuRouterRebuildSubscriber->menuLinksRebuild() (Line: 70)
Drupal\Core\EventSubscriber\MenuRouterRebuildSubscriber->onRouterRebuild(Object, 'routing.route_finished', Object)
call_user_func(Array, Object, 'routing.route_finished', Object) (Line: 142)
Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher->dispatch(Object, 'routing.route_finished') (Line: 197)
Drupal\Core\Routing\RouteBuilder->rebuild() (Line: 83)
Drupal\Core\ProxyClass\Routing\RouteBuilder->rebuild() (Line: 585)
drupal_flush_all_caches() (Line: 205)
Drupal\admin_toolbar_tools\Controller\ToolbarController->flushAll()
call_user_func_array(Array, Array) (Line: 123)
Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber->Drupal\Core\EventSubscriber\{closure}() (Line: 564)
Drupal\Core\Render\Renderer->executeInRenderContext(Object, Object) (Line: 124)
Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber->wrapControllerExecutionInRenderContext(Array, Array) (Line: 97)
Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber->Drupal\Core\EventSubscriber\{closure}() (Line: 158)
Symfony\Component\HttpKernel\HttpKernel->handleRaw(Object, 1) (Line: 80)
Symfony\Component\HttpKernel\HttpKernel->handle(Object, 1, 1) (Line: 58)
Drupal\Core\StackMiddleware\Session->handle(Object, 1, 1) (Line: 48)
Drupal\Core\StackMiddleware\KernelPreHandle->handle(Object, 1, 1) (Line: 106)
Drupal\page_cache\StackMiddleware\PageCache->pass(Object, 1, 1) (Line: 85)
Drupal\page_cache\StackMiddleware\PageCache->handle(Object, 1, 1) (Line: 48)
Drupal\Core\StackMiddleware\ReverseProxyMiddleware->handle(Object, 1, 1) (Line: 51)
Drupal\Core\StackMiddleware\NegotiationMiddleware->handle(Object, 1, 1) (Line: 23)
Stack\StackedHttpKernel->handle(Object, 1, 1) (Line: 709)
Drupal\Core\DrupalKernel->handle(Object) (Line: 19)

Re-roll for 3.x-dev branch

Heads Up to anyone who is working on this issue .

If #2976861 gets committed, we need to proceed with a different approach as this patch is creating duplicate menu links for custom entities as mentioned in #2976861-83

Applying this patch on both 3.3.0 and dev of admin_toolbar gives me the following error after clearing caches. Drupal 9.5.3 and Feeds Beta 3. If I'm understanding this correctly, it seems like this patch should skip over a bad, missing, or misconfigured route vs fatally trying to create it. If this isn't seen as the responsibility of this project, this comment will just serve as an FYI for others (I'll leave it to others to set it to needs work).

Rolling back the patch and rebuilding the cache fixed the issue. :)

The website encountered an unexpected error. Please try again later.

Symfony\Component\Routing\Exception\RouteNotFoundException: Route "entity.feeds_feed.collection" does not exist. in Drupal\Core\Routing\RouteProvider->getRouteByName() (line 206 of core/lib/Drupal/Core/Routing/RouteProvider.php).
Drupal\Core\Routing\UrlGenerator->getRoute() (Line: 129)
Drupal\Core\Routing\UrlGenerator->getPathFromRoute() (Line: 68)
Drupal\Core\Render\MetadataBubblingUrlGenerator->getPathFromRoute() (Line: 802)
Drupal\Core\Url->getInternalPath() (Line: 136)
Drupal\Core\Utility\LinkGenerator->generate() (Line: 95)
Drupal\Core\Render\Element\Link::preRenderLink()
call_user_func_array() (Line: 101)
Drupal\Core\Render\Renderer->doTrustedCallback() (Line: 788)
Drupal\Core\Render\Renderer->doCallback() (Line: 374)
Drupal\Core\Render\Renderer->doRender() (Line: 204)
Drupal\Core\Render\Renderer->render() (Line: 479)
Drupal\Core\Template\TwigExtension->escapeFilter() (Line: 102)
__TwigTemplate_12e0ac103d6d37453e250b27d8442420->macro_menu_links() (Line: 1169)
twig_call_macro() (Line: 44)
__TwigTemplate_12e0ac103d6d37453e250b27d8442420->doDisplay() (Line: 405)
Twig\Template->displayWithErrorHandling() (Line: 378)
Twig\Template->display() (Line: 390)
Twig\Template->render() (Line: 55)
twig_render_template() (Line: 384)
Drupal\Core\Theme\ThemeManager->render() (Line: 433)
Drupal\Core\Render\Renderer->doRender() (Line: 204)
Drupal\Core\Render\Renderer->render() (Line: 118)
Drupal\toolbar\Controller\ToolbarController::Drupal\toolbar\Controller\{closure}() (Line: 580)
Drupal\Core\Render\Renderer->executeInRenderContext() (Line: 119)
Drupal\toolbar\Controller\ToolbarController::preRenderGetRenderedSubtrees()
call_user_func_array() (Line: 101)
Drupal\Core\Render\Renderer->doTrustedCallback() (Line: 788)
Drupal\Core\Render\Renderer->doCallback() (Line: 374)
Drupal\Core\Render\Renderer->doRender() (Line: 204)
Drupal\Core\Render\Renderer->render() (Line: 285)
{closure}() (Line: 580)
Drupal\Core\Render\Renderer->executeInRenderContext() (Line: 286)
toolbar_get_rendered_subtrees() (Line: 297)
_toolbar_get_subtrees_hash() (Line: 168)
toolbar_toolbar()
call_user_func_array() (Line: 426)
Drupal\Core\Extension\ModuleHandler->Drupal\Core\Extension\{closure}() (Line: 405)
Drupal\Core\Extension\ModuleHandler->invokeAllWith() (Line: 433)
Drupal\Core\Extension\ModuleHandler->invokeAll() (Line: 81)
Drupal\toolbar\Element\Toolbar::preRenderToolbar()
call_user_func_array() (Line: 101)
Drupal\Core\Render\Renderer->doTrustedCallback() (Line: 788)
Drupal\Core\Render\Renderer->doCallback() (Line: 374)
Drupal\Core\Render\Renderer->doRender() (Line: 446)
Drupal\Core\Render\Renderer->doRender() (Line: 204)
Drupal\Core\Render\Renderer->render() (Line: 479)
Drupal\Core\Template\TwigExtension->escapeFilter() (Line: 82)
__TwigTemplate_84b190a55469c4f95ce742f2e57ac716->doDisplay() (Line: 405)
Twig\Template->displayWithErrorHandling() (Line: 378)
Twig\Template->display() (Line: 390)
Twig\Template->render() (Line: 55)
twig_render_template() (Line: 384)
Drupal\Core\Theme\ThemeManager->render() (Line: 433)
Drupal\Core\Render\Renderer->doRender() (Line: 204)
Drupal\Core\Render\Renderer->render() (Line: 162)
Drupal\Core\Render\MainContent\HtmlRenderer->Drupal\Core\Render\MainContent\{closure}() (Line: 580)
Drupal\Core\Render\Renderer->executeInRenderContext() (Line: 163)
Drupal\Core\Render\MainContent\HtmlRenderer->renderResponse() (Line: 90)
Drupal\Core\EventSubscriber\MainContentViewSubscriber->onViewRenderArray()
call_user_func() (Line: 142)
Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher->dispatch() (Line: 174)
Symfony\Component\HttpKernel\HttpKernel->handleRaw() (Line: 81)
Symfony\Component\HttpKernel\HttpKernel->handle() (Line: 58)
Drupal\Core\StackMiddleware\Session->handle() (Line: 48)
Drupal\Core\StackMiddleware\KernelPreHandle->handle() (Line: 106)
Drupal\page_cache\StackMiddleware\PageCache->pass() (Line: 85)
Drupal\page_cache\StackMiddleware\PageCache->handle() (Line: 48)
Drupal\Core\StackMiddleware\ReverseProxyMiddleware->handle() (Line: 51)
Drupal\Core\StackMiddleware\NegotiationMiddleware->handle() (Line: 23)
Stack\StackedHttpKernel->handle() (Line: 713)
Drupal\Core\DrupalKernel->handle() (Line: 19)

Hi Joachim (@joachim)!

Thanks a lot for the great work on this issue and for keeping the suggested code changes maintained.🙏

Just wanted to bring to your attention related issue #3550604: Automated Tests: Add Functional tests for classes ExtraLinks and SearchLinks which references this issue several times 🙂

It would be super helpful if you could please try to see how the changes in the merge request could integrate with the 'ExtraLinks' tests added in the related tests issue.
I would definitely be in favor of working on this issue and getting this change potentially integrated, as soon as we could have the 'ExtraLinks' and 'SearchLinks' automated tests in place.

Overall, I think this ticket is more of a refactoring task than a new feature, so with the tests in place, we should be able to move forward a bit quicker with these changes.

Could we also refactor the following links/labels? 'Add {entity type}' links under 'Structure' ('admin/structure')

'Add contact form'
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...

'Add media type' ==> I "think" you've already done this one ✅
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...

'Add content type' ==> I "think" you've already done this one ✅
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...

'Add vocabulary'
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...

'Add role'
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...

'Add view'
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...

Note that Block content and Comment types currently do not have an 'Add {entity type}' link added by the ExtraLinks class.... which should ideally also be standardized: the same behavior across all entity types would be easier to understand for anyone. 👌

Ideally, we wish we could remove exceptions with static label declarations in the AdminToolbarToolsEntityCreationTrait test matrix from the other ticket, so we could use a more standardized method for the tests (instead of static labels), see:
https://git.drupalcode.org/project/admin_toolbar/-/blob/af36beae3b23cab0...

It would be great if we could find a more generic way to approach the 'Add {entity type}' links added by the module under 'Structure' 👍
Then we should be able to come back to the 'Add {entity type} content' links, under the 'Content' menu.

Any feedback, comments or reviews on related issue or this ticket would be greatly appreciated.
Thanks in advance!