maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[APM] Fix hidden search bar in error pages while loading (#84476) (#93139)

Browse source
This commit is contained in:
Oliver Gupte 2021-03-01 21:39:32 -05:00 committed by GitHub
parent 3e026a3c3c
commit 6897a4ac0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx
View file

@ -60,6 +60,45 @@ function getShortGroupId(errorGroupId?: string) {
return errorGroupId.slice(0, 5);
}
function ErrorGroupHeader({
groupId,
isUnhandled,
}: {
groupId: string;
isUnhandled?: boolean;
}) {
return (
<>
<ApmHeader>
<EuiFlexGroup alignItems="center">
<EuiFlexItem grow={false}>
<EuiTitle>
<h1>
{i18n.translate('xpack.apm.errorGroupDetails.errorGroupTitle', {
defaultMessage: 'Error group {errorGroupId}',
values: {
errorGroupId: getShortGroupId(groupId),
},
})}
</h1>
</EuiTitle>
</EuiFlexItem>
{isUnhandled && (
<EuiFlexItem grow={false}>
<EuiBadge color="warning">
{i18n.translate('xpack.apm.errorGroupDetails.unhandledLabel', {
defaultMessage: 'Unhandled',
})}
</EuiBadge>
</EuiFlexItem>
)}
</EuiFlexGroup>
</ApmHeader>
<SearchBar />
</>
);
}
type ErrorGroupDetailsProps = RouteComponentProps<{
groupId: string;
serviceName: string;
@ -101,7 +140,7 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
useTrackPageview({ app: 'apm', path: 'error_group_details', delay: 15000 });
if (!errorGroupData || !errorDistributionData) {
return null;
return <ErrorGroupHeader groupId={groupId} />;
}
// If there are 0 occurrences, show only distribution chart w. empty message
@ -114,32 +153,7 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
return (
<>
<ApmHeader>
<EuiFlexGroup alignItems="center">
<EuiFlexItem grow={false}>
<EuiTitle>
<h1>
{i18n.translate('xpack.apm.errorGroupDetails.errorGroupTitle', {
defaultMessage: 'Error group {errorGroupId}',
values: {
errorGroupId: getShortGroupId(groupId),
},
})}
</h1>
</EuiTitle>
</EuiFlexItem>
{isUnhandled && (
<EuiFlexItem grow={false}>
<EuiBadge color="warning">
{i18n.translate('xpack.apm.errorGroupDetails.unhandledLabel', {
defaultMessage: 'Unhandled',
})}
</EuiBadge>
</EuiFlexItem>
)}
</EuiFlexGroup>
</ApmHeader>
<SearchBar />
<ErrorGroupHeader groupId={groupId} isUnhandled={isUnhandled} />
<EuiPage>
<EuiPageBody>
<EuiPanel>

2
x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
View file

@ -68,7 +68,7 @@ export function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) {
useTrackPageview({ app: 'apm', path: 'error_group_overview', delay: 15000 });
if (!errorDistributionData || !errorGroupListData) {
return null;
return <SearchBar />;
}
return (