diff --git a/x-pack/plugins/apm/public/application/uxApp.tsx b/x-pack/plugins/apm/public/application/uxApp.tsx index ddcccf45ccab5..e889b0a1e7d68 100644 --- a/x-pack/plugins/apm/public/application/uxApp.tsx +++ b/x-pack/plugins/apm/public/application/uxApp.tsx @@ -22,7 +22,10 @@ import { } from '../../../../../src/plugins/kibana_react/public'; import { APMRouteDefinition } from '../application/routes'; import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange'; -import { RumHome, UX_LABEL } from '../components/app/RumDashboard/RumHome'; +import { + RumHome, + DASHBOARD_LABEL, +} from '../components/app/RumDashboard/RumHome'; import { ApmPluginContext } from '../context/apm_plugin/apm_plugin_context'; import { UrlParamsProvider } from '../context/url_params_context/url_params_context'; import { ConfigSchema } from '../index'; @@ -40,7 +43,7 @@ export const uxRoutes: APMRouteDefinition[] = [ exact: true, path: '/', render: redirectTo('/ux'), - breadcrumb: UX_LABEL, + breadcrumb: DASHBOARD_LABEL, }, ]; diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx index bbc77bcabca52..80c50aac13f0e 100644 --- a/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx @@ -20,7 +20,7 @@ import { KibanaPageTemplateProps } from '../../../../../../../src/plugins/kibana import { useHasRumData } from './hooks/useHasRumData'; import { EmptyStateLoading } from './empty_state_loading'; -export const UX_LABEL = i18n.translate('xpack.apm.ux.title', { +export const DASHBOARD_LABEL = i18n.translate('xpack.apm.ux.title', { defaultMessage: 'Dashboard', }); @@ -28,12 +28,8 @@ export function RumHome() { const { core, observability } = useApmPluginContext(); const PageTemplateComponent = observability.navigation.PageTemplate; - const { isSmall, isXXL } = useBreakpoints(); - const { data: rumHasData, status } = useHasRumData(); - const envStyle = isSmall ? {} : { maxWidth: 500 }; - const noDataConfig: KibanaPageTemplateProps['noDataConfig'] = !rumHasData?.hasData ? { @@ -66,23 +62,7 @@ export function RumHome() { , -
- -
, - , - , - ], - } - : { children: } - } + pageHeader={{ children: }} > {isLoading && }
@@ -95,33 +75,31 @@ export function RumHome() { } function PageHeader() { - const { isSmall } = useBreakpoints(); + const sizes = useBreakpoints(); - const envStyle = isSmall ? {} : { maxWidth: 400 }; + const datePickerStyle = sizes.isMedium ? {} : { maxWidth: '70%' }; return (
-

{UX_LABEL}

+

{DASHBOARD_LABEL}

- +
- + - + - -
- -
+ +
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/ServiceNameFilter/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/ServiceNameFilter/index.tsx index 9d17f980d16d4..5750dd9cf441e 100644 --- a/x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/ServiceNameFilter/index.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/URLFilter/ServiceNameFilter/index.tsx @@ -65,23 +65,22 @@ function ServiceNameFilter({ loading, serviceNames }: Props) { }, [serviceNames, selectedServiceName, updateServiceName, loading]); return ( - <> - { - updateServiceName(event.target.value); - }} - /> - + { + updateServiceName(event.target.value); + }} + /> ); } diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/UserPercentile/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/UserPercentile/index.tsx index df5e7d6682b3f..0a5669095c2e5 100644 --- a/x-pack/plugins/apm/public/components/app/RumDashboard/UserPercentile/index.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/UserPercentile/index.tsx @@ -80,9 +80,9 @@ export function UserPercentile() { return ( onChange(evt.target.value)} /> diff --git a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx index ad55a94d70552..d52e8a412e18f 100644 --- a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx @@ -126,6 +126,7 @@ export function EnvironmentFilter({ return (