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

Update usage of deprecated EUI components in SharedUx plugins #163560

Merged
merged 23 commits into from
Aug 14, 2023
Merged

Update usage of deprecated EUI components in SharedUx plugins #163560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9ced484
update deprecated EUI components in screenshotting plugin
vadimkibana Aug 10, 2023
8e1da69
update EUI components in screenshotting_example plugin
vadimkibana Aug 10, 2023
192ac96
update reporting example plugin deprecated EUI component usage
vadimkibana Aug 10, 2023
5dfeca6
update enhanced UI Actions deprecated EUI component usage
vadimkibana Aug 10, 2023
7a29ff6
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Aug 10, 2023
8a2afb3
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Aug 10, 2023
7f58276
stop using deprecated EUI components in UI Actions example plugin
vadimkibana Aug 10, 2023
ff03f5e
update deprecated EUI components in state containers example plugin
vadimkibana Aug 10, 2023
72f29c7
update deprecated EUI components in redirect app
vadimkibana Aug 10, 2023
7c35110
update theme provider import in redirect app
vadimkibana Aug 10, 2023
97ba36e
Merge branch 'main' into eui-deprecations-sharedux
kibanamachine Aug 10, 2023
23d14ba
[CI] Auto-commit changed files from 'node scripts/lint_ts_projects --…
kibanamachine Aug 10, 2023
f486f48
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Aug 10, 2023
8179be2
Merge branch 'main' into eui-deprecations-sharedux
kibanamachine Aug 10, 2023
f5d5e2f
revert back capture test changes
vadimkibana Aug 13, 2023
79fa96f
Merge branch 'main' into eui-deprecations-sharedux
kibanamachine Aug 13, 2023
72cac50
revert reporting_example changes
vadimkibana Aug 13, 2023
6ab9cc2
revert screenshotting_example changes
vadimkibana Aug 14, 2023
34fdb93
revert more screenshotting changes
vadimkibana Aug 14, 2023
63383f9
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Aug 14, 2023
b20d57a
revert screenshotting plugin changes
vadimkibana Aug 14, 2023
db93c05
Merge remote-tracking branch 'origin/eui-deprecations-sharedux' into …
vadimkibana Aug 14, 2023
250bf78
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Aug 14, 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
6 changes: 3 additions & 3 deletions examples/state_containers_examples/public/common/example_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import React, { PropsWithChildren } from 'react';
import { EuiPage, EuiPageSideBar_Deprecated as EuiPageSideBar, EuiSideNav } from '@elastic/eui';
import { EuiPage, EuiPageTemplate, EuiSideNav } from '@elastic/eui';
import { CoreStart } from '@kbn/core/public';

