From 7cd034f33a202d493cc6154d4d57c49fb84491b0 Mon Sep 17 00:00:00 2001
From: Andrej Ocenas <mr.ocenas@gmail.com>
Date: Mon, 23 May 2022 19:21:00 +0200
Subject: [PATCH] Loki: Cleanup some code for default editorMode (#49431)

---
 .../loki/querybuilder/components/LokiQueryEditorSelector.tsx  | 4 ++--
 .../querybuilder/components/PromQueryEditorSelector.tsx       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
index ecc74b6efbd..4f43cf5e0d3 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryEditorSelector.tsx
@@ -24,6 +24,8 @@ export const LokiQueryEditorSelector = React.memo<LokiQueryEditorProps>((props)
   const [dataIsStale, setDataIsStale] = useState(false);
 
   const query = getQueryWithDefaults(props.query);
+  // This should be filled in from the defaults by now.
+  const editorMode = query.editorMode!;
 
   const onEditorModeChange = useCallback(
     (newEditorMode: QueryEditorMode) => {
@@ -54,8 +56,6 @@ export const LokiQueryEditorSelector = React.memo<LokiQueryEditorProps>((props)
     onChange({ ...query, rawQuery: isEnabled });
   };
 
-  // If no expr (ie new query) then default to builder
-  const editorMode = query.editorMode ?? (query.expr ? QueryEditorMode.Code : QueryEditorMode.Builder);
   return (
     <>
       <ConfirmModal
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
index 754c0b6c455..1c0d61b519a 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryEditorSelector.tsx
@@ -26,6 +26,7 @@ export const PromQueryEditorSelector = React.memo<PromQueryEditorProps>((props)
   const [dataIsStale, setDataIsStale] = useState(false);
 
   const query = getQueryWithDefaults(props.query, app);
+  // This should be filled in from the defaults by now.
   const editorMode = query.editorMode!;
 
   const onEditorModeChange = useCallback(