Skip to content

Commit

Permalink
[UX] Update csm app name to UX (#78179)
Browse files Browse the repository at this point in the history
  • Loading branch information
shahzad31 authored Sep 24, 2020
1 parent 4d08763 commit 3618cef
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Given(`a user browses the APM UI application for RUM Data`, () => {
const RANGE_FROM = 'now-24h';
const RANGE_TO = 'now';
loginAndWaitForPage(
`/app/csm`,
`/app/ux`,
{
from: RANGE_FROM,
to: RANGE_TO,
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/apm/public/application/csmApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
import { APMRouteDefinition } from '../application/routes';
import { renderAsRedirectTo } from '../components/app/Main/route_config';
import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
import { RumHome } from '../components/app/RumDashboard/RumHome';
import { RumHome, UX_LABEL } from '../components/app/RumDashboard/RumHome';
import { ApmPluginContext } from '../context/ApmPluginContext';
import { LoadingIndicatorProvider } from '../context/LoadingIndicatorContext';
import { UrlParamsProvider } from '../context/UrlParamsContext';
Expand All @@ -39,8 +39,8 @@ export const rumRoutes: APMRouteDefinition[] = [
{
exact: true,
path: '/',
render: renderAsRedirectTo('/csm'),
breadcrumb: 'Client Side Monitoring',
render: renderAsRedirectTo('/ux'),
breadcrumb: UX_LABEL,
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ import { i18n } from '@kbn/i18n';
import { RumOverview } from '../RumDashboard';
import { RumHeader } from './RumHeader';

export const UX_LABEL = i18n.translate('xpack.apm.ux.title', {
defaultMessage: 'User Experience',
});

export function RumHome() {
return (
<div>
<RumHeader>
<EuiFlexGroup alignItems="center">
<EuiFlexItem grow={false}>
<EuiTitle size="l">
<h1>
{i18n.translate('xpack.apm.csm.title', {
defaultMessage: 'Client Side Monitoring',
})}
</h1>
<h1>{UX_LABEL}</h1>
</EuiTitle>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import { useApmPluginContext } from '../../../hooks/useApmPluginContext';

export function ClientSideMonitoringCallout() {
const { core } = useApmPluginContext();
const clientSideMonitoringHref = core.http.basePath.prepend(`/app/csm`);
const clientSideMonitoringHref = core.http.basePath.prepend(`/app/ux`);

return (
<EuiCallOut
iconType="cheer"
title={i18n.translate(
'xpack.apm.transactionOverview.clientSideMonitoring.calloutTitle',
{ defaultMessage: 'Introducing: Client Side Monitoring' }
{ defaultMessage: 'Introducing: Elastic User Experience' }
)}
>
<EuiText>
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
});

core.application.register({
id: 'csm',
title: 'Client Side Monitoring',
id: 'ux',
title: 'User Experience',
order: 8500,
euiIconType: 'logoObservability',
category: DEFAULT_APP_CATEGORIES.observability,
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/apm/server/feature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import {
export const APM_FEATURE = {
id: 'apm',
name: i18n.translate('xpack.apm.featureRegistry.apmFeatureName', {
defaultMessage: 'APM and Client Side Monitoring',
defaultMessage: 'APM and User Experience',
}),
order: 900,
category: DEFAULT_APP_CATEGORIES.observability,
icon: 'apmApp',
navLinkId: 'apm',
app: ['apm', 'csm', 'kibana'],
app: ['apm', 'ux', 'kibana'],
catalogue: ['apm'],
management: {
insightsAndAlerting: ['triggersActions'],
Expand All @@ -31,7 +31,7 @@ export const APM_FEATURE = {
// see x-pack/plugins/features/common/feature_kibana_privileges.ts
privileges: {
all: {
app: ['apm', 'csm', 'kibana'],
app: ['apm', 'ux', 'kibana'],
api: ['apm', 'apm_write'],
catalogue: ['apm'],
savedObject: {
Expand All @@ -47,7 +47,7 @@ export const APM_FEATURE = {
ui: ['show', 'save', 'alerting:show', 'alerting:save'],
},
read: {
app: ['apm', 'csm', 'kibana'],
app: ['apm', 'ux', 'kibana'],
api: ['apm'],
catalogue: ['apm'],
savedObject: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
expect(navLinks.map((link) => link.text)).to.eql([
'Overview',
'APM',
'Client Side Monitoring',
'User Experience',
'Stack Management',
]);
});
Expand Down Expand Up @@ -114,7 +114,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {

it('shows apm navlink', async () => {
const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
expect(navLinks).to.eql(['Overview', 'APM', 'Client Side Monitoring', 'Stack Management']);
expect(navLinks).to.eql(['Overview', 'APM', 'User Experience', 'Stack Management']);
});

it('can navigate to APM app', async () => {
Expand Down

0 comments on commit 3618cef

Please sign in to comment.