Explore: Fixed default data source loading (#37059) (#39379)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
(cherry picked from commit 64f898c5f6)

Co-authored-by: Assaf Dayan <asfdyn@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2021-09-20 10:11:51 +02:00
committed by GitHub
co-authored by Assaf Dayan
parent 972ec9cf85
commit e272e239d0
3 changed files with 5 additions and 5 deletions
@@ -31,7 +31,7 @@ type Props = OwnProps & ConnectedProps<typeof connector>;
export class UnConnectedExploreToolbar extends PureComponent<Props> {
onChangeDatasource = async (dsSettings: DataSourceInstanceSettings) => {
this.props.changeDatasource(this.props.exploreId, dsSettings.name, { importQueries: true });
this.props.changeDatasource(this.props.exploreId, dsSettings.uid, { importQueries: true });
};
onClearAll = () => {
@@ -35,12 +35,12 @@ export const updateDatasourceInstanceAction = createAction<UpdateDatasourceInsta
*/
export function changeDatasource(
exploreId: ExploreId,
datasourceName: string,
datasourceUid: string,
options?: { importQueries: boolean }
): ThunkResult<void> {
return async (dispatch, getState) => {
const orgId = getState().user.orgId;
const { history, instance } = await loadAndInitDatasource(orgId, datasourceName);
const { history, instance } = await loadAndInitDatasource(orgId, datasourceUid);
const currentDataSourceInstance = getState().explore[exploreId]!.datasourceInstance;
dispatch(
+2 -2
View File
@@ -60,11 +60,11 @@ export const createEmptyQueryResponse = (): PanelData => ({
export async function loadAndInitDatasource(
orgId: number,
datasourceName?: string
datasourceUid?: string
): Promise<{ history: HistoryItem[]; instance: DataSourceApi }> {
let instance;
try {
instance = await getDatasourceSrv().get(datasourceName);
instance = await getDatasourceSrv().get(datasourceUid);
} catch (error) {
// Falling back to the default data source in case the provided data source was not found.
// It may happen if last used data source or the data source provided in the URL has been