Skip to content

[9.1] [Discover][APM] Check for undefined data from useFetcher in TraceWaterfallEmbeddable (#240843) #241095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iblancof merged 2 commits into from
Oct 29, 2025
Merged

[9.1] [Discover][APM] Check for undefined data from useFetcher in TraceWaterfallEmbeddable (#240843) #241095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54c7ccb
[Discover][APM] Add fallback to traceItems when calling useTraceWater…
iblancof Oct 29, 2025
a32ee76
Remove unknown announceOnMount prop
iblancof Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions ...lity/plugins/apm/public/embeddable/trace_waterfall/focused_trace_waterfall_embeddable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { EuiText } from '@elastic/eui';
import { EuiCallOut } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
import { FocusedTraceWaterfall } from '../../components/shared/focused_trace_waterfall';
Expand Down Expand Up @@ -35,12 +35,14 @@ export function FocusedTraceWaterfallEmbeddable({

if (data === undefined) {
return (
<EuiText>
{i18n.translate(
'xpack.apm.focusedTraceWaterfallEmbeddable.traceWaterfallCouldNotTextLabel',
{ defaultMessage: 'Trace waterfall could not be loaded' }
)}
</EuiText>
<EuiCallOut
data-test-subj="FocusedTraceWaterfallEmbeddableNoData"
color="danger"
size="s"
title={i18n.translate('xpack.apm.focusedTraceWaterfallEmbeddable.noDataCalloutLabel', {
defaultMessage: 'Trace waterfall could not be loaded.',
})}
/>
);
}

Expand Down
17 changes: 16 additions & 1 deletion ...bservability/plugins/apm/public/embeddable/trace_waterfall/trace_waterfall_embeddable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
*/
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import React from 'react';
import { WaterfallLegends } from '../../components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_legends';
import { EuiCallOut } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { isPending, useFetcher } from '../../hooks/use_fetcher';
import { Loading } from './loading';
import type { ApmTraceWaterfallEmbeddableEntryProps } from './react_embeddable_factory';
import { TraceWaterfall } from '../../components/shared/trace_waterfall';
import { getServiceLegends } from '../../components/shared/trace_waterfall/use_trace_waterfall';
import { WaterfallLegendType } from '../../components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers';
import { WaterfallLegends } from '../../components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_legends';

export function TraceWaterfallEmbeddable({
serviceName,
Expand Down Expand Up @@ -43,6 +45,19 @@ export function TraceWaterfallEmbeddable({
return <Loading />;
}

if (data === undefined) {
return (
<EuiCallOut
data-test-subj="TraceWaterfallEmbeddableNoData"
color="danger"
size="s"
title={i18n.translate('xpack.apm.traceWaterfallEmbeddable.noDataCalloutLabel', {
defaultMessage: 'Trace waterfall could not be loaded.',
})}
/>
);
}

return (
<EuiFlexGroup direction="column">
<EuiFlexItem>
Expand Down