Skip to content

Commit f70bc2e

Browse files
breehallkibanamachineConstance
committed
Bumping EUI to 39.0.0 (#113633)
* Upgraded the version of EUI to 38.2.0 from 38.0.1 * Updated the i18n mappings required for EUI v.38.2.0 * Update i18n snapshots and resolve linting error * Removed html_id_generator mocks. Current mock was failing due to missing useGeneratedHtmlId export. This is safe to remove because EUI contains a .testenv that contains an mock for html_id_generator. More info at https://github.com/elastic/eui/blob/master/src/services/accessibility/html_id_generator.testenv.ts * Resolve linting error in i18n mapping file * Removed html_id_generator mocks. Current mock was failing due to missing useGeneratedHtmlId export. This is safe to remove because EUI contains a .testenv that contains a mock for html_id_generator. More info at https://github.com/elastic/eui/blob/master/src/services/accessibility/html_id_generator.testenv.ts * Update plugin snapshots * Resolve merge conflict in license_checker config.ts file * Upgrade EUI to version 39.0.0 from the original target (38.2.0) to handle an issue found with a functional test during the original upgrade * Updated the i18n mapping for EUI v.39.0.0 * Update various snapshots to account for the an i18n translation token addition in EUI v. 39.0.0 * Updated test cases marked as obsolete by CI * Update src/dev/license_checker/config.ts Removing TODO comments from src/dev/license_checker/config.ts as they are no longer needed. Co-authored-by: Constance <constancecchen@users.noreply.github.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Constance <constancecchen@users.noreply.github.com>
1 parent c5a0aaa commit f70bc2e

42 files changed

Lines changed: 204 additions & 166 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
9797
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^7.16.0-canary.4",
9898
"@elastic/ems-client": "7.15.0",
99-
"@elastic/eui": "38.0.1",
99+
"@elastic/eui": "39.0.0",
100100
"@elastic/filesaver": "1.1.2",
101101
"@elastic/good": "^9.0.1-kibana3",
102102
"@elastic/maki": "6.3.0",

src/core/public/core_app/status/components/__snapshots__/status_table.test.tsx.snap

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/public/i18n/i18n_eui_mapping.tsx

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ export const getEuiContextMapping = (): EuiTokensObject => {
6868
values: { tableCaption },
6969
description: 'Screen reader text to describe the pagination controls',
7070
}),
71+
'euiBasicTable.noItemsMessage': i18n.translate('core.euiBasicTable.noItemsMessage', {
72+
defaultMessage: 'No items found',
73+
}),
7174
'euiBottomBar.customScreenReaderAnnouncement': ({ landmarkHeading }: EuiValues) =>
7275
i18n.translate('core.euiBottomBar.customScreenReaderAnnouncement', {
7376
defaultMessage:
@@ -634,19 +637,31 @@ export const getEuiContextMapping = (): EuiTokensObject => {
634637
defaultMessage: 'Syntax help',
635638
}
636639
),
637-
'euiMarkdownEditorFooter.descriptionPrefix': i18n.translate(
638-
'core.euiMarkdownEditorFooter.descriptionPrefix',
640+
'euiMarkdownEditorFooter.mdSyntaxLink': i18n.translate(
641+
'core.euiMarkdownEditorFooter.mdSyntaxLink',
642+
{
643+
defaultMessage: 'GitHub flavored markdown',
644+
}
645+
),
646+
'euiMarkdownEditorFooter.syntaxModalDescriptionPrefix': i18n.translate(
647+
'core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix',
639648
{
640649
defaultMessage: 'This editor uses',
641650
}
642651
),
643-
'euiMarkdownEditorFooter.descriptionSuffix': i18n.translate(
644-
'core.euiMarkdownEditorFooter.descriptionSuffix',
652+
'euiMarkdownEditorFooter.syntaxModalDescriptionSuffix': i18n.translate(
653+
'core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix',
645654
{
646655
defaultMessage:
647656
'You can also utilize these additional syntax plugins to add rich content to your text.',
648657
}
649658
),
659+
'euiMarkdownEditorFooter.syntaxPopoverDescription': i18n.translate(
660+
'core.euiMarkdownEditorFooter.syntaxPopoverDescription',
661+
{
662+
defaultMessage: 'This editor uses',
663+
}
664+
),
650665
'euiMarkdownEditorToolbar.editor': i18n.translate('core.euiMarkdownEditorToolbar.editor', {
651666
defaultMessage: 'Editor',
652667
}),

src/dev/license_checker/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ export const LICENSE_OVERRIDES = {
7575
'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
7676
'@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
7777
'@elastic/ems-client@7.15.0': ['Elastic License 2.0'],
78-
'@elastic/eui@38.0.1': ['SSPL-1.0 OR Elastic License 2.0'],
78+
'@elastic/eui@39.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
7979
'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
8080
};

src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ import { mountWithI18nProvider } from '@kbn/test/jest';
1414
import { Frequency } from './types';
1515
import { CronEditor } from './cron_editor';
1616

17-
jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
18-
return {
19-
htmlIdGenerator: () => () => `generated-id`,
20-
};
21-
});
22-
2317
describe('CronEditor', () => {
2418
['MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'YEAR'].forEach((unit) => {
2519
test(`is rendered with a ${unit} frequency`, () => {

src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ import React from 'react';
99

1010
const EDITOR_ID = 'testEditor';
1111

12-
jest.mock('@elastic/eui/lib/services/accessibility', () => {
13-
return {
14-
htmlIdGenerator: () => () => `generated-id`,
15-
};
16-
});
17-
1812
jest.mock('@elastic/eui', () => {
1913
const original = jest.requireActual('@elastic/eui');
2014

src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/__snapshots__/color.test.tsx.snap

Lines changed: 18 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)