From 58aa098ed77902a3bad80180bf314826a407304f Mon Sep 17 00:00:00 2001 From: Marcus Andersson Date: Mon, 15 May 2023 09:01:05 +0200 Subject: [PATCH] Extensions: Moved the "Extensions" menu item so the "More..." is displayed last in the panel menu. (#68372) Moved the extensions before the more option. --- .../features/dashboard/utils/getPanelMenu.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts index 20a3d20bd0d..fb710df94d1 100644 --- a/public/app/features/dashboard/utils/getPanelMenu.ts +++ b/public/app/features/dashboard/utils/getPanelMenu.ts @@ -269,16 +269,6 @@ export function getPanelMenu( }); } - if (subMenu.length) { - menu.push({ - type: 'submenu', - text: t('panel.header-menu.more', `More...`), - iconClassName: 'cube', - subMenu, - onClick: onMore, - }); - } - const { extensions } = getPluginExtensions({ extensionPointId: PluginExtensionPoints.DashboardPanelMenu, context: createExtensionContext(panel, dashboard), @@ -306,6 +296,16 @@ export function getPanelMenu( }); } + if (subMenu.length) { + menu.push({ + type: 'submenu', + text: t('panel.header-menu.more', `More...`), + iconClassName: 'cube', + subMenu, + onClick: onMore, + }); + } + if (dashboard.canEditPanel(panel) && !panel.isEditing && !panel.isViewing) { menu.push({ type: 'divider', text: '' });