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

Chore: Refactor QueryRunner to remove type assertions (#42329)

Browse Source
This commit is contained in:
Josh Hunt
2021-11-26 10:28:13 +00:00
committed by GitHub
parent d862d210e4
commit 62e55f4724
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/query/state/QueryRunner.ts
View File

@@ -70,7 +70,7 @@ export class QueryRunner implements QueryRunnerSrv {
}; };
// Add deprecated property // Add deprecated property
(request as any).rangeRaw = timeRange.raw; request.rangeRaw = timeRange.raw;
from(getDataSource(datasource, request.scopedVars)) from(getDataSource(datasource, request.scopedVars))
.pipe(first()) .pipe(first())
@@ -144,8 +144,9 @@ async function getDataSource(
datasource: DataSourceRef | DataSourceApi | null, datasource: DataSourceRef | DataSourceApi | null,
scopedVars: ScopedVars scopedVars: ScopedVars
): Promise<DataSourceApi> { ): Promise<DataSourceApi> {
if (datasource && (datasource as any).query) { if (datasource && 'query' in datasource) {
return datasource as DataSourceApi; return datasource;
} }
return await getDatasourceSrv().get(datasource, scopedVars);
return getDatasourceSrv().get(datasource, scopedVars);
} }