fix: make it work in 6.7 and 7.0+

This commit is contained in:
Ivan Mikheykin
2020-05-23 13:11:59 +03:00
parent b33248c664
commit 6b6219c1a9
7 changed files with 41 additions and 19 deletions
+7 -7
View File
@@ -83,13 +83,13 @@ coreModule.directive('statusHeatmapLegend', function() {
}
}
console.log("legent state:", {
rangeFrom: rangeFrom,
rangeTo: rangeTo,
maxValue: maxValue,
minValue: minValue,
colorMode: panel.color.mode
});
// console.log("legend state:", {
// rangeFrom: rangeFrom,
// rangeTo: rangeTo,
// maxValue: maxValue,
// minValue: minValue,
// colorMode: panel.color.mode
// });
if (panel.color.mode === 'spectrum') {
let colorScheme = _.find(ctrl.colorSchemes, {value: panel.color.colorScheme});
+11
View File
@@ -262,6 +262,14 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
return chartWidth!;
}
// Quick workaround for 6.7 and 7.0+. There is no call to
// calculateInterval in updateTimeRange in those versions.
updateTimeRange() {
let ret = super.updateTimeRange();
this.calculateInterval();
return ret;
}
// calculateInterval is called on 'refresh' to calculate an interval
// for datasource.
// It is override of calculateInterval from MetricsPanelCtrl.
@@ -356,10 +364,13 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
onDataReceived(dataList: any) {
//console.log("data",dataList)
this.data = dataList;
this.bucketMatrix = this.convertDataToBuckets(dataList, this.range.from.valueOf(), this.range.to.valueOf(), this.intervalMs, true);
this.noDatapoints = this.bucketMatrix.noDatapoints;
//console.log("buckets",this.bucketMatrix)
this.annotationsPromise.then(
(result: { alertState: any; annotations: any }) => {
this.loading = false;