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

StateTimeline: Try to sort time field (#51569)

Browse Source 
* StateTimeline: Try to sort time field

* Sort frame earlier
This commit is contained in:
Zoltán Bedi 2022-07-04 10:11:33 +02:00 committed by GitHub
parent e88514beea
commit ebb9025669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.betterer.results
View File

@ -11817,31 +11817,31 @@ exports[`better eslint`] = {
"public/app/plugins/panel/state-timeline/types.ts:3228907517": [ "public/app/plugins/panel/state-timeline/types.ts:3228907517": [
[20, 62, 3, "Unexpected any. Specify a different type.", "193409811"] [20, 62, 3, "Unexpected any. Specify a different type.", "193409811"]
], ],
"public/app/plugins/panel/state-timeline/utils.test.ts:2922455252": [ "public/app/plugins/panel/state-timeline/utils.test.ts:4199205996": [
[17, 9, 9, "Do not use any type assertions.", "3692209159"], [17, 9, 9, "Do not use any type assertions.", "3692209159"],
[17, 15, 3, "Unexpected any. Specify a different type.", "193409811"], [17, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
[78, 18, 147, "Do not use any type assertions.", "893298400"], [90, 18, 147, "Do not use any type assertions.", "893298400"],
[82, 9, 3, "Unexpected any. Specify a different type.", "193409811"], [94, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
[88, 18, 139, "Do not use any type assertions.", "3045277193"], [100, 18, 139, "Do not use any type assertions.", "3045277193"],
[92, 9, 3, "Unexpected any. Specify a different type.", "193409811"], [104, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
[98, 18, 150, "Do not use any type assertions.", "1747702495"], [110, 18, 150, "Do not use any type assertions.", "1747702495"],
[102, 9, 3, "Unexpected any. Specify a different type.", "193409811"], [114, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
[108, 18, 291, "Do not use any type assertions.", "3141576499"], [120, 18, 291, "Do not use any type assertions.", "3141576499"],
[124, 9, 3, "Unexpected any. Specify a different type.", "193409811"], [136, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
[130, 18, 106, "Do not use any type assertions.", "328761055"], [142, 18, 106, "Do not use any type assertions.", "328761055"],
[134, 9, 3, "Unexpected any. Specify a different type.", "193409811"], [146, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
[165, 17, 3, "Unexpected any. Specify a different type.", "193409811"], [177, 17, 3, "Unexpected any. Specify a different type.", "193409811"],
[222, 53, 46, "Do not use any type assertions.", "697874192"], [234, 53, 46, "Do not use any type assertions.", "697874192"],
[222, 96, 3, "Unexpected any. Specify a different type.", "193409811"] [234, 96, 3, "Unexpected any. Specify a different type.", "193409811"]
], ],
"public/app/plugins/panel/state-timeline/utils.ts:1740139691": [ "public/app/plugins/panel/state-timeline/utils.ts:2030937583": [
[79, 53, 3, "Unexpected any. Specify a different type.", "193409811"], [80, 53, 3, "Unexpected any. Specify a different type.", "193409811"],
[211, 19, 48, "Do not use any type assertions.", "1573487560"], [212, 19, 48, "Do not use any type assertions.", "1573487560"],
[262, 26, 11, "Do not use any type assertions.", "319541530"], [263, 26, 11, "Do not use any type assertions.", "319541530"],
[262, 34, 3, "Unexpected any. Specify a different type.", "193409811"], [263, 34, 3, "Unexpected any. Specify a different type.", "193409811"],
[286, 46, 3, "Unexpected any. Specify a different type.", "193409811"], [287, 46, 3, "Unexpected any. Specify a different type.", "193409811"],
[286, 54, 3, "Unexpected any. Specify a different type.", "193409811"], [287, 54, 3, "Unexpected any. Specify a different type.", "193409811"],
[288, 13, 3, "Unexpected any. Specify a different type.", "193409811"] [289, 13, 3, "Unexpected any. Specify a different type.", "193409811"]
], ],
"public/app/plugins/panel/table-old/column_options.ts:3218485965": [ "public/app/plugins/panel/table-old/column_options.ts:3218485965": [
[5, 9, 3, "Unexpected any. Specify a different type.", "193409811"], [5, 9, 3, "Unexpected any. Specify a different type.", "193409811"],

12
public/app/plugins/panel/state-timeline/utils.test.ts
View File

@ -72,6 +72,18 @@ describe('prepare timeline graph', () => {
] ]
`); `);
}); });
it('should try to sort time fields', () => {
const frames = [
toDataFrame({
fields: [
{ name: 'a', type: FieldType.time, values: [4, 3, 1, 2] },
{ name: 'b', values: [1, 1, 2, 2] },
],
}),
];
const result = prepareTimelineFields(frames, true, timeRange, theme);
expect(result.frames?.[0].fields[0].values.toArray()).toEqual([1, 2, 3, 4]);
});
}); });
describe('findNextStateIndex', () => { describe('findNextStateIndex', () => {

11
public/app/plugins/panel/state-timeline/utils.ts
View File

@ -23,6 +23,7 @@ import {
ThresholdsMode, ThresholdsMode,
TimeRange, TimeRange,
} from '@grafana/data'; } from '@grafana/data';
import { maybeSortFrame } from '@grafana/data/src/transformations/transformers/joinDataFrames';
import { VizLegendOptions, AxisPlacement, ScaleDirection, ScaleOrientation } from '@grafana/schema'; import { VizLegendOptions, AxisPlacement, ScaleDirection, ScaleOrientation } from '@grafana/schema';
import { import {
FIXED_UNIT, FIXED_UNIT,
@ -394,9 +395,13 @@ export function prepareTimelineFields(
for (let frame of series) { for (let frame of series) {
let isTimeseries = false; let isTimeseries = false;
let changed = false; let changed = false;
let maybeSortedFrame = maybeSortFrame(
frame,
frame.fields.findIndex((f) => f.type === FieldType.time)
);
let nulledFrame = applyNullInsertThreshold({ let nulledFrame = applyNullInsertThreshold({
frame, frame: maybeSortedFrame,
refFieldPseudoMin: timeRange.from.valueOf(), refFieldPseudoMin: timeRange.from.valueOf(),
refFieldPseudoMax: timeRange.to.valueOf(), refFieldPseudoMax: timeRange.to.valueOf(),
}); });
@ -445,11 +450,11 @@ export function prepareTimelineFields(
hasTimeseries = true; hasTimeseries = true;
if (changed) { if (changed) {
frames.push({ frames.push({
...frame, ...maybeSortedFrame,
fields, fields,
}); });
} else { } else {
frames.push(frame); frames.push(maybeSortedFrame);
} }
} }
} }