IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore: Fixed default data source loading (#37059)

Browse Source 
Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
This commit is contained in:
Assaf Dayan 2021-09-16 13:07:27 +03:00 committed by GitHub
parent 02f9564607
commit 64f898c5f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/explore/ExploreToolbar.tsx
View File

@ -31,7 +31,7 @@ type Props = OwnProps & ConnectedProps<typeof connector>;
export class UnConnectedExploreToolbar extends PureComponent<Props> { export class UnConnectedExploreToolbar extends PureComponent<Props> {
onChangeDatasource = async (dsSettings: DataSourceInstanceSettings) => { 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 = () => { onClearAll = () => {

4
public/app/features/explore/state/datasource.ts
View File

@ -35,12 +35,12 @@ export const updateDatasourceInstanceAction = createAction<UpdateDatasourceInsta
*/ */
export function changeDatasource( export function changeDatasource(
exploreId: ExploreId, exploreId: ExploreId,
datasourceName: string, datasourceUid: string,
options?: { importQueries: boolean } options?: { importQueries: boolean }
): ThunkResult<void> { ): ThunkResult<void> {
return async (dispatch, getState) => { return async (dispatch, getState) => {
const orgId = getState().user.orgId; 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; const currentDataSourceInstance = getState().explore[exploreId]!.datasourceInstance;
dispatch( dispatch(

4
public/app/features/explore/state/utils.ts
View File

@ -60,11 +60,11 @@ export const createEmptyQueryResponse = (): PanelData => ({
export async function loadAndInitDatasource( export async function loadAndInitDatasource(
orgId: number, orgId: number,
datasourceName?: string datasourceUid?: string
): Promise<{ history: HistoryItem[]; instance: DataSourceApi }> { ): Promise<{ history: HistoryItem[]; instance: DataSourceApi }> {
let instance; let instance;
try { try {
instance = await getDatasourceSrv().get(datasourceName); instance = await getDatasourceSrv().get(datasourceUid);
} catch (error) { } catch (error) {
// Falling back to the default data source in case the provided data source was not found. // 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 // It may happen if last used data source or the data source provided in the URL has been