maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Logs / Metrics UI] Remove path prefix from ViewSourceConfigur… (#58238)

Browse source 
In the NP the routes have already the app name on them. Adding it to
this button made the app name double

    /app/metrics/metrics/settings
    /app/logs/logs/settings

The button only needs to go to the settings page within the app where
it's being loaded, so we can safely drop the prefix.

Closes #58233
This commit is contained in:
Alejandro Fernández 2020-02-25 13:39:13 +01:00 committed by GitHub
parent 6fc6cb8b36
commit db276d1894
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
x-pack/plugins/infra/public/components/source_configuration/index.ts
View file

@ -5,7 +5,4 @@
*/
export { SourceConfigurationSettings } from './source_configuration_settings';
export {
ViewSourceConfigurationButton,
ViewSourceConfigurationButtonHrefBase,
} from './view_source_configuration_button';
export { ViewSourceConfigurationButton } from './view_source_configuration_button';

9
x-pack/plugins/infra/public/components/source_configuration/view_source_configuration_button.tsx
View file

@ -8,23 +8,16 @@ import { EuiButton } from '@elastic/eui';
import React from 'react';
import { Route } from 'react-router-dom';
export enum ViewSourceConfigurationButtonHrefBase {
infrastructure = 'infrastructure',
logs = 'logs',
}
interface ViewSourceConfigurationButtonProps {
'data-test-subj'?: string;
hrefBase: ViewSourceConfigurationButtonHrefBase;
children: React.ReactNode;
}
export const ViewSourceConfigurationButton = ({
'data-test-subj': dataTestSubj,
hrefBase,
children,
}: ViewSourceConfigurationButtonProps) => {
const href = `/${hrefBase}/settings`;
const href = '/settings';
return (
<Route

10
x-pack/plugins/infra/public/pages/infrastructure/snapshot/index.tsx
View file

@ -18,10 +18,7 @@ import { ColumnarPage } from '../../../components/page';
import { SourceErrorPage } from '../../../components/source_error_page';
import { SourceLoadingPage } from '../../../components/source_loading_page';
import {
ViewSourceConfigurationButton,
ViewSourceConfigurationButtonHrefBase,
} from '../../../components/source_configuration';
import { ViewSourceConfigurationButton } from '../../../components/source_configuration';
import { Source } from '../../../containers/source';
import { WithWaffleFilterUrlState } from '../../../containers/waffle/with_waffle_filters';
import { WithWaffleOptionsUrlState } from '../../../containers/waffle/with_waffle_options';
@ -92,10 +89,7 @@ export const SnapshotPage = () => {
</EuiFlexItem>
{uiCapabilities?.infrastructure?.configureSource ? (
<EuiFlexItem>
<ViewSourceConfigurationButton
data-test-subj="configureSourceButton"
hrefBase={ViewSourceConfigurationButtonHrefBase.infrastructure}
>
<ViewSourceConfigurationButton data-test-subj="configureSourceButton">
{i18n.translate('xpack.infra.configureSourceActionLabel', {
defaultMessage: 'Change source configuration',
})}

10
x-pack/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
View file

@ -10,10 +10,7 @@ import { identity } from 'fp-ts/lib/function';
import React from 'react';
import { NoIndices } from '../../../components/empty_states/no_indices';
import {
ViewSourceConfigurationButton,
ViewSourceConfigurationButtonHrefBase,
} from '../../../components/source_configuration';
import { ViewSourceConfigurationButton } from '../../../components/source_configuration';
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
export const LogsPageNoIndicesContent = () => {
@ -49,10 +46,7 @@ export const LogsPageNoIndicesContent = () => {
</EuiFlexItem>
{canConfigureSource ? (
<EuiFlexItem>
<ViewSourceConfigurationButton
data-test-subj="configureSourceButton"
hrefBase={ViewSourceConfigurationButtonHrefBase.logs}
>
<ViewSourceConfigurationButton data-test-subj="configureSourceButton">
{i18n.translate('xpack.infra.configureSourceActionLabel', {
defaultMessage: 'Change source configuration',
})}

10
x-pack/plugins/infra/public/pages/metrics/components/invalid_node.tsx
View file

@ -10,10 +10,7 @@ import { identity } from 'fp-ts/lib/function';
import React from 'react';
import { euiStyled } from '../../../../../observability/public';
import {
ViewSourceConfigurationButton,
ViewSourceConfigurationButtonHrefBase,
} from '../../../components/source_configuration';
import { ViewSourceConfigurationButton } from '../../../components/source_configuration';
import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
interface InvalidNodeErrorProps {
@ -59,10 +56,7 @@ export const InvalidNodeError: React.FunctionComponent<InvalidNodeErrorProps> =
</EuiButton>
</EuiFlexItem>
<EuiFlexItem>
<ViewSourceConfigurationButton
data-test-subj="configureSourceButton"
hrefBase={ViewSourceConfigurationButtonHrefBase.infrastructure}
>
<ViewSourceConfigurationButton data-test-subj="configureSourceButton">
<FormattedMessage
id="xpack.infra.configureSourceActionLabel"
defaultMessage="Change source configuration"