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

TimeSeries: Fix legend and tooltip colors changing after data refreshes (#63823)

Browse Source
This commit is contained in:
Leon Sorokin 2023-02-28 08:16:27 -06:00 committed by GitHub
parent 429d693a4a
commit b2c0175777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/grafana-ui/src/components/TimeSeries/utils.ts
View File

@ -105,8 +105,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<{
return builder; // empty frame with no options
}
let seriesIndex = 0;
const xScaleKey = 'x';
let xScaleUnit = '_x';
let yScaleKey = '';
@ -217,9 +215,6 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<{
continue;
}
// TODO: skip this for fields with custom renderers?
field.state!.seriesIndex = seriesIndex++;
let fmt = field.display ?? defaultFormatter;
if (field.config.custom?.stacking?.mode === StackingMode.Percent) {
fmt = getDisplayProcessor({

16
public/app/plugins/panel/timeseries/utils.test.ts
View File

@ -29,6 +29,22 @@ describe('prepare timeseries graph', () => {
expect(frames).toBeNull();
});
it('sets classic palette index on graphable fields', () => {
const input = [
toDataFrame({
fields: [
{ name: 'a', type: FieldType.time, values: [1, 2, 3] },
{ name: 'b', type: FieldType.string, values: ['a', 'b', 'c'] },
{ name: 'c', type: FieldType.number, values: [1, 2, 3] },
{ name: 'd', type: FieldType.string, values: ['d', 'e', 'f'] },
{ name: 'e', type: FieldType.boolean, values: [true, false, true] },
],
}),
];
const frames = prepareGraphableFields(input, createTheme());
expect(frames![0].fields.map((f) => f.state?.seriesIndex)).toEqual([undefined, undefined, 0, undefined, 1]);
});
it('will graph numbers and boolean values', () => {
const input = [
toDataFrame({

18
public/app/plugins/panel/timeseries/utils.ts
View File

@ -128,12 +128,30 @@ export function prepareGraphableFields(
}
if (frames.length) {
setClassicPaletteIdxs(frames, theme);
return frames;
}
return null;
}
const setClassicPaletteIdxs = (frames: DataFrame[], theme: GrafanaTheme2) => {
let seriesIndex = 0;
frames.forEach((frame) => {
frame.fields.forEach((field) => {
// TODO: also add FieldType.enum type here after https://github.com/grafana/grafana/pull/60491
if (field.type === FieldType.number || field.type === FieldType.boolean) {
field.state = {
...field.state,
seriesIndex: seriesIndex++, // TODO: skip this for fields with custom renderers (e.g. Candlestick)?
};
field.display = getDisplayProcessor({ field, theme });
}
});
});
};
export function getTimezones(timezones: string[] | undefined, defaultTimezone: string): string[] {
if (!timezones || !timezones.length) {
return [defaultTimezone];