public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflicts (#53538)

Browse Source
This commit is contained in:
Leo
2022-08-12 14:26:25 +02:00
committed by GitHub
parent 6c935d3aa0
commit cc4acb719d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/plugins/datasource_srv.ts
+7 -3
View File
@@ -246,11 +246,15 @@ export class DatasourceSrv implements DataSourceService {
if (filters.variables) {
for (const variable of this.templateSrv.getVariables()) {
if (!isDataSource(variable) || variable.multi || variable.includeAll) {
if (!isDataSource(variable)) {
continue;
}
const dsName = variable.current.value === 'default' ? this.defaultName : variable.current.value;
const dsSettings = !Array.isArray(dsName) && this.settingsMapByName[dsName];
let dsValue = variable.current.value === 'default' ? this.defaultName : variable.current.value;
if (Array.isArray(dsValue) && dsValue.length === 1) {
// Support for multi-value variables with only one selected datasource
dsValue = dsValue[0];
}
const dsSettings = !Array.isArray(dsValue) && this.settingsMapByName[dsValue];
if (dsSettings) {
const key = `$\{${variable.name}\}`;