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.

Sign up for GitHub

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

[Infra UI][Stack Monitoring] Migrate EuiPage*_Depracated usage #161870

Merged
merged 7 commits into from
Jul 20, 2023
Merged

[Infra UI][Stack Monitoring] Migrate EuiPage*_Depracated usage #161870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59eafea
Migrate EuiPage*_Depracated usage
crespocarlos Jul 13, 2023
e5967ff
Update snapshot
crespocarlos Jul 13, 2023
1df0cb0
Clean up and small fixes
crespocarlos Jul 13, 2023
8a32fe6
CR fixes
crespocarlos Jul 17, 2023
c6be2a6
Merge branch 'main' into 161404-migrate-euipage_deprecated_usage
kibanamachine Jul 17, 2023
d389c3e
Merge branch 'main' into 161404-migrate-euipage_deprecated_usage
kibanamachine Jul 17, 2023
2f7c2f5
Merge branch 'main' of github.com:elastic/kibana into 161404-migrate-…
crespocarlos Jul 20, 2023
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
58 changes: 23 additions & 35 deletions x-pack/plugins/infra/public/pages/error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,7 @@
* 2.0.
*/

import {
EuiCallOut,
EuiPage,
EuiPageBody,
EuiPageContent_Deprecated as EuiPageContent,
EuiPageHeader,
EuiPageHeaderSection,
EuiTitle,
} from '@elastic/eui';
import { EuiCallOut, EuiTitle, EuiPageTemplate } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import React from 'react';

Expand Down Expand Up @@ -41,31 +33,27 @@ export const Error: React.FC<Props> = ({ message }) => {

export const ErrorPageBody: React.FC<{ message: string }> = ({ message }) => {
return (
<EuiPage style={{ flex: '1 0 auto' }}>
<EuiPageBody>
<EuiPageHeader>
<EuiPageHeaderSection>
<EuiTitle size="m">
<h1>
<FormattedMessage
id="xpack.infra.errorPage.unexpectedErrorTitle"
defaultMessage="Oops!"
/>
</h1>
</EuiTitle>
</EuiPageHeaderSection>
</EuiPageHeader>
<EuiPageContent>
<EuiCallOut color="danger" title={message} iconType="error">
<p>
<FormattedMessage
id="xpack.infra.errorPage.tryAgainDescription "
defaultMessage="Please click the back button and try again."
/>
</p>
</EuiCallOut>
</EuiPageContent>
</EuiPageBody>
</EuiPage>
<EuiPageTemplate offset={0} restrictWidth={false} bottomBorder={false} grow={false}>
<EuiPageTemplate.Header>
<EuiTitle size="m">
<h1>
<FormattedMessage
id="xpack.infra.errorPage.unexpectedErrorTitle"
defaultMessage="Oops!"
/>
</h1>
</EuiTitle>
</EuiPageTemplate.Header>
<EuiPageTemplate.Section>
<EuiCallOut color="danger" title={message} iconType="error">
<p>
<FormattedMessage
id="xpack.infra.errorPage.tryAgainDescription "
defaultMessage="Please click the back button and try again."
/>
</p>
</EuiCallOut>
</EuiPageTemplate.Section>
</EuiPageTemplate>
);
};
12 changes: 3 additions & 9 deletions x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
* 2.0.
*/

import {
EuiCodeBlock,
EuiPage,
EuiPageBody,
EuiPageContent_Deprecated as EuiPageContent,
PropsOf,
} from '@elastic/eui';
import { EuiCodeBlock, EuiPage, EuiPageBody, EuiPanel, PropsOf } from '@elastic/eui';
import { I18nProvider } from '@kbn/i18n-react';
import { Meta, Story } from '@storybook/react/types-6-0';
import React from 'react';
Expand All @@ -36,9 +30,9 @@ export default {
>
<EuiPage restrictWidth>
<EuiPageBody>
<EuiPageContent>
<EuiPanel>
<WrappedStory />
</EuiPageContent>
</EuiPanel>
</EuiPageBody>
</EuiPage>
</MockIndexPatternsKibanaContextProvider>
Expand Down
7 changes: 3 additions & 4 deletions x-pack/plugins/infra/public/pages/metrics/metric_detail/components/chart_section_vis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ import {
TooltipProps,
Tooltip,
} from '@elastic/charts';
import { EuiPageContentBody_Deprecated as EuiPageContentBody } from '@elastic/eui';
import { EuiPageSection } from '@elastic/eui';
import { useTimelineChartTheme } from '../../../../utils/use_timeline_chart_theme';

import { SeriesChart } from './series_chart';
import {
getFormatter,
Expand Down Expand Up @@ -111,7 +110,7 @@ export const ChartSectionVis = ({
}

return (
<EuiPageContentBody>
<EuiPageSection>
<div className="infrastructureChart" style={{ height: 250, marginBottom: 16 }}>
<Chart>
<Axis
Expand Down Expand Up @@ -143,6 +142,6 @@ export const ChartSectionVis = ({
/>
</Chart>
</div>
</EuiPageContentBody>
</EuiPageSection>
);
};
6 changes: 3 additions & 3 deletions x-pack/plugins/infra/public/pages/metrics/metric_detail/components/gauges_section_vis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import {
EuiFlexItem,
EuiPageContentBody_Deprecated as EuiPageContentBody,
EuiPageSection,
EuiPanel,
EuiProgress,
EuiSpacer,
Expand Down Expand Up @@ -54,7 +54,7 @@ export const GaugesSectionVis = ({
return null;
}
return (
<EuiPageContentBody>
<EuiPageSection>
<EuiSpacer size="m" />
<GroupBox>
{metric.series.map((series) => {
Expand Down Expand Up @@ -93,7 +93,7 @@ export const GaugesSectionVis = ({
})}
</GroupBox>
<EuiSpacer size="m" />
</EuiPageContentBody>
</EuiPageSection>
);
};

Expand Down
13 changes: 0 additions & 13 deletions x-pack/plugins/infra/public/pages/metrics/metric_detail/components/layout_content.tsx
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...ck/plugins/infra/public/pages/metrics/metric_detail/components/layouts/aws_ec2_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
* 2.0.
*/

import { EuiPanel } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { withTheme } from '@kbn/kibana-react-plugin/common';
import React from 'react';
import type { LayoutPropsWithTheme } from '../../types';
import { ChartSectionVis } from '../chart_section_vis';
import { LayoutContent } from '../layout_content';
import { MetadataDetails } from '../metadata_details';
import { Section } from '../section';
import { SubSection } from '../sub_section';
Expand All @@ -28,7 +28,7 @@ export const AwsEC2Layout = withTheme(
'cloud.project.id',
]}
/>
<LayoutContent>
<EuiPanel>
<Section
navLabel="AWS EC2"
sectionLabel={i18n.translate(
Expand Down Expand Up @@ -129,7 +129,7 @@ export const AwsEC2Layout = withTheme(
/>
</SubSection>
</Section>
</LayoutContent>
</EuiPanel>
</React.Fragment>
)
);
Loading