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

Upgrade EUI to v63.0.6 - updates to new EuiPageTemplate and deprecates old page components #139524

Merged
merged 60 commits into from
Sep 7, 2022
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
2f0dd94
Update all usages of EuiPageTemplate to EuiPageTemplate_Deprecated
Jun 6, 2022
f55db1d
EuiPageContent_Deprecated as EuiPageContent
Jun 28, 2022
3d8e92f
EuiPageContentBody_Deprecated as EuiPageContentBody
Jun 28, 2022
8150158
EuiPageContentHeader_Deprecated as EuiPageContentHeader
Jun 28, 2022
ff13084
EuiPageContentHeaderSection_Deprecated as EuiPageContentHeaderSection
Jun 28, 2022
dd2b86d
EuiPageSideBar_Deprecated as EuiPageSideBar
Jun 28, 2022
1441e14
EuiPageContent__Deprecated to EuiPageContent_Deprecated
Jun 28, 2022
989911a
Fix rogue semi-colons
Aug 3, 2022
80ee608
WIP: NoDataConfigPage & NoDataPage converted to new template
Aug 3, 2022
ea6328c
WIP: KibanaPageTemplateInner converted to use new template
Aug 3, 2022
3edccbd
WIP: `withSolutionNav` now renders the sidebar content properly
Aug 3, 2022
e0354a0
Fixing stickiness of sidebar
Aug 3, 2022
d7a91f3
[Security] Fixed SecuritySolutionTemplateWrapper’s usage
Aug 3, 2022
38bc08f
[O11y] Wrap `children` with EuiPageTemplate.Section
Aug 3, 2022
e25c2c1
Fix getting_started usage
Aug 3, 2022
63d36e6
WIP: Fixing types
Aug 3, 2022
657e2dd
Removing `template` pass through
Aug 9, 2022
a30f768
Set EUI to 63.0.0
Aug 10, 2022
4630a60
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Aug 10, 2022
8bf432f
More import fixes
Aug 10, 2022
0379b68
Sidebar component update
Aug 10, 2022
c4a562d
Expand `KibanaPageTemplate` to all namespaced EUI counterparts
Aug 10, 2022
1d50937
Updated the tutorial mdx page
Aug 10, 2022
542c9c9
[Stack Management] Updated app layout to new template
Aug 11, 2022
07ef84b
Fix circular dep
Aug 11, 2022
8aeb29b
Fix new circular dependency
cee-chen Aug 25, 2022
26901b2
[Security Solution] Remove `template` prop - no longer a prop on Kiba…
cee-chen Aug 26, 2022
e489f36
[O11y] Allow customizing EuiPageTemplate.Section wrapper
cee-chen Aug 26, 2022
dd106d8
[Enterprise Search] Update page templates
cee-chen Aug 26, 2022
8adc28a
Update KibanaPageTemplate tests
cee-chen Aug 26, 2022
95cf2e3
Update snapshots
cee-chen Aug 26, 2022
fc95d52
Fix FTR test with removed EUI classNames
cee-chen Aug 26, 2022
4a1a4d3
Fix FTR tests with changed kbn classNames
cee-chen Aug 26, 2022
6e277cc
Update failing dashboard snapshots
cee-chen Aug 29, 2022
271bcde
Fix failing Security Cypress test
cee-chen Aug 29, 2022
df1ae27
[O11y] Fix Inventory page using deprecated CSS hooks
cee-chen Aug 29, 2022
84c278e
[O11y][Uptime] Fix missing bottom bars
cee-chen Aug 29, 2022
aefaf03
[O11y] Fix route template typing
cee-chen Aug 29, 2022
289331b
Fix broken minWidth behavior
cee-chen Aug 30, 2022
4c124a0
[Security Solution] Type fixes, restore empty state
cee-chen Aug 30, 2022
4f2b524
Fix failing synthetics selector
cee-chen Aug 30, 2022
321f6b1
Grab EUI v63.0.6
cee-chen Aug 31, 2022
0c929b4
Fix Kibana Overview plugin layout
cee-chen Aug 31, 2022
3811b6b
Convert Home plugin to new KibanaPageTemplate
cee-chen Aug 31, 2022
87a54b9
Merge branch 'main' into test/page_template
kibanamachine Aug 31, 2022
0dc8919
Merge branch 'main' into test/page_template
kibanamachine Aug 31, 2022
6238e3c
Merge branch 'main' into test/page_template
kibanamachine Aug 31, 2022
c90b633
Merge branch 'main' into test/page_template
kibanamachine Sep 1, 2022
aed01d5
Merge branch 'main' into test/page_template
kibanamachine Sep 1, 2022
6eacf3c
[O11y] Fix non-centered empty/loading states
cee-chen Sep 1, 2022
8674c6c
[O11y] Restore subdued background on various empty state prompts
cee-chen Sep 1, 2022
cc623b9
[O11y] Fix all instances of views that require a scrollable full-heig…
cee-chen Sep 1, 2022
e7af253
[O11y][ux] Fix broken sidebar
cee-chen Sep 1, 2022
4f7fa44
Merge remote-tracking branch 'upstream/main' into test/page_template
cee-chen Sep 1, 2022
7ee2602
Merge branch 'main' into test/page_template
cee-chen Sep 6, 2022
e330e35
Merge branch 'main' into test/page_template
kibanamachine Sep 6, 2022
462963d
[APM Cypress tests] harden flaky test
cee-chen Sep 6, 2022
f1f429d
[APM Cypress tests] Fix failing Cypress test, again
cee-chen Sep 6, 2022
62d884d
Merge branch 'main' into test/page_template
cee-chen Sep 7, 2022
ce90eec
Merge branch 'main' into test/page_template
kibanamachine Sep 7, 2022
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
Prev Previous commit
Next Next commit
WIP: NoDataConfigPage & NoDataPage converted to new template
- `withSolutionNav` not yet handled
  • Loading branch information
cchaos authored and cee-chen committed Aug 31, 2022

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
commit 80ee608b93bd8bb2f0c6b02560c16e1ce56a32f7
11 changes: 8 additions & 3 deletions packages/shared-ux/page/no_data/impl/src/no_data_page.tsx
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
import React from 'react';
import classNames from 'classnames';

import { EuiLink, EuiSpacer, EuiText, EuiTextColor } from '@elastic/eui';
import { EuiPageTemplate, EuiLink, EuiSpacer, EuiText, EuiTextColor } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';

@@ -51,7 +51,12 @@ export const NoDataPage = ({
);

return (
<div className={classNames('kbnNoDataPageContents', className)} data-test-subj="kbnNoDataPage">
<EuiPageTemplate.Section
alignment="center"
grow
className={classNames('kbnNoDataPageContents', className)}
data-test-subj="kbnNoDataPage"
>
<EuiText textAlign="center">
<KibanaSolutionAvatar name={solution} iconType={logo || `logo${solution}`} size="xxl" />
<EuiSpacer size="l" />
@@ -62,6 +67,6 @@ export const NoDataPage = ({
</EuiText>
<EuiSpacer size="xxl" />
<ActionCard {...{ action }} />
</div>
</EuiPageTemplate.Section>
);
};
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

import React from 'react';
import classNames from 'classnames';
import { EuiPageTemplate_Deprecated as EuiPageTemplate } from '@elastic/eui';
import { EuiPageTemplate } from '@elastic/eui';

import { withSolutionNav } from '@kbn/shared-ux-page-solution-nav';
import { NoDataPage } from '@kbn/shared-ux-page-no-data';
import type { NoDataConfigPageProps } from '@kbn/shared-ux-page-no-data-config-types';

import { NO_DATA_PAGE_TEMPLATE_PROPS } from './constants';
import { NO_DATA_PAGE_MAX_WIDTH } from './constants';

const getClasses = (template?: string, className?: string) => {
return classNames(
@@ -25,19 +25,25 @@ const getClasses = (template?: string, className?: string) => {
};

export const NoDataConfigPage = (props: NoDataConfigPageProps) => {
const { className: classNameProp, noDataConfig, ...rest } = props;
const { className, noDataConfig, ...rest } = props;

if (!noDataConfig) {
return null;
}

const className = getClasses(NO_DATA_PAGE_TEMPLATE_PROPS.template, classNameProp);
const classes = getClasses(undefined, className);

return (
<EuiPageTemplate
data-test-subj={props['data-test-subj']}
{...{ className, ...rest }}
{...NO_DATA_PAGE_TEMPLATE_PROPS}
className={classes}
restrictWidth={NO_DATA_PAGE_MAX_WIDTH}
panelled={false}
// Note: Once all pages have been converted to this new component,
// the following props can be removed to allow the template to auto-handle
// the fixed header and banner heights.
offset={0}
minHeight={0}
{...rest}
>
<NoDataPage {...noDataConfig} />
</EuiPageTemplate>
12 changes: 4 additions & 8 deletions packages/shared-ux/page/no_data_config/types/index.d.ts
Original file line number Diff line number Diff line change
@@ -6,22 +6,18 @@
* Side Public License, v 1.
*/

import { EuiPageTemplateProps_Deprecated } from '@elastic/eui';
import { EuiPageTemplateProps } from '@elastic/eui';

import type {
NoDataPageProps,
NoDataPageServices,
NoDataPageKibanaDependencies,
} from '@kbn/shared-ux-page-no-data-types';
import { KibanaPageTemplateProps } from '@kbn/shared-ux-page-kibana-template-types';

export type NoDataConfigPageKibanaDependencies = NoDataPageKibanaDependencies;
export type NoDataConfigPageServices = NoDataPageServices;
export type NoDataConfig = NoDataPageProps;

export type NoDataConfigPageProps = EuiPageTemplateProps_Deprecated & {
/**
* Accepts a configuration object, that when provided, ignores pageHeader and children and instead
* displays Agent, Beats, and custom cards to direct users to the right ingest location
*/
noDataConfig?: NoDataConfig;
};
export type NoDataConfigPageProps = EuiPageTemplateProps &
Pick<KibanaPageTemplateProps, 'solutionNav' | 'noDataConfig'>;