From d746df485c54856480ab8ffa21ff49ada32ad9f2 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Wed, 30 Jan 2019 09:36:23 +0100
Subject: [PATCH] Add missing code

---
 public/app/features/explore/state/actions.ts           | 10 +++++++---
 .../app/plugins/datasource/loki/language_provider.ts   |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts
index 3d2896f38d3..1b7461a41e1 100644
--- a/public/app/features/explore/state/actions.ts
+++ b/public/app/features/explore/state/actions.ts
@@ -324,7 +324,13 @@ export function importQueries(
       // Default is blank queries
       importedQueries = ensureQueries();
     }
-    dispatch(setInitialQueries(exploreId, importedQueries));
+
+    const nextQueries = importedQueries.map((q, i) => ({
+      ...importedQueries[i],
+      ...generateEmptyQuery(i),
+    }));
+
+    dispatch(setInitialQueries(exploreId, nextQueries));
   };
 }
 
@@ -360,8 +366,6 @@ export function loadDatasource(exploreId: ExploreId, instance: DataSourceApi): T
       instance.init();
     }
 
-    // Check if queries can be imported from previously selected datasource
-
     if (datasourceName !== getState().explore[exploreId].requestedDatasourceName) {
       // User already changed datasource again, discard results
       return;
diff --git a/public/app/plugins/datasource/loki/language_provider.ts b/public/app/plugins/datasource/loki/language_provider.ts
index 8b50eeaad53..631e61277b8 100644
--- a/public/app/plugins/datasource/loki/language_provider.ts
+++ b/public/app/plugins/datasource/loki/language_provider.ts
@@ -177,7 +177,6 @@ export default class LokiLanguageProvider extends LanguageProvider {
     return queries.map(query => ({
       refId: query.refId,
       expr: '',
-      key: query.key,
     }));
   }