From f4edf05575b9fab4227a61eefcf15e7b971e8907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastien?= Date: Wed, 30 Jan 2019 17:12:26 +0100 Subject: [PATCH 1/5] Fix api endpoit for auto-follow stats --- .../cross_cluster_replication/public/app/services/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/api.js b/x-pack/plugins/cross_cluster_replication/public/app/services/api.js index 10676826c1b77..32e8cf1460c0d 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/services/api.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/services/api.js @@ -95,7 +95,7 @@ export const updateFollowerIndex = (id, followerIndex) => ( /* Stats */ export const loadAutoFollowStats = () => ( - httpClient.get(`${apiPrefix}/stats/auto-follow`).then(extractData) + httpClient.get(`${apiPrefix}/stats/auto_follow`).then(extractData) ); /* Indices */ From 34a20c68a20e780434e907338d82fb1c6d19292c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastien?= Date: Thu, 31 Jan 2019 10:58:09 +0100 Subject: [PATCH 2/5] Prevent letter wrapping in IE for the Remote cluster "connection" table column --- .../components/connection_status/connection_status.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/connection_status.js b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/connection_status.js index d316267f435e0..da7bd768e7de8 100644 --- a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/connection_status.js +++ b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/connection_status.js @@ -56,7 +56,7 @@ export function ConnectionStatus({ isConnected }) { {icon} - + {message} From 35d3bae20edc099e9056aeeb2f8582c9c1660bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastien?= Date: Fri, 1 Feb 2019 10:19:01 +0100 Subject: [PATCH 3/5] Move inline style to CSS class to fix IE flex bug --- x-pack/plugins/remote_clusters/public/index.scss | 1 + .../components/connection_status/_index.scss | 3 +++ .../components/connection_status/connection_status.js | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/_index.scss diff --git a/x-pack/plugins/remote_clusters/public/index.scss b/x-pack/plugins/remote_clusters/public/index.scss index f1bbc7941c608..2d1a6374352e9 100644 --- a/x-pack/plugins/remote_clusters/public/index.scss +++ b/x-pack/plugins/remote_clusters/public/index.scss @@ -1,5 +1,6 @@ // Import the EUI global scope so we can use EUI constants @import 'ui/public/styles/_styling_constants'; +@import './sections/remote_cluster_list/components/connection_status/index'; // Index management plugin styles diff --git a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/_index.scss b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/_index.scss new file mode 100644 index 0000000000000..88f998701e5fe --- /dev/null +++ b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/_index.scss @@ -0,0 +1,3 @@ +.euiFlexGroup .euiFlexItem .remoteClustersConnectionStatus__message { + flex-basis: auto; +} diff --git a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/connection_status.js b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/connection_status.js index da7bd768e7de8..71d9e671fdae8 100644 --- a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/connection_status.js +++ b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/connection_status.js @@ -56,7 +56,7 @@ export function ConnectionStatus({ isConnected }) { {icon} - + {message} From a0f521b54621d22b5adf9c90d853596120e692cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastien?= Date: Fri, 1 Feb 2019 11:55:37 +0100 Subject: [PATCH 4/5] Update jest snapshot --- .../__snapshots__/remote_cluster_table.test.js.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/remote_cluster_table/__snapshots__/remote_cluster_table.test.js.snap b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/remote_cluster_table/__snapshots__/remote_cluster_table.test.js.snap index 21110725f0eb2..bf21cd3e7de35 100644 --- a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/remote_cluster_table/__snapshots__/remote_cluster_table.test.js.snap +++ b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/remote_cluster_table/__snapshots__/remote_cluster_table.test.js.snap @@ -86,7 +86,7 @@ exports[`RemoteClusterTable renders a row for an API-defined remote cluster 1`]
Date: Mon, 4 Feb 2019 11:52:41 +0100 Subject: [PATCH 5/5] Update failing test snapshot + update .remoteClustersConnectionStatus__message css class --- .../components/connection_status/_index.scss | 7 +++++-- .../detail_panel/__snapshots__/detail_panel.test.js.snap | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/_index.scss b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/_index.scss index 88f998701e5fe..c85cb36c5dc5a 100644 --- a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/_index.scss +++ b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/components/connection_status/_index.scss @@ -1,3 +1,6 @@ -.euiFlexGroup .euiFlexItem .remoteClustersConnectionStatus__message { - flex-basis: auto; +/** + * 1. Prevent inherited flexbox layout from compressing this element on IE. + */ + .remoteClustersConnectionStatus__message { + flex-basis: auto !important; /* 1 */ } diff --git a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/detail_panel/__snapshots__/detail_panel.test.js.snap b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/detail_panel/__snapshots__/detail_panel.test.js.snap index b02f009512054..aca7f851783a3 100644 --- a/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/detail_panel/__snapshots__/detail_panel.test.js.snap +++ b/x-pack/plugins/remote_clusters/public/sections/remote_cluster_list/detail_panel/__snapshots__/detail_panel.test.js.snap @@ -95,7 +95,7 @@ exports[` 1`] = `