public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.0.x] TimeSeries: Fix series rendering with data links and extra fields (#86044)

Browse Source 
TimeSeries: Fix series rendering with data links and extra fields (#86007)

(cherry picked from commit 2bedbcf344)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-04-12 07:50:27 -05:00
committed by GitHub
co-authored by Leon Sorokin
parent 173f10c439
commit 8eef690da0
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/components/GraphNG/GraphNG.tsx
+17 -12
View File
@@ -82,6 +82,11 @@ export interface GraphNGState {
config?: UPlotConfigBuilder;
}
const defaultMatchers = {
x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
y: fieldMatchers.get(FieldMatcherID.byTypes).get(new Set([FieldType.number, FieldType.enum])),
};
/**
* "Time as X" core component, expects ascending x
*/
@@ -102,21 +107,21 @@ export class GraphNG extends Component<GraphNGProps, GraphNGState> {
prepState(props: GraphNGProps, withConfig = true) {
let state: GraphNGState = null as any;
const { frames, fields, preparePlotFrame, replaceVariables, dataLinkPostProcessor } = props;
const { frames, fields = defaultMatchers, preparePlotFrame, replaceVariables, dataLinkPostProcessor } = props;
const preparePlotFrameFn = preparePlotFrame ?? defaultPreparePlotFrame;
const matchYDefault = fieldMatchers.get(FieldMatcherID.byTypes).get(new Set([FieldType.number, FieldType.enum]));
// if there are data links, we have to keep all fields so they're index-matched, then filter out dimFields.y
const withLinks = frames.some((frame) => frame.fields.some((field) => (field.config.links?.length ?? 0) > 0));
const dimFields = fields ?? {
x: fieldMatchers.get(FieldMatcherID.firstTimeField).get({}),
y: withLinks ? () => true : matchYDefault,
};
const alignedFrame = preparePlotFrameFn(frames, dimFields, props.timeRange);
const alignedFrame = preparePlotFrameFn(
frames,
{
...fields,
// if there are data links, keep all fields during join so they're index-matched
y: withLinks ? () => true : fields.y,
},
props.timeRange
);
pluginLog('GraphNG', false, 'data aligned', alignedFrame);
@@ -147,10 +152,10 @@ export class GraphNG extends Component<GraphNGProps, GraphNGState> {
);
});
// filter join field and dimFields.y
// filter join field and fields.y
alignedFrameFinal = {
...alignedFrame,
fields: alignedFrame.fields.filter((field, i) => i === 0 || dimFields.y(field, alignedFrame, [alignedFrame])),
fields: alignedFrame.fields.filter((field, i) => i === 0 || fields.y(field, alignedFrame, [alignedFrame])),
};
}