From fe890a0708100d92d7a20e8fa61fb50541c3484a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@grafana.com>
Date: Wed, 20 May 2020 13:56:28 +0200
Subject: [PATCH] Panel: shows correct panel menu items in view mode (#24912)

(cherry picked from commit 460847f3edb255ad8662f3f96b776769f165a496)
---
 .../dashboard/utils/getPanelMenu.test.ts      | 74 ++++++++++++++++++-
 .../features/dashboard/utils/getPanelMenu.ts  |  6 +-
 2 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/public/app/features/dashboard/utils/getPanelMenu.test.ts b/public/app/features/dashboard/utils/getPanelMenu.test.ts
index f39d54dc32f..2adfd25b287 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.test.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.test.ts
@@ -1,5 +1,6 @@
-import { PanelModel, DashboardModel } from '../state';
+import { DashboardModel, PanelModel } from '../state';
 import { getPanelMenu } from './getPanelMenu';
+import { describe } from '../../../../test/lib/common';
 
 describe('getPanelMenu', () => {
   it('should return the correct panel menu items', () => {
@@ -69,4 +70,75 @@ describe('getPanelMenu', () => {
       ]
     `);
   });
+
+  describe('when panel is in view mode', () => {
+    it('should return the correct panel menu items', () => {
+      const getExtendedMenu = () => [{ text: 'Toggle legend', shortcut: 'p l', click: jest.fn() }];
+      const ctrl: any = { getExtendedMenu };
+      const scope: any = { $$childHead: { ctrl } };
+      const angularComponent: any = { getScope: () => scope };
+      const panel = new PanelModel({ isViewing: true });
+      const dashboard = new DashboardModel({});
+
+      const menuItems = getPanelMenu(dashboard, panel, angularComponent);
+      expect(menuItems).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "iconClassName": "eye",
+          "onClick": [Function],
+          "shortcut": "v",
+          "text": "View",
+        },
+        Object {
+          "iconClassName": "edit",
+          "onClick": [Function],
+          "shortcut": "e",
+          "text": "Edit",
+        },
+        Object {
+          "iconClassName": "share-alt",
+          "onClick": [Function],
+          "shortcut": "p s",
+          "text": "Share",
+        },
+        Object {
+          "iconClassName": "info-circle",
+          "onClick": [Function],
+          "shortcut": "i",
+          "subMenu": Array [
+            Object {
+              "onClick": [Function],
+              "text": "Panel JSON",
+            },
+          ],
+          "text": "Inspect",
+          "type": "submenu",
+        },
+        Object {
+          "iconClassName": "cube",
+          "onClick": [Function],
+          "subMenu": Array [
+            Object {
+              "href": undefined,
+              "onClick": [Function],
+              "shortcut": "p l",
+              "text": "Toggle legend",
+            },
+          ],
+          "text": "More...",
+          "type": "submenu",
+        },
+        Object {
+          "type": "divider",
+        },
+        Object {
+          "iconClassName": "trash-alt",
+          "onClick": [Function],
+          "shortcut": "p r",
+          "text": "Remove",
+        },
+      ]
+    `);
+    });
+  });
 });
diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts
index f9ec12bf748..02952f1e93d 100644
--- a/public/app/features/dashboard/utils/getPanelMenu.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.ts
@@ -1,6 +1,6 @@
 import { updateLocation } from 'app/core/actions';
 import { store } from 'app/store/store';
-import { getDataSourceSrv, getLocationSrv, AngularComponent } from '@grafana/runtime';
+import { AngularComponent, getDataSourceSrv, getLocationSrv } from '@grafana/runtime';
 import { PanelMenuItem } from '@grafana/data';
 import { copyPanel, duplicatePanel, removePanel, sharePanel } from 'app/features/dashboard/utils/panel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
@@ -187,12 +187,12 @@ export function getPanelMenu(
     }
   }
 
-  if (!panel.isEditing) {
+  if (!panel.isEditing && subMenu.length) {
     menu.push({
       type: 'submenu',
       text: 'More...',
       iconClassName: 'cube',
-      subMenu: subMenu,
+      subMenu,
       onClick: onMore,
     });
   }