export interface ExampleLink {
Expand Down Expand Up @@ -53,9 +53,9 @@ export const StateContainersExamplesPage: React.FC<Props> = ({
}: PropsWithChildren<Props>) => {
return (
<EuiPage>
<EuiPageSideBar>
<EuiPageTemplate.Sidebar>
<SideNav navigateToApp={navigateToApp} exampleLinks={exampleLinks} />
</EuiPageSideBar>
</EuiPageTemplate.Sidebar>
{children}
</EuiPage>
);
Expand Down
12 changes: 6 additions & 6 deletions examples/state_containers_examples/public/todo/todo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
EuiCheckbox,
EuiFieldText,
EuiPageBody,
EuiPageContent_Deprecated as EuiPageContent,
EuiPageContentBody_Deprecated as EuiPageContentBody,
EuiPageTemplate,
EuiPageSection,
EuiPageHeader,
EuiPageHeaderSection,
EuiSpacer,
Expand Down Expand Up @@ -202,8 +202,8 @@ export const TodoAppPage: React.FC<{
</EuiText>
</EuiPageHeaderSection>
</EuiPageHeader>
<EuiPageContent>
<EuiPageContentBody>
<EuiPageTemplate.Section>
<EuiPageSection>
<Routes>
<Route path={'/completed'}>
<TodoApp filter={'completed'} stateContainer={stateContainer} />
Expand Down Expand Up @@ -233,8 +233,8 @@ export const TodoAppPage: React.FC<{
<EuiButton onClick={() => setUseHashedUrl(!useHashedUrl)}>
{useHashedUrl ? 'Use Expanded State' : 'Use Hashed State'}
</EuiButton>
</EuiPageContentBody>
</EuiPageContent>
</EuiPageSection>
</EuiPageTemplate.Section>
</EuiPageBody>
</Router>
);
Expand Down
6 changes: 3 additions & 3 deletions examples/state_containers_examples/public/with_data_services/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Router } from '@kbn/shared-ux-router';
import {
EuiFieldText,
EuiPageBody,
EuiPageContent_Deprecated as EuiPageContent,
EuiPageTemplate,
EuiPageHeader,
EuiText,
EuiTitle,
Expand Down Expand Up @@ -99,7 +99,7 @@ export const App = ({
useDefaultBehaviors={true}
showSaveQuery={true}
/>
<EuiPageContent>
<EuiPageTemplate.Section>
<EuiText>
<p>In addition to state from query bar also sync your arbitrary application state:</p>
</EuiText>
Expand All @@ -109,7 +109,7 @@ export const App = ({
onChange={(e) => appStateContainer.set({ ...appState, name: e.target.value })}
aria-label="My name"
/>
</EuiPageContent>
</EuiPageTemplate.Section>
</EuiPageBody>
</Router>
</StateContainersExamplesPage>
Expand Down
37 changes: 20 additions & 17 deletions examples/ui_actions_explorer/public/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
import React, { useState } from 'react';
import ReactDOM from 'react-dom';

import { EuiPage } from '@elastic/eui';

import { EuiButton } from '@elastic/eui';
import { EuiPageBody } from '@elastic/eui';
import { EuiPageContent_Deprecated as EuiPageContent } from '@elastic/eui';
import { EuiPageContentBody_Deprecated as EuiPageContentBody } from '@elastic/eui';
import { EuiSpacer } from '@elastic/eui';
import { EuiText } from '@elastic/eui';
import { EuiFieldText } from '@elastic/eui';
import { EuiCallOut } from '@elastic/eui';
import { EuiPageHeader } from '@elastic/eui';
import { EuiModalBody } from '@elastic/eui';
import {
EuiPage,
EuiButton,
EuiPageBody,
EuiPageTemplate,
EuiPageSection,
EuiSpacer,
EuiText,
EuiFieldText,
EuiCallOut,
EuiPageHeader,
EuiModalBody,
} from '@elastic/eui';
import { toMountPoint } from '@kbn/kibana-react-plugin/public';
import { UiActionsStart, createAction } from '@kbn/ui-actions-plugin/public';
import { AppMountParameters, OverlayStart } from '@kbn/core/public';
Expand All @@ -39,9 +40,11 @@ const ActionsExplorer = ({ uiActionsApi, openModal }: Props) => {
return (
<EuiPage>
<EuiPageBody>
<EuiPageHeader>Ui Actions Explorer</EuiPageHeader>
<EuiPageContent>
<EuiPageContentBody>
<EuiPageSection>
<EuiPageHeader pageTitle={'Ui Actions Explorer'} />
</EuiPageSection>
<EuiPageTemplate.Section>
<EuiPageSection>
<EuiText>
<p>
By default there is a single action attached to the `HELLO_WORLD_TRIGGER`. Clicking
Expand Down Expand Up @@ -105,8 +108,8 @@ const ActionsExplorer = ({ uiActionsApi, openModal }: Props) => {
<EuiSpacer />

<ContextMenuExamples />
</EuiPageContentBody>
</EuiPageContent>
</EuiPageSection>
</EuiPageTemplate.Section>
</EuiPageBody>
</EuiPage>
);
Expand Down
25 changes: 7 additions & 18 deletions examples/ui_actions_explorer/public/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,7 @@

import React from 'react';

import {
EuiPageBody,
EuiPageContent_Deprecated as EuiPageContent,
EuiPageContentBody_Deprecated as EuiPageContentBody,
EuiPageHeader,
EuiPageHeaderSection,
EuiTitle,
} from '@elastic/eui';
import { EuiPageBody, EuiPageTemplate, EuiPageSection, EuiPageHeader } from '@elastic/eui';

interface PageProps {
title: string;
Expand All @@ -25,16 +18,12 @@ interface PageProps {
export function Page({ title, children }: PageProps) {
return (
<EuiPageBody data-test-subj="searchTestPage">
<EuiPageHeader>
<EuiPageHeaderSection>
<EuiTitle size="l">
<h1>{title}</h1>
</EuiTitle>
</EuiPageHeaderSection>
</EuiPageHeader>
<EuiPageContent>
<EuiPageContentBody>{children}</EuiPageContentBody>
</EuiPageContent>
<EuiPageSection>
<EuiPageHeader pageTitle={title} />
</EuiPageSection>
<EuiPageTemplate.Section>
<EuiPageSection>{children}</EuiPageSection>
</EuiPageTemplate.Section>
</EuiPageBody>
);
}
22 changes: 6 additions & 16 deletions src/plugins/share/public/url_service/redirect/components/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

import * as React from 'react';
import useObservable from 'react-use/lib/useObservable';
import { EuiPageTemplate_Deprecated as EuiPageTemplate } from '@elastic/eui';
import { EuiPageTemplate } from '@elastic/eui';
import { ThemeServiceSetup } from '@kbn/core/public';
import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
import { CustomBrandingStart } from '@kbn/core-custom-branding-browser';
import { Error } from './error';
import { RedirectManager } from '../redirect_manager';
Expand All @@ -28,27 +28,17 @@ export const Page: React.FC<PageProps> = ({ manager, theme, customBranding }) =>

if (error) {
return (
<KibanaThemeProvider theme$={theme.theme$}>
<EuiPageTemplate
template="centeredContent"
pageContentProps={{
color: 'danger',
}}
>
<KibanaThemeProvider theme={{ theme$: theme.theme$ }}>
<EuiPageTemplate>
<Error error={error} />
</EuiPageTemplate>
</KibanaThemeProvider>
);
}

return (
<KibanaThemeProvider theme$={theme.theme$}>
<EuiPageTemplate
template="centeredContent"
pageContentProps={{
color: 'primary',
}}
>
<KibanaThemeProvider theme={{ theme$: theme.theme$ }}>
<EuiPageTemplate>
<Spinner showPlainSpinner={Boolean(hasCustomBranding)} />
</EuiPageTemplate>
</KibanaThemeProvider>
Expand Down
1 change: 1 addition & 0 deletions src/plugins/share/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@kbn/config-schema",
"@kbn/core-custom-branding-browser",
"@kbn/core-saved-objects-utils-server",
"@kbn/react-kibana-context-theme",
],
"exclude": [
"target/**/*",
Expand Down
27 changes: 7 additions & 20 deletions x-pack/examples/ui_actions_enhanced_examples/public/components/page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,7 @@
*/

import * as React from 'react';
import {
EuiPageBody,
EuiPageContent_Deprecated as EuiPageContent,
EuiPageContentBody_Deprecated as EuiPageContentBody,
EuiPageHeader,
EuiPageHeaderSection,
EuiTitle,
} from '@elastic/eui';
import { EuiPageBody, EuiPageTemplate, EuiPageSection, EuiPageHeader } from '@elastic/eui';

export interface PageProps {
title?: React.ReactNode;
Expand All @@ -22,18 +15,12 @@ export interface PageProps {
export const Page: React.FC<PageProps> = ({ title = 'Untitled', children }) => {
return (
<EuiPageBody style={{ maxWidth: 1200, margin: '0 auto' }}>
<EuiPageHeader>
<EuiPageHeaderSection>
<EuiTitle size="l">
<h1>{title}</h1>
</EuiTitle>
</EuiPageHeaderSection>
</EuiPageHeader>
<EuiPageContent>
<EuiPageContentBody style={{ maxWidth: 800, margin: '0 auto' }}>
{children}
</EuiPageContentBody>
</EuiPageContent>
<EuiPageSection>
<EuiPageHeader pageTitle={title} />
</EuiPageSection>
<EuiPageTemplate.Section>
<EuiPageSection style={{ maxWidth: 800, margin: '0 auto' }}>{children}</EuiPageSection>
</EuiPageTemplate.Section>
</EuiPageBody>
);
};