From 67cb97e6aad932bd164c1047f61d8f2990386299 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Thu, 31 Jan 2019 16:40:37 -0800 Subject: [PATCH 1/4] Adjust spacing around description around descriptions in list views so that it's even on top and bottom. --- .../home/auto_follow_pattern_list/auto_follow_pattern_list.js | 2 +- .../home/follower_indices_list/follower_indices_list.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js index f541370fe247d..51e80271063b4 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/auto_follow_pattern_list.js @@ -128,7 +128,7 @@ export const AutoFollowPatternList = injectI18n( - + ); } diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js index 8c1dfabe7ff32..5de818123dccd 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/follower_indices_list.js @@ -124,7 +124,7 @@ export const FollowerIndicesList = injectI18n( - + ); } From 648965e45a31f1cf9b3d127092a206a57cd3bda3 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Thu, 31 Jan 2019 16:48:15 -0800 Subject: [PATCH 2/4] Add link to transport port docs from Remote Cluster form. --- .../remote_cluster_form/remote_cluster_form.js | 17 +++++++++++++++-- .../public/services/documentation_links.js | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/remote_clusters/public/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/sections/components/remote_cluster_form/remote_cluster_form.js index c8f08b9aad0c9..e927d6b4b2b48 100644 --- a/x-pack/plugins/remote_clusters/public/sections/components/remote_cluster_form/remote_cluster_form.js +++ b/x-pack/plugins/remote_clusters/public/sections/components/remote_cluster_form/remote_cluster_form.js @@ -31,7 +31,10 @@ import { EuiTitle, } from '@elastic/eui'; -import { skippingDisconnectedClustersUrl } from '../../../services/documentation_links'; +import { + skippingDisconnectedClustersUrl, + transportPortUrl, +} from '../../../services/documentation_links'; import { validateName, validateSeeds, validateSeed } from './validators'; const defaultFields = { @@ -264,7 +267,17 @@ export const RemoteClusterForm = injectI18n( helpText={( + + + ), + }} /> )} isInvalid={showErrors} diff --git a/x-pack/plugins/remote_clusters/public/services/documentation_links.js b/x-pack/plugins/remote_clusters/public/services/documentation_links.js index a7ccaa7df8800..d094f05ce1eda 100644 --- a/x-pack/plugins/remote_clusters/public/services/documentation_links.js +++ b/x-pack/plugins/remote_clusters/public/services/documentation_links.js @@ -10,3 +10,4 @@ const esBase = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LIN export const skippingDisconnectedClustersUrl = `${esBase}/modules-cross-cluster-search.html#_skipping_disconnected_clusters`; export const remoteClustersUrl = `${esBase}/modules-remote-clusters.html`; +export const transportPortUrl = `${esBase}/modules-transport.html`; From c6b03ef67b716c0ff9708ebed3a881cd4d0bbc73 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Thu, 31 Jan 2019 17:58:07 -0800 Subject: [PATCH 3/4] Update snapshots. --- .../remote_cluster_form.test.js.snap | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/remote_clusters/public/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/plugins/remote_clusters/public/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap index 752b4880c7b01..b4b6eb2afc962 100644 --- a/x-pack/plugins/remote_clusters/public/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap +++ b/x-pack/plugins/remote_clusters/public/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap @@ -166,7 +166,16 @@ Array [ class="euiFormHelpText euiFormRow__text" id="mockId-help" > - An IP address or host name, followed by the transport port of the remote cluster. + An IP address or host name, followed by the + + transport port + + of the remote cluster. @@ -430,7 +439,16 @@ Array [ class="euiFormHelpText euiFormRow__text" id="mockId-help" > - An IP address or host name, followed by the transport port of the remote cluster. + An IP address or host name, followed by the + + transport port + + of the remote cluster. ,
Date: Thu, 31 Jan 2019 18:12:57 -0800 Subject: [PATCH 4/4] Move 'View in Index Management' link from the detail panel body into the footer. --- .../components/detail_panel/detail_panel.js | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js index ce8b40cfb5a2e..7ac6904965e8a 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/detail_panel/detail_panel.js @@ -10,6 +10,7 @@ import { injectI18n, FormattedMessage } from '@kbn/i18n/react'; import { getIndexListUri } from '../../../../../../../../index_management/public/services/navigation'; import { + EuiButton, EuiButtonEmpty, EuiCodeEditor, EuiDescriptionList, @@ -23,7 +24,6 @@ import { EuiFlyoutHeader, EuiHealth, EuiIcon, - EuiLink, EuiLoadingSpinner, EuiSpacer, EuiText, @@ -48,7 +48,6 @@ export class DetailPanelUi extends Component { renderFollowerIndex() { const { followerIndex: { - name, remoteCluster, leaderIndex, isPaused, @@ -66,8 +65,6 @@ export class DetailPanelUi extends Component { }, } = this.props; - const indexManagementUri = getIndexListUri(`name:${name}`); - return ( @@ -324,15 +321,6 @@ export class DetailPanelUi extends Component { - - - - {shards && shards.map((shard, i) => ( @@ -436,6 +424,8 @@ export class DetailPanelUi extends Component { closeDetailPanel, } = this.props; + const indexManagementUri = getIndexListUri(`name:${followerIndex.name}`); + return ( @@ -452,22 +442,37 @@ export class DetailPanelUi extends Component { - {followerIndex && ( - - + + + - )} - followerIndices={[followerIndex]} - /> - - )} + + + + {followerIndex && ( + + + )} + followerIndices={[followerIndex]} + /> + + )} + + );