Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
075fb8e9
Commit
075fb8e9
authored
Feb 12, 2019
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: Rename isDataPanel to noQueries
parent
b7b1a794
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
11 deletions
+10
-11
pkg/api/frontendsettings.go
+1
-1
pkg/plugins/models.go
+1
-1
public/app/features/dashboard/dashgrid/PanelChrome.tsx
+5
-4
public/app/features/dashboard/panel_editor/PanelEditor.tsx
+1
-1
public/app/plugins/panel/gauge/plugin.json
+0
-1
public/app/plugins/panel/graph2/plugin.json
+0
-1
public/app/plugins/panel/text2/plugin.json
+1
-1
public/app/types/plugins.ts
+1
-1
No files found.
pkg/api/frontendsettings.go
View file @
075fb8e9
...
@@ -145,7 +145,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
...
@@ -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
,
}
}
}
}
...
...
pkg/plugins/models.go
View file @
075fb8e9
...
@@ -47,7 +47,7 @@ type PluginBase struct {
...
@@ -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:"-"`
...
...
public/app/features/dashboard/dashgrid/PanelChrome.tsx
View file @
075fb8e9
...
@@ -131,8 +131,11 @@ export class PanelChrome extends PureComponent<Props, State> {
...
@@ -131,8 +131,11 @@ 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
?
<
DataPanel
{
plugin
.
noQueries
===
true
?
this
.
renderPanelPlugin
(
LoadingState
.
Done
,
null
,
width
,
height
)
:
(
<
DataPanel
panelId=
{
panel
.
id
}
panelId=
{
panel
.
id
}
datasource=
{
datasource
}
datasource=
{
datasource
}
queries=
{
targets
}
queries=
{
targets
}
...
@@ -146,8 +149,6 @@ export class PanelChrome extends PureComponent<Props, State> {
...
@@ -146,8 +149,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
)
)
}
)
}
</>
</>
)
}
)
}
...
...
public/app/features/dashboard/panel_editor/PanelEditor.tsx
View file @
075fb8e9
...
@@ -107,7 +107,7 @@ export class PanelEditor extends PureComponent<PanelEditorProps> {
...
@@ -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
...
...
public/app/plugins/panel/gauge/plugin.json
View file @
075fb8e9
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
"type"
:
"panel"
,
"type"
:
"panel"
,
"name"
:
"Gauge"
,
"name"
:
"Gauge"
,
"id"
:
"gauge"
,
"id"
:
"gauge"
,
"isDataPanel"
:
true
,
"info"
:
{
"info"
:
{
"author"
:
{
"author"
:
{
...
...
public/app/plugins/panel/graph2/plugin.json
View file @
075fb8e9
...
@@ -2,7 +2,6 @@
...
@@ -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"
:
{
...
...
public/app/plugins/panel/text2/plugin.json
View file @
075fb8e9
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
"name"
:
"Text v2"
,
"name"
:
"Text v2"
,
"id"
:
"text2"
,
"id"
:
"text2"
,
"state"
:
"alpha"
,
"state"
:
"alpha"
,
"
isDataPanel"
:
fals
e
,
"
noQueries"
:
tru
e
,
"info"
:
{
"info"
:
{
"author"
:
{
"author"
:
{
...
...
public/app/types/plugins.ts
View file @
075fb8e9
...
@@ -9,7 +9,7 @@ export interface PanelPlugin {
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment