datasource: fix disable query when using mixed datasource (#16409)

This fixes an error that was thrown when one or several queries
was disabled using the mixed datasource.

Fixes #12977
This commit is contained in:
Marcus Efraimsson
2019-04-08 11:39:54 +02:00
committed by GitHub
parent 70dcb6a22a
commit 4a70056d3c
@@ -13,9 +13,17 @@ class MixedDatasource {
return this.$q([]);
}
const filtered = _.filter(targets, t => {
return !t.hide;
});
if (filtered.length === 0) {
return { data: [] };
}
return this.datasourceSrv.get(dsName).then(ds => {
const opt = angular.copy(options);
opt.targets = targets;
opt.targets = filtered;
return ds.query(opt);
});
});