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

Hydrate nested templates consistently

pull/10616/head
Christopher Henn 2018-07-11 10:36:21 -07:00
parent e79f02c682
commit a58490207a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/dashboards/actions/index.ts
View File

@ -733,10 +733,12 @@ export const rehydrateNestedTemplatesAsync = (
const dashboard = getDashboard(getState(), dashboardId)
const proxyLink = source.links.proxy
const templateSelections = templateSelectionsFromQueryParams()
const nestedTemplates = await Promise.all(
dashboard.templates
.filter(t => isTemplateNested(t))
.map(t => hydrateTemplate(proxyLink, t, dashboard.templates))
const nestedTemplates = await hydrateTemplates(
dashboard.templates.filter(isTemplateNested),
dashboard.templates,
proxyLink,
dispatch
)
applyLocalSelections(nestedTemplates, templateSelections)

6
ui/src/tempVars/apis/index.ts
View File

@ -16,7 +16,11 @@ export const hydrateTemplate = async (
return template
}
const query = templateReplace(makeQueryForTemplate(template.query), templates)
const query = templateReplace(
makeQueryForTemplate(template.query),
templates.filter(t => !isTemplateNested(t))
)
const response = await proxy({source: proxyLink, query})
const values = parseMetaQuery(query, response.data)
const type = TEMPLATE_VARIABLE_TYPES[template.type]