Remove superfluous try/catch block

pull/10616/head
Christopher Henn 2018-07-11 09:59:23 -07:00
parent b0d22dcb33
commit d1fd2697a3
1 changed files with 18 additions and 25 deletions

View File

@ -16,35 +16,28 @@ export const hydrateTemplate = async (
return template
}
try {
const query = templateReplace(
makeQueryForTemplate(template.query),
templates
)
const response = await proxy({source: proxyLink, query})
const values = parseMetaQuery(query, response.data)
const type = TEMPLATE_VARIABLE_TYPES[template.type]
const selectedValue = getSelectedValue(template)
const selectedLocalValue = getLocalSelectedValue(template)
const query = templateReplace(makeQueryForTemplate(template.query), templates)
const response = await proxy({source: proxyLink, query})
const values = parseMetaQuery(query, response.data)
const type = TEMPLATE_VARIABLE_TYPES[template.type]
const selectedValue = getSelectedValue(template)
const selectedLocalValue = getLocalSelectedValue(template)
const templateValues = values.map(value => {
return {
type,
value,
selected: value === selectedValue,
localSelected: value === selectedLocalValue,
}
})
if (templateValues.length && !templateValues.find(v => v.selected)) {
// Handle stale selected value
templateValues[0].selected = true
const templateValues = values.map(value => {
return {
type,
value,
selected: value === selectedValue,
localSelected: value === selectedLocalValue,
}
})
return {...template, values: templateValues}
} catch (error) {
throw error
if (templateValues.length && !templateValues.find(v => v.selected)) {
// Handle stale selected value
templateValues[0].selected = true
}
return {...template, values: templateValues}
}
export const isTemplateNested = (template: Template): boolean => {