api/ds/query: simplify data sources lookup for queries and expressions (#41172)

This commit is contained in:
Ryan McKinley
2021-11-05 08:12:55 -07:00
committed by GitHub
parent c8b7373016
commit 3489721ed6
16 changed files with 255 additions and 224 deletions

View File

@@ -1,5 +1,5 @@
import { DataQuery } from '@grafana/data';
import { ExpressionDatasourceID } from './ExpressionDatasource';
import { isExpressionReference } from '@grafana/runtime/src/utils/DataSourceWithBackend';
import { ExpressionQuery, ExpressionQueryType } from './types';
export const isExpressionQuery = (dataQuery?: DataQuery): dataQuery is ExpressionQuery => {
@@ -7,7 +7,7 @@ export const isExpressionQuery = (dataQuery?: DataQuery): dataQuery is Expressio
return false;
}
if (dataQuery.datasource === ExpressionDatasourceID) {
if (isExpressionReference(dataQuery.datasource)) {
return true;
}