Commit 4a70056d by Marcus Efraimsson Committed by GitHub

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
parent 70dcb6a2
...@@ -13,9 +13,17 @@ class MixedDatasource { ...@@ -13,9 +13,17 @@ class MixedDatasource {
return this.$q([]); return this.$q([]);
} }
const filtered = _.filter(targets, t => {
return !t.hide;
});
if (filtered.length === 0) {
return { data: [] };
}
return this.datasourceSrv.get(dsName).then(ds => { return this.datasourceSrv.get(dsName).then(ds => {
const opt = angular.copy(options); const opt = angular.copy(options);
opt.targets = targets; opt.targets = filtered;
return ds.query(opt); return ds.query(opt);
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment