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

Bumping EUI to 39.0.0 #113633

Merged
merged 22 commits into from
Oct 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a298fb9
Upgraded the version of EUI to 38.2.0 from 38.0.1
breehall Oct 1, 2021
69ee19c
Updated the i18n mappings required for EUI v.38.2.0
breehall Oct 1, 2021
d44b789
Update i18n snapshots and resolve linting error
breehall Oct 4, 2021
8a29a96
Removed html_id_generator mocks.
breehall Oct 4, 2021
1973fc9
Resolve linting error in i18n mapping file
breehall Oct 4, 2021
27291a2
Removed html_id_generator mocks.
breehall Oct 4, 2021
ca1991e
Update plugin snapshots
breehall Oct 4, 2021
eea8204
Merging in the latest code from the master branch and resolve merge c…
breehall Oct 5, 2021
308c7ca
Resolve merge conflict in license_checker config.ts file
breehall Oct 5, 2021
4380434
Merge branch 'master' of https://github.com/elastic/kibana into eui-u…
breehall Oct 6, 2021
a9cf44b
Upgrade EUI to version 39.0.0 from the original target (38.2.0) to ha…
breehall Oct 6, 2021
432b23f
Updated the i18n mapping for EUI v.39.0.0
breehall Oct 6, 2021
fb88b04
Update various snapshots to account for the an i18n translation token…
breehall Oct 6, 2021
71233e5
Updated test cases marked as obsolete by CI
breehall Oct 7, 2021
f6833eb
Merge branch 'master' of https://github.com/elastic/kibana into eui-u…
breehall Oct 7, 2021
6a940f5
Merge branch 'master' into eui-upgrade-38.2.0
kibanamachine Oct 7, 2021
379acdd
Update src/dev/license_checker/config.ts
breehall Oct 8, 2021
54726ea
Merge branch 'master' into eui-upgrade-38.2.0
kibanamachine Oct 11, 2021
dd4ccbb
Merge branch 'master' into eui-upgrade-38.2.0
kibanamachine Oct 11, 2021
d13120a
Merge branch 'master' into eui-upgrade-38.2.0
kibanamachine Oct 11, 2021
f2394b2
Merge branch 'master' into eui-upgrade-38.2.0
kibanamachine Oct 12, 2021
a291847
Merge branch 'master' into eui-upgrade-38.2.0
kibanamachine Oct 12, 2021
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 @@ -103,7 +103,7 @@
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.21",
"@elastic/ems-client": "7.15.0",
"@elastic/eui": "38.0.1",
"@elastic/eui": "39.0.0",
"@elastic/filesaver": "1.1.2",
"@elastic/maki": "6.3.0",
"@elastic/node-crypto": "1.2.1",
Expand Down

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

7 changes: 5 additions & 2 deletions src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap

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

23 changes: 19 additions & 4 deletions src/core/public/i18n/i18n_eui_mapping.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ export const getEuiContextMapping = (): EuiTokensObject => {
values: { tableCaption },
description: 'Screen reader text to describe the pagination controls',
}),
'euiBasicTable.noItemsMessage': i18n.translate('core.euiBasicTable.noItemsMessage', {
defaultMessage: 'No items found',
}),
'euiBottomBar.customScreenReaderAnnouncement': ({ landmarkHeading }: EuiValues) =>
i18n.translate('core.euiBottomBar.customScreenReaderAnnouncement', {
defaultMessage:
Expand Down Expand Up @@ -634,19 +637,31 @@ export const getEuiContextMapping = (): EuiTokensObject => {
defaultMessage: 'Syntax help',
}
),
'euiMarkdownEditorFooter.descriptionPrefix': i18n.translate(
'core.euiMarkdownEditorFooter.descriptionPrefix',
'euiMarkdownEditorFooter.mdSyntaxLink': i18n.translate(
'core.euiMarkdownEditorFooter.mdSyntaxLink',
{
defaultMessage: 'GitHub flavored markdown',
}
),
'euiMarkdownEditorFooter.syntaxModalDescriptionPrefix': i18n.translate(
'core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix',
{
defaultMessage: 'This editor uses',
}
),
'euiMarkdownEditorFooter.descriptionSuffix': i18n.translate(
'core.euiMarkdownEditorFooter.descriptionSuffix',
'euiMarkdownEditorFooter.syntaxModalDescriptionSuffix': i18n.translate(
'core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix',
{
defaultMessage:
'You can also utilize these additional syntax plugins to add rich content to your text.',
}
),
'euiMarkdownEditorFooter.syntaxPopoverDescription': i18n.translate(
'core.euiMarkdownEditorFooter.syntaxPopoverDescription',
{
defaultMessage: 'This editor uses',
}
),
'euiMarkdownEditorToolbar.editor': i18n.translate('core.euiMarkdownEditorToolbar.editor', {
defaultMessage: 'Editor',
}),
Expand Down
2 changes: 1 addition & 1 deletion src/dev/license_checker/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ export const LICENSE_OVERRIDES = {
'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
'@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
'@elastic/ems-client@7.15.0': ['Elastic License 2.0'],
'@elastic/eui@38.0.1': ['SSPL-1.0 OR Elastic License 2.0'],
'@elastic/eui@39.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
};

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 @@ -14,12 +14,6 @@ import { mountWithI18nProvider } from '@kbn/test/jest';
import { Frequency } from './types';
import { CronEditor } from './cron_editor';

jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
return {
htmlIdGenerator: () => () => `generated-id`,
};
});

describe('CronEditor', () => {
['MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'YEAR'].forEach((unit) => {
test(`is rendered with a ${unit} frequency`, () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ import React from 'react';

const EDITOR_ID = 'testEditor';

jest.mock('@elastic/eui/lib/services/accessibility', () => {
return {
htmlIdGenerator: () => () => `generated-id`,
};
});

jest.mock('@elastic/eui', () => {
const original = jest.requireActual('@elastic/eui');

Expand Down

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

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

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 @@ -15,12 +15,6 @@ import { createKibanaReactContext } from '../../../../../../kibana_react/public'
import { render } from '@testing-library/react';
import userEvent from '@testing-library/user-event';

jest.mock('@elastic/eui/lib/services/accessibility', () => {
return {
htmlIdGenerator: () => () => `generated-id`,
};
});

const fieldType = 'string';
const format = {
getConverterFor: jest
Expand Down

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

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 @@ -15,12 +15,6 @@ import props from './__fixtures__/props.json';
import { MemoryRouter } from 'react-router-dom';
import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';

jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
return {
htmlIdGenerator: () => () => `generated-id`,
};
});

describe('ErrorGroupOverview -> List', () => {
beforeAll(() => {
mockMoment();
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 @@ -12,12 +12,6 @@ import { mountWithTheme } from '../../../utils/testHelpers';
import { Stackframe as StackframeComponent } from './Stackframe';
import stacktracesMock from './__fixtures__/stacktraces.json';

jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
return {
htmlIdGenerator: () => () => `generated-id`,
};
});

describe('Stackframe', () => {
describe('when stackframe has source lines', () => {
let wrapper: ReactWrapper;
Expand Down

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

Loading