fix: do not use datasourcePromises for 5.x before 5.4

This commit is contained in:
Ivan Mikheykin
2019-03-22 17:37:32 +03:00
parent 5a758213c6
commit 06cb92bbb8
3 changed files with 15 additions and 5 deletions
+5
View File
@@ -208,9 +208,14 @@ System.register(['app/plugins/sdk', 'lodash', 'app/core/core', 'app/core/utils/k
* (but not wait for completion). This resolves * (but not wait for completion). This resolves
* issue 11806. * issue 11806.
*/ */
// 5.x before 5.4 doesn't have dataPromises
if ("undefined" !== typeof _this.annotationsSrv.datasourcePromises) {
return _this.annotationsSrv.datasourcePromises.then(function (r) { return _this.annotationsSrv.datasourcePromises.then(function (r) {
return _get(StatusHeatmapCtrl.prototype.__proto__ || Object.getPrototypeOf(StatusHeatmapCtrl.prototype), 'issueQueries', _this).call(_this, datasource); return _get(StatusHeatmapCtrl.prototype.__proto__ || Object.getPrototypeOf(StatusHeatmapCtrl.prototype), 'issueQueries', _this).call(_this, datasource);
}); });
} else {
return _get(StatusHeatmapCtrl.prototype.__proto__ || Object.getPrototypeOf(StatusHeatmapCtrl.prototype), 'issueQueries', _this).call(_this, datasource);
}
}; };
_this.onDataReceived = function (dataList) { _this.onDataReceived = function (dataList) {
+1 -1
View File
File diff suppressed because one or more lines are too long
+5
View File
@@ -206,9 +206,14 @@ export class StatusHeatmapCtrl extends MetricsPanelCtrl {
* (but not wait for completion). This resolves * (but not wait for completion). This resolves
* issue 11806. * issue 11806.
*/ */
// 5.x before 5.4 doesn't have dataPromises
if ("undefined" !== typeof(this.annotationsSrv.datasourcePromises)) {
return this.annotationsSrv.datasourcePromises.then(r => { return this.annotationsSrv.datasourcePromises.then(r => {
return super.issueQueries(datasource); return super.issueQueries(datasource);
}); });
} else {
return super.issueQueries(datasource);
}
} }