From 6d894ee38b9f7a4ffd5bb3850cd98e4ec0a25447 Mon Sep 17 00:00:00 2001 From: Tomasz Kajtoch Date: Tue, 2 Jul 2024 12:47:47 +0200 Subject: [PATCH 1/4] chore: upgrade `@elastic/eui` to v95.3.0 --- package.json | 2 +- src/dev/license_checker/config.ts | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e4e89ddceb8563..3ebea7827eb8c8 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "@elastic/ecs": "^8.11.1", "@elastic/elasticsearch": "^8.14.0", "@elastic/ems-client": "8.5.1", - "@elastic/eui": "95.2.0", + "@elastic/eui": "95.3.0", "@elastic/filesaver": "1.1.2", "@elastic/node-crypto": "1.2.1", "@elastic/numeral": "^2.5.1", diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index fabd250b291377..1abd34caea872b 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -86,7 +86,7 @@ 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@8.5.1': ['Elastic License 2.0'], - '@elastic/eui@95.2.0': ['SSPL-1.0 OR Elastic License 2.0'], + '@elastic/eui@95.3.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 'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary '@bufbuild/protobuf@1.2.1': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause) diff --git a/yarn.lock b/yarn.lock index 17882dae4ca640..824afa4972d6b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1743,10 +1743,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@95.2.0": - version "95.2.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-95.2.0.tgz#12204f9206f1432e17276264e08e48cd026913bf" - integrity sha512-DVIAqZHox5esbmoxnG3McTw0ppbatvH+ymXYjr3PNNTTnXzmcAGadQAA0ZIpx1/c3/YOZmh2LJWWowLl4wodzw== +"@elastic/eui@95.3.0": + version "95.3.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-95.3.0.tgz#b880012120f748e71bc2c1e4dbcf5acd514f043e" + integrity sha512-KKe2Yuswm0pnOpEnFdWjnekOqFQpN1rlWLp4MPLQwHTc9hMIujiRfOo66RGgc4K3p8qWhyRl/DxbxXC+NnsKiQ== dependencies: "@hello-pangea/dnd" "^16.6.0" "@types/lodash" "^4.14.202" From 48cc12aaea8a2cbf853ccfddc8c92818a6250632 Mon Sep 17 00:00:00 2001 From: Tomasz Kajtoch Date: Tue, 2 Jul 2024 13:48:31 +0200 Subject: [PATCH 2/4] chore: update i18n --- .../src/__snapshots__/i18n_service.test.tsx.snap | 2 +- .../i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx | 4 ++-- x-pack/plugins/translations/translations/fr-FR.json | 1 - x-pack/plugins/translations/translations/ja-JP.json | 1 - x-pack/plugins/translations/translations/zh-CN.json | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap b/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap index 67fe5f2a462215..51caec4b95289a 100644 --- a/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap +++ b/packages/core/i18n/core-i18n-browser-internal/src/__snapshots__/i18n_service.test.tsx.snap @@ -140,10 +140,10 @@ exports[`#start() returns \`Context\` component 1`] = ` "euiExternalLinkIcon.newTarget.screenReaderOnlyText": "(opens in a new tab or window)", "euiFieldPassword.maskPassword": "Mask password", "euiFieldPassword.showPassword": "Show password as plain text. Note: this will visually expose your password on the screen.", - "euiFilePicker.clearSelectedFiles": "Clear selected files", "euiFilePicker.filesSelected": [Function], "euiFilePicker.promptText": "Select or drag and drop a file", "euiFilePicker.removeSelected": "Remove", + "euiFilePicker.removeSelectedAriaLabel": "Remove selected files", "euiFilterButton.filterBadgeActiveAriaLabel": [Function], "euiFilterButton.filterBadgeAvailableAriaLabel": [Function], "euiFlyout.screenReaderFixedHeaders": "You can still continue tabbing through the page headers in addition to the dialog.", diff --git a/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx b/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx index 151a94bd3ce228..02444526827e37 100644 --- a/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx +++ b/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx @@ -725,8 +725,8 @@ export const getEuiContextMapping = (): EuiTokensObject => { 'euiFieldPassword.maskPassword': i18n.translate('core.euiFieldPassword.maskPassword', { defaultMessage: 'Mask password', }), - 'euiFilePicker.clearSelectedFiles': i18n.translate('core.euiFilePicker.clearSelectedFiles', { - defaultMessage: 'Clear selected files', + 'euiFilePicker.removeSelectedAriaLabel': i18n.translate('core.euiFilePicker.removeSelectedAriaLabel', { + defaultMessage: 'Remove selected files', }), 'euiFilePicker.filesSelected': ({ fileCount }: EuiValues) => i18n.translate('core.euiFilePicker.filesSelected', { diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index 53e56dc0c09c16..95e4da25d725e2 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -780,7 +780,6 @@ "core.euiExternalLinkIcon.newTarget.screenReaderOnlyText": "(s’ouvre dans un nouvel onglet ou une nouvelle fenêtre)", "core.euiFieldPassword.maskPassword": "Masquer le mot de passe", "core.euiFieldPassword.showPassword": "Afficher le mot de passe en texte brut. Remarque : votre mot de passe sera visible à l'écran.", - "core.euiFilePicker.clearSelectedFiles": "Effacer les fichiers sélectionnés", "core.euiFilePicker.promptText": "Sélectionner ou glisser-déposer un fichier", "core.euiFilePicker.removeSelected": "Supprimer", "core.euiFlyoutCloseButton.ariaLabel": "Fermer cette boîte de dialogue", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 64c1ec3017aaf0..08a77ce71ec9c0 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -780,7 +780,6 @@ "core.euiExternalLinkIcon.newTarget.screenReaderOnlyText": "（新しいタブまたはウィンドウで開く）", "core.euiFieldPassword.maskPassword": "パスワードをマスク", "core.euiFieldPassword.showPassword": "プレーンテキストとしてパスワードを表示します。注記：パスワードは画面上に見えるように表示されます。", - "core.euiFilePicker.clearSelectedFiles": "選択したファイルを消去", "core.euiFilePicker.promptText": "ファイルを選択するかドラッグ&ドロップしてください", "core.euiFilePicker.removeSelected": "削除", "core.euiFlyoutCloseButton.ariaLabel": "このダイアログを閉じる", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index e2b4c8ab1f6020..b689a91c0bb197 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -782,7 +782,6 @@ "core.euiExternalLinkIcon.newTarget.screenReaderOnlyText": "（在新选项卡或窗口中打开）", "core.euiFieldPassword.maskPassword": "屏蔽密码", "core.euiFieldPassword.showPassword": "将密码显示为纯文本。注意：这会将您的密码暴露在屏幕上。", - "core.euiFilePicker.clearSelectedFiles": "清除选定的文件", "core.euiFilePicker.promptText": "选择或拖放文件", "core.euiFilePicker.removeSelected": "移除", "core.euiFlyoutCloseButton.ariaLabel": "关闭此对话框", From 09181832e82521552c74a2b66ffd727377ad63d0 Mon Sep 17 00:00:00 2001 From: Tomasz Kajtoch Date: Tue, 2 Jul 2024 14:20:40 +0200 Subject: [PATCH 3/4] test: update import_data_model snapshot --- .../import_data_modal/__snapshots__/index.test.tsx.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap index 1fe2bda944e0a4..1c2e4f3cf3fdda 100644 --- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap +++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap @@ -295,7 +295,7 @@ Object { subtitle