From d654255d32bb95a44f99964f4f8f7b5cef43de5b Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Sat, 25 Apr 2020 16:15:08 +0200
Subject: [PATCH] NewPanelEditor: adjust panel menu items (#23888)

---
 .../features/dashboard/utils/getPanelMenu.ts  | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts
index e075f93be72..f9ec12bf748 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.ts
@@ -84,14 +84,16 @@ export function getPanelMenu(
 
   const menu: PanelMenuItem[] = [];
 
-  menu.push({
-    text: 'View',
-    iconClassName: 'eye',
-    onClick: onViewPanel,
-    shortcut: 'v',
-  });
+  if (!panel.isEditing) {
+    menu.push({
+      text: 'View',
+      iconClassName: 'eye',
+      onClick: onViewPanel,
+      shortcut: 'v',
+    });
+  }
 
-  if (dashboard.canEditPanel(panel)) {
+  if (dashboard.canEditPanel(panel) && !panel.isEditing) {
     menu.push({
       text: 'Edit',
       iconClassName: 'edit',
@@ -185,15 +187,17 @@ export function getPanelMenu(
     }
   }
 
-  menu.push({
-    type: 'submenu',
-    text: 'More...',
-    iconClassName: 'cube',
-    subMenu: subMenu,
-    onClick: onMore,
-  });
+  if (!panel.isEditing) {
+    menu.push({
+      type: 'submenu',
+      text: 'More...',
+      iconClassName: 'cube',
+      subMenu: subMenu,
+      onClick: onMore,
+    });
+  }
 
-  if (dashboard.canEditPanel(panel)) {
+  if (dashboard.canEditPanel(panel) && !panel.isEditing) {
     menu.push({ type: 'divider' });
 
     menu.push({