diff --git a/ui/src/dashboards/actions/index.ts b/ui/src/dashboards/actions/index.ts index 051a6659ba..4fd8fd7985 100644 --- a/ui/src/dashboards/actions/index.ts +++ b/ui/src/dashboards/actions/index.ts @@ -630,7 +630,9 @@ export const hydrateTempVarValuesAsync = ( ) const templates: Template[] = dashboard.templates const queries = templates - .filter(template => !!template.query.influxql) + .filter( + template => getDeep(template, 'query.influxql', '') !== '' + ) .map(async template => { const query = makeQueryForTemplate(template.query) const response = await proxy({source: source.links.proxy, query}) diff --git a/ui/src/shared/parsing/showSeries.ts b/ui/src/shared/parsing/showSeries.ts index 3cad741e04..0ebd1436a9 100644 --- a/ui/src/shared/parsing/showSeries.ts +++ b/ui/src/shared/parsing/showSeries.ts @@ -1,3 +1,5 @@ +import {getDeep} from 'src/utils/wrappers' + interface ParseShowSeriesResponse { errors: string[] series: string[] @@ -10,17 +12,15 @@ const parseShowSeries = (response): ParseShowSeriesResponse => { return {errors: [results.error], series: []} } - const series = results.series[0] + const seriesValues = getDeep(results, 'series.0.values', []) - if (!series.values) { + if (!seriesValues.length) { return {errors: [], series: []} } - const seriesValues = series.values.map(s => { - return s[0] - }) + const series = seriesValues.map(s => s[0]) - return {errors: [], series: seriesValues} + return {series, errors: []} } export default parseShowSeries diff --git a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx index c21472bd58..514b2459dc 100644 --- a/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx +++ b/ui/src/tempVars/components/MetaQueryTemplateBuilder.tsx @@ -5,6 +5,7 @@ import {proxy} from 'src/utils/queryUrlGenerator' import {ErrorHandling} from 'src/shared/decorators/errors' import TemplateMetaQueryPreview from 'src/tempVars/components/TemplateMetaQueryPreview' import {parseMetaQuery, isInvalidMetaQuery} from 'src/tempVars/utils/parsing' +import {getDeep} from 'src/utils/wrappers' import { TemplateBuilderProps, @@ -39,7 +40,7 @@ class CustomMetaQueryTemplateBuilder extends PureComponent< constructor(props) { super(props) - const metaQuery = _.get(props.template, 'query.influxql', '') + const metaQuery = getDeep(props.template, 'query.influxql', '') this.state = { metaQuery,