github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix Potential Color Bugs (#26292) (#26427)

Browse source 
- Fixes 25707 by parsing the colors generated for the node and adding a
try/catch to prevent an errors by returning the default color
- Set the min bounds to zero when there is only one data point
This commit is contained in:
Chris Cowan 2018-11-29 10:33:40 -07:00 • committed by GitHub
parent c658f4461a
commit 127a07148b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/infra/public/components/waffle/index.tsx
View file

@ -88,6 +88,10 @@ const extractValuesFromMap = (groups: InfraWaffleMapGroup[], values: number[] =
const calculateBoundsFromMap = (map: InfraWaffleData): InfraWaffleMapBounds => {
const values = extractValuesFromMap(map);
// if there is only one value then we need to set the bottom range to zero
if (values.length === 1) {
values.unshift(0);
}
return { min: min(values), max: max(values) };
};

26
x-pack/plugins/infra/public/components/waffle/lib/color_from_value.ts
View file

@ -5,7 +5,7 @@
*/
import { eq, first, gt, gte, last, lt, lte, sortBy } from 'lodash';
import { mix } from 'polished';
import { mix, parseToRgb, toColorString } from 'polished';
import {
InfraWaffleMapBounds,
InfraWaffleMapGradientLegend,
@ -23,19 +23,27 @@ const OPERATOR_TO_FN = {
[InfraWaffleMapRuleOperator.gt]: gt,
};
const convertToRgbString = (color: string) => {
return toColorString(parseToRgb(color));
};
export const colorFromValue = (
legend: InfraWaffleMapLegend,
value: number | string,
bounds: InfraWaffleMapBounds,
defaultColor = 'rgba(0, 179, 164, 1)'
defaultColor = 'rgba(217, 217, 217, 1)'
): string => {
if (isInfraWaffleMapStepLegend(legend)) {
return calculateStepColor(legend, value, defaultColor);
try {
if (isInfraWaffleMapStepLegend(legend)) {
return convertToRgbString(calculateStepColor(legend, value, defaultColor));
}
if (isInfraWaffleMapGradientLegend(legend)) {
return convertToRgbString(calculateGradientColor(legend, value, bounds, defaultColor));
}
return defaultColor;
} catch (error) {
return defaultColor;
}
if (isInfraWaffleMapGradientLegend(legend)) {
return calculateGradientColor(legend, value, bounds, defaultColor);
}
return defaultColor;
};
const normalizeValue = (min: number, max: number, value: number): number => {
@ -45,7 +53,7 @@ const normalizeValue = (min: number, max: number, value: number): number => {
export const calculateStepColor = (
legend: InfraWaffleMapStepLegend,
value: number | string,
defaultColor = 'rgba(0, 179, 164, 1)'
defaultColor = 'rgba(217, 217, 217, 1)'
): string => {
return sortBy(legend.rules, 'sortBy').reduce((color: string, rule) => {
const operatorFn = OPERATOR_TO_FN[rule.operator];