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
97f7a7fb
Commit
97f7a7fb
authored
Nov 20, 2018
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
react-panel: Add data source "options". Needs UX, WIP.
parent
bc9f3a33
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
106 additions
and
6 deletions
+106
-6
public/app/features/dashboard/dashgrid/DataSourceOption.tsx
+31
-0
public/app/features/dashboard/dashgrid/EditorTabBody.tsx
+4
-2
public/app/features/dashboard/dashgrid/QueriesTab.tsx
+70
-4
public/app/features/dashboard/panel_model.ts
+1
-0
No files found.
public/app/features/dashboard/dashgrid/DataSourceOption.tsx
0 → 100644
View file @
97f7a7fb
import
React
,
{
SFC
}
from
'react'
;
import
Tooltip
from
'app/core/components/Tooltip/Tooltip'
;
interface
Props
{
label
:
string
;
placeholder
?:
string
;
name
?:
string
;
value
?:
string
;
onChange
?:
(
evt
:
any
)
=>
void
;
tooltipInfo
?:
any
;
}
export
const
DataSourceOptions
:
SFC
<
Props
>
=
({
label
,
placeholder
,
name
,
value
,
onChange
,
tooltipInfo
})
=>
{
const
dsOption
=
(
<
div
className=
"gf-form gf-form--flex-end"
>
<
label
className=
"gf-form-label"
>
{
label
}
</
label
>
<
input
type=
"text"
className=
"gf-form-input width-6"
placeholder=
{
placeholder
}
name=
{
name
}
spellCheck=
{
false
}
onBlur=
{
evt
=>
onChange
(
evt
.
target
.
value
)
}
/>
</
div
>
);
return
tooltipInfo
?
<
Tooltip
content=
{
tooltipInfo
}
>
{
dsOption
}
</
Tooltip
>
:
dsOption
;
};
export
default
DataSourceOptions
;
public/app/features/dashboard/dashgrid/EditorTabBody.tsx
View file @
97f7a7fb
...
...
@@ -14,7 +14,7 @@ export interface EditorToolBarView {
icon
?:
string
;
disabled
?:
boolean
;
onClick
?:
()
=>
void
;
render
:
(
closeFunction
:
any
)
=>
JSX
.
Element
;
render
:
(
closeFunction
:
any
)
=>
JSX
.
Element
|
JSX
.
Element
[]
;
}
interface
State
{
...
...
@@ -42,7 +42,9 @@ export class EditorTabBody extends PureComponent<Props, State> {
static
getDerivedStateFromProps
(
props
,
state
)
{
if
(
state
.
openView
)
{
const
activeToolbarItem
=
props
.
toolbarItems
.
find
(
item
=>
item
.
title
===
state
.
openView
.
title
);
const
activeToolbarItem
=
props
.
toolbarItems
.
find
(
item
=>
item
.
title
===
state
.
openView
.
title
&&
item
.
icon
===
state
.
openView
.
icon
);
if
(
activeToolbarItem
)
{
return
{
...
state
,
...
...
public/app/features/dashboard/dashgrid/QueriesTab.tsx
View file @
97f7a7fb
import
React
,
{
PureComponent
}
from
'react'
;
import
DataSourceOption
from
'./DataSourceOption'
;
import
{
getAngularLoader
,
AngularComponent
}
from
'app/core/services/AngularLoader'
;
import
{
EditorTabBody
}
from
'./EditorTabBody'
;
import
{
DataSourcePicker
}
from
'./DataSourcePicker'
;
...
...
@@ -139,11 +139,71 @@ export class QueriesTab extends PureComponent<Props, State> {
}
};
renderOptions
=
close
=>
{
const
{
currentDatasource
}
=
this
.
state
;
const
{
queryOptions
}
=
currentDatasource
.
meta
;
const
{
panel
}
=
this
.
props
;
const
onChangeFn
=
(
panelKey
:
string
)
=>
{
return
(
value
:
string
|
number
)
=>
{
panel
[
panelKey
]
=
value
;
panel
.
refresh
();
};
};
const
allOptions
=
{
cacheTimeout
:
{
label
:
'Cache timeout'
,
placeholder
:
'60'
,
name
:
'cacheTimeout'
,
value
:
panel
.
cacheTimeout
,
tooltipInfo
:
(
<>
If your time series store has a query cache this option can override the default cache timeout. Specify a
numeric value in seconds.
</>
),
},
maxDataPoints
:
{
label
:
'Max data points'
,
placeholder
:
'auto'
,
name
:
'maxDataPoints'
,
value
:
panel
.
maxDataPoints
,
tooltipInfo
:
(
<>
The maximum data points the query should return. For graphs this is automatically set to one data point per
pixel.
</>
),
},
minInterval
:
{
label
:
'Min time interval'
,
placeholder
:
'0'
,
name
:
'minInterval'
,
value
:
panel
.
interval
,
panelKey
:
'interval'
,
tooltipInfo
:
(
<>
A lower limit for the auto group by time interval. Recommended to be set to write frequency, for example
{
' '
}
<
code
>
1m
</
code
>
if your data is written every minute. Access auto interval via variable
{
' '
}
<
code
>
$__interval
</
code
>
for time range string and
<
code
>
$__interval_ms
</
code
>
for numeric variable that can
be used in math expressions.
</>
),
},
};
return
Object
.
keys
(
queryOptions
).
map
(
key
=>
{
const
options
=
allOptions
[
key
];
return
<
DataSourceOption
key=
{
key
}
{
...
options
}
onChange=
{
onChangeFn
(
allOptions
[
key
].
panelKey
||
key
)
}
/>;
});
};
render
()
{
const
{
currentDatasource
}
=
this
.
state
;
const
{
helpHtml
}
=
this
.
state
.
help
;
const
{
hasQueryHelp
}
=
currentDatasource
.
meta
;
const
{
hasQueryHelp
,
queryOptions
}
=
currentDatasource
.
meta
;
const
hasQueryOptions
=
!!
queryOptions
;
const
dsInformation
=
{
title
:
currentDatasource
.
name
,
imgSrc
:
currentDatasource
.
meta
.
info
.
logos
.
small
,
...
...
@@ -171,8 +231,14 @@ export class QueriesTab extends PureComponent<Props, State> {
render
:
()
=>
helpHtml
,
};
const
options
=
{
title
:
'Options'
,
disabled
:
!
hasQueryOptions
,
render
:
this
.
renderOptions
,
};
return
(
<
EditorTabBody
main=
{
dsInformation
}
toolbarItems=
{
[
queryInspector
,
dsHelp
]
}
>
<
EditorTabBody
main=
{
dsInformation
}
toolbarItems=
{
[
queryInspector
,
dsHelp
,
options
]
}
>
<
div
ref=
{
element
=>
(
this
.
element
=
element
)
}
style=
{
{
width
:
'100%'
}
}
/>
</
EditorTabBody
>
);
...
...
public/app/features/dashboard/panel_model.ts
View file @
97f7a7fb
...
...
@@ -94,6 +94,7 @@ export class PanelModel {
isEditing
:
boolean
;
hasRefreshed
:
boolean
;
events
:
Emitter
;
cacheTimeout
?:
any
;
constructor
(
model
)
{
this
.
events
=
new
Emitter
();
...
...
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