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
c5a70e9b
Commit
c5a70e9b
authored
Feb 19, 2019
by
Daniel Lee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass dashboardModel to PanelCtrl class. Fixes #15541
parent
88a46e6d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
public/app/features/dashboard/panel_editor/QueriesTab.tsx
+2
-1
public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
+5
-1
No files found.
public/app/features/dashboard/panel_editor/QueriesTab.tsx
View file @
c5a70e9b
...
...
@@ -176,7 +176,7 @@ export class QueriesTab extends PureComponent<Props, State> {
};
render
()
{
const
{
panel
}
=
this
.
props
;
const
{
panel
,
dashboard
}
=
this
.
props
;
const
{
currentDS
,
scrollTop
}
=
this
.
state
;
const
queryInspector
:
EditorToolbarView
=
{
...
...
@@ -205,6 +205,7 @@ export class QueriesTab extends PureComponent<Props, State> {
dataSourceValue=
{
query
.
datasource
||
panel
.
datasource
}
key=
{
query
.
refId
}
panel=
{
panel
}
dashboard=
{
dashboard
}
query=
{
query
}
onChange=
{
query
=>
this
.
onQueryChange
(
query
,
index
)
}
onRemoveQuery=
{
this
.
onRemoveQuery
}
...
...
public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
View file @
c5a70e9b
...
...
@@ -12,10 +12,12 @@ import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
// Types
import
{
PanelModel
}
from
'../state/PanelModel'
;
import
{
DataQuery
,
DataSourceApi
,
TimeRange
}
from
'@grafana/ui'
;
import
{
DashboardModel
}
from
'../state/DashboardModel'
;
interface
Props
{
panel
:
PanelModel
;
query
:
DataQuery
;
dashboard
:
DashboardModel
;
onAddQuery
:
(
query
?:
DataQuery
)
=>
void
;
onRemoveQuery
:
(
query
:
DataQuery
)
=>
void
;
onMoveQuery
:
(
query
:
DataQuery
,
direction
:
number
)
=>
void
;
...
...
@@ -83,13 +85,14 @@ export class QueryEditorRow extends PureComponent<Props, State> {
};
getAngularQueryComponentScope
():
AngularQueryComponentScope
{
const
{
panel
,
query
}
=
this
.
props
;
const
{
panel
,
query
,
dashboard
}
=
this
.
props
;
const
{
datasource
}
=
this
.
state
;
return
{
datasource
:
datasource
,
target
:
query
,
panel
:
panel
,
dashboard
:
dashboard
,
refresh
:
()
=>
panel
.
refresh
(),
render
:
()
=>
panel
.
render
(),
events
:
panel
.
events
,
...
...
@@ -265,6 +268,7 @@ export class QueryEditorRow extends PureComponent<Props, State> {
export
interface
AngularQueryComponentScope
{
target
:
DataQuery
;
panel
:
PanelModel
;
dashboard
:
DashboardModel
;
events
:
Emitter
;
refresh
:
()
=>
void
;
render
:
()
=>
void
;
...
...
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