Skip to content
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

Jump to bottom

[7.x] APM header changes (#82870) #83390

Merged
merged 1 commit into from
Nov 16, 2020
Merged

[7.x] APM header changes (#82870) #83390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions x-pack/plugins/apm/public/application/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ import { ApmPluginSetupDeps } from '../plugin';
import { createCallApmApi } from '../services/rest/createCallApmApi';
import { createStaticIndexPattern } from '../services/rest/index_pattern';
import { setHelpExtension } from '../setHelpExtension';
import { px, units } from '../style/variables';
import { setReadonlyBadge } from '../updateBadge';

const MainContainer = styled.div`
padding: ${px(units.plus)};
height: 100%;
`;

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/app/Correlations/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export function Correlations() {

return (
<>
<EuiTitle size="m">
<EuiTitle>
<h2>Correlations</h2>
</EuiTitle>

Expand Down
108 changes: 58 additions & 50 deletions x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import {
EuiBadge,
EuiFlexGroup,
EuiFlexItem,
EuiPage,
EuiPageBody,
EuiPanel,
EuiSpacer,
EuiText,
Expand All @@ -24,6 +26,7 @@ import { useUrlParams } from '../../../hooks/useUrlParams';
import { callApmApi } from '../../../services/rest/createCallApmApi';
import { fontFamilyCode, fontSizes, px, units } from '../../../style/variables';
import { ApmHeader } from '../../shared/ApmHeader';
import { SearchBar } from '../../shared/search_bar';
import { DetailView } from './DetailView';
import { ErrorDistribution } from './Distribution';

Expand Down Expand Up @@ -120,7 +123,7 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
errorGroupData.error?.error.exception?.[0].handled === false;

return (
<div>
<>
<ApmHeader>
<EuiFlexGroup alignItems="center">
<EuiFlexItem grow={false}>
Expand All @@ -146,62 +149,67 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
)}
</EuiFlexGroup>
</ApmHeader>

<EuiSpacer size="s" />

<EuiPanel>
{showDetails && (
<Titles>
<EuiText>
{logMessage && (
<Fragment>
<SearchBar />
<EuiPage>
<EuiPageBody>
<EuiPanel>
{showDetails && (
<Titles>
<EuiText>
{logMessage && (
<Fragment>
<Label>
{i18n.translate(
'xpack.apm.errorGroupDetails.logMessageLabel',
{
defaultMessage: 'Log message',
}
)}
</Label>
<Message>{logMessage}</Message>
</Fragment>
)}
<Label>
{i18n.translate(
'xpack.apm.errorGroupDetails.logMessageLabel',
'xpack.apm.errorGroupDetails.exceptionMessageLabel',
{
defaultMessage: 'Log message',
defaultMessage: 'Exception message',
}
)}
</Label>
<Message>{logMessage}</Message>
</Fragment>
<Message>{excMessage || NOT_AVAILABLE_LABEL}</Message>
<Label>
{i18n.translate(
'xpack.apm.errorGroupDetails.culpritLabel',
{
defaultMessage: 'Culprit',
}
)}
</Label>
<Culprit>{culprit || NOT_AVAILABLE_LABEL}</Culprit>
</EuiText>
</Titles>
)}
<ErrorDistribution
distribution={errorDistributionData}
title={i18n.translate(
'xpack.apm.errorGroupDetails.occurrencesChartLabel',
{
defaultMessage: 'Occurrences',
}
)}
<Label>
{i18n.translate(
'xpack.apm.errorGroupDetails.exceptionMessageLabel',
{
defaultMessage: 'Exception message',
}
)}
</Label>
<Message>{excMessage || NOT_AVAILABLE_LABEL}</Message>
<Label>
{i18n.translate('xpack.apm.errorGroupDetails.culpritLabel', {
defaultMessage: 'Culprit',
})}
</Label>
<Culprit>{culprit || NOT_AVAILABLE_LABEL}</Culprit>
</EuiText>
</Titles>
)}
<ErrorDistribution
distribution={errorDistributionData}
title={i18n.translate(
'xpack.apm.errorGroupDetails.occurrencesChartLabel',
{
defaultMessage: 'Occurrences',
}
/>
</EuiPanel>
<EuiSpacer size="s" />
{showDetails && (
<DetailView
errorGroup={errorGroupData}
urlParams={urlParams}
location={location}
/>
)}
/>
</EuiPanel>
<EuiSpacer size="s" />
{showDetails && (
<DetailView
errorGroup={errorGroupData}
urlParams={urlParams}
location={location}
/>
)}
</div>
</EuiPageBody>
</EuiPage>
</>
);
}
66 changes: 35 additions & 31 deletions x-pack/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import {
EuiFlexGroup,
EuiFlexItem,
EuiPage,
EuiPanel,
EuiSpacer,
EuiTitle,
Expand All @@ -19,6 +20,7 @@ import { useFetcher } from '../../../hooks/useFetcher';
import { useUrlParams } from '../../../hooks/useUrlParams';
import { callApmApi } from '../../../services/rest/createCallApmApi';
import { LocalUIFilters } from '../../shared/LocalUIFilters';
import { SearchBar } from '../../shared/search_bar';
import { ErrorDistribution } from '../ErrorGroupDetails/Distribution';
import { ErrorGroupList } from './List';

Expand Down Expand Up @@ -95,39 +97,41 @@ function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) {

return (
<>
<EuiSpacer />
<EuiFlexGroup>
<EuiFlexItem grow={1}>
<LocalUIFilters {...localUIFiltersConfig} />
</EuiFlexItem>
<EuiFlexItem grow={7}>
<EuiPanel>
<ErrorDistribution
distribution={errorDistributionData}
title={i18n.translate(
'xpack.apm.serviceDetails.metrics.errorOccurrencesChartTitle',
{
defaultMessage: 'Error occurrences',
}
)}
/>
</EuiPanel>

<EuiSpacer size="s" />

<EuiPanel>
<EuiTitle size="xs">
<h3>Errors</h3>
</EuiTitle>
<SearchBar />
<EuiPage>
<EuiFlexGroup>
<EuiFlexItem grow={1}>
<LocalUIFilters {...localUIFiltersConfig} />
</EuiFlexItem>
<EuiFlexItem grow={7}>
<EuiPanel>
<ErrorDistribution
distribution={errorDistributionData}
title={i18n.translate(
'xpack.apm.serviceDetails.metrics.errorOccurrencesChartTitle',
{
defaultMessage: 'Error occurrences',
}
)}
/>
</EuiPanel>

<EuiSpacer size="s" />

<ErrorGroupList
items={errorGroupListData}
serviceName={serviceName}
/>
</EuiPanel>
</EuiFlexItem>
</EuiFlexGroup>
<EuiPanel>
<EuiTitle size="xs">
<h3>Errors</h3>
</EuiTitle>
<EuiSpacer size="s" />

<ErrorGroupList
items={errorGroupListData}
serviceName={serviceName}
/>
</EuiPanel>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPage>
</>
);
}
Expand Down
101 changes: 49 additions & 52 deletions x-pack/plugins/apm/public/components/app/Home/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,79 +4,76 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiTabs, EuiTitle } from '@elastic/eui';
import { EuiTab, EuiTitle } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
import React, { ComponentType } from 'react';
import { $ElementType } from 'utility-types';
import { ApmHeader } from '../../shared/ApmHeader';
import { EuiTabLink } from '../../shared/EuiTabLink';
import { ServiceMapLink } from '../../shared/Links/apm/ServiceMapLink';
import { ServiceInventoryLink } from '../../shared/Links/apm/service_inventory_link';
import { TraceOverviewLink } from '../../shared/Links/apm/TraceOverviewLink';
import { useServiceMapHref } from '../../shared/Links/apm/ServiceMapLink';
import { useServiceInventoryHref } from '../../shared/Links/apm/service_inventory_link';
import { useTraceOverviewHref } from '../../shared/Links/apm/TraceOverviewLink';
import { MainTabs } from '../../shared/main_tabs';
import { ServiceMap } from '../ServiceMap';
import { ServiceInventory } from '../service_inventory';
import { TraceOverview } from '../TraceOverview';

const homeTabs = [
{
link: (
<ServiceInventoryLink>
{i18n.translate('xpack.apm.home.servicesTabLabel', {
defaultMessage: 'Services',
})}
</ServiceInventoryLink>
),
render: () => <ServiceInventory />,
name: 'services',
},
{
link: (
<TraceOverviewLink>
{i18n.translate('xpack.apm.home.tracesTabLabel', {
defaultMessage: 'Traces',
})}
</TraceOverviewLink>
),
render: () => <TraceOverview />,
name: 'traces',
},
{
link: (
<ServiceMapLink>
{i18n.translate('xpack.apm.home.serviceMapTabLabel', {
defaultMessage: 'Service Map',
})}
</ServiceMapLink>
),
render: () => <ServiceMap />,
name: 'service-map',
},
];
interface Tab {
key: string;
href: string;
text: string;
Component: ComponentType;
}

interface Props {
tab: 'traces' | 'services' | 'service-map';
}

export function Home({ tab }: Props) {
const homeTabs: Tab[] = [
{
key: 'services',
href: useServiceInventoryHref(),
text: i18n.translate('xpack.apm.home.servicesTabLabel', {
defaultMessage: 'Services',
}),
Component: ServiceInventory,
},
{
key: 'traces',
href: useTraceOverviewHref(),
text: i18n.translate('xpack.apm.home.tracesTabLabel', {
defaultMessage: 'Traces',
}),
Component: TraceOverview,
},
{
key: 'service-map',
href: useServiceMapHref(),
text: i18n.translate('xpack.apm.home.serviceMapTabLabel', {
defaultMessage: 'Service Map',
}),
Component: ServiceMap,
},
];
const selectedTab = homeTabs.find(
(homeTab) => homeTab.name === tab
(homeTab) => homeTab.key === tab
) as $ElementType<typeof homeTabs, number>;

return (
<div>
<>
<ApmHeader>
<EuiTitle size="l">
<EuiTitle>
<h1>APM</h1>
</EuiTitle>
</ApmHeader>
<EuiTabs>
{homeTabs.map((homeTab) => (
<EuiTabLink isSelected={homeTab === selectedTab} key={homeTab.name}>
{homeTab.link}
</EuiTabLink>
<MainTabs>
{homeTabs.map(({ href, key, text }) => (
<EuiTab href={href} isSelected={key === selectedTab.key} key={key}>
{text}
</EuiTab>
))}
</EuiTabs>
{selectedTab.render()}
</div>
</MainTabs>
<selectedTab.Component />
</>
);
}
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function RumHome() {
<CsmSharedContextProvider>
<EuiFlexGroup>
<EuiFlexItem>
<EuiTitle size="l">
<EuiTitle>
<h1 className="eui-textNoWrap">{UX_LABEL}</h1>
</EuiTitle>
</EuiFlexItem>
Expand Down
Loading