From cbd64585721b970a05834c73251a0c2a38672522 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 23 Oct 2019 14:30:08 -0500 Subject: [PATCH 1/5] eui 14.7.0 --- package.json | 2 +- .../plugins/kbn_tp_run_pipeline/package.json | 2 +- .../plugins/kbn_tp_custom_visualizations/package.json | 2 +- .../plugins/kbn_tp_embeddable_explorer/package.json | 2 +- .../plugins/kbn_tp_sample_panel_action/package.json | 2 +- .../plugins/kbn_tp_visualize_embedding/package.json | 2 +- x-pack/package.json | 2 +- yarn.lock | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 101cee27aa28f..1899b9afa25fb 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "@elastic/charts": "^13.5.4", "@elastic/datemath": "5.0.2", "@elastic/ems-client": "1.0.5", - "@elastic/eui": "14.5.0", + "@elastic/eui": "14.7.0", "@elastic/filesaver": "1.1.2", "@elastic/good": "8.1.1-kibana2", "@elastic/numeral": "2.3.3", diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json index 68641c2fd6b1f..21b49a9823f62 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.5.0", + "@elastic/eui": "14.7.0", "react": "^16.8.0", "react-dom": "^16.8.0" } diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json index a03849129192f..7aacfbc22ceee 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.5.0", + "@elastic/eui": "14.7.0", "react": "^16.8.0" } } diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json index 18b14516b9be4..80ec89fb0078a 100644 --- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json +++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.5.0", + "@elastic/eui": "14.7.0", "react": "^16.8.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json index b147da6a448ae..54aba07079eeb 100644 --- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.5.0", + "@elastic/eui": "14.7.0", "react": "^16.8.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json index 10f122823353c..121f69ada329b 100644 --- a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json +++ b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "14.5.0", + "@elastic/eui": "14.7.0", "react": "^16.8.0", "react-dom": "^16.8.0" } diff --git a/x-pack/package.json b/x-pack/package.json index d55910ccd5a5c..1e047790a2985 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -194,7 +194,7 @@ "@elastic/ctags-langserver": "^0.1.11", "@elastic/datemath": "5.0.2", "@elastic/ems-client": "1.0.5", - "@elastic/eui": "14.5.0", + "@elastic/eui": "14.7.0", "@elastic/filesaver": "1.1.2", "@elastic/javascript-typescript-langserver": "^0.3.3", "@elastic/lsp-extension": "^0.1.2", diff --git a/yarn.lock b/yarn.lock index 67954e168ac91..434c7d04cc381 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1153,10 +1153,10 @@ tabbable "^1.1.0" uuid "^3.1.0" -"@elastic/eui@14.5.0": - version "14.5.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-14.5.0.tgz#1b27559cd644403e2692cab1549082cbd3421dab" - integrity sha512-QpmfO6Unt4evb4P18CyWzassLFrw/4CUPFYZXQK12IChDOs6GrwQ6xZM8f0wjN/NXwjRjlWzMhtCWHYmrI6NGg== +"@elastic/eui@14.7.0": + version "14.7.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-14.7.0.tgz#dcbd3e9a9307e52a2fdca5833a116de5940de06d" + integrity sha512-IjYjUqhfqjqG6cbaTANiuHyWq3U62ODzcOnIKACxHOGCK2JVwiDvtDByAuj3PvD0wG/cDN49oNbUZ/o0QCapVw== dependencies: "@types/lodash" "^4.14.116" "@types/numeral" "^0.0.25" From f32889014822f15a6db281175a2a73bd284f7c6b Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 23 Oct 2019 14:31:40 -0500 Subject: [PATCH 2/5] icon updates --- .../TransactionActionMenu.tsx | 14 +++++------ x-pack/legacy/plugins/infra/index.ts | 6 ++--- .../metrics_explorer/chart_context_menu.tsx | 4 ++-- .../plugins/infra/public/register_feature.ts | 4 ++-- .../plugins/infra/server/kibana.index.ts | 4 ++-- .../modules/logs_ui_analysis/logo.json | 2 +- .../logs/__snapshots__/logs.test.js.snap | 8 +++---- .../monitoring/public/components/logs/logs.js | 2 +- .../integration_group.test.tsx.snap | 24 +++++++++---------- .../functional/integration_group.tsx | 12 +++++----- .../functional/integration_link.tsx | 2 +- .../watcher/common/types/action_types.ts | 2 +- .../public/models/action/logging_action.js | 2 +- 13 files changed, 43 insertions(+), 43 deletions(-) diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx index a121e8dc25b43..533bc845f14f9 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx @@ -81,7 +81,7 @@ export const TransactionActionMenu: FunctionComponent = ( const infraConfigItems: InfraConfigItem[] = [ { - icon: 'loggingApp', + icon: 'logsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showPodLogsLinkLabel', { defaultMessage: 'Show pod logs' } @@ -91,7 +91,7 @@ export const TransactionActionMenu: FunctionComponent = ( query: { time } }, { - icon: 'loggingApp', + icon: 'logsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showContainerLogsLinkLabel', { defaultMessage: 'Show container logs' } @@ -101,7 +101,7 @@ export const TransactionActionMenu: FunctionComponent = ( query: { time } }, { - icon: 'loggingApp', + icon: 'logsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showHostLogsLinkLabel', { defaultMessage: 'Show host logs' } @@ -111,7 +111,7 @@ export const TransactionActionMenu: FunctionComponent = ( query: { time } }, { - icon: 'loggingApp', + icon: 'logsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showTraceLogsLinkLabel', { defaultMessage: 'Show trace logs' } @@ -124,7 +124,7 @@ export const TransactionActionMenu: FunctionComponent = ( } }, { - icon: 'infraApp', + icon: 'metricsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showPodMetricsLinkLabel', { defaultMessage: 'Show pod metrics' } @@ -134,7 +134,7 @@ export const TransactionActionMenu: FunctionComponent = ( query: infraMetricsQuery }, { - icon: 'infraApp', + icon: 'metricsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showContainerMetricsLinkLabel', { defaultMessage: 'Show container metrics' } @@ -144,7 +144,7 @@ export const TransactionActionMenu: FunctionComponent = ( query: infraMetricsQuery }, { - icon: 'infraApp', + icon: 'metricsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showHostMetricsLinkLabel', { defaultMessage: 'Show host metrics' } diff --git a/x-pack/legacy/plugins/infra/index.ts b/x-pack/legacy/plugins/infra/index.ts index 671ae7d747e01..9bf679fb5ff80 100644 --- a/x-pack/legacy/plugins/infra/index.ts +++ b/x-pack/legacy/plugins/infra/index.ts @@ -43,7 +43,7 @@ export function infra(kibana: any) { defaultMessage: 'Explore your metrics', }), icon: 'plugins/infra/images/infra_mono_white.svg', - euiIconType: 'infraApp', + euiIconType: 'metricsApp', id: 'infra:home', order: 8000, title: i18n.translate('xpack.infra.linkInfrastructureTitle', { @@ -56,7 +56,7 @@ export function infra(kibana: any) { defaultMessage: 'Explore your logs', }), icon: 'plugins/infra/images/logging_mono_white.svg', - euiIconType: 'loggingApp', + euiIconType: 'logsApp', id: 'infra:logs', order: 8001, title: i18n.translate('xpack.infra.linkLogsTitle', { @@ -76,7 +76,7 @@ export function infra(kibana: any) { { path: `/app/${APP_ID}#/logs`, label: logsSampleDataLinkLabel, - icon: 'loggingApp', + icon: 'logsApp', }, ]); }, diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx index 5293af666723a..aa3616c5ecfbe 100644 --- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx +++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx @@ -96,7 +96,7 @@ export const MetricsExplorerChartContextMenu = ({ name: i18n.translate('xpack.infra.metricsExplorer.filterByLabel', { defaultMessage: 'Add filter', }), - icon: 'infraApp', + icon: 'metricsApp', onClick: handleFilter, 'data-test-subj': 'metricsExplorerAction-AddFilter', }, @@ -111,7 +111,7 @@ export const MetricsExplorerChartContextMenu = ({ defaultMessage: 'View metrics for {name}', values: { name: nodeType }, }), - icon: 'infraApp', + icon: 'metricsApp', href: createNodeDetailLink(nodeType, series.id, timeRange.from, timeRange.to), 'data-test-subj': 'metricsExplorerAction-ViewNodeMetrics', }, diff --git a/x-pack/legacy/plugins/infra/public/register_feature.ts b/x-pack/legacy/plugins/infra/public/register_feature.ts index 2557503ef5c0a..bf56db77e360f 100644 --- a/x-pack/legacy/plugins/infra/public/register_feature.ts +++ b/x-pack/legacy/plugins/infra/public/register_feature.ts @@ -21,7 +21,7 @@ FeatureCatalogueRegistryProvider.register((i18n: I18nServiceType) => ({ defaultMessage: 'Explore infrastructure metrics and logs for common servers, containers, and services.', }), - icon: 'infraApp', + icon: 'metricsApp', path: `/app/${APP_ID}#infrastructure`, showOnHomePage: true, category: FeatureCatalogueCategory.DATA, @@ -36,7 +36,7 @@ FeatureCatalogueRegistryProvider.register((i18n: I18nServiceType) => ({ defaultMessage: 'Stream logs in real time or scroll through historical views in a console-like experience.', }), - icon: 'loggingApp', + icon: 'logsApp', path: `/app/${APP_ID}#logs`, showOnHomePage: true, category: FeatureCatalogueCategory.DATA, diff --git a/x-pack/legacy/plugins/infra/server/kibana.index.ts b/x-pack/legacy/plugins/infra/server/kibana.index.ts index 59e3ffb3cb33d..48ef846ec5275 100644 --- a/x-pack/legacy/plugins/infra/server/kibana.index.ts +++ b/x-pack/legacy/plugins/infra/server/kibana.index.ts @@ -35,7 +35,7 @@ export const initServerWithKibana = (kbnServer: KbnServer) => { name: i18n.translate('xpack.infra.featureRegistry.linkInfrastructureTitle', { defaultMessage: 'Metrics', }), - icon: 'infraApp', + icon: 'metricsApp', navLinkId: 'infra:home', app: ['infra', 'kibana'], catalogue: ['infraops'], @@ -73,7 +73,7 @@ export const initServerWithKibana = (kbnServer: KbnServer) => { name: i18n.translate('xpack.infra.featureRegistry.linkLogsTitle', { defaultMessage: 'Logs', }), - icon: 'loggingApp', + icon: 'logsApp', navLinkId: 'infra:logs', app: ['infra', 'kibana'], catalogue: ['infralogging'], diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json index ead765e474720..26b404ff331c6 100644 --- a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json +++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json @@ -1,3 +1,3 @@ { - "icon": "loggingApp" + "icon": "logsApp" } diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap index b108746a422bb..4affadd127530 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap +++ b/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap @@ -2,7 +2,7 @@ exports[`Logs should render a link to filter by cluster uuid 1`] = ` @@ -26,7 +26,7 @@ exports[`Logs should render a link to filter by cluster uuid 1`] = ` exports[`Logs should render a link to filter by cluster uuid and index uuid 1`] = ` @@ -50,7 +50,7 @@ exports[`Logs should render a link to filter by cluster uuid and index uuid 1`] exports[`Logs should render a link to filter by cluster uuid and node uuid 1`] = ` @@ -275,7 +275,7 @@ exports[`Logs should render normally 1`] = ` size="m" /> diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js b/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js index c59a3d595b14f..50e3cbd9af6c9 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js +++ b/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js @@ -169,7 +169,7 @@ export class Logs extends PureComponent { title={i18n.translate('xpack.monitoring.logs.listing.calloutTitle', { defaultMessage: 'Want to see more log entries?' })} - iconType="loggingApp" + iconType="logsApp" >

@@ -15,7 +15,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`] @@ -23,7 +23,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`] @@ -31,7 +31,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`] @@ -39,7 +39,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`] @@ -47,7 +47,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`] @@ -71,7 +71,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable @@ -79,7 +79,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable @@ -87,7 +87,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable @@ -111,7 +111,7 @@ exports[`IntegrationGroup will not display logging links when logging is unavail @@ -119,7 +119,7 @@ exports[`IntegrationGroup will not display logging links when logging is unavail @@ -127,7 +127,7 @@ exports[`IntegrationGroup will not display logging links when logging is unavail diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx index 2dd3d24a3cd8d..da66235e37f1a 100644 --- a/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx +++ b/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx @@ -87,7 +87,7 @@ export const IntegrationGroup = ({ } )} href={getInfraIpHref(summary, basePath)} - iconType="infraApp" + iconType="metricsApp" message={i18n.translate( 'xpack.uptime.monitorList.infraIntegrationAction.ip.message', { @@ -116,7 +116,7 @@ export const IntegrationGroup = ({ } )} href={getInfraKubernetesHref(summary, basePath)} - iconType="infraApp" + iconType="metricsApp" message={i18n.translate( 'xpack.uptime.monitorList.infraIntegrationAction.kubernetes.message', { @@ -145,7 +145,7 @@ export const IntegrationGroup = ({ } )} href={getInfraContainerHref(summary, basePath)} - iconType="infraApp" + iconType="metricsApp" message={i18n.translate( 'xpack.uptime.monitorList.infraIntegrationAction.container.message', { @@ -177,7 +177,7 @@ export const IntegrationGroup = ({ } )} href={getLoggingIpHref(summary, basePath)} - iconType="loggingApp" + iconType="logsApp" message={i18n.translate( 'xpack.uptime.monitorList.loggingIntegrationAction.ip.message', { @@ -200,7 +200,7 @@ export const IntegrationGroup = ({ } )} href={getLoggingKubernetesHref(summary, basePath)} - iconType="loggingApp" + iconType="logsApp" message={i18n.translate( 'xpack.uptime.monitorList.loggingIntegrationAction.kubernetes.message', { @@ -227,7 +227,7 @@ export const IntegrationGroup = ({ } )} href={getLoggingContainerHref(summary, basePath)} - iconType="loggingApp" + iconType="logsApp" message={i18n.translate( 'xpack.uptime.monitorList.loggingIntegrationAction.container.message', { diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx index 63a3053afc601..a545cd7c42927 100644 --- a/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx +++ b/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx @@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n'; interface IntegrationLinkProps { ariaLabel: string; href: string | undefined; - iconType: 'apmApp' | 'infraApp' | 'loggingApp'; + iconType: 'apmApp' | 'metricsApp' | 'logsApp'; message: string; tooltipContent: string; } diff --git a/x-pack/legacy/plugins/watcher/common/types/action_types.ts b/x-pack/legacy/plugins/watcher/common/types/action_types.ts index 8247df3293d17..123bf0f58db9d 100644 --- a/x-pack/legacy/plugins/watcher/common/types/action_types.ts +++ b/x-pack/legacy/plugins/watcher/common/types/action_types.ts @@ -34,7 +34,7 @@ export interface EmailAction extends BaseAction { export interface LoggingAction extends BaseAction { type: LoggingActionType; - iconClass: 'loggingApp'; + iconClass: 'logsApp'; text: string; } diff --git a/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js b/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js index e11ebedc874c0..477ee9e2230b4 100644 --- a/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js +++ b/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js @@ -68,7 +68,7 @@ export class LoggingAction extends BaseAction { static typeName = i18n.translate('xpack.watcher.models.loggingAction.typeName', { defaultMessage: 'Logging', }); - static iconClass = 'loggingApp'; + static iconClass = 'logsApp'; static selectMessage = i18n.translate('xpack.watcher.models.loggingAction.selectMessageText', { defaultMessage: 'Add an item to the logs.', }); From f9e6e864476fc428e6ac1193118871dc6edc31a8 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 23 Oct 2019 14:33:52 -0500 Subject: [PATCH 3/5] snapshot updates --- .../__test__/__snapshots__/List.test.tsx.snap | 167 ++++++++++++++++-- .../ServiceOverview.test.tsx.snap | 8 +- .../__snapshots__/file_tree.test.tsx.snap | 12 -- .../__snapshots__/symbol_tree.test.tsx.snap | 12 -- .../report_listing.test.tsx.snap | 50 ++++++ 5 files changed, 209 insertions(+), 40 deletions(-) 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 2689ce8bd9424..521a92f0b320b 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 @@ -132,7 +132,11 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = ` data-test-subj="tableHeaderCell_groupId_0" role="columnheader" scope="col" - width="96px" + style={ + Object { + "width": "96px", + } + } >

List should render empty state 1`] = ` data-test-subj="tableHeaderCell_message_1" role="columnheader" scope="col" - width="50%" + style={ + Object { + "width": "50%", + } + } >
List should render empty state 1`] = ` data-test-subj="tableHeaderCell_handled_2" role="columnheader" scope="col" + style={ + Object { + "width": undefined, + } + } >
List should render empty state 1`] = ` data-test-subj="tableHeaderCell_occurrenceCount_3" role="columnheader" scope="col" + style={ + Object { + "width": undefined, + } + } >