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

PanelEdit: Hide multi-/all-select datasource variables in datasource picker (#52142)

Browse Source
This commit is contained in:
eledobleefe
2022-07-18 11:02:18 +02:00
committed by GitHub
parent 3617eac5f3
commit 332639ce43
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/features/plugins/datasource_srv.ts
View File

@@ -24,7 +24,7 @@ import {
instanceSettings as expressionInstanceSettings,
} from 'app/features/expressions/ExpressionDatasource';
import { DataSourceVariableModel } from '../variables/types';
import { isDataSource } from '../variables/guard';
import { importDataSourcePlugin } from './plugin_loader';
@@ -245,11 +245,12 @@ export class DatasourceSrv implements DataSourceService {
});
if (filters.variables) {
for (const variable of this.templateSrv.getVariables().filter((variable) => variable.type === 'datasource')) {
const dsVar = variable as DataSourceVariableModel;
const first = dsVar.current.value === 'default' ? this.defaultName : dsVar.current.value;
const dsName = first as unknown as string;
const dsSettings = this.settingsMapByName[dsName];
for (const variable of this.templateSrv.getVariables()) {
if (!isDataSource(variable) || variable.multi || variable.includeAll) {
continue;
}
const dsName = variable.current.value === 'default' ? this.defaultName : variable.current.value;
const dsSettings = !Array.isArray(dsName) && this.settingsMapByName[dsName];
if (dsSettings) {
const key = `$\{${variable.name}\}`;