From c41dcbd200a1ed6ffd47f4b4a0ae1a620b5a54ba Mon Sep 17 00:00:00 2001
From: Michael Lee <lee.5151@osu.edu>
Date: Wed, 9 Feb 2022 11:33:54 -0500
Subject: [PATCH] Upgrading drupal/admin_toolbar (3.0.3 => 3.1.0)
---
composer.json | 2 +-
composer.lock | 18 +--
vendor/composer/installed.json | 18 +--
vendor/composer/installed.php | 10 +-
.../admin_toolbar/admin_toolbar.info.yml | 8 +-
.../admin_toolbar/admin_toolbar.module | 8 +-
...admin_toolbar_links_access_filter.info.yml | 8 +-
.../admin_toolbar_links_access_filter.module | 2 +-
.../admin_toolbar_search.info.yml | 8 +-
.../admin_toolbar_search.libraries.yml | 2 +-
.../admin_toolbar_search.module | 20 +++-
.../css/admin.toolbar_search.css | 43 ++++++-
.../js/admin_toolbar_search.js | 107 ++++++++++--------
.../AdminToolbarSearchController.php | 2 +-
.../admin_toolbar_search/src/SearchLinks.php | 6 +-
.../AdminToolbarSearchSettingTest.php | 5 +-
.../admin_toolbar_tools.info.yml | 8 +-
.../admin_toolbar_tools.module | 30 +++--
.../admin_toolbar_tools/css/tools.css | 7 +-
.../src/Controller/ToolbarController.php | 2 +-
.../Form/AdminToolbarToolsSettingsForm.php | 2 +-
.../src/Plugin/Derivative/ExtraLinks.php | 9 ++
web/modules/admin_toolbar/composer.json | 7 +-
.../admin_toolbar/js/admin_toolbar.hover.js | 2 +-
.../src/Render/Element/AdminToolbar.php | 2 +-
25 files changed, 219 insertions(+), 117 deletions(-)
diff --git a/composer.json b/composer.json
index 1527bdbb9a..83b40ee335 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
"desandro/masonry": "4.2",
"dimsemenov/magnific-popup": "1.1",
"drupal/addtocalendar": "3.2",
- "drupal/admin_toolbar": "3.0.3",
+ "drupal/admin_toolbar": "3.1.0",
"drupal/administerusersbyrole": "3.0",
"drupal/allowed_formats": "1.3",
"drupal/anchor_link": "1.7",
diff --git a/composer.lock b/composer.lock
index dfe46eb5de..dd6dcc6451 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "cc02b294136709d94b7f71af1ce79139",
+ "content-hash": "48d56c2b2219d32e7748e0c8de599e83",
"packages": [
{
"name": "alchemy/zippy",
@@ -1710,20 +1710,20 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "3.0.3",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
- "reference": "3.0.3"
+ "reference": "3.1.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.0.3.zip",
- "reference": "3.0.3",
- "shasum": "ce735c931c0bd6da79bd8e45ca459d61015bbe44"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.1.0.zip",
+ "reference": "3.1.0",
+ "shasum": "7b596d7de04faca747ba3e5216c2e819aae71f40"
},
"require": {
- "drupal/core": "^8.8.0 || ^9.0"
+ "drupal/core": "^8.8.0 || ^9.0 || ^10.0"
},
"require-dev": {
"drupal/admin_toolbar_tools": "*"
@@ -1731,8 +1731,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.0.3",
- "datestamp": "1632322497",
+ "version": "3.1.0",
+ "datestamp": "1643097060",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index eb042be3b0..24aec2af9b 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1751,21 +1751,21 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "3.0.3",
- "version_normalized": "3.0.3.0",
+ "version": "3.1.0",
+ "version_normalized": "3.1.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
- "reference": "3.0.3"
+ "reference": "3.1.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.0.3.zip",
- "reference": "3.0.3",
- "shasum": "ce735c931c0bd6da79bd8e45ca459d61015bbe44"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.1.0.zip",
+ "reference": "3.1.0",
+ "shasum": "7b596d7de04faca747ba3e5216c2e819aae71f40"
},
"require": {
- "drupal/core": "^8.8.0 || ^9.0"
+ "drupal/core": "^8.8.0 || ^9.0 || ^10.0"
},
"require-dev": {
"drupal/admin_toolbar_tools": "*"
@@ -1773,8 +1773,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.0.3",
- "datestamp": "1632322497",
+ "version": "3.1.0",
+ "datestamp": "1643097060",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index df52a89041..3b1cc54827 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -5,7 +5,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'f44fdff5274a17c492ffd2f1245c926323704c94',
+ 'reference' => '017d554d05ee95263629d62bfe1ad0b3dcb57e47',
'name' => 'osu-asc-webservices/d8-upstream',
'dev' => true,
),
@@ -284,12 +284,12 @@
'dev_requirement' => false,
),
'drupal/admin_toolbar' => array(
- 'pretty_version' => '3.0.3',
- 'version' => '3.0.3.0',
+ 'pretty_version' => '3.1.0',
+ 'version' => '3.1.0.0',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/admin_toolbar',
'aliases' => array(),
- 'reference' => '3.0.3',
+ 'reference' => '3.1.0',
'dev_requirement' => false,
),
'drupal/administerusersbyrole' => array(
@@ -2101,7 +2101,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => 'f44fdff5274a17c492ffd2f1245c926323704c94',
+ 'reference' => '017d554d05ee95263629d62bfe1ad0b3dcb57e47',
'dev_requirement' => false,
),
'pantheon-systems/quicksilver-pushback' => array(
diff --git a/web/modules/admin_toolbar/admin_toolbar.info.yml b/web/modules/admin_toolbar/admin_toolbar.info.yml
index 5f7085cfee..958ddec165 100644
--- a/web/modules/admin_toolbar/admin_toolbar.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar.info.yml
@@ -2,11 +2,11 @@ name: Admin Toolbar
description: Provides an improved drop-down menu interface to the site Toolbar.
package: Administration
type: module
-core_version_requirement: ^8.8.0 || ^9
+core_version_requirement: ^8.8.0 || ^9 || ^10
dependencies:
- drupal:toolbar
-# Information added by Drupal.org packaging script on 2021-09-22
-version: '3.0.3'
+# Information added by Drupal.org packaging script on 2022-01-25
+version: '3.1.0'
project: 'admin_toolbar'
-datestamp: 1632322070
+datestamp: 1643097063
diff --git a/web/modules/admin_toolbar/admin_toolbar.module b/web/modules/admin_toolbar/admin_toolbar.module
index 2b32b57995..376c77f56d 100755
--- a/web/modules/admin_toolbar/admin_toolbar.module
+++ b/web/modules/admin_toolbar/admin_toolbar.module
@@ -14,12 +14,14 @@
* Implements hook_toolbar_alter().
*/
function admin_toolbar_toolbar_alter(&$items) {
- $items['administration']['tray']['toolbar_administration']['#pre_render'] = [[AdminToolbar::class, 'preRenderTray']];
+ $items['administration']['tray']['toolbar_administration']['#pre_render'] = [
+ [AdminToolbar::class, 'preRenderTray'],
+ ];
$items['administration']['#attached']['library'][] = 'admin_toolbar/toolbar.tree';
$hoverintent_functionality = \Drupal::config('admin_toolbar_tools.settings')->get('hoverintent_functionality');
if ($hoverintent_functionality === TRUE) {
- // Use jQuery hover() effect.
- $items['administration']['#attached']['library'][] = 'admin_toolbar/toolbar.tree.hoverintent';
+ // Use jQuery hover() effect.
+ $items['administration']['#attached']['library'][] = 'admin_toolbar/toolbar.tree.hoverintent';
}
else {
// User hoverIntent plugin.
diff --git a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
index 55b4877dbb..68010d988c 100644
--- a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
@@ -3,12 +3,12 @@ description: Provides a workaround for the common problem that users with 'Use t
package: Administration
type: module
-core_version_requirement: ^8.8.0 || ^9.0
+core_version_requirement: ^8.8.0 || ^9.0 || ^10
dependencies:
- admin_toolbar:admin_toolbar
-# Information added by Drupal.org packaging script on 2021-09-22
-version: '3.0.3'
+# Information added by Drupal.org packaging script on 2022-01-25
+version: '3.1.0'
project: 'admin_toolbar'
-datestamp: 1632322070
+datestamp: 1643097063
diff --git a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module
index cec6a7c71f..616f37e5c1 100755
--- a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module
+++ b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module
@@ -133,7 +133,7 @@ function admin_toolbar_links_access_filter_filter_non_accessible_links(array &$i
* FALSE otherwise.
*/
function admin_toolbar_links_access_filter_is_overview_page($route_name) {
- // @var \Drupal\Core\Routing\RouteProviderInterface $route_provider.
+ /** @var \Drupal\Core\Routing\RouteProviderInterface $route_provider. */
$route_provider = \Drupal::service('router.route_provider');
$overview_page_controllers = [
'\Drupal\system\Controller\AdminController::index',
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
index 7ae3778224..c34964fd7c 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
@@ -2,12 +2,12 @@ name: Admin Toolbar Search
description: Provides search of Admin Toolbar items.
package: Administration
type: module
-core_version_requirement: ^8.8.0 || ^9.0
+core_version_requirement: ^8.8.0 || ^9.0 || ^10
configure: admin_toolbar_search.settings
dependencies:
- admin_toolbar:admin_toolbar_tools
-# Information added by Drupal.org packaging script on 2021-09-22
-version: '3.0.3'
+# Information added by Drupal.org packaging script on 2022-01-25
+version: '3.1.0'
project: 'admin_toolbar'
-datestamp: 1632322070
+datestamp: 1643097063
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.libraries.yml b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.libraries.yml
index 4f3bedac46..057e36c966 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.libraries.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.libraries.yml
@@ -8,4 +8,4 @@ search:
- core/jquery
- core/drupal
- core/jquery.once
- - core/jquery.ui.autocomplete
+ - core/drupal.autocomplete
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.module b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.module
index 047e485f6c..12f117dbcf 100755
--- a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.module
+++ b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.module
@@ -38,9 +38,27 @@ function admin_toolbar_search_toolbar_alter(&$items) {
$display_menu_item = $config->get('display_menu_item');
if (!$display_menu_item) {
+ $items['administration_mobile_search'] = [
+ '#type' => 'toolbar_item',
+ '#weight' => 100,
+ 'tab' => [
+ '#type' => 'link',
+ '#title' => new TranslatableMarkup('Search'),
+ '#url' => Url::fromRoute('system.admin'),
+ '#attributes' => [
+ 'class' => [
+ 'toolbar-icon',
+ ],
+ ],
+ ],
+ '#wrapper_attributes' => [
+ 'id' => 'admin-toolbar-mobile-search-tab',
+ ],
+ ];
+
$items['administration_search'] = [
"#type" => "toolbar_item",
- '#weight' => 100,
+ '#weight' => 101,
'tab' => [
'search' => [
'#title' => t('Search'),
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/css/admin.toolbar_search.css b/web/modules/admin_toolbar/admin_toolbar_search/css/admin.toolbar_search.css
index 62e9655032..34dac4cd8f 100755
--- a/web/modules/admin_toolbar/admin_toolbar_search/css/admin.toolbar_search.css
+++ b/web/modules/admin_toolbar/admin_toolbar_search/css/admin.toolbar_search.css
@@ -1,6 +1,43 @@
-#admin-toolbar-search-tab .js-form-item.form-item {
- margin-top: 0.3rem;
- margin-bottom: 0;
+#admin-toolbar-mobile-search-tab + #admin-toolbar-search-tab {
+ display: none;
+}
+
+#admin-toolbar-mobile-search-tab + #admin-toolbar-search-tab.visible {
+ display: block;
+ width: 100%;
+}
+
+#admin-toolbar-mobile-search-tab + #admin-toolbar-search-tab .js-form-item.form-item {
+ margin: 0.75rem 0;
+ padding-left: 1rem;
+ padding-right: 1rem;
+}
+
+#admin-toolbar-mobile-search-tab .toolbar-item::before {
+ background-image: url('../../misc/icons/bebebe/loupe.svg');
+}
+
+#admin-toolbar-mobile-search-tab + #admin-toolbar-search-tab #admin-toolbar-search-input {
+ width: 100%;
+}
+
+@media only screen and (min-width: 769px) {
+ #admin-toolbar-mobile-search-tab {
+ display: none;
+ }
+
+ #admin-toolbar-mobile-search-tab + #admin-toolbar-search-tab {
+ display: block;
+ }
+
+ #admin-toolbar-mobile-search-tab + #admin-toolbar-search-tab.visible {
+ width: auto;
+ }
+
+ #admin-toolbar-mobile-search-tab + #admin-toolbar-search-tab .js-form-item.form-item {
+ margin-top: 0.3rem;
+ margin-bottom: 0;
+ }
}
#admin-toolbar-search-input {
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js b/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
index 877272fbfe..0ceca9e804 100755
--- a/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
+++ b/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
@@ -18,58 +18,73 @@
}
var $self = this;
- this.links = [];
-
- $("#admin-toolbar-search-input").autocomplete({
- minLength: 2,
- source: function (request, response) {
- var data = $self.handleAutocomplete(request.term);
- if (!$self.extraFetched && drupalSettings.adminToolbarSearch.loadExtraLinks) {
- $.getJSON( Drupal.url( "admin/admin-toolbar-search" ), function( data ) {
- $(data).each(function () {
- var item = this;
- item.label = this.labelRaw + ' ' + this.value;
- $self.links.push(item);
- });
- $self.extraFetched = true;
+ $('#toolbar-bar', context).once('admin-toolbar-search').each(function () {
+ $self.links = [];
+
+ var $searchTab = $(this).find('#admin-toolbar-search-tab')
+ var $searchInput = $searchTab.find('#admin-toolbar-search-input');
+
+ if ($searchInput.length === 0) {
+ return;
+ }
+
+ $searchInput.autocomplete({
+ minLength: 2,
+ position: { collision : 'fit' },
+ source: function (request, response) {
+ var data = $self.handleAutocomplete(request.term);
+ if (!$self.extraFetched && drupalSettings.adminToolbarSearch.loadExtraLinks) {
+ $.getJSON( Drupal.url('admin/admin-toolbar-search'), function( data ) {
+ $(data).each(function () {
+ var item = this;
+ item.label = this.labelRaw + ' ' + this.value;
+ $self.links.push(item);
+ });
+
+ $self.extraFetched = true;
+
+ var results = $self.handleAutocomplete(request.term);
+ response(results);
+ });
+ }
+ else {
+ response(data);
+ }
+ },
+ open: function () {
+ var zIndex = $('#toolbar-item-administration-tray')
+ .css('z-index') + 1;
+ $(this).autocomplete('widget').css('z-index', zIndex);
- var results = $self.handleAutocomplete(request.term);
- response(results);
- });
- }
- else {
- response(data);
- }
- },
- open: function () {
- var zIndex = $('#toolbar-item-administration-tray')
- .css("z-index") + 1;
- $(this).autocomplete('widget').css('z-index', zIndex);
-
- return false;
- },
- select: function (event, ui) {
- if (ui.item.value) {
- location.href = ui.item.value;
return false;
+ },
+ select: function (event, ui) {
+ if (ui.item.value) {
+ location.href = ui.item.value;
+ return false;
+ }
}
- }
- }).data("ui-autocomplete")._renderItem = (function (ul, item) {
- ul.addClass('admin-toolbar-search-autocomplete-list');
- return $("<li>")
- .append('<div>' + item.labelRaw + '<span class="admin-toolbar-search-url">' + item.value + '</span></div>')
- .appendTo(ul);
- });
+ }).data('ui-autocomplete')._renderItem = (function (ul, item) {
+ ul.addClass('admin-toolbar-search-autocomplete-list');
+ return $('<li>')
+ .append('<div>' + item.labelRaw + ' <span class="admin-toolbar-search-url">' + item.value + '</span></div>')
+ .appendTo(ul);
+ });
- // Populate the links for search results when the input is pressed.
- $(context).find('#admin-toolbar-search-input')
- .once('admin_toolbar_search')
- .each(function () {
- $(this).focus(function () {
- Drupal.behaviors.adminToolbarSearch.populateLinks($self);
- });
+ // Populate the links for search results when the input is pressed.
+ $searchInput.focus(function () {
+ Drupal.behaviors.adminToolbarSearch.populateLinks($self);
});
+
+ // Show/hide search input field when mobile tab item is pressed.
+ $('#admin-toolbar-mobile-search-tab .toolbar-item', context).click(function (e) {
+ e.preventDefault();
+ $(this).toggleClass('is-active');
+ $searchTab.toggleClass('visible');
+ $searchInput.focus();
+ });
+ });
},
getItemLabel: function (item) {
var breadcrumbs = [];
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/src/Controller/AdminToolbarSearchController.php b/web/modules/admin_toolbar/admin_toolbar_search/src/Controller/AdminToolbarSearchController.php
index d3ae3325b7..f796ff3a57 100755
--- a/web/modules/admin_toolbar/admin_toolbar_search/src/Controller/AdminToolbarSearchController.php
+++ b/web/modules/admin_toolbar/admin_toolbar_search/src/Controller/AdminToolbarSearchController.php
@@ -8,7 +8,7 @@
use Symfony\Component\HttpFoundation\JsonResponse;
/**
- * Class AdminToolbarSearchController.
+ * Class AdminToolbarSearchController to the search functionality.
*
* @package Drupal\admin_toolbar_tools\Controller
*/
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/src/SearchLinks.php b/web/modules/admin_toolbar/admin_toolbar_search/src/SearchLinks.php
index cff509f40d..fe8f211fb6 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/src/SearchLinks.php
+++ b/web/modules/admin_toolbar/admin_toolbar_search/src/SearchLinks.php
@@ -240,7 +240,7 @@ public function getLinks() {
$url_string = $url->toString();
$links[] = [
- 'labelRaw' => $this->t('Menus > @menu_label > ', ['@menu_label' => $menu->label()]) . $this->t('Add link'),
+ 'labelRaw' => $this->t('Menus > @menu_label > Add link', ['@menu_label' => $menu->label()]),
'value' => $url_string,
];
}
@@ -255,7 +255,7 @@ public function getLinks() {
$url_string = $url->toString();
$links[] = [
- 'labelRaw' => $this->t('Menus > @menu_label > ', ['@menu_label' => $menu->label()]) . $this->t('Delete'),
+ 'labelRaw' => $this->t('Menus > @menu_label > Delete', ['@menu_label' => $menu->label()]),
'value' => $url_string,
];
}
@@ -268,7 +268,7 @@ public function getLinks() {
$url_string = $url->toString();
$links[] = [
- 'labelRaw' => $this->t('Menus > @menu_label > ', ['@menu_label' => $menu->label()]) . $this->t('Devel'),
+ 'labelRaw' => $this->t('Menus > @menu_label > Devel', ['@menu_label' => $menu->label()]),
'value' => $url_string,
];
}
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/tests/src/Functional/AdminToolbarSearchSettingTest.php b/web/modules/admin_toolbar/admin_toolbar_search/tests/src/Functional/AdminToolbarSearchSettingTest.php
index 71ad1257b2..bafcc4946c 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/tests/src/Functional/AdminToolbarSearchSettingTest.php
+++ b/web/modules/admin_toolbar/admin_toolbar_search/tests/src/Functional/AdminToolbarSearchSettingTest.php
@@ -44,7 +44,10 @@ class AdminToolbarSearchSettingTest extends BrowserTestBase {
*/
protected $noAccessUser;
- public function setUp(): void {
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
parent::setUp();
$permissions = [
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
index 059a4f1684..7bf45be5d3 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
@@ -3,11 +3,11 @@ description: Adds menu links like Flush cache, Run cron, Run updates, and Logout
package: Administration
configure: admin_toolbar_tools.settings
type: module
-core_version_requirement: ^8.8.0 || ^9.0
+core_version_requirement: ^8.8.0 || ^9.0 || ^10
dependencies:
- admin_toolbar:admin_toolbar
-# Information added by Drupal.org packaging script on 2021-09-22
-version: '3.0.3'
+# Information added by Drupal.org packaging script on 2022-01-25
+version: '3.1.0'
project: 'admin_toolbar'
-datestamp: 1632322070
+datestamp: 1643097063
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.module b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.module
index 05855353bd..17f3dba7fb 100755
--- a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.module
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.module
@@ -56,9 +56,13 @@ function admin_toolbar_tools_help($route_name, RouteMatchInterface $route_match)
* Implements hook_entity_insert().
*/
function admin_toolbar_tools_entity_insert(EntityInterface $entity) {
- $entities = \Drupal::service('admin_toolbar_tools.helper')->getRebuildEntityTypes();
- if (in_array($entity->getEntityTypeId(), $entities)) {
- \Drupal::service('plugin.manager.menu.link')->rebuild();
+ // Skip rebuild during config sync because rebuild should
+ // always be a post-sync step.
+ if (!\Drupal::isConfigSyncing()) {
+ $entities = \Drupal::service('admin_toolbar_tools.helper')->getRebuildEntityTypes();
+ if (in_array($entity->getEntityTypeId(), $entities)) {
+ \Drupal::service('plugin.manager.menu.link')->rebuild();
+ }
}
}
@@ -66,9 +70,13 @@ function admin_toolbar_tools_entity_insert(EntityInterface $entity) {
* Implements hook_entity_update().
*/
function admin_toolbar_tools_entity_update(EntityInterface $entity) {
- $entities = \Drupal::service('admin_toolbar_tools.helper')->getRebuildEntityTypes();
- if (in_array($entity->getEntityTypeId(), $entities)) {
- \Drupal::service('plugin.manager.menu.link')->rebuild();
+ // Skip rebuild during config sync because rebuild should
+ // always be a post-sync step.
+ if (!\Drupal::isConfigSyncing()) {
+ $entities = \Drupal::service('admin_toolbar_tools.helper')->getRebuildEntityTypes();
+ if (in_array($entity->getEntityTypeId(), $entities)) {
+ \Drupal::service('plugin.manager.menu.link')->rebuild();
+ }
}
}
@@ -76,8 +84,12 @@ function admin_toolbar_tools_entity_update(EntityInterface $entity) {
* Implements hook_entity_delete().
*/
function admin_toolbar_tools_entity_delete(EntityInterface $entity) {
- $entities = \Drupal::service('admin_toolbar_tools.helper')->getRebuildEntityTypes();
- if (in_array($entity->getEntityTypeId(), $entities)) {
- \Drupal::service('plugin.manager.menu.link')->rebuild();
+ // Skip rebuild during config sync because rebuild should
+ // always be a post-sync step.
+ if (!\Drupal::isConfigSyncing()) {
+ $entities = \Drupal::service('admin_toolbar_tools.helper')->getRebuildEntityTypes();
+ if (in_array($entity->getEntityTypeId(), $entities)) {
+ \Drupal::service('plugin.manager.menu.link')->rebuild();
+ }
}
}
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/css/tools.css b/web/modules/admin_toolbar/admin_toolbar_tools/css/tools.css
index 9233a708da..db426ba8ff 100755
--- a/web/modules/admin_toolbar/admin_toolbar_tools/css/tools.css
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/css/tools.css
@@ -2,7 +2,8 @@
text-indent: -9999px;
}
-.toolbar-icon-9 .toolbar-icon-admin-toolbar-tools-help:before {
+.toolbar-icon-9 .toolbar-icon-admin-toolbar-tools-help:before,
+.toolbar-icon-10 .toolbar-icon-admin-toolbar-tools-help:before {
box-sizing: content-box;
background-image: url(../misc/icons/ffffff/drupal-9-logo.svg);
padding-bottom: 0;
@@ -13,7 +14,9 @@
}
.toolbar-icon-9 .toolbar-icon-admin-toolbar-tools-help:active:before,
-.toolbar-icon-9 .toolbar-icon-admin-toolbar-tools-help.active:before {
+.toolbar-icon-9 .toolbar-icon-admin-toolbar-tools-help.active:before,
+.toolbar-icon-10 .toolbar-icon-admin-toolbar-tools-help:active:before,
+.toolbar-icon-10 .toolbar-icon-admin-toolbar-tools-help.active:before {
background-image: url(../misc/icons/ffffff/drupal-9-logo.svg);
}
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
index dcb9d2b883..478eeb0907 100755
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
@@ -18,7 +18,7 @@
use Drupal\Core\Theme\Registry;
/**
- * Class ToolbarController.
+ * Controller for AdminToolbar Tools.
*
* @package Drupal\admin_toolbar_tools\Controller
*/
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php
index ecdb03fe5e..6463bdf729 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php
@@ -10,7 +10,7 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
- * Class AdminToolbarToolsSettingsForm.
+ * Settings form for AdminToobar Tools.
*
* @package Drupal\admin_toolbar_tools\Form
*/
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php
index 8b6cdf9d6c..70a49526dd 100755
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php
@@ -534,6 +534,15 @@ public function getDerivativeDefinitions($base_plugin_definition) {
'parent' => 'entity.view.collection',
'weight' => -5,
] + $base_plugin_definition;
+ $views = $this->entityTypeManager->getStorage('view')->loadMultiple();
+ foreach ($views as $view) {
+ $links['views_ui.' . $view->id()] = [
+ 'title' => $view->label(),
+ 'route_name' => 'entity.view.edit_form',
+ 'route_parameters' => ['view' => $view->id()],
+ 'parent' => 'entity.view.collection',
+ ] + $base_plugin_definition;
+ }
$links['views_ui.field_list'] = [
'title' => $this->t('Used in views'),
'route_name' => 'views_ui.reports_fields',
diff --git a/web/modules/admin_toolbar/composer.json b/web/modules/admin_toolbar/composer.json
index aaffa92dce..1d867222a8 100755
--- a/web/modules/admin_toolbar/composer.json
+++ b/web/modules/admin_toolbar/composer.json
@@ -2,7 +2,10 @@
"name": "drupal/admin_toolbar",
"description": "Provides a drop-down menu interface to the core Drupal Toolbar.",
"type": "drupal-module",
- "keywords": ["Drupal", "Toolbar"],
+ "keywords": [
+ "Drupal",
+ "Toolbar"
+ ],
"homepage": "http://drupal.org/project/admin_toolbar",
"license": "GPL-2.0-or-later",
"authors": [
@@ -33,6 +36,6 @@
"source": "https://git.drupalcode.org/project/admin_toolbar"
},
"require": {
- "drupal/core": "^8.8.0 || ^9.0"
+ "drupal/core": "^8.8.0 || ^9.0 || ^10.0"
}
}
diff --git a/web/modules/admin_toolbar/js/admin_toolbar.hover.js b/web/modules/admin_toolbar/js/admin_toolbar.hover.js
index 11da3cd844..3d3c4445f3 100644
--- a/web/modules/admin_toolbar/js/admin_toolbar.hover.js
+++ b/web/modules/admin_toolbar/js/admin_toolbar.hover.js
@@ -1,6 +1,6 @@
(function ($) {
$(document).ready(function () {
- $('.toolbar-tray.is-active.toolbar-tray-horizontal .menu-item.menu-item--expanded').hover(function () {
+ $('.toolbar-tray.toolbar-tray-horizontal .menu-item.menu-item--expanded').hover(function () {
// At the current depth, we should delete all "hover-intent" classes.
// Other wise we get unwanted behaviour where menu items are expanded while already in hovering other ones.
$(this).parent().find('li').removeClass('hover-intent');
diff --git a/web/modules/admin_toolbar/src/Render/Element/AdminToolbar.php b/web/modules/admin_toolbar/src/Render/Element/AdminToolbar.php
index bd7de64b18..33f4604c77 100644
--- a/web/modules/admin_toolbar/src/Render/Element/AdminToolbar.php
+++ b/web/modules/admin_toolbar/src/Render/Element/AdminToolbar.php
@@ -6,7 +6,7 @@
use Drupal\Core\Security\TrustedCallbackInterface;
/**
- * Class AdminToolbar.
+ * Render element element for AdminToolbar.
*
* @package Drupal\admin_toolbar\Render\Element
*/
--
GitLab