From f682ad8c601143dc72db4a87c6974cd54556d870 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 20 Apr 2022 08:17:38 -0400
Subject: [PATCH] Prometheus/Loki: Fixes the query type option when multiple
 queries present (#47846) (#47944)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 68aac0bd9082c9f9f492e760e90079df3d2c3a96)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
---
 .../querybuilder/components/LokiQueryBuilderOptions.tsx    | 7 +------
 .../querybuilder/components/PromQueryBuilderOptions.tsx    | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
index 0aac629b32e..92b1501f740 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
@@ -58,12 +58,7 @@ export const LokiQueryBuilderOptions = React.memo<Props>(({ query, onChange, onR
           />
         </EditorField>
         <EditorField label="Type">
-          <RadioButtonGroup
-            id="options.query.type"
-            options={queryTypeOptions}
-            value={queryType}
-            onChange={onQueryTypeChange}
-          />
+          <RadioButtonGroup options={queryTypeOptions} value={queryType} onChange={onQueryTypeChange} />
         </EditorField>
         {showMaxLines && (
           <EditorField label="Line limit" tooltip="Upper limit for number of log lines returned by query.">
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
index 432d2516f65..74d1067fedb 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.tsx
@@ -75,12 +75,7 @@ export const PromQueryBuilderOptions = React.memo<Props>(({ query, app, onChange
           <Select value={formatOption} allowCustomValue onChange={onChangeFormat} options={FORMAT_OPTIONS} />
         </EditorField>
         <EditorField label="Type">
-          <RadioButtonGroup
-            id="options.query.type"
-            options={queryTypeOptions}
-            value={queryTypeValue}
-            onChange={onQueryTypeChange}
-          />
+          <RadioButtonGroup options={queryTypeOptions} value={queryTypeValue} onChange={onQueryTypeChange} />
         </EditorField>
         {shouldShowExemplarSwitch(query, app) && (
           <EditorField label="Exemplars">