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

[7.x] Closes #60265. Adds Beta badge to service map (#60482) #60521

Merged
merged 1 commit into from
Mar 19, 2020
Merged

[7.x] Closes #60265. Adds Beta badge to service map (#60482) #60521

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
56 changes: 35 additions & 21 deletions x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@

import {
EuiButton,
EuiEmptyPrompt,
EuiPanel,
EuiFlexGroup,
EuiFlexItem,
EuiPanel
EuiTitle,
EuiText,
EuiSpacer
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
Expand All @@ -18,7 +20,8 @@ import { useKibanaUrl } from '../../../hooks/useKibanaUrl';

export function PlatinumLicensePrompt() {
// Set the height to give it some top margin
const style = { height: '60vh' };
const flexGroupStyle = { height: '60vh' };
const flexItemStyle = { width: 600, textAlign: 'center' as const };

const licensePageUrl = useKibanaUrl(
'/app/kibana',
Expand All @@ -29,30 +32,41 @@ export function PlatinumLicensePrompt() {
<EuiFlexGroup
alignItems="center"
justifyContent="spaceAround"
style={style}
style={flexGroupStyle}
>
<EuiFlexItem grow={false}>
<EuiPanel grow={false} hasShadow={true}>
<EuiEmptyPrompt
actions={[
<EuiButton fill={true} href={licensePageUrl}>
{i18n.translate(
'xpack.apm.serviceMap.licensePromptButtonText',
{
defaultMessage: 'Start 30-day Platinum trial'
}
)}
</EuiButton>
]}
body={<p>{invalidLicenseMessage}</p>}
title={
<EuiFlexItem grow={false} style={flexItemStyle}>
<EuiPanel grow={false} hasShadow={true} paddingSize="none">
<EuiPanel
betaBadgeLabel={i18n.translate('xpack.apm.serviceMap.betaBadge', {
defaultMessage: 'Beta'
})}
betaBadgeTooltipContent={i18n.translate(
'xpack.apm.serviceMap.betaTooltipMessage',
{
defaultMessage:
'This feature is currently in beta. If you encounter any bugs or have feedback, please open an issue or visit our discussion forum.'
}
)}
>
<EuiSpacer size="l" />
<EuiTitle>
<h2>
{i18n.translate('xpack.apm.serviceMap.licensePromptTitle', {
defaultMessage: 'Service maps is available in Platinum.'
})}
</h2>
}
/>
</EuiTitle>
<EuiSpacer size="m" />
<EuiText grow={false}>
<p>{invalidLicenseMessage}</p>
</EuiText>
<EuiSpacer size="l" />
<EuiButton href={licensePageUrl} fill={true}>
{i18n.translate('xpack.apm.serviceMap.licensePromptButtonText', {
defaultMessage: 'Start 30-day Platinum trial'
})}
</EuiButton>
</EuiPanel>
</EuiPanel>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down
23 changes: 22 additions & 1 deletion x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import React, {
useRef,
useState
} from 'react';
import { EuiBetaBadge } from '@elastic/eui';
import styled from 'styled-components';
import { isValidPlatinumLicense } from '../../../../../../../plugins/apm/common/service_map';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { ServiceMapAPIResponse } from '../../../../../../../plugins/apm/server/lib/service_map/get_service_map';
Expand Down Expand Up @@ -56,7 +58,12 @@ ${theme.euiColorLightShade}`,
margin: `-${theme.gutterTypes.gutterLarge}`,
marginTop: 0
};

const BetaBadgeContainer = styled.div`
right: ${theme.gutterTypes.gutterMedium};
position: absolute;
top: ${theme.gutterTypes.gutterSmall};
z-index: 1; /* The element containing the cytoscape canvas has z-index = 0. */
`;
const MAX_REQUESTS = 5;

export function ServiceMap({ serviceName }: ServiceMapProps) {
Expand Down Expand Up @@ -186,6 +193,20 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
<EmptyBanner />
)}
<Popover focusedServiceName={serviceName} />
<BetaBadgeContainer>
<EuiBetaBadge
label={i18n.translate('xpack.apm.serviceMap.betaBadge', {
defaultMessage: 'Beta'
})}
tooltipContent={i18n.translate(
'xpack.apm.serviceMap.betaTooltipMessage',
{
defaultMessage:
'This feature is currently in beta. If you encounter any bugs or have feedback, please open an issue or visit our discussion forum.'
}
)}
/>
</BetaBadgeContainer>
</Cytoscape>
</div>
) : (
Expand Down