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.

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

translate InfraOps visualization component (Part 1 - folder pages) #25194

Merged
merged 14 commits into from
Nov 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"tagCloud": "src/core_plugins/tagcloud",
"xpack.grokDebugger": "x-pack/plugins/grokdebugger",
"xpack.idxMgmt": "x-pack/plugins/index_management",
"xpack.infra": "x-pack/plugins/infra",
"xpack.licenseMgmt": "x-pack/plugins/license_management",
"xpack.monitoring": "x-pack/plugins/monitoring",
"xpack.rollupJobs": "x-pack/plugins/rollup",
Expand All @@ -25,6 +26,9 @@
},
"exclude": [
"src/ui/ui_render/bootstrap/app_bootstrap.js",
"src/ui/ui_render/ui_render_mixin.js"
"src/ui/ui_render/ui_render_mixin.js",
"x-pack/plugins/infra/public/utils/loading_state/loading_result.ts",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These files were excluded because i18n validation tool can not parse them due to an issue in babel parser which is used by the tool.

"x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts"

]
}
21 changes: 12 additions & 9 deletions x-pack/plugins/infra/public/apps/start_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { I18nProvider } from '@kbn/i18n/react';
import { createHashHistory } from 'history';
import React from 'react';
import { ApolloProvider } from 'react-apollo';
Expand All @@ -29,14 +30,16 @@ export async function startApp(libs: InfraFrontendLibs) {
});

libs.framework.render(
<EuiErrorBoundary>
<ReduxStoreProvider store={store}>
<ApolloProvider client={libs.apolloClient}>
<ThemeProvider theme={{ eui: euiVars }}>
<PageRouter history={history} />
</ThemeProvider>
</ApolloProvider>
</ReduxStoreProvider>
</EuiErrorBoundary>
<I18nProvider>
<EuiErrorBoundary>
<ReduxStoreProvider store={store}>
<ApolloProvider client={libs.apolloClient}>
<ThemeProvider theme={{ eui: euiVars }}>
<PageRouter history={history} />
</ThemeProvider>
</ApolloProvider>
</ReduxStoreProvider>
</EuiErrorBoundary>
</I18nProvider>
);
}
10 changes: 9 additions & 1 deletion x-pack/plugins/infra/public/pages/404.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,18 @@
* you may not use this file except in compliance with the Elastic License.
*/

tibmt marked this conversation as resolved.
Show resolved Hide resolved
import { FormattedMessage } from '@kbn/i18n/react';
import React from 'react';

export class NotFoundPage extends React.PureComponent {
public render() {
return <div>No content found</div>;
return (
<div>
<FormattedMessage
id="xpack.infra.notFoundPage.noContentFoundErrorTitle"
defaultMessage="No content found"
/>
</div>
);
}
}
15 changes: 13 additions & 2 deletions x-pack/plugins/infra/public/pages/error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
EuiPageHeaderSection,
EuiTitle,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import React from 'react';
import styled from 'styled-components';
import { Header } from '../components/header';
Expand Down Expand Up @@ -44,13 +45,23 @@ export const ErrorPageBody: React.SFC<{ message: string }> = ({ message }) => {
<EuiPageHeader>
<EuiPageHeaderSection>
<EuiTitle size="m">
<h1>Oops!</h1>
<h1>
<FormattedMessage
id="xpack.infra.errorPage.unexpectedErrorTitle"
defaultMessage="Oops!"
/>
</h1>
</EuiTitle>
</EuiPageHeaderSection>
</EuiPageHeader>
<EuiPageContent>
<EuiCallOut color="danger" title={message} iconType={'alert'}>
<p>Please click the back button and try again.</p>
<p>
<FormattedMessage
id="xpack.infra.errorPage.tryAgainDescription "
defaultMessage="Please click the back button and try again."
/>
</p>
</EuiCallOut>
</EuiPageContent>
</EuiPageBody>
Expand Down
84 changes: 51 additions & 33 deletions x-pack/plugins/infra/public/pages/home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
import React from 'react';

import { HomePageContent } from './page_content';
Expand All @@ -20,37 +21,54 @@ import { WithWaffleTimeUrlState } from '../../containers/waffle/with_waffle_time
import { WithKibanaChrome } from '../../containers/with_kibana_chrome';
import { WithSource } from '../../containers/with_source';

export class HomePage extends React.PureComponent {
public render() {
return (
<ColumnarPage>
<WithSource>
{({ metricIndicesExist }) =>
metricIndicesExist || metricIndicesExist === null ? (
<>
<WithWaffleTimeUrlState />
<WithWaffleFilterUrlState />
<WithWaffleOptionsUrlState />
<Header appendSections={<InfrastructureBetaBadgeHeaderSection />} />
<HomeToolbar />
<HomePageContent />
</>
) : (
<WithKibanaChrome>
{({ basePath }) => (
<EmptyPage
title="Looks like you don't have any metrics indices."
message="Let's add some!"
actionLabel="Setup Instructions"
actionUrl={`${basePath}/app/kibana#/home/tutorial_directory/metrics`}
data-test-subj="noMetricsIndicesPrompt"
/>
)}
</WithKibanaChrome>
)
}
</WithSource>
</ColumnarPage>
);
}
interface HomePageProps {
intl: InjectedIntl;
}

export const HomePage = injectI18n(
class extends React.PureComponent<HomePageProps, {}> {
public static displayName = 'HomePage';
public render() {
const { intl } = this.props;
return (
<ColumnarPage>
<WithSource>
{({ metricIndicesExist }) =>
metricIndicesExist || metricIndicesExist === null ? (
<>
<WithWaffleTimeUrlState />
<WithWaffleFilterUrlState />
<WithWaffleOptionsUrlState />
<Header appendSections={<InfrastructureBetaBadgeHeaderSection />} />
<HomeToolbar />
<HomePageContent />
</>
) : (
<WithKibanaChrome>
{({ basePath }) => (
<EmptyPage
title={intl.formatMessage({
id: 'xpack.infra.homePage.noMetricsIndicesTitle',
defaultMessage: "Looks like you don't have any metrics indices.",
})}
message={intl.formatMessage({
id: 'xpack.infra.homePage.noMetricsIndicesDescription',
defaultMessage: "Let's add some!",
})}
actionLabel={intl.formatMessage({
id: 'xpack.infra.homePage.noMetricsIndicesActionLabel',
defaultMessage: 'Setup Instructions',
})}
actionUrl={`${basePath}/app/kibana#/home/tutorial_directory/metrics`}
data-test-subj="noMetricsIndicesPrompt"
/>
)}
</WithKibanaChrome>
)
}
</WithSource>
</ColumnarPage>
);
}
}
);
43 changes: 34 additions & 9 deletions x-pack/plugins/infra/public/pages/home/toolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/

import { EuiFlexGroup, EuiFlexItem, EuiText, EuiTitle } from '@elastic/eui';
// import { i18n } from '@kbn/i18n';
import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
import React from 'react';

import { AutocompleteField } from '../../components/autocomplete_field';
Expand All @@ -20,25 +22,45 @@ import { WithWaffleOptions } from '../../containers/waffle/with_waffle_options';
import { WithWaffleTime } from '../../containers/waffle/with_waffle_time';
import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion';

const TITLES = {
[InfraNodeType.host]: 'Hosts',
[InfraNodeType.pod]: 'Kubernetes Pods',
[InfraNodeType.container]: 'Docker Containers',
const getTitle = (nodeType: string) => {
const TITLES = {
[InfraNodeType.host as string]: (
<FormattedMessage id="xpack.infra.homePage.toolbar.hostsTitle" defaultMessage="Hosts" />
),
[InfraNodeType.pod as string]: (
<FormattedMessage
id="xpack.infra.homePage.toolbar.kubernetesPodsTitle"
defaultMessage="Kubernetes Pods"
/>
),
[InfraNodeType.container as string]: (
<FormattedMessage
id="xpack.infra.homePage.toolbar.dockerContainersTitle"
defaultMessage="Docker Containers"
/>
),
};
return TITLES[nodeType];
};

export const HomeToolbar: React.SFC = () => (
export const HomeToolbar = injectI18n(({ intl }) => (
<Toolbar>
<EuiFlexGroup alignItems="center">
<EuiFlexItem>
<WithWaffleOptions>
{({ nodeType }) => (
<EuiTitle size="m">
<h1>{TITLES[nodeType]}</h1>
<h1>{getTitle(nodeType)}</h1>
</EuiTitle>
)}
</WithWaffleOptions>
<EuiText color="subdued">
<p>Showing the last 1 minute of data from the time period</p>
<p>
<FormattedMessage
id="xpack.infra.homePage.toolbar.showingLastOneMinuteDataText"
defaultMessage="Showing the last 1 minute of data from the time period"
/>
</p>
</EuiText>
</EuiFlexItem>
<WithWaffleOptions>
Expand Down Expand Up @@ -71,7 +93,10 @@ export const HomeToolbar: React.SFC = () => (
loadSuggestions={loadSuggestions}
onChange={setFilterQueryDraftFromKueryExpression}
onSubmit={applyFilterQueryFromKueryExpression}
placeholder="Search for infrastructure data... (e.g. host.name:host-1)"
placeholder={intl.formatMessage({
id: 'xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder',
defaultMessage: 'Search for infrastructure data… (e.g. host.name:host-1)',
})}
suggestions={suggestions}
value={filterQueryDraft ? filterQueryDraft.expression : ''}
/>
Expand Down Expand Up @@ -111,4 +136,4 @@ export const HomeToolbar: React.SFC = () => (
</EuiFlexItem>
</EuiFlexGroup>
</Toolbar>
);
));
62 changes: 41 additions & 21 deletions x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
import compose from 'lodash/fp/compose';
import React from 'react';
import { Redirect, RouteComponentProps } from 'react-router-dom';
Expand All @@ -15,31 +16,50 @@ import { replaceLogPositionInQueryString } from '../../containers/logs/with_log_
import { WithSource } from '../../containers/with_source';
import { getTimeFromLocation } from './query_params';

type RedirectToNodeLogsProps = RouteComponentProps<{
type RedirectToNodeLogsType = RouteComponentProps<{
nodeName: string;
nodeType: InfraNodeType;
}>;

export const RedirectToNodeLogs = ({
match: {
params: { nodeName, nodeType },
},
location,
}: RedirectToNodeLogsProps) => (
<WithSource>
{({ configuredFields }) => {
if (!configuredFields) {
return <LoadingPage message={`Loading ${nodeType} logs`} />;
}

const searchString = compose(
replaceLogFilterInQueryString(`${configuredFields[nodeType]}: ${nodeName}`),
replaceLogPositionInQueryString(getTimeFromLocation(location))
)('');

return <Redirect to={`/logs?${searchString}`} />;
}}
</WithSource>
interface RedirectToNodeLogsProps extends RedirectToNodeLogsType {
intl: InjectedIntl;
}

export const RedirectToNodeLogs = injectI18n(
({
match: {
params: { nodeName, nodeType },
},
location,
intl,
}: RedirectToNodeLogsProps) => (
<WithSource>
{({ configuredFields }) => {
if (!configuredFields) {
return (
<LoadingPage
message={intl.formatMessage(
{
id: 'xpack.infra.redirectToNodeLogs.loadingNodeLogsMessage',
defaultMessage: 'Loading {nodeType} logs',
},
{
nodeType,
}
)}
/>
);
}

const searchString = compose(
replaceLogFilterInQueryString(`${configuredFields[nodeType]}: ${nodeName}`),
replaceLogPositionInQueryString(getTimeFromLocation(location))
)('');

return <Redirect to={`/logs?${searchString}`} />;
}}
</WithSource>
)
);

export const getNodeLogsUrl = ({
Expand Down
Loading