IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: Rename isDataPanel to noQueries

Browse Source
This commit is contained in:
Johannes Schill 2019-02-12 09:48:46 +01:00
parent 0019e0ffc9
commit 2db9cb3d93
8 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/frontendsettings.go
View File

@ -145,7 +145,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
"info": panel.Info, "info": panel.Info,
"hideFromList": panel.HideFromList, "hideFromList": panel.HideFromList,
"sort": getPanelSort(panel.Id), "sort": getPanelSort(panel.Id),
"isDataPanel": panel.IsDataPanel, "noQueries": panel.NoQueries,
} }
} }

2
pkg/plugins/models.go
View File

@ -47,7 +47,7 @@ type PluginBase struct {
BaseUrl string `json:"baseUrl"` BaseUrl string `json:"baseUrl"`
HideFromList bool `json:"hideFromList,omitempty"` HideFromList bool `json:"hideFromList,omitempty"`
State PluginState `json:"state,omitempty"` State PluginState `json:"state,omitempty"`
IsDataPanel bool `json:"isDataPanel"` NoQueries bool `json:"noQueries"`
IncludedInAppId string `json:"-"` IncludedInAppId string `json:"-"`
PluginDir string `json:"-"` PluginDir string `json:"-"`

8
public/app/features/dashboard/dashgrid/PanelChrome.tsx
View File

@ -131,8 +131,10 @@ export class PanelChrome extends PureComponent<Props, State> {
this.renderPanelPlugin(LoadingState.Done, snapshotDataToPanelData(panel), width, height) this.renderPanelPlugin(LoadingState.Done, snapshotDataToPanelData(panel), width, height)
) : ( ) : (
<> <>
{plugin.isDataPanel === true ? {plugin.noQueries === true ?
<DataPanel this.renderPanelPlugin(LoadingState.Done, null, width, height)
: (
<DataPanel
datasource={datasource} datasource={datasource}
queries={targets} queries={targets}
timeRange={timeRange} timeRange={timeRange}
@ -145,8 +147,6 @@ export class PanelChrome extends PureComponent<Props, State> {
return this.renderPanelPlugin(loading, panelData, width, height); return this.renderPanelPlugin(loading, panelData, width, height);
}} }}
</DataPanel> </DataPanel>
: (
this.renderPanelPlugin(LoadingState.Done, null, width, height)
)} )}
</> </>
)} )}

2
public/app/features/dashboard/panel_editor/PanelEditor.tsx
View File

@ -107,7 +107,7 @@ export class PanelEditor extends PureComponent<PanelEditorProps> {
]; ];
// handle panels that do not have queries tab // handle panels that do not have queries tab
if (!plugin.isDataPanel) { if (plugin.noQueries === true) {
// remove queries tab // remove queries tab
tabs.shift(); tabs.shift();
// switch tab // switch tab

1
public/app/plugins/panel/gauge/plugin.json
View File

@ -2,7 +2,6 @@
"type": "panel", "type": "panel",
"name": "Gauge", "name": "Gauge",
"id": "gauge", "id": "gauge",
"isDataPanel": true,
"info": { "info": {
"author": { "author": {

1
public/app/plugins/panel/graph2/plugin.json
View File

@ -2,7 +2,6 @@
"type": "panel", "type": "panel",
"name": "React Graph", "name": "React Graph",
"id": "graph2", "id": "graph2",
"isDataPanel": true,
"state": "alpha", "state": "alpha",
"info": { "info": {

2
public/app/plugins/panel/text2/plugin.json
View File

@ -3,7 +3,7 @@
"name": "Text v2", "name": "Text v2",
"id": "text2", "id": "text2",
"state": "alpha", "state": "alpha",
"isDataPanel": false, "noQueries": true,
"info": { "info": {
"author": { "author": {

2
public/app/types/plugins.ts
View File

@ -9,7 +9,7 @@ export interface PanelPlugin {
info: any; info: any;
sort: number; sort: number;
exports?: PluginExports; exports?: PluginExports;
isDataPanel?: boolean; noQueries?: boolean;
} }
export interface Plugin { export interface Plugin {