fix: add condition for noDatapoints state

- see #134
This commit is contained in:
Ivan Mikheykin
2020-10-10 13:30:27 +03:00
parent 3b0d119113
commit 7cc09175f0
6 changed files with 12 additions and 10 deletions
+2
View File
@@ -0,0 +1,2 @@
/dist linguist-generated
/src/libs/d3-scale-chromatic linguist-vendored
+4 -4
View File
@@ -366,17 +366,17 @@ System.register(["lodash", "jquery", "d3", "./libs/d3-scale-chromatic/index", "a
if (ctrl.bucketMatrix) {
var rangeFrom = ctrl.bucketMatrix.minValue;
var rangeTo = ctrl.bucketMatrix.maxValue;
var maxValue = panel.color.max || rangeTo;
var minValue = panel.color.min || rangeFrom;
var maxValue = panel.color.max != null ? panel.color.max : rangeTo;
var minValue = panel.color.min != null ? panel.color.min : rangeFrom;
if (ctrl.bucketMatrix.noDatapoints) {
if (!panel.color.max) {
if (panel.color.max != null) {
rangeTo = maxValue = 100;
} else {
rangeTo = 100;
}
if (!panel.color.min) {
if (panel.color.min != null) {
rangeFrom = minValue = 0;
} else {
rangeFrom = 0;
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -462,8 +462,8 @@ System.register(["lodash", "jquery", "moment", "app/core/utils/kbn", "app/core/c
value: function addStatusmap() {
var _this = this;
var maxValue = this.panel.color.max || this.bucketMatrix.maxValue;
var minValue = this.panel.color.min || this.bucketMatrix.minValue;
var maxValue = this.panel.color.max != null ? this.panel.color.max : this.bucketMatrix.maxValue;
var minValue = this.panel.color.min != null ? this.panel.color.min : this.bucketMatrix.minValue;
if (this.panel.color.mode !== 'discrete') {
this.colorScale = this.getColorScale(maxValue, minValue);
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -72,12 +72,12 @@ coreModule.directive('statusHeatmapLegend', function() {
let minValue = panel.color.min != null ? panel.color.min : rangeFrom;
if (ctrl.bucketMatrix.noDatapoints) {
if (!panel.color.max) {
if (panel.color.max != null) {
rangeTo = maxValue = 100;
} else {
rangeTo = 100;
}
if (!panel.color.min) {
if (panel.color.min != null) {
rangeFrom = minValue = 0;
} else {
rangeFrom = 0;