From f86e30f492245751783e138041c5ebf1bb2fbf51 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 23 Feb 2022 06:47:32 -0600
Subject: [PATCH] Annotations: Fixes issue with tags filter not showing in
 annotation query (#45724) (#45778)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ef3f25420838f8f1ba497e5bc59f0c6a3e49e054)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .../datasource/grafana/components/AnnotationQueryEditor.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
index 39e0d5a0821..0e956cd7e1b 100644
--- a/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
@@ -88,7 +88,7 @@ export default function AnnotationQueryEditor({ query, onChange }: Props) {
           onChange={onMaxLimitChange}
         />
       </Field>
-      {type === GrafanaAnnotationType.Tags && tags && (
+      {type === GrafanaAnnotationType.Tags && (
         <>
           <Field label="Match any" description={matchTooltipContent}>
             <Switch id="grafana-annotations__match-any" value={matchAny} onChange={onMatchAnyChange} />
@@ -100,7 +100,7 @@ export default function AnnotationQueryEditor({ query, onChange }: Props) {
               inputId="grafana-annotations__tags"
               onChange={onTagsChange}
               tagOptions={getAnnotationTags}
-              tags={tags}
+              tags={tags ?? []}
             />
           </Field>
         </>