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

Fix broken upper time range tempvar.

pull/10616/head
Hunter Trujillo 2017-07-07 08:34:03 -06:00
parent ecad98beba
commit ce3305fabd
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/src/dashboards/containers/DashboardPage.js
View File

@ -280,7 +280,7 @@ class DashboardPage extends Component {
type: 'constant', type: 'constant',
values: [ values: [
{ {
value: upper, value: upper || 'now()',
type: 'constant', type: 'constant',
selected: true, selected: true,
}, },
@ -301,20 +301,12 @@ class DashboardPage extends Component {
let templatesIncludingDashTime let templatesIncludingDashTime
if (dashboard) { if (dashboard) {
if (upper) { templatesIncludingDashTime = [
templatesIncludingDashTime = [ ...dashboard.templates,
...dashboard.templates, dashboardTime,
dashboardTime, upperDashboardTime,
upperDashboardTime, interval,
interval, ]
]
} else {
templatesIncludingDashTime = [
...dashboard.templates,
dashboardTime,
interval,
]
}
} else { } else {
templatesIncludingDashTime = [] templatesIncludingDashTime = []
} }

7
ui/src/shared/components/LayoutRenderer.js
View File

@ -88,7 +88,10 @@ class LayoutRenderer extends Component {
let queryText let queryText
if (query.queryConfig) { if (query.queryConfig) {
const {queryConfig: {rawText, range}} = query const {queryConfig: {rawText, range}} = query
const timeRange = range || {upper: null, lower: ':dashboardTime:'} const timeRange = range || {
upper: ':upperDashboardTime:',
lower: ':dashboardTime:',
}
queryText = rawText || buildInfluxQLQuery(timeRange, query.queryConfig) queryText = rawText || buildInfluxQLQuery(timeRange, query.queryConfig)
} else { } else {
queryText = this.buildQueryForOldQuerySchema(query) queryText = this.buildQueryForOldQuerySchema(query)
@ -210,7 +213,7 @@ class LayoutRenderer extends Component {
PAGE_HEADER_HEIGHT - PAGE_HEADER_HEIGHT -
PAGE_CONTAINER_MARGIN - PAGE_CONTAINER_MARGIN -
PAGE_CONTAINER_MARGIN) / PAGE_CONTAINER_MARGIN) /
STATUS_PAGE_ROW_COUNT STATUS_PAGE_ROW_COUNT
: DASHBOARD_LAYOUT_ROW_HEIGHT : DASHBOARD_LAYOUT_ROW_HEIGHT
} }