From d1fd2697a3c672cad2363322cc80a3b941bd3b00 Mon Sep 17 00:00:00 2001 From: Christopher Henn Date: Wed, 11 Jul 2018 09:59:23 -0700 Subject: [PATCH] Remove superfluous try/catch block --- ui/src/tempVars/apis/index.ts | 43 +++++++++++++++-------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/ui/src/tempVars/apis/index.ts b/ui/src/tempVars/apis/index.ts index e7aaffc894..1a17551238 100644 --- a/ui/src/tempVars/apis/index.ts +++ b/ui/src/tempVars/apis/index.ts @@ -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 => {