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 v76.3.0 #153341

Merged
merged 14 commits into from
Mar 23, 2023
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"@elastic/datemath": "5.0.3",
"@elastic/elasticsearch": "npm:@elastic/[email protected]",
"@elastic/ems-client": "8.4.0",
"@elastic/eui": "76.0.2",
"@elastic/eui": "76.3.0",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ export const getEuiContextMapping = (): EuiTokensObject => {
'core.euiSelectable.screenReaderInstructions',
{
defaultMessage:
'Use up and down arrows to move focus over options. Enter to select. Escape to collapse options.',
'Use the Up and Down arrow keys to move focus over options. Press Enter to select. Press Escape to collapse options.',
}
),
'euiSelectable.searchResults': ({ resultsLength }: EuiValues) =>
Expand Down Expand Up @@ -1664,11 +1664,6 @@ export const getEuiContextMapping = (): EuiTokensObject => {
'You are in a form selector and must select a single option. Use the Up and Down arrow keys to navigate or Escape to close.',
}
),
'euiSuperSelectControl.selectAnOption': ({ selectedValue }: EuiValues) =>
i18n.translate('core.euiSuperSelectControl.selectAnOption', {
defaultMessage: 'Select an option: {selectedValue}, is selected',
values: { selectedValue },
}),
'euiSuperUpdateButton.cannotUpdateTooltip': i18n.translate(
'core.euiSuperUpdateButton.cannotUpdateTooltip',
{
Expand Down Expand Up @@ -1812,5 +1807,25 @@ export const getEuiContextMapping = (): EuiTokensObject => {
defaultMessage: 'Loaded {contentAriaLabel}',
values: { contentAriaLabel },
}),
'euiDualRange.sliderScreenReaderInstructions': i18n.translate(
'core.euiDualRange.sliderScreenReaderInstructions',
{
defaultMessage:
'You are in a custom range slider. Use the Up and Down arrow keys to change the minimum value. Press Tab to interact with the maximum value.',
description: 'Screen reader instructions for changing dual range slider values.',
}
),
'euiRange.sliderScreenReaderInstructions': i18n.translate(
'core.euiRange.sliderScreenReaderInstructions',
{
defaultMessage:
'You are in a custom range slider. Use the Up and Down arrow keys to change the value.',
description: 'Screen reader instructions for changing range slider values.',
}
),
'euiSuperSelect.ariaLabel': i18n.translate('core.euiSuperSelect.ariaLabel', {
defaultMessage: 'Select listbox',
description: 'Accessible label for Super Selects without a visible label.',
}),
};
};
2 changes: 1 addition & 1 deletion src/dev/license_checker/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ export const LICENSE_OVERRIDES = {
'[email protected]': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
'@mapbox/[email protected]': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
'@elastic/[email protected]': ['Elastic License 2.0'],
'@elastic/eui@76.0.2': ['SSPL-1.0 OR Elastic License 2.0'],
'@elastic/eui@76.3.0': ['SSPL-1.0 OR Elastic License 2.0'],
'[email protected]': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
};
13 changes: 5 additions & 8 deletions test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
"outDir": "target/types",
"types": [
"node",
"cheerio",
"@emotion/react/types/css-prop",
"@kbn/ambient-ui-types",
"@kbn/ambient-ftr-types",
"@kbn/ambient-ftr-types"
]
},
"include": [
Expand All @@ -16,13 +17,9 @@
"api_integration/apis/logstash/pipeline/fixtures/*.json",
"api_integration/apis/logstash/pipelines/fixtures/*.json",
"api_integration/apis/telemetry/fixtures/*.json",
"api_integration/apis/telemetry/fixtures/*.json",
],
"exclude": [
"target/**/*",
"*/plugins/**/*",
"plugins/**/*",
"api_integration/apis/telemetry/fixtures/*.json"
],
"exclude": ["target/**/*", "*/plugins/**/*", "plugins/**/*"],
"kbn_references": [
"@kbn/core",
{ "path": "../src/setup_node_env/tsconfig.json" },
Expand Down Expand Up @@ -68,6 +65,6 @@
"@kbn/safer-lodash-set",
"@kbn/utility-types",
"@kbn/dev-proc-runner",
"@kbn/enterprise-search-plugin",
"@kbn/enterprise-search-plugin"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ describe('SelectAnomalySeverity', () => {
/>,
{ wrapper: Wrapper }
);
const button = (await result.findAllByText('critical'))[1];

// SR-only text 'Critical, is selected'
// was removed here: https://github.com/elastic/eui/pull/6630#discussion_r1123655995
const button = await result.findByText('critical');

button.click();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ describe('Severity form field', () => {
// default to LOW in this test configuration
it('defaults to the correct value', () => {
const result = appMockRender.render(<SeverityFilter {...props} />);
// two items. one for the popover one for the selected field
expect(result.getAllByTestId('case-severity-filter-low').length).toBe(2);
// Popver span and ID was removed here:
// https://github.com/elastic/eui/pull/6630#discussion_r1123655995
expect(result.getAllByTestId('case-severity-filter-low').length).toBe(1);
});

it('selects the correct value when changed', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ describe('ConnectorsDropdown', () => {
.find('[data-test-subj="dropdown-connectors"]')
.first()
.text()
.includes('My SN connector, is selected')
.includes('My SN connector')
).toBeTruthy();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,9 @@ describe('Create case', () => {
await waitForFormToRender(screen);

expect(screen.getByTestId('caseSeverity')).toBeTruthy();
// there should be 2 low elements. one for the options popover and one for the displayed one.
expect(screen.getAllByTestId('case-severity-selection-low').length).toBe(2);
// ID removed for options dropdown here:
// https://github.com/elastic/eui/pull/6630#discussion_r1123657852
expect(screen.getAllByTestId('case-severity-selection-low').length).toBe(1);

await waitForComponentToUpdate();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ describe('Severity form field', () => {
</MockHookWrapperComponent>
);
expect(result.getByTestId('caseSeverity')).toBeTruthy();
// two items. one for the popover one for the selected field
expect(result.getAllByTestId('case-severity-selection-low').length).toBe(2);
// ID removed for options dropdown here:
// https://github.com/elastic/eui/pull/6630#discussion_r1123657852
expect(result.getAllByTestId('case-severity-selection-low').length).toBe(1);
});

it('selects the correct value when changed', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('SelectSeverity', () => {
);

// assert initial state
expect(getAllByText('warning')).toHaveLength(2);
expect(getAllByText('warning')).toHaveLength(1);
expect(queryByText('minor')).not.toBeInTheDocument();
expect(queryByText('major')).not.toBeInTheDocument();
expect(queryByText('critical')).not.toBeInTheDocument();
Expand All @@ -48,7 +48,7 @@ describe('SelectSeverity', () => {
});

// assert open popover
expect(getAllByText('warning')).toHaveLength(3);
expect(getAllByText('warning')).toHaveLength(2);
expect(getAllByText('minor')).toHaveLength(1);
expect(getAllByText('major')).toHaveLength(1);
expect(getAllByText('critical')).toHaveLength(1);
Expand All @@ -63,7 +63,7 @@ describe('SelectSeverity', () => {
await waitFor(() => {
expect(queryByText('warning')).not.toBeInTheDocument();
expect(queryByText('minor')).not.toBeInTheDocument();
expect(getAllByText('major')).toHaveLength(2);
expect(getAllByText('major')).toHaveLength(1);
expect(queryByText('critical')).not.toBeInTheDocument();
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ journey('Exploratory view', async ({ page, params }) => {
await page.click('[aria-label="Remove report metric"]');
await page.click('button:has-text("Select report metric")');
await page.click('button:has-text("Step duration")');
await page.click('text=Select an option: Monitor type, is selectedMonitor type >> button');
await page.click('button[data-test-subj="seriesBreakdown"]:has-text("Monitor type")');
await page.click('button[role="option"]:has-text("Step name")');
await page.click('.euiComboBox__inputWrap');
await page.click(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ describe('OperationTypeSelect', function () {
it('should render properly', function () {
render(<OperationTypeSelect seriesId={0} series={mockUxSeries} />);

screen.getByText('Select an option: , is selected');
// SR-only text 'Select an option: , is selected'
// was removed here: https://github.com/elastic/eui/pull/6630#discussion_r1123655995
screen.getByRole('button');
});

it('should display selected value', function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,22 @@ journey(`MonitorManagementList`, async ({ page, params }) => {
await page.click('[aria-label="expands filter group for Type filter"]');
});

step(
'Click [aria-label="Use up and down arrows to move focus over options. Enter to select. Escape to collapse options."] >> text="Journey / Page"',
async () => {
await page.click(
'[aria-label="Use up and down arrows to move focus over options. Enter to select. Escape to collapse options."] >> text="Journey / Page"'
);
await page.click('[aria-label="Apply the selected filters for Type"]');
expect(page.url()).toBe(`${pageBaseUrl}?monitorTypes=%5B%22browser%22%5D`);
await page.click('[placeholder="Search by name, url, host, tag, project or location"]');
await Promise.all([
page.waitForNavigation({
url: `${pageBaseUrl}?monitorTypes=%5B%22browser%22%5D&query=3`,
}),
page.fill('[placeholder="Search by name, url, host, tag, project or location"]', '3'),
]);
await page.click('text=1-1');
await page.waitForSelector('text=Showing 1-1 of 1 Configuration');
}
);
step('Click listbox option >> text="Journey / Page"', async () => {
// Refactored the aria-label in https://github.com/elastic/eui/pull/6589
// to an aria-describedby so it would be announced on EuiSelectable focus.
await page.click('span >> text="Journey / Page"');
await page.click('[aria-label="Apply the selected filters for Type"]');
expect(page.url()).toBe(`${pageBaseUrl}?monitorTypes=%5B%22browser%22%5D`);
await page.click('[placeholder="Search by name, url, host, tag, project or location"]');
await Promise.all([
page.waitForNavigation({
url: `${pageBaseUrl}?monitorTypes=%5B%22browser%22%5D&query=3`,
}),
page.fill('[placeholder="Search by name, url, host, tag, project or location"]', '3'),
]);
await page.click('text=1-1');
await page.waitForSelector('text=Showing 1-1 of 1 Configuration');
});

step('when no results appears', async () => {
await searchBarInput.click();
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@
"core.euiStepStrings.simpleWarning": "L'étape {number} comporte des avertissements",
"core.euiStepStrings.step": "Étape {number} : {title}",
"core.euiStepStrings.warning": "L'étape {number} : {title} comporte des avertissements",
"core.euiSuperSelectControl.selectAnOption": "Choisir une option : {selectedValue} est sélectionné",
"core.euiTableHeaderCell.titleTextWithDesc": "{innerText}; {description}",
"core.euiTablePagination.rowsPerPageOption": "{rowsPerPage} lignes",
"core.euiTourStepIndicator.ariaLabel": "Étape {number} {status}",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@
"core.euiStepStrings.simpleWarning": "ステップ{number}には警告があります",
"core.euiStepStrings.step": "ステップ{number}:{title}",
"core.euiStepStrings.warning": "ステップ{number}:{title}には警告があります",
"core.euiSuperSelectControl.selectAnOption": "オプションの選択:{selectedValue}件を選択済み",
"core.euiTableHeaderCell.titleTextWithDesc": "{innerText}; {description}",
"core.euiTablePagination.rowsPerPageOption": "{rowsPerPage}行",
"core.euiTourStepIndicator.ariaLabel": "ステップ{number}{status}",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@
"core.euiStepStrings.simpleWarning": "第 {number} 步有警告",
"core.euiStepStrings.step": "第 {number} 步:{title}",
"core.euiStepStrings.warning": "第 {number} 步:{title} 有警告",
"core.euiSuperSelectControl.selectAnOption": "选择选项:{selectedValue} 已选",
"core.euiTableHeaderCell.titleTextWithDesc": "{innerText}; {description}",
"core.euiTablePagination.rowsPerPageOption": "{rowsPerPage} 行",
"core.euiTourStepIndicator.ariaLabel": "第 {number} 步{status}",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1543,10 +1543,10 @@
resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==

"@elastic/eui@76.0.2":
version "76.0.2"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-76.0.2.tgz#5b99730de10785167b4ab98fcfdb8717018343ce"
integrity sha512-HB6HyjkWQ6akYBcIWl9vGenONpymP3q8cYUui/g4DS3/WPUp8R0jV/zEryjlJ5HyJ4Vp3THDoKtCmIEVy+wZvg==
"@elastic/eui@76.3.0":
version "76.3.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-76.3.0.tgz#65ab0d106a6da4ed962454c59148a9743f61f1e4"
integrity sha512-faSemLNfRvOcNFRYk6t7f9sep8ekOawppEGs2opKiSPDBefd5JNawMzluHYpnmIJuHqlCRVjP/Ph6yWvJwWfQg==
dependencies:
"@types/chroma-js" "^2.0.0"
"@types/lodash" "^4.14.160"
Expand Down