github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] Makes service overview page default (#85786) (#85891)

Browse source 
* Closes #81948 by setting the default route for services to the service overview page
also updates links to the general path which gets redirected according to user settings

* fixes incorrect test names

* Update x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx

Co-authored-by: Cauê Marcondes <55978943+cauemarcondes@users.noreply.github.com>

* fixes linting

Co-authored-by: Cauê Marcondes <55978943+cauemarcondes@users.noreply.github.com>

Co-authored-by: Cauê Marcondes <55978943+cauemarcondes@users.noreply.github.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Oliver Gupte 2020-12-15 13:44:49 -05:00 • committed by GitHub
parent 7d7ebb15bb
commit bcafd22574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/apm/e2e/cypress/integration/apm.feature
View file

@ -3,4 +3,4 @@ Feature: APM
Scenario: Transaction duration charts
Given a user browses the APM UI application
When the user inspects the opbeans-node service
Then should redirect to correct path with correct params
Then should redirect to correct path

5
x-pack/plugins/apm/e2e/cypress/support/step_definitions/apm.ts
View file

@ -25,7 +25,6 @@ When(`the user inspects the opbeans-node service`, () => {
.click({ force: true });
});
Then(`should redirect to correct path with correct params`, () => {
cy.url().should('contain', `/app/apm/services/opbeans-node/transactions`);
cy.url().should('contain', `transactionType=request`);
Then(`should redirect to correct path`, () => {
cy.url().should('contain', `/app/apm/services/opbeans-node/overview`);
});

18
x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
View file

@ -27,6 +27,8 @@ import {
CreateAgentConfigurationRouteHandler,
EditAgentConfigurationRouteHandler,
} from './route_handlers/agent_configuration';
import { enableServiceOverview } from '../../../../../common/ui_settings_keys';
import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
/**
* Given a path, redirect to that location, preserving the search and maintaining
@ -143,6 +145,17 @@ function SettingsCustomizeUI(props: RouteComponentProps<{}>) {
);
}
function DefaultServicePageRouteHandler(
props: RouteComponentProps<{ serviceName: string }>
) {
const { uiSettings } = useApmPluginContext().core;
const { serviceName } = props.match.params;
if (uiSettings.get(enableServiceOverview)) {
return renderAsRedirectTo(`/services/${serviceName}/overview`)(props);
}
return renderAsRedirectTo(`/services/${serviceName}/transactions`)(props);
}
/**
* The array of route definitions to be used when the application
* creates the routes.
@ -217,10 +230,7 @@ export const routes: APMRouteDefinition[] = [
exact: true,
path: '/services/:serviceName',
breadcrumb: ({ match }) => match.params.serviceName,
render: (props: RouteComponentProps<{ serviceName: string }>) =>
renderAsRedirectTo(
`/services/${props.match.params.serviceName}/transactions`
)(props),
component: DefaultServicePageRouteHandler,
} as APMRouteDefinition<{ serviceName: string }>,
{
exact: true,

2
x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.tsx
View file

@ -29,7 +29,7 @@ export function Buttons({
const detailsUrl = getAPMHref({
basePath,
path: `/services/${selectedNodeServiceName}/transactions`,
path: `/services/${selectedNodeServiceName}`,
query: urlParams,
});
const focusUrl = getAPMHref({

2
x-pack/plugins/apm/public/components/shared/Links/apm/TransactionOverviewLink.tsx
View file

@ -31,7 +31,7 @@ export function TransactionOverviewLink({ serviceName, ...rest }: Props) {
return (
<APMLink
path={`/services/${serviceName}/transactions`}
path={`/services/${serviceName}`}
query={pickKeys(urlParams as APMQueryParams, ...persistedFilters)}
{...rest}
/>

2
x-pack/plugins/apm/server/ui_settings.ts
View file

@ -36,7 +36,7 @@ export const uiSettings: Record<string, UiSettingsParams<boolean>> = {
name: i18n.translate('xpack.apm.enableServiceOverviewExperimentName', {
defaultMessage: 'APM Service overview',
}),
value: false,
value: true,
description: i18n.translate(
'xpack.apm.enableServiceOverviewExperimentDescription',
{