From b076394cd359d09ca168697fb967ec2223cf1c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 20 Jul 2020 11:31:51 +0200 Subject: [PATCH] BackendSrv: Fix error alert logic (#26453) (cherry picked from commit fba329f3acaba5d2b7db327e1fd31531887ae880) --- public/app/features/templating/template_srv.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/public/app/features/templating/template_srv.ts b/public/app/features/templating/template_srv.ts index 36c032e9acc..a1708f8730e 100644 --- a/public/app/features/templating/template_srv.ts +++ b/public/app/features/templating/template_srv.ts @@ -298,7 +298,8 @@ export class TemplateSrv implements BaseTemplateSrv { variableExists(expression: string) { const name = this.getVariableName(expression); - return name && this.getVariableAtIndex(name) !== void 0; + const variable = name && this.getVariableAtIndex(name); + return variable !== null && variable !== undefined; } highlightVariablesAsHtml(str: string) { @@ -458,7 +459,7 @@ export class TemplateSrv implements BaseTemplateSrv { return value.join(','); } - private getVariableAtIndex = (name: string): any => { + private getVariableAtIndex(name: string) { if (!name) { return; } @@ -468,11 +469,11 @@ export class TemplateSrv implements BaseTemplateSrv { } return this.index[name]; - }; + } - private getAdHocVariables = (): any[] => { + private getAdHocVariables(): any[] { return this.dependencies.getFilteredVariables(isAdHoc); - }; + } } // Expose the template srv