From 5ccefed7d70c1047acdee2ceddc31b3ff89513d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Sat, 4 Apr 2020 15:44:55 +0200
Subject: [PATCH] NewPanelEditor: Tab rename and minor fix

---
 public/app/core/services/keybindingSrv.ts            |  1 +
 .../dashboard/components/PanelEditor/PanelEditor.tsx |  4 ++--
 .../components/PanelEditor/PanelEditorTabs.tsx       |  4 ++--
 .../components/PanelEditor/state/selectors.ts        | 12 ++++++------
 .../dashboard/components/PanelEditor/types.ts        |  4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index f9276560746..0b8bead18e7 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -128,6 +128,7 @@ export class KeybindingSrv {
 
     if (search.editPanel) {
       delete search.editPanel;
+      delete search.tab;
       this.$location.search(search);
       return;
     }
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
index 402514bd69e..7705979b6c0 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx
@@ -77,7 +77,7 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
 
   onPanelExit = () => {
     this.props.updateLocation({
-      query: { editPanel: null },
+      query: { editPanel: null, tab: null },
       partial: true,
     });
   };
@@ -85,7 +85,7 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
   onDiscard = () => {
     this.props.setDiscardChanges(true);
     this.props.updateLocation({
-      query: { editPanel: null },
+      query: { editPanel: null, tab: null },
       partial: true,
     });
   };
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
index e09ee3eb784..2ee41c2e21c 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
@@ -46,9 +46,9 @@ export const PanelEditorTabs: React.FC<PanelEditorTabsProps> = ({ panel, dashboa
         })}
       </TabsBar>
       <TabContent className={styles.tabContent}>
-        {activeTab.id === PanelEditorTabId.Queries && <QueriesTab panel={panel} dashboard={dashboard} />}
+        {activeTab.id === PanelEditorTabId.Query && <QueriesTab panel={panel} dashboard={dashboard} />}
         {activeTab.id === PanelEditorTabId.Alert && <AlertTab panel={panel} dashboard={dashboard} />}
-        {activeTab.id === PanelEditorTabId.Visualization && <VisualizationTab panel={panel} />}
+        {activeTab.id === PanelEditorTabId.Visualize && <VisualizationTab panel={panel} />}
         {activeTab.id === PanelEditorTabId.Transform && data.state !== LoadingState.NotStarted && (
           <TransformationsEditor
             transformations={panel.transformations || []}
diff --git a/public/app/features/dashboard/components/PanelEditor/state/selectors.ts b/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
index e2b66c99ae4..c9182bc953a 100644
--- a/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
+++ b/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
@@ -10,14 +10,14 @@ export const getPanelEditorTabs = memoizeOne((location: LocationState, plugin?:
     return tabs;
   }
 
-  let defaultTab = PanelEditorTabId.Visualization;
+  let defaultTab = PanelEditorTabId.Visualize;
 
   if (!plugin.meta.skipDataQuery) {
-    defaultTab = PanelEditorTabId.Queries;
+    defaultTab = PanelEditorTabId.Query;
 
     tabs.push({
-      id: PanelEditorTabId.Queries,
-      text: 'Queries',
+      id: PanelEditorTabId.Query,
+      text: 'Query',
       icon: 'gicon gicon-datasources',
       active: false,
     });
@@ -31,8 +31,8 @@ export const getPanelEditorTabs = memoizeOne((location: LocationState, plugin?:
   }
 
   tabs.push({
-    id: PanelEditorTabId.Visualization,
-    text: 'Visualization',
+    id: PanelEditorTabId.Visualize,
+    text: 'Visualize',
     icon: 'fa fa-bar-chart',
     active: false,
   });
diff --git a/public/app/features/dashboard/components/PanelEditor/types.ts b/public/app/features/dashboard/components/PanelEditor/types.ts
index 034393bb2b0..13e6dde2a96 100644
--- a/public/app/features/dashboard/components/PanelEditor/types.ts
+++ b/public/app/features/dashboard/components/PanelEditor/types.ts
@@ -6,9 +6,9 @@ export interface PanelEditorTab {
 }
 
 export enum PanelEditorTabId {
-  Queries = 'queries',
+  Query = 'Query',
   Transform = 'transform',
-  Visualization = 'visualization',
+  Visualize = 'visualize',
   Alert = 'alert',
 }