Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass queryConfig down to Dygraphs so it can make label decisions

pull/10616/head
Andrew Watkins 2017-08-03 14:50:44 -07:00
parent 47b5f6cf4d
commit e11d2d38aa
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/src/data_explorer/components/Visualization.js
View File

@ -102,10 +102,11 @@ const Visualization = React.createClass({
const statements = queryConfigs.map(query => { const statements = queryConfigs.map(query => {
const text = const text =
query.rawText || buildInfluxQLQuery(query.range || timeRange, query) query.rawText || buildInfluxQLQuery(query.range || timeRange, query)
return {text, id: query.id} return {text, id: query.id, queryConfig: query}
}) })
const queries = statements.filter(s => s.text !== null).map(s => { const queries = statements.filter(s => s.text !== null).map(s => {
return {host: [proxy], text: s.text, id: s.id} return {host: [proxy], text: s.text, id: s.id, queryConfig: s.queryConfig}
}) })
return ( return (

3
ui/src/shared/components/Dygraph.js
View File

@ -271,11 +271,12 @@ export default class Dygraph extends Component {
const y = _.get(axes, ['y', 'bounds'], [null, null]) const y = _.get(axes, ['y', 'bounds'], [null, null])
const y2 = _.get(axes, ['y2', 'bounds'], undefined) const y2 = _.get(axes, ['y2', 'bounds'], undefined)
const timeSeries = this.getTimeSeries() const timeSeries = this.getTimeSeries()
const ylabel = this.getLabel('y')
const updateOptions = { const updateOptions = {
labels, labels,
file: timeSeries, file: timeSeries,
ylabel: this.getLabel('y'), ylabel,
axes: { axes: {
y: { y: {
valueRange: getRange(timeSeries, y, ruleValues), valueRange: getRange(timeSeries, y, ruleValues),