From 62e55f4724afe38690402e20178664e7266d3c51 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Fri, 26 Nov 2021 10:28:13 +0000 Subject: [PATCH] Chore: Refactor QueryRunner to remove type assertions (#42329) --- public/app/features/query/state/QueryRunner.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/public/app/features/query/state/QueryRunner.ts b/public/app/features/query/state/QueryRunner.ts index 8e8ec394a29..a437e7ec554 100644 --- a/public/app/features/query/state/QueryRunner.ts +++ b/public/app/features/query/state/QueryRunner.ts @@ -70,7 +70,7 @@ export class QueryRunner implements QueryRunnerSrv { }; // Add deprecated property - (request as any).rangeRaw = timeRange.raw; + request.rangeRaw = timeRange.raw; from(getDataSource(datasource, request.scopedVars)) .pipe(first()) @@ -144,8 +144,9 @@ async function getDataSource( datasource: DataSourceRef | DataSourceApi | null, scopedVars: ScopedVars ): Promise { - if (datasource && (datasource as any).query) { - return datasource as DataSourceApi; + if (datasource && 'query' in datasource) { + return datasource; } - return await getDatasourceSrv().get(datasource, scopedVars); + + return getDatasourceSrv().get(datasource, scopedVars); }