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

Add missing code

Browse Source
This commit is contained in:
Dominik Prokop 2019-01-30 09:36:23 +01:00
parent ca0d2996f2
commit d746df485c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/explore/state/actions.ts
View File

@ -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;

1
public/app/plugins/datasource/loki/language_provider.ts
View File

@ -177,7 +177,6 @@ export default class LokiLanguageProvider extends LanguageProvider {
return queries.map(query => ({
refId: query.refId,
expr: '',
key: query.key,
}));
}