From 6cdf0ab5d943bb1a355ca04ab7a728c64396ea12 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:24:47 +0100
Subject: [PATCH] Keep query keys consistent (#29855)

---
 public/app/features/explore/state/query.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/app/features/explore/state/query.ts b/public/app/features/explore/state/query.ts
index 7c89893f792..6439544764d 100644
--- a/public/app/features/explore/state/query.ts
+++ b/public/app/features/explore/state/query.ts
@@ -551,13 +551,11 @@ export const queryReducer = (state: ExploreItemState, action: AnyAction): Explor
       nextQueries.push(generateNewKeyAndAddRefIdIfMissing(query, nextQueries, i));
     });
 
-    const nextQueryKeys: string[] = nextQueries.map(query => query.key!);
-
     return {
       ...state,
       queries: nextQueries,
       logsHighlighterExpressions: undefined,
-      queryKeys: nextQueryKeys,
+      queryKeys: getQueryKeys(nextQueries, state.datasourceInstance),
     };
   }