diff --git a/README.txt b/README.txt index dfcc03a..530e286 100755 --- a/README.txt +++ b/README.txt @@ -50,7 +50,9 @@ INSTALLATION CONFIGURATION ------------- -No configuration is needed. + * Visit the max bundle number setting form at (/admin/config/bundle-number/settings). + + * Enter the max bundle number in textfield and save the form. MAINTAINERS diff --git a/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml b/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml index 567e32d..a4dc1bf 100755 --- a/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml +++ b/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml @@ -78,3 +78,8 @@ admin_toolbar_tools.flush_rendercache: admin_toolbar_tools.extra_links: deriver: \Drupal\admin_toolbar_tools\Plugin\Derivative\ExtraLinks menu_name: admin + +admin_toolbar_tools.max_bundle_number: + title: 'Set Max Bundle Toolbar' + route_name: admin_toolbar.max_bundle_number_settings_form + parent: system.admin_config diff --git a/admin_toolbar_tools/admin_toolbar_tools.routing.yml b/admin_toolbar_tools/admin_toolbar_tools.routing.yml index ee4eb23..9ce90d7 100755 --- a/admin_toolbar_tools/admin_toolbar_tools.routing.yml +++ b/admin_toolbar_tools/admin_toolbar_tools.routing.yml @@ -85,3 +85,11 @@ admin_toolbar.search: _controller: '\Drupal\admin_toolbar_tools\Controller\ToolbarController::search' requirements: _permission: 'administer site configuration' + +admin_toolbar.max_bundle_number_settings_form: + path: '/admin/config/bundle-number/settings' + defaults: + _form: '\Drupal\admin_toolbar_tools\Form\BundleSettingsForm' + _title: 'BundleSettingsForm' + requirements: + _permission: 'administer site configuration' diff --git a/admin_toolbar_tools/src/Form/BundleSettingsForm.php b/admin_toolbar_tools/src/Form/BundleSettingsForm.php new file mode 100644 index 0000000..5377d7e --- /dev/null +++ b/admin_toolbar_tools/src/Form/BundleSettingsForm.php @@ -0,0 +1,60 @@ +config('max_bundle.settings'); + $max_bundle_number = $config->get('max_bundle_number'); + $form['max_bundle_number'] = array( + '#type' => 'textfield', + '#title' => $this->t('Set Max Bundle Number'), + '#default_value' => !empty($max_bundle_number) ? $max_bundle_number : 20, + ); + return parent::buildForm($form, $form_state); + } + /** + * {@inheritdoc} + */ + public function validateForm(array &$form, FormStateInterface $form_state) { + parent::validateForm($form, $form_state); + if (!is_numeric($form_state->getValue('max_bundle_number'))) { + $form_state->setErrorByName('max_bundle_number', $this->t('Max Bundle Number must be numeric')); + } + } + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + parent::submitForm($form, $form_state); + $this->config('max_bundle.settings') + ->set('max_bundle_number', $form_state->getValue('max_bundle_number')) + ->save(); + } +} diff --git a/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php b/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php index c667b6b..8f6959e 100755 --- a/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php +++ b/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php @@ -11,6 +11,7 @@ use Drupal\Core\Routing\RouteProviderInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\system\Entity\Menu; use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\Core\Config\ConfigFactoryInterface; /** * Provides a default implementation for menu link plugins. @@ -19,8 +20,6 @@ class ExtraLinks extends DeriverBase implements ContainerDeriverInterface { use StringTranslationTrait; - const MAX_BUNDLE_NUMBER = 10; - /** * The entity type manager. * @@ -49,14 +48,23 @@ class ExtraLinks extends DeriverBase implements ContainerDeriverInterface { */ protected $themeHandler; + + /** + * A config object for the system performance configuration. + * + * @var \Drupal\Core\Config\Config + */ + protected $config; + /** * {@inheritdoc} */ - public function __construct($base_plugin_id, EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, RouteProviderInterface $route_provider, ThemeHandlerInterface $theme_handler) { + public function __construct($base_plugin_id, EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, RouteProviderInterface $route_provider, ThemeHandlerInterface $theme_handler,ConfigFactoryInterface $config_factory) { $this->entityTypeManager = $entity_type_manager; $this->moduleHandler = $module_handler; $this->routeProvider = $route_provider; $this->themeHandler = $theme_handler; + $this->config = $config = $config_factory->get('max_bundle.settings'); } /** @@ -68,7 +76,8 @@ class ExtraLinks extends DeriverBase implements ContainerDeriverInterface { $container->get('entity_type.manager'), $container->get('module_handler'), $container->get('router.route_provider'), - $container->get('theme_handler') + $container->get('theme_handler'), + $container->get('config.factory') ); } @@ -77,6 +86,7 @@ class ExtraLinks extends DeriverBase implements ContainerDeriverInterface { */ public function getDerivativeDefinitions($base_plugin_definition) { $links = []; + $max_bundle_number = $this->config->get('max_bundle_number'); $entity_types = $this->entityTypeManager->getDefinitions(); $content_entities = []; foreach ($entity_types as $key => $entity_type) { @@ -94,9 +104,9 @@ class ExtraLinks extends DeriverBase implements ContainerDeriverInterface { $content_entity = $entities['content_entity']; // We do not display more than 10 different bundles per entity type. $content_entity_bundle_storage = $this->entityTypeManager->getStorage($content_entity_bundle); - $bundles_ids = $content_entity_bundle_storage->getQuery()->pager(self::MAX_BUNDLE_NUMBER)->execute(); + $bundles_ids = $content_entity_bundle_storage->getQuery()->pager($max_bundle_number)->execute(); $bundles = $this->entityTypeManager->getStorage($content_entity_bundle)->loadMultiple($bundles_ids); - if (count($bundles) == self::MAX_BUNDLE_NUMBER) { + if (count($bundles) == $max_bundle_number) { $links[$content_entity_bundle . '.collection'] = [ 'title' => $this->t('All types'), 'route_name' => 'entity.' . $content_entity_bundle . '.collection', @@ -321,8 +331,8 @@ class ExtraLinks extends DeriverBase implements ContainerDeriverInterface { // We do not display more than 10 different menus. $menus = $this->entityTypeManager->getStorage('menu')->loadMultiple(); uasort($menus, [Menu::class, 'sort']); - $menus = array_slice($menus, 0, self::MAX_BUNDLE_NUMBER); - if (count($menus) == self::MAX_BUNDLE_NUMBER) { + $menus = array_slice($menus, 0, $max_bundle_number); + if (count($menus) == $max_bundle_number) { $links['entity.menu.collection'] = [ 'title' => $this->t('All menus'), 'route_name' => 'entity.menu.collection', diff --git a/admin_toolbar_tools/src/SearchLinks.php b/admin_toolbar_tools/src/SearchLinks.php index 703edbe..af0db3b 100644 --- a/admin_toolbar_tools/src/SearchLinks.php +++ b/admin_toolbar_tools/src/SearchLinks.php @@ -13,6 +13,7 @@ use Drupal\Core\Routing\RouteProviderInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\Url; use Drupal\system\Entity\Menu; +use Drupal\Core\Config\ConfigFactoryInterface; /** * Extra search links. @@ -56,15 +57,24 @@ class SearchLinks { */ protected $toolbarCache; + + /** + * A config object for the system performance configuration. + * + * @var \Drupal\Core\Config\Config + */ + protected $config; + /** * {@inheritdoc} */ - public function __construct(EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, RouteProviderInterface $route_provider, CacheContextsManager $cache_context_manager, CacheBackendInterface $toolbar_cache) { + public function __construct(EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, RouteProviderInterface $route_provider, CacheContextsManager $cache_context_manager, CacheBackendInterface $toolbar_cache, ConfigFactoryInterface $config_factory) { $this->entityTypeManager = $entity_type_manager; $this->moduleHandler = $module_handler; $this->routeProvider = $route_provider; $this->cacheContextManager = $cache_context_manager; $this->toolbarCache = $toolbar_cache; + $this->config = $config = $config_factory->get('max_bundle.settings'); } /** @@ -77,6 +87,7 @@ class SearchLinks { * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException */ public function getLinks() { + $max_bundle_number = $this->config->get('max_bundle_number'); $additional_keys = $this->cacheContextManager->convertTokensToKeys([ 'languages:' . LanguageInterface::TYPE_INTERFACE, 'user.permissions', @@ -98,7 +109,7 @@ class SearchLinks { $content_entity = $entities['content_entity']; // Start at offset 10, since the toolbar has already loaded the first 10. $content_entity_bundle_storage = $this->entityTypeManager->getStorage($content_entity_bundle); - $bundles_ids = $content_entity_bundle_storage->getQuery()->range(ExtraLinks::MAX_BUNDLE_NUMBER)->execute(); + $bundles_ids = $content_entity_bundle_storage->getQuery()->range($max_bundle_number)->execute(); if (!empty($bundles_ids)) { $bundles = $this->entityTypeManager ->getStorage($content_entity_bundle) @@ -182,7 +193,7 @@ class SearchLinks { $menus = $this->entityTypeManager->getStorage('menu')->loadMultiple(); uasort($menus, [Menu::class, 'sort']); - $menus = array_slice($menus, ExtraLinks::MAX_BUNDLE_NUMBER); + $menus = array_slice($menus, $max_bundle_number); $cache_tags = Cache::mergeTags($cache_tags, ['config:menu_list']); foreach ($menus as $menu_id => $menu) {