Skip to content

Commit

Permalink
[v11.0.x] StateTimeline: Fix data links causing unrendering of string…
Browse files Browse the repository at this point in the history
… fields (#85307)

StateTimeline: Fix data links causing unrendering of string fields (#85260)

(cherry picked from commit 1ffeb7c)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
  • Loading branch information
grafana-delivery-bot[bot] and leeoniya committed Mar 27, 2024
1 parent 47a5ae3 commit ac880c6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions public/app/core/components/GraphNG/GraphNG.tsx
Expand Up @@ -106,14 +106,14 @@ export class GraphNG extends Component<GraphNGProps, GraphNGState> {

const preparePlotFrameFn = preparePlotFrame ?? defaultPreparePlotFrame;

const matchY = fieldMatchers.get(FieldMatcherID.byTypes).get(new Set([FieldType.number, FieldType.enum]));
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 : matchY,
y: withLinks ? () => true : matchYDefault,
};

const alignedFrame = preparePlotFrameFn(frames, dimFields, props.timeRange);
Expand Down Expand Up @@ -150,7 +150,7 @@ export class GraphNG extends Component<GraphNGProps, GraphNGState> {
// filter join field and dimFields.y
alignedFrameFinal = {
...alignedFrame,
fields: alignedFrame.fields.filter((field, i) => i === 0 || matchY(field, alignedFrame, [alignedFrame])),
fields: alignedFrame.fields.filter((field, i) => i === 0 || dimFields.y(field, alignedFrame, [alignedFrame])),
};
}

Expand Down

0 comments on commit ac880c6

Please sign in to comment.