From 91673b84f7f71a404599bc56c93fb38789ae43d4 Mon Sep 17 00:00:00 2001
From: TonyTheFerg <tony@greatlakestapingtools.com>
Date: Thu, 20 Feb 2025 12:14:38 -0500
Subject: [PATCH 1/2] First pass at reverting
---
.../admin_toolbar_tools.links.menu.yml | 7 -----
.../admin_toolbar_tools.routing.yml | 9 ------
.../src/Controller/ToolbarController.php | 29 +------------------
3 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml b/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml
index f42e394..7b006ba 100644
--- a/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml
+++ b/admin_toolbar_tools/admin_toolbar_tools.links.menu.yml
@@ -90,10 +90,3 @@ admin_toolbar_tools.settings:
description: 'Configure the Admin Toolbar Tools module.'
route_name: admin_toolbar_tools.settings
parent: system.admin_config_ui
-
-system.run_reindex_site:
- title: 'Re-index Site'
- route_name: admin_toolbar.run.reindex.site
- menu_name: admin
- parent: admin_toolbar_tools.help
- weight: -9
diff --git a/admin_toolbar_tools/admin_toolbar_tools.routing.yml b/admin_toolbar_tools/admin_toolbar_tools.routing.yml
index ca9d57d..e5a0bfd 100644
--- a/admin_toolbar_tools/admin_toolbar_tools.routing.yml
+++ b/admin_toolbar_tools/admin_toolbar_tools.routing.yml
@@ -95,12 +95,3 @@ admin_toolbar_tools.settings:
_title: 'Admin Toolbar Tools settings'
requirements:
_permission: 'administer site configuration'
-
-admin_toolbar.run.reindex.site:
- path: '/reindex-site'
- defaults:
- _controller: '\Drupal\admin_toolbar_tools\Controller\ToolbarController::runReindexSite'
- _title: 'Re-index Site'
- requirements:
- _permission: 'administer site configuration'
- _csrf_token: 'TRUE'
diff --git a/admin_toolbar_tools/src/Controller/ToolbarController.php b/admin_toolbar_tools/src/Controller/ToolbarController.php
index fcd3ac3..497181f 100644
--- a/admin_toolbar_tools/src/Controller/ToolbarController.php
+++ b/admin_toolbar_tools/src/Controller/ToolbarController.php
@@ -13,7 +13,6 @@ use Drupal\Core\Menu\MenuLinkManagerInterface;
use Drupal\Core\Plugin\CachedDiscoveryClearerInterface;
use Drupal\Core\Template\TwigEnvironment;
use Drupal\Core\Theme\Registry;
-use Drupal\search\SearchPageRepositoryInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -109,13 +108,6 @@ class ToolbarController extends ControllerBase {
*/
protected $themeRegistry;
- /**
- * The search page repository service.
- *
- * @var \Drupal\search\SearchPageRepositoryInterface
- */
- protected SearchPageRepositoryInterface $searchPageRepository;
-
/**
* Constructs a ToolbarController object.
*
@@ -143,8 +135,6 @@ class ToolbarController extends ControllerBase {
* A TwigEnvironment instance.
* @param \Drupal\Core\Theme\Registry $theme_registry
* The theme.registry service.
- * @param \Drupal\search\SearchPageRepositoryInterface $search_page_repository
- * The search page repository service.
*/
public function __construct(
CronInterface $cron,
@@ -160,7 +150,6 @@ class ToolbarController extends ControllerBase {
TwigEnvironment $twig,
Registry $theme_registry,
// phpcs:ignore Drupal.Functions.MultiLineFunctionDeclaration.MissingTrailingComma
- SearchPageRepositoryInterface $search_page_repository
) {
$this->cron = $cron;
$this->menuLinkManager = $menuLinkManager;
@@ -174,7 +163,6 @@ class ToolbarController extends ControllerBase {
$this->cacheMenu = $cache_menu;
$this->twig = $twig;
$this->themeRegistry = $theme_registry;
- $this->searchPageRepository = $search_page_repository;
}
/**
@@ -193,8 +181,7 @@ class ToolbarController extends ControllerBase {
$container->get('plugin.cache_clearer'),
$container->get('cache.menu'),
$container->get('twig'),
- $container->get('theme.registry'),
- $container->get('search.search_page_repository')
+ $container->get('theme.registry')
);
}
@@ -306,18 +293,4 @@ class ToolbarController extends ControllerBase {
return new RedirectResponse($this->reloadPage());
}
- /**
- * Reindexes all active search pages.
- */
- public function runReindexSite() {
- // Ask each active search page to mark itself for re-index.
- foreach ($this->searchPageRepository->getIndexableSearchPages() as $entity) {
- $entity->getPlugin()->markForReindex();
- }
- // Run the cron to process the reindexing.
- $this->cron->run();
- $this->messenger()->addMessage($this->t('All search indexes have been rebuilt.'));
- return new RedirectResponse($this->reloadPage());
- }
-
}
--
GitLab
From e2c4377a36f2ca65c58a3904b5c22c8a6e787d4a Mon Sep 17 00:00:00 2001
From: TonyTheFerg <tony@greatlakestapingtools.com>
Date: Thu, 20 Feb 2025 12:18:27 -0500
Subject: [PATCH 2/2] comma
---
admin_toolbar_tools/src/Controller/ToolbarController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin_toolbar_tools/src/Controller/ToolbarController.php b/admin_toolbar_tools/src/Controller/ToolbarController.php
index 497181f..169a719 100644
--- a/admin_toolbar_tools/src/Controller/ToolbarController.php
+++ b/admin_toolbar_tools/src/Controller/ToolbarController.php
@@ -148,8 +148,8 @@ class ToolbarController extends ControllerBase {
CachedDiscoveryClearerInterface $plugin_cache_clearer,
CacheBackendInterface $cache_menu,
TwigEnvironment $twig,
- Registry $theme_registry,
// phpcs:ignore Drupal.Functions.MultiLineFunctionDeclaration.MissingTrailingComma
+ Registry $theme_registry
) {
$this->cron = $cron;
$this->menuLinkManager = $menuLinkManager;
--
GitLab