IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

FieldColor: Prefer displayName for hashing (#93062)

Browse Source 
* FieldColor: Prefer displayName for hashing
This commit is contained in:
Leon Sorokin 2024-09-09 12:58:22 -05:00 committed by GitHub
parent a6e2962319
commit 53e59b27cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
packages/grafana-data/src/field/fieldColor.test.ts
View File

@ -1,8 +1,9 @@
import { createTheme } from '../themes/createTheme';
import { Field, FieldType } from '../types/dataFrame';
import { DataFrame, Field, FieldType } from '../types/dataFrame';
import { FieldColorModeId } from '../types/fieldColor';
import { fieldColorModeRegistry, FieldValueColorCalculator, getFieldSeriesColor } from './fieldColor';
import { cacheFieldDisplayNames } from './fieldState';
function getTestField(mode: string, fixedColor?: string, name = 'name'): Field {
return {
@ -55,6 +56,67 @@ describe('fieldColorModeRegistry', () => {
expect(calcFn1(12, 34, undefined)).toEqual(calcFn2(56, 78, undefined));
});
it('Palette uses displayName with Value fields', () => {
let frames: DataFrame[] = [
{
length: 0,
fields: [
{
name: 'Time',
type: FieldType.time,
values: [],
config: {},
},
{
name: 'Value',
labels: { foo: 'bar' },
type: FieldType.number,
values: [],
config: {
color: {
mode: FieldColorModeId.PaletteClassicByName,
},
},
state: {},
},
],
},
{
length: 0,
fields: [
{
name: 'Time',
type: FieldType.time,
values: [],
config: {},
},
{
name: 'Value',
labels: { foo: 'baz' },
type: FieldType.number,
values: [],
config: {
color: {
mode: FieldColorModeId.PaletteClassicByName,
},
},
state: {},
},
],
},
];
cacheFieldDisplayNames(frames);
const mode = fieldColorModeRegistry.get(FieldColorModeId.PaletteClassicByName);
const calcFn1 = mode.getCalculator(frames[0].fields[1], createTheme());
const calcFn2 = mode.getCalculator(frames[1].fields[1], createTheme());
expect(calcFn1(0, 0)).toEqual('#82B5D8');
expect(calcFn2(0, 0)).toEqual('#FCE2DE');
});
it('When color.seriesBy is set to last use that instead of v', () => {
const field = getTestField('continuous-GrYlRd');

2
packages/grafana-data/src/field/fieldColor.ts
View File

@ -218,7 +218,7 @@ export class FieldColorSchemeMode implements FieldColorMode {
}
} else if (this.useSeriesName) {
return (_: number, _percent: number, _threshold?: Threshold) => {
return colors[Math.abs(stringHash(field.name)) % colors.length];
return colors[Math.abs(stringHash(field.state?.displayName ?? field.name)) % colors.length];
};
} else {
return (_: number, _percent: number, _threshold?: Threshold) => {