Просмотр исходного кода

Merge pull request #14928 from grafana/davkal/14926-loki-missing

Explore: Fix datasource selector being empty with single datasource
David 7 лет назад
Родитель
Сommit
6f6c4652dc
1 измененных файлов с 9 добавлено и 3 удалено
  1. 9 3
      public/app/features/explore/state/actions.ts

+ 9 - 3
public/app/features/explore/state/actions.ts

@@ -161,11 +161,17 @@ export function initializeExplore(
       },
     });
 
-    if (exploreDatasources.length > 1) {
+    if (exploreDatasources.length >= 1) {
       let instance;
       if (datasource) {
-        instance = await getDatasourceSrv().get(datasource);
-      } else {
+        try {
+          instance = await getDatasourceSrv().get(datasource);
+        } catch (error) {
+          console.error(error);
+        }
+      }
+      // Checking on instance here because requested datasource could be deleted already
+      if (!instance) {
         instance = await getDatasourceSrv().get();
       }
       dispatch(loadDatasource(exploreId, instance));