From 2db9cb3d93f1a44e859a176ca41c541445856fae Mon Sep 17 00:00:00 2001
From: Johannes Schill <johannes.schill@polyester.se>
Date: Tue, 12 Feb 2019 09:48:46 +0100
Subject: [PATCH] chore: Rename isDataPanel to noQueries

---
 pkg/api/frontendsettings.go                               | 2 +-
 pkg/plugins/models.go                                     | 2 +-
 public/app/features/dashboard/dashgrid/PanelChrome.tsx    | 8 ++++----
 .../app/features/dashboard/panel_editor/PanelEditor.tsx   | 2 +-
 public/app/plugins/panel/gauge/plugin.json                | 1 -
 public/app/plugins/panel/graph2/plugin.json               | 1 -
 public/app/plugins/panel/text2/plugin.json                | 2 +-
 public/app/types/plugins.ts                               | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 238a3965641..cb401577140 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -145,7 +145,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
 			"info":         panel.Info,
 			"hideFromList": panel.HideFromList,
 			"sort":         getPanelSort(panel.Id),
-			"isDataPanel":  panel.IsDataPanel,
+			"noQueries":    panel.NoQueries,
 		}
 	}
 
diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go
index e37b1fcf7d9..7584981fc6c 100644
--- a/pkg/plugins/models.go
+++ b/pkg/plugins/models.go
@@ -47,7 +47,7 @@ type PluginBase struct {
 	BaseUrl      string             `json:"baseUrl"`
 	HideFromList bool               `json:"hideFromList,omitempty"`
 	State        PluginState        `json:"state,omitempty"`
-	IsDataPanel  bool               `json:"isDataPanel"`
+	NoQueries    bool               `json:"noQueries"`
 
 	IncludedInAppId string `json:"-"`
 	PluginDir       string `json:"-"`
diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
index 1f9a2a32a5d..d658ace43dd 100644
--- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
@@ -131,8 +131,10 @@ export class PanelChrome extends PureComponent<Props, State> {
         this.renderPanelPlugin(LoadingState.Done, snapshotDataToPanelData(panel), width, height)
       ) : (
         <>
-        {plugin.isDataPanel === true ?
-          <DataPanel
+        {plugin.noQueries === true ?
+            this.renderPanelPlugin(LoadingState.Done, null, width, height)
+          : (
+            <DataPanel
             datasource={datasource}
             queries={targets}
             timeRange={timeRange}
@@ -145,8 +147,6 @@ export class PanelChrome extends PureComponent<Props, State> {
               return this.renderPanelPlugin(loading, panelData, width, height);
             }}
           </DataPanel>
-          : (
-            this.renderPanelPlugin(LoadingState.Done, null, width, height)
           )}
         </>
       )}
diff --git a/public/app/features/dashboard/panel_editor/PanelEditor.tsx b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
index 37240389373..31274a6ad26 100644
--- a/public/app/features/dashboard/panel_editor/PanelEditor.tsx
+++ b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
@@ -107,7 +107,7 @@ export class PanelEditor extends PureComponent<PanelEditorProps> {
     ];
 
     // handle panels that do not have queries tab
-    if (!plugin.isDataPanel) {
+    if (plugin.noQueries === true) {
       // remove queries tab
       tabs.shift();
       // switch tab
diff --git a/public/app/plugins/panel/gauge/plugin.json b/public/app/plugins/panel/gauge/plugin.json
index 733d2281cf4..58437779d25 100644
--- a/public/app/plugins/panel/gauge/plugin.json
+++ b/public/app/plugins/panel/gauge/plugin.json
@@ -2,7 +2,6 @@
   "type": "panel",
   "name": "Gauge",
   "id": "gauge",
-  "isDataPanel": true,
 
   "info": {
     "author": {
diff --git a/public/app/plugins/panel/graph2/plugin.json b/public/app/plugins/panel/graph2/plugin.json
index 9b2a915a597..b11f93c9adc 100644
--- a/public/app/plugins/panel/graph2/plugin.json
+++ b/public/app/plugins/panel/graph2/plugin.json
@@ -2,7 +2,6 @@
   "type": "panel",
   "name": "React Graph",
   "id": "graph2",
-  "isDataPanel": true,
   "state": "alpha",
 
   "info": {
diff --git a/public/app/plugins/panel/text2/plugin.json b/public/app/plugins/panel/text2/plugin.json
index cd4ff424d89..661ac4671ef 100644
--- a/public/app/plugins/panel/text2/plugin.json
+++ b/public/app/plugins/panel/text2/plugin.json
@@ -3,7 +3,7 @@
   "name": "Text v2",
   "id": "text2",
   "state": "alpha",
-  "isDataPanel": false,
+  "noQueries": true,
 
   "info": {
     "author": {
diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts
index 0c5c53eb6f0..101f649eda9 100644
--- a/public/app/types/plugins.ts
+++ b/public/app/types/plugins.ts
@@ -9,7 +9,7 @@ export interface PanelPlugin {
   info: any;
   sort: number;
   exports?: PluginExports;
-  isDataPanel?: boolean;
+  noQueries?: boolean;
 }
 
 export interface Plugin {