diff --git a/package.json b/package.json index 0f7e92f2a71aa..623d0cc5ace48 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "@elastic/ecs": "^9.0.0", "@elastic/elasticsearch": "9.0.3", "@elastic/ems-client": "8.6.3", - "@elastic/eui": "106.1.0", + "@elastic/eui": "106.2.0", "@elastic/eui-amsterdam": "npm:@elastic/eui@106.1.0-amsterdam.0", "@elastic/eui-theme-borealis": "3.3.0", "@elastic/filesaver": "1.1.2", diff --git a/src/core/packages/i18n/browser-internal/src/__snapshots__/i18n_service.test.tsx.snap b/src/core/packages/i18n/browser-internal/src/__snapshots__/i18n_service.test.tsx.snap index 7f08a80e725b1..06ddd8d4e00c3 100644 --- a/src/core/packages/i18n/browser-internal/src/__snapshots__/i18n_service.test.tsx.snap +++ b/src/core/packages/i18n/browser-internal/src/__snapshots__/i18n_service.test.tsx.snap @@ -146,18 +146,18 @@ exports[`#start() returns \`Context\` component 1`] = ` \\"euiLoadingStrings.ariaLabel\\": \\"Loading\\", \\"euiMark.highlightStart\\": \\"highlight start\\", \\"euiMark.highlightEnd\\": \\"highlight end\\", - \\"euiMarkdownEditorFooter.closeButton\\": \\"Close\\", \\"euiMarkdownEditorFooter.uploadingFiles\\": \\"Click to upload files\\", \\"euiMarkdownEditorFooter.openUploadModal\\": \\"Open upload files modal\\", \\"euiMarkdownEditorFooter.unsupportedFileType\\": \\"File type not supported\\", \\"euiMarkdownEditorFooter.showSyntaxErrors\\": \\"Show errors\\", - \\"euiMarkdownEditorFooter.showMarkdownHelp\\": \\"Show markdown help\\", \\"euiMarkdownEditorFooter.errorsTitle\\": \\"Errors\\", - \\"euiMarkdownEditorFooter.syntaxTitle\\": \\"Syntax help\\", - \\"euiMarkdownEditorFooter.mdSyntaxLink\\": \\"GitHub flavored markdown\\", - \\"euiMarkdownEditorFooter.syntaxModalDescriptionPrefix\\": \\"This editor uses\\", - \\"euiMarkdownEditorFooter.syntaxModalDescriptionSuffix\\": \\"You can also utilize these additional syntax plugins to add rich content to your text.\\", - \\"euiMarkdownEditorFooter.syntaxPopoverDescription\\": \\"This editor uses\\", + \\"euiMarkdownEditorHelpButton.mdSyntaxLink\\": \\"GitHub flavored markdown\\", + \\"euiMarkdownEditorHelpButton.syntaxTitle\\": \\"Syntax help\\", + \\"euiMarkdownEditorHelpButton.showMarkdownHelp\\": \\"Show markdown help\\", + \\"euiMarkdownEditorHelpButton.syntaxModalDescriptionPrefix\\": \\"This editor uses\\", + \\"euiMarkdownEditorHelpButton.syntaxModalDescriptionSuffix\\": \\"You can also utilize these additional syntax plugins to add rich content to your text.\\", + \\"euiMarkdownEditorHelpButton.closeButton\\": \\"Close\\", + \\"euiMarkdownEditorHelpButton.syntaxPopoverDescription\\": \\"This editor uses\\", \\"euiMarkdownEditorToolbar.editor\\": \\"Editor\\", \\"euiMarkdownEditorToolbar.previewMarkdown\\": \\"Preview\\", \\"euiModal.closeModal\\": \\"Closes this modal window\\", diff --git a/src/core/packages/i18n/browser-internal/src/i18n_eui_mapping.tsx b/src/core/packages/i18n/browser-internal/src/i18n_eui_mapping.tsx index 07fb713c790ab..668601405b655 100644 --- a/src/core/packages/i18n/browser-internal/src/i18n_eui_mapping.tsx +++ b/src/core/packages/i18n/browser-internal/src/i18n_eui_mapping.tsx @@ -877,12 +877,6 @@ export const getEuiContextMapping = (): EuiTokensObject => { 'euiMark.highlightEnd': i18n.translate('core.euiMark.highlightEnd', { defaultMessage: 'highlight end', }), - 'euiMarkdownEditorFooter.closeButton': i18n.translate( - 'core.euiMarkdownEditorFooter.closeButton', - { - defaultMessage: 'Close', - } - ), 'euiMarkdownEditorFooter.uploadingFiles': i18n.translate( 'core.euiMarkdownEditorFooter.uploadingFiles', { @@ -912,45 +906,51 @@ export const getEuiContextMapping = (): EuiTokensObject => { defaultMessage: 'Show errors', } ), - 'euiMarkdownEditorFooter.showMarkdownHelp': i18n.translate( - 'core.euiMarkdownEditorFooter.showMarkdownHelp', - { - defaultMessage: 'Show markdown help', - } - ), 'euiMarkdownEditorFooter.errorsTitle': i18n.translate( 'core.euiMarkdownEditorFooter.errorsTitle', { defaultMessage: 'Errors', } ), - 'euiMarkdownEditorFooter.syntaxTitle': i18n.translate( - 'core.euiMarkdownEditorFooter.syntaxTitle', + 'euiMarkdownEditorHelpButton.mdSyntaxLink': i18n.translate( + 'core.euiMarkdownEditorHelpButton.mdSyntaxLink', + { + defaultMessage: 'GitHub flavored markdown', + } + ), + 'euiMarkdownEditorHelpButton.syntaxTitle': i18n.translate( + 'core.euiMarkdownEditorHelpButton.syntaxTitle', { defaultMessage: 'Syntax help', } ), - 'euiMarkdownEditorFooter.mdSyntaxLink': i18n.translate( - 'core.euiMarkdownEditorFooter.mdSyntaxLink', + 'euiMarkdownEditorHelpButton.showMarkdownHelp': i18n.translate( + 'core.euiMarkdownEditorHelpButton.showMarkdownHelp', { - defaultMessage: 'GitHub flavored markdown', + defaultMessage: 'Show markdown help', } ), - 'euiMarkdownEditorFooter.syntaxModalDescriptionPrefix': i18n.translate( - 'core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix', + 'euiMarkdownEditorHelpButton.syntaxModalDescriptionPrefix': i18n.translate( + 'core.euiMarkdownEditorHelpButton.syntaxModalDescriptionPrefix', { defaultMessage: 'This editor uses', } ), - 'euiMarkdownEditorFooter.syntaxModalDescriptionSuffix': i18n.translate( - 'core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix', + 'euiMarkdownEditorHelpButton.syntaxModalDescriptionSuffix': i18n.translate( + 'core.euiMarkdownEditorHelpButton.syntaxModalDescriptionSuffix', { defaultMessage: 'You can also utilize these additional syntax plugins to add rich content to your text.', } ), - 'euiMarkdownEditorFooter.syntaxPopoverDescription': i18n.translate( - 'core.euiMarkdownEditorFooter.syntaxPopoverDescription', + 'euiMarkdownEditorHelpButton.closeButton': i18n.translate( + 'core.euiMarkdownEditorHelpButton.closeButton', + { + defaultMessage: 'Close', + } + ), + 'euiMarkdownEditorHelpButton.syntaxPopoverDescription': i18n.translate( + 'core.euiMarkdownEditorHelpButton.syntaxPopoverDescription', { defaultMessage: 'This editor uses', } diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index c7d19fbb16093..aa6925742dd81 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -89,7 +89,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.6.3': ['Elastic License 2.0'], - '@elastic/eui@106.0.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'], + '@elastic/eui@106.2.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'], '@elastic/eui-amsterdam@106.0.0-amsterdam.0': [ 'Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0', ], diff --git a/x-pack/platform/plugins/private/translations/translations/de-DE.json b/x-pack/platform/plugins/private/translations/translations/de-DE.json index 97768559269d6..c411b68b1483f 100644 --- a/x-pack/platform/plugins/private/translations/translations/de-DE.json +++ b/x-pack/platform/plugins/private/translations/translations/de-DE.json @@ -1037,17 +1037,10 @@ "core.euiLoadingStrings.ariaLabel": "Wird geladen", "core.euiMark.highlightEnd": "Ende hervorheben", "core.euiMark.highlightStart": "Start hervorheben", - "core.euiMarkdownEditorFooter.closeButton": "Schließen", "core.euiMarkdownEditorFooter.errorsTitle": "Fehler", - "core.euiMarkdownEditorFooter.mdSyntaxLink": "GitHub-Flavored Markdown", "core.euiMarkdownEditorFooter.openUploadModal": "Modal zum Hochladen von Dateien öffnen", - "core.euiMarkdownEditorFooter.showMarkdownHelp": "Markdown-Hilfe anzeigen", "core.euiMarkdownEditorFooter.showSyntaxErrors": "Fehler anzeigen", "core.euiMarkdownEditorFooter.supportedFileTypes": "Unterstützte Dateien: {supportedFileTypes}", - "core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix": "Dieser Editor verwendet", - "core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix": "Sie können auch diese zusätzlichen Syntax-Plugins verwenden, um Ihrem Text reichhaltige Inhalte hinzuzufügen.", - "core.euiMarkdownEditorFooter.syntaxPopoverDescription": "Dieser Editor verwendet", - "core.euiMarkdownEditorFooter.syntaxTitle": "Syntax-Hilfe", "core.euiMarkdownEditorFooter.unsupportedFileType": "Dateityp wird nicht unterstützt", "core.euiMarkdownEditorFooter.uploadingFiles": "Klicken Sie, um Dateien hochzuladen.", "core.euiMarkdownEditorToolbar.editor": "Editor", diff --git a/x-pack/platform/plugins/private/translations/translations/fr-FR.json b/x-pack/platform/plugins/private/translations/translations/fr-FR.json index e52a97590fca5..87ecdfc712a88 100644 --- a/x-pack/platform/plugins/private/translations/translations/fr-FR.json +++ b/x-pack/platform/plugins/private/translations/translations/fr-FR.json @@ -1037,17 +1037,10 @@ "core.euiLoadingStrings.ariaLabel": "Chargement", "core.euiMark.highlightEnd": "mettre la fin en surbrillance", "core.euiMark.highlightStart": "mettre le début en surbrillance", - "core.euiMarkdownEditorFooter.closeButton": "Fermer", "core.euiMarkdownEditorFooter.errorsTitle": "Erreurs", - "core.euiMarkdownEditorFooter.mdSyntaxLink": "Markdown avec une touche GitHub", "core.euiMarkdownEditorFooter.openUploadModal": "Activer le mode de chargement de fichiers", - "core.euiMarkdownEditorFooter.showMarkdownHelp": "Afficher l'aide de Markdown", "core.euiMarkdownEditorFooter.showSyntaxErrors": "Afficher les erreurs", "core.euiMarkdownEditorFooter.supportedFileTypes": "Fichiers pris en charge : {supportedFileTypes}", - "core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix": "Cet éditeur utilise", - "core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix": "Vous pouvez également utiliser ces plug-ins de syntaxe supplémentaires pour enrichir votre texte.", - "core.euiMarkdownEditorFooter.syntaxPopoverDescription": "Cet éditeur utilise", - "core.euiMarkdownEditorFooter.syntaxTitle": "Aide pour la syntaxe", "core.euiMarkdownEditorFooter.unsupportedFileType": "Type de fichiers non pris en charge", "core.euiMarkdownEditorFooter.uploadingFiles": "Cliquer pour charger des fichiers", "core.euiMarkdownEditorToolbar.editor": "Éditeur", diff --git a/x-pack/platform/plugins/private/translations/translations/ja-JP.json b/x-pack/platform/plugins/private/translations/translations/ja-JP.json index 4f2e1c4a12d48..cfed27eef7e9d 100644 --- a/x-pack/platform/plugins/private/translations/translations/ja-JP.json +++ b/x-pack/platform/plugins/private/translations/translations/ja-JP.json @@ -1040,17 +1040,10 @@ "core.euiLoadingStrings.ariaLabel": "読み込み中", "core.euiMark.highlightEnd": "ハイライト終了", "core.euiMark.highlightStart": "ハイライト開始", - "core.euiMarkdownEditorFooter.closeButton": "閉じる", "core.euiMarkdownEditorFooter.errorsTitle": "エラー", - "core.euiMarkdownEditorFooter.mdSyntaxLink": "GitHub風のマークダウン", "core.euiMarkdownEditorFooter.openUploadModal": "ファイルのアップロードモーダルを開く", - "core.euiMarkdownEditorFooter.showMarkdownHelp": "マークダウンヘルプを表示", "core.euiMarkdownEditorFooter.showSyntaxErrors": "エラーを表示", "core.euiMarkdownEditorFooter.supportedFileTypes": "サポートされているファイル:{supportedFileTypes}", - "core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix": "このエディターは使用します", - "core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix": "これらの追加の構文プラグインを利用して、リッチコンテンツをテキストに追加することもできます。", - "core.euiMarkdownEditorFooter.syntaxPopoverDescription": "このエディターで使用", - "core.euiMarkdownEditorFooter.syntaxTitle": "構文ヘルプ", "core.euiMarkdownEditorFooter.unsupportedFileType": "ファイルタイプがサポートされていません", "core.euiMarkdownEditorFooter.uploadingFiles": "クリックすると、ファイルをアップロードします", "core.euiMarkdownEditorToolbar.editor": "エディター", diff --git a/x-pack/platform/plugins/private/translations/translations/zh-CN.json b/x-pack/platform/plugins/private/translations/translations/zh-CN.json index e78495d89953f..c63ac15ccd5da 100644 --- a/x-pack/platform/plugins/private/translations/translations/zh-CN.json +++ b/x-pack/platform/plugins/private/translations/translations/zh-CN.json @@ -1036,17 +1036,10 @@ "core.euiLoadingStrings.ariaLabel": "正在加载", "core.euiMark.highlightEnd": "高亮显示结尾", "core.euiMark.highlightStart": "高亮显示开头", - "core.euiMarkdownEditorFooter.closeButton": "关闭", "core.euiMarkdownEditorFooter.errorsTitle": "错误", - "core.euiMarkdownEditorFooter.mdSyntaxLink": "GitHub 风格的 Markdown", "core.euiMarkdownEditorFooter.openUploadModal": "打开上传文件模式窗口", - "core.euiMarkdownEditorFooter.showMarkdownHelp": "显示 Markdown 帮助", "core.euiMarkdownEditorFooter.showSyntaxErrors": "显示错误", "core.euiMarkdownEditorFooter.supportedFileTypes": "支持的文件:{supportedFileTypes}", - "core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix": "此编辑器使用", - "core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix": "还可以利用这些附加的语法插件向文本添加富文本内容。", - "core.euiMarkdownEditorFooter.syntaxPopoverDescription": "此编辑器使用", - "core.euiMarkdownEditorFooter.syntaxTitle": "语法帮助", "core.euiMarkdownEditorFooter.unsupportedFileType": "文件类型不受支持", "core.euiMarkdownEditorFooter.uploadingFiles": "单击上传文件", "core.euiMarkdownEditorToolbar.editor": "编辑器", diff --git a/x-pack/platform/test/functional/page_objects/copy_saved_objects_to_space_page.ts b/x-pack/platform/test/functional/page_objects/copy_saved_objects_to_space_page.ts index aa22a9b24e6b6..2e894cf3354a6 100644 --- a/x-pack/platform/test/functional/page_objects/copy_saved_objects_to_space_page.ts +++ b/x-pack/platform/test/functional/page_objects/copy_saved_objects_to_space_page.ts @@ -40,20 +40,23 @@ export function CopySavedObjectsToSpacePageProvider({ if (createNewCopies && overwrite) { throw new Error('createNewCopies and overwrite options cannot be used together'); } + if (!createNewCopies) { const form = await testSubjects.find('copy-to-space-form'); // a radio button consists of a div tag that contains an input, a div, and a label // we can't click the input directly, need to click the label const label = await form.findByCssSelector('label[for="createNewCopiesDisabled"]'); await label.click(); + + if (!overwrite) { + const radio = await testSubjects.find('cts-copyModeControl-overwriteRadioGroup'); + // a radio button consists of a div tag that contains an input, a div, and a label + // we can't click the input directly, need to click the label + const overwriteLabel = await radio.findByCssSelector('label[for="overwriteDisabled"]'); + await overwriteLabel.click(); + } } - if (!overwrite) { - const radio = await testSubjects.find('cts-copyModeControl-overwriteRadioGroup'); - // a radio button consists of a div tag that contains an input, a div, and a label - // we can't click the input directly, need to click the label - const label = await radio.findByCssSelector('label[for="overwriteDisabled"]'); - await label.click(); - } + await testSubjects.click(`cts-space-selector-row-${destinationSpaceId}`); }, diff --git a/yarn.lock b/yarn.lock index 6e3812d081412..d85793eb219f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2291,10 +2291,10 @@ chroma-js "^2.4.2" lodash "^4.17.21" -"@elastic/eui@106.1.0": - version "106.1.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-106.1.0.tgz#e027aefbfb8938a6f5429d81891448c9c45a179d" - integrity sha512-2uGrfZ5lul3w9v71lzikMS1keEDZeaLP8zYDGO+yp1DAXuF/8wQ574yvyN0kemV9KsESxr6XSNJ/L+68qAznlw== +"@elastic/eui@106.2.0": + version "106.2.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-106.2.0.tgz#9513b959681fb471eaf6ba454950cd5b575a1959" + integrity sha512-I4JQChwHAZC4W0PDQzfh/26WhdHCzc/7CTFOqp4sgLpX1hoG3jCJDQMDVQy6d7MFWWYg2RWpfk3qTHXapwAlBw== dependencies: "@elastic/eui-theme-common" "3.1.0" "@elastic/prismjs-esql" "^1.1.0"