Prechádzať zdrojové kódy

Explore: Fix datasource selector being empty with single datasource

- The "missing" action was triggered unless the number of datasource >1 :facepalm:
- Made datasource preselection more robust in case the requested datasource is already gone
David Kaltschmidt 7 rokov pred
rodič
commit
648a775acb

+ 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));