jsteele/grafana-statusmap
2
0
Fork 0
mirror of https://github.com/timberjoegithub/grafana-statusmap.git synced 2026-07-22 15:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from flant/fix_empty_buckets_with_normal_values

Browse Source 
Fix display of multivalues buckets as an empty cell
This commit is contained in:
Ivan Mikheykin
2018-12-11 20:48:38 +03:00
committed by GitHub
parent cb5d353b36 f13adb369b
commit f6973a81b8
3 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/color_mode_discrete.js
Vendored
+21 -9
View File
@@ -101,16 +101,28 @@ System.register(["lodash"], function (_export, _context) {
value: function getBucketColor(values) {
var thresholds = this.panel.color.thresholds;
if (!values || values.length == 0) {
// treat as null value
return this.getMatchedThreshold(null).color;
}
if (values.length == 1) {
return this.getMatchedThreshold(values[0]).color;
}
var isAllValuesNulls = true;
for (var j = 0; j < values.length; j++) {
if (values[j] != null) {
isAllValuesNulls = false;
}
}
if (isAllValuesNulls) {
return this.getMatchedThreshold(null).color;
}
for (var i = 0; i < thresholds.length; i++) {
for (var j = 0; j < values.length; j++) {
if (values[j] == null) {
if (this.panel.nullPointMode == 'as zero') {
return this.getMatchedThreshold(0).color;
} else {
return 'rgba(0,0,0,0)';
}
}
if (values[j] == thresholds[i].value) {
for (var _j = 0; _j < values.length; _j++) {
if (values[_j] == thresholds[i].value) {
return this.getDiscreteColor(i);
}
}
dist/color_mode_discrete.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/color_mode_discrete.js
+19 -7
View File
@@ -61,15 +61,27 @@ export class ColorModeDiscrete {
getBucketColor(values) {
let thresholds = this.panel.color.thresholds;
if (!values || values.length == 0) {
// treat as null value
return this.getMatchedThreshold(null).color;
}
if (values.length == 1) {
return this.getMatchedThreshold(values[0]).color;
}
let isAllValuesNulls = true;
for (let j = 0; j < values.length; j++) {
if (values[j] != null) {
isAllValuesNulls = false;
}
}
if (isAllValuesNulls) {
return this.getMatchedThreshold(null).color;
}
for (let i = 0; i < thresholds.length; i++) {
for (let j = 0; j < values.length; j++) {
if (values[j] == null) {
if (this.panel.nullPointMode == 'as zero') {
return this.getMatchedThreshold(0).color;
} else {
return 'rgba(0,0,0,0)';
}
}
if (values[j] == thresholds[i].value) {
return this.getDiscreteColor(i);
}