From 4070c581ec518aa361914776f3d2027d74bb9ce9 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 26 Jun 2019 13:07:22 -0500 Subject: [PATCH] [7.x] Upgrade EUI to 12.1.0 (#39601) (#39699) * Upgrade EUI to 12.1.0 (#39601) * eui@12.1.0 * jest regenerator-runtime babel-polyfill * TS Toast -> EuiGlobalToastListToast * EuiBadge * EuiCopy * snapshot updates * simplify toast interface usage * misc review cleanup * remove eui core-js resolution * toast interface import --- package.json | 5 +-- .../toasts/global_toast_list.tsx | 2 +- src/core/public/notifications/toasts/index.ts | 2 +- .../notifications/toasts/toasts_api.tsx | 2 +- .../notifications/toasts/toasts_service.tsx | 2 +- src/core/public/public.api.md | 2 +- src/dev/jest/setup/babel_polyfill.js | 2 + .../filter/filter_bar/filter_view/index.tsx | 7 +-- .../__snapshots__/introduction.test.js.snap | 1 - .../__snapshots__/header.test.js.snap | 1 - .../__snapshots__/server_status.test.js.snap | 1 - .../__snapshots__/help_flyout.test.js.snap | 1 + .../url_panel_content.test.js.snap | 16 ------- .../share/components/url_panel_content.tsx | 5 ++- .../plugins/kbn_tp_run_pipeline/package.json | 2 +- .../kbn_tp_custom_visualizations/package.json | 2 +- .../kbn_tp_embeddable_explorer/package.json | 2 +- .../kbn_tp_sample_panel_action/package.json | 2 +- .../kbn_tp_visualize_embedding/package.json | 2 +- typings/@elastic/eui/index.d.ts | 1 - .../__test__/__snapshots__/List.test.tsx.snap | 8 ++++ .../ServiceOverview.test.tsx.snap | 4 ++ .../public/components/tag/tag_badge.tsx | 43 ++++++++++++------- .../suggestion_component.test.tsx.snap | 2 - .../suggestions_component.test.tsx.snap | 8 ---- .../extend_index_management.test.js.snap | 2 + .../__snapshots__/policy_table.test.js.snap | 1 + .../__snapshots__/add_license.test.js.snap | 4 +- .../__snapshots__/upload_license.test.js.snap | 5 +++ .../form_label_with_icon_tip.test.js.snap | 1 - .../__snapshots__/json_tooltip.test.js.snap | 6 --- .../actions_section.test.js.snap | 12 ------ .../__snapshots__/page.test.tsx.snap | 1 - .../__snapshots__/expanded_row.test.tsx.snap | 1 + .../explorer_chart_label.test.js.snap | 4 -- .../explorer_chart_label_badge.test.js.snap | 1 - .../__snapshots__/shard.test.js.snap | 6 --- .../__snapshots__/detail_drawer.test.js.snap | 5 +-- .../__snapshots__/metric.test.js.snap | 1 - .../plugin_statement.test.js.snap | 8 ---- .../components/reporting_panel_content.tsx | 20 ++------- .../public/components/and_or_badge/index.tsx | 14 +++--- .../public/components/draggables/index.tsx | 13 +++--- .../public/components/error_toast/index.tsx | 2 +- .../public/components/flyout/button/index.tsx | 29 +++++++++---- .../siem/public/components/page/index.tsx | 23 +++++++--- .../__snapshots__/index.test.tsx.snap | 6 +-- .../renderers/suricata/suricata_signature.tsx | 10 +++-- .../body/renderers/zeek/zeek_signature.tsx | 10 +++-- .../timeline/data_providers/empty.tsx | 26 ++++++++--- .../data_providers/provider_badge.tsx | 4 +- .../provider_item_and_drag_drop.tsx | 12 ++++-- .../timeline/properties/helpers.tsx | 12 ++++-- .../siem/public/lib/clipboard/clipboard.tsx | 2 +- .../__snapshots__/ping_list.test.tsx.snap | 1 - x-pack/package.json | 2 +- yarn.lock | 9 ++-- 57 files changed, 192 insertions(+), 186 deletions(-) diff --git a/package.json b/package.json index b8e6400e80161..e8102c77dac95 100644 --- a/package.json +++ b/package.json @@ -79,8 +79,7 @@ "resolutions": { "**/@types/node": "10.12.27", "**/@types/hapi": "^17.0.18", - "**/typescript": "^3.3.3333", - "**/@elastic/eui/**/core-js": "2.6.9" + "**/typescript": "^3.3.3333" }, "workspaces": { "packages": [ @@ -104,7 +103,7 @@ "@babel/register": "7.4.4", "@elastic/charts": "^6.0.1", "@elastic/datemath": "5.0.2", - "@elastic/eui": "11.3.2", + "@elastic/eui": "12.1.0", "@elastic/filesaver": "1.1.2", "@elastic/good": "8.1.1-kibana2", "@elastic/numeral": "2.3.3", diff --git a/src/core/public/notifications/toasts/global_toast_list.tsx b/src/core/public/notifications/toasts/global_toast_list.tsx index 1b3717f55d45b..57dc899016264 100644 --- a/src/core/public/notifications/toasts/global_toast_list.tsx +++ b/src/core/public/notifications/toasts/global_toast_list.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { EuiGlobalToastList, Toast } from '@elastic/eui'; +import { EuiGlobalToastList, EuiGlobalToastListToast as Toast } from '@elastic/eui'; import React from 'react'; import * as Rx from 'rxjs'; diff --git a/src/core/public/notifications/toasts/index.ts b/src/core/public/notifications/toasts/index.ts index 2279f44a55090..c047ac71f7adc 100644 --- a/src/core/public/notifications/toasts/index.ts +++ b/src/core/public/notifications/toasts/index.ts @@ -19,4 +19,4 @@ export { ToastsService, ToastsSetup, ToastsStart } from './toasts_service'; export { ErrorToastOptions, ToastsApi, ToastInput } from './toasts_api'; -export { Toast } from '@elastic/eui'; +export { EuiGlobalToastListToast as Toast } from '@elastic/eui'; diff --git a/src/core/public/notifications/toasts/toasts_api.tsx b/src/core/public/notifications/toasts/toasts_api.tsx index 9376c4758d855..8c8e567638f78 100644 --- a/src/core/public/notifications/toasts/toasts_api.tsx +++ b/src/core/public/notifications/toasts/toasts_api.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { Toast } from '@elastic/eui'; +import { EuiGlobalToastListToast as Toast } from '@elastic/eui'; import React from 'react'; import * as Rx from 'rxjs'; diff --git a/src/core/public/notifications/toasts/toasts_service.tsx b/src/core/public/notifications/toasts/toasts_service.tsx index 2ddaf8dad5f0b..75d80d6e353d8 100644 --- a/src/core/public/notifications/toasts/toasts_service.tsx +++ b/src/core/public/notifications/toasts/toasts_service.tsx @@ -20,7 +20,7 @@ import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import { Toast } from '@elastic/eui'; +import { EuiGlobalToastListToast as Toast } from '@elastic/eui'; import { I18nStart } from '../../i18n'; import { UiSettingsSetup } from '../../ui_settings'; import { GlobalToastList } from './global_toast_list'; diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md index d1e39779ed9a3..6979635bcba00 100644 --- a/src/core/public/public.api.md +++ b/src/core/public/public.api.md @@ -8,7 +8,7 @@ import { IconType } from '@elastic/eui'; import { Observable } from 'rxjs'; import React from 'react'; import * as Rx from 'rxjs'; -import { Toast } from '@elastic/eui'; +import { EuiGlobalToastListToast as Toast } from '@elastic/eui'; // @public (undocumented) export interface ApplicationSetup { diff --git a/src/dev/jest/setup/babel_polyfill.js b/src/dev/jest/setup/babel_polyfill.js index 58325c1a67f94..945d76e4be800 100644 --- a/src/dev/jest/setup/babel_polyfill.js +++ b/src/dev/jest/setup/babel_polyfill.js @@ -21,3 +21,5 @@ // include the necessary polyfills when using `@babel/preset-env`, but for some // reason it did not work. See https://github.com/elastic/kibana/issues/14506 import '../../../setup_node_env/babel_register/polyfill'; +// Required for EUI +import 'regenerator-runtime/runtime'; diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx index b905bd3a732ed..dca2101d435cf 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx +++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx @@ -28,7 +28,7 @@ interface Props { [propName: string]: any; } -export const FilterView: SFC = ({ filter, ...rest }: Props) => { +export const FilterView: SFC = ({ filter, iconOnClick, onClick, ...rest }: Props) => { let title = `Filter: ${getFilterDisplayText(filter)}. ${i18n.translate( 'data.filter.filterBar.moreFilterActionsMessage', { @@ -51,16 +51,17 @@ export const FilterView: SFC = ({ filter, ...rest }: Props) => { diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap index 31ee58a2f4fe4..a4998fc975372 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/__snapshots__/header.test.js.snap @@ -16,7 +16,6 @@ exports[`Header should render a different name, prompt, and beta tag if provided diff --git a/src/legacy/core_plugins/status_page/public/components/__snapshots__/server_status.test.js.snap b/src/legacy/core_plugins/status_page/public/components/__snapshots__/server_status.test.js.snap index af852a367edf9..6ff046557afa3 100644 --- a/src/legacy/core_plugins/status_page/public/components/__snapshots__/server_status.test.js.snap +++ b/src/legacy/core_plugins/status_page/public/components/__snapshots__/server_status.test.js.snap @@ -22,7 +22,6 @@ exports[`render 1`] = ` Object { "kibanaStatus": Green , diff --git a/src/legacy/ui/public/field_editor/components/scripting_help/__snapshots__/help_flyout.test.js.snap b/src/legacy/ui/public/field_editor/components/scripting_help/__snapshots__/help_flyout.test.js.snap index 12492b0bb7b68..b2ee13e865a9a 100644 --- a/src/legacy/ui/public/field_editor/components/scripting_help/__snapshots__/help_flyout.test.js.snap +++ b/src/legacy/ui/public/field_editor/components/scripting_help/__snapshots__/help_flyout.test.js.snap @@ -12,6 +12,7 @@ exports[`ScriptingHelpFlyout should render normally 1`] = ` > , diff --git a/src/legacy/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap b/src/legacy/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap index 068a7246e7145..b36a40b77e918 100644 --- a/src/legacy/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap +++ b/src/legacy/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap @@ -51,7 +51,6 @@ exports[`render 1`] = ` grow={false} > } position="bottom" - type="questionInCircle" /> , @@ -87,7 +85,6 @@ exports[`render 1`] = ` grow={false} > } position="bottom" - type="questionInCircle" /> , @@ -137,7 +133,6 @@ exports[`render 1`] = ` grow={false} > } position="bottom" - type="questionInCircle" /> @@ -201,7 +195,6 @@ exports[`should enable saved object export option when objectId is provided 1`] grow={false} > } position="bottom" - type="questionInCircle" /> , @@ -237,7 +229,6 @@ exports[`should enable saved object export option when objectId is provided 1`] grow={false} > } position="bottom" - type="questionInCircle" /> , @@ -287,7 +277,6 @@ exports[`should enable saved object export option when objectId is provided 1`] grow={false} > } position="bottom" - type="questionInCircle" /> @@ -351,7 +339,6 @@ exports[`should hide short url section when allowShortUrl is false 1`] = ` grow={false} > } position="bottom" - type="questionInCircle" /> , @@ -387,7 +373,6 @@ exports[`should hide short url section when allowShortUrl is false 1`] = ` grow={false} > } position="bottom" - type="questionInCircle" /> , diff --git a/src/legacy/ui/public/share/components/url_panel_content.tsx b/src/legacy/ui/public/share/components/url_panel_content.tsx index 07c7173797809..6d468d740e101 100644 --- a/src/legacy/ui/public/share/components/url_panel_content.tsx +++ b/src/legacy/ui/public/share/components/url_panel_content.tsx @@ -100,7 +100,10 @@ class UrlPanelContentUI extends Component { {this.renderShortUrlSwitch()} - + {(copy: () => void) => ( ; - export const EuiCopy: React.SFC; export const EuiOutsideClickDetector: React.SFC; export const EuiSideNav: React.SFC; diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap index f75bbc8575a05..f22f8c60912a9 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap +++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap @@ -515,6 +515,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` a0ce2 @@ -546,6 +547,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` href="#/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0" onBlur={[Function]} onFocus={[Function]} + rel="noreferrer" > About to blow up! @@ -622,6 +624,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` f3ac9 @@ -653,6 +656,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` href="#/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0" onBlur={[Function]} onFocus={[Function]} + rel="noreferrer" > AssertionError: @@ -729,6 +733,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` e9086 @@ -760,6 +765,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` href="#/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0" onBlur={[Function]} onFocus={[Function]} + rel="noreferrer" > AssertionError: Bad luck! @@ -836,6 +842,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` 8673d @@ -867,6 +874,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` href="#/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc?rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0" onBlur={[Function]} onFocus={[Function]} + rel="noreferrer" > Customer with ID 8517 not found diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap index e8ae5e73a54e0..4d3f9f9ee8ee5 100644 --- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap +++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap @@ -80,6 +80,7 @@ NodeList [ Learn more by visiting the Kibana Upgrade Assistant @@ -96,6 +97,7 @@ NodeList [