SSE: Add functions that determine NodeType by UID and construct a data source struct from NodeType (#70106)
* add NodeTypeFromDatasourceUID and DataSourceModelFromNodeType() * deprecate expr.DataSourceModel * replace usages of IsDataSource to NodeTypeFromDatasourceUID * replace usages of DataSourceModel to DataSourceModelFromNodeType()
This commit is contained in:
@@ -269,7 +269,7 @@ func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user *user.SignedI
|
||||
}
|
||||
|
||||
datasourcesByUid[ds.UID] = ds
|
||||
if expr.IsDataSource(ds.UID) {
|
||||
if expr.NodeTypeFromDatasourceUID(ds.UID) != expr.TypeDatasourceNode {
|
||||
req.hasExpression = true
|
||||
} else {
|
||||
req.dsTypes[ds.Type] = true
|
||||
@@ -321,8 +321,8 @@ func (s *ServiceImpl) getDataSourceFromQuery(ctx context.Context, user *user.Sig
|
||||
return ds, nil
|
||||
}
|
||||
|
||||
if expr.IsDataSource(uid) {
|
||||
return expr.DataSourceModel(), nil
|
||||
if kind := expr.NodeTypeFromDatasourceUID(uid); kind != expr.TypeDatasourceNode {
|
||||
return expr.DataSourceModelFromNodeType(kind)
|
||||
}
|
||||
|
||||
if uid == grafanads.DatasourceUID {
|
||||
|
||||
Reference in New Issue
Block a user