diff --git a/src/ui/public/indices/constants/index.js b/src/ui/public/indices/constants/index.js index e8f1da34e400d..717472ebeffe5 100644 --- a/src/ui/public/indices/constants/index.js +++ b/src/ui/public/indices/constants/index.js @@ -19,4 +19,9 @@ import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from 'ui/index_patterns'; -export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.concat(','); +export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [ ...INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE ]; + +// Insert the comma into the middle, so it doesn't look as if it has grammatical meaning when +// these characters are rendered in the UI. +const insertionIndex = Math.floor(INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.length / 2); +INDEX_ILLEGAL_CHARACTERS_VISIBLE.splice(insertionIndex, 0, ','); diff --git a/x-pack/plugins/cross_cluster_replication/public/app/app.js b/x-pack/plugins/cross_cluster_replication/public/app/app.js index 39ecd816de5c5..e360d639d4279 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/app.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/app.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import React, { Component } from 'react'; +import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { Route, Switch, Redirect } from 'react-router-dom'; import chrome from 'ui/chrome'; @@ -18,6 +18,7 @@ import { EuiFlexItem, EuiLoadingSpinner, EuiPageContent, + EuiSpacer, EuiTitle, } from '@elastic/eui'; @@ -160,15 +161,19 @@ export const App = injectI18n( if (fetchPermissionError) { return ( - - )} - error={fetchPermissionError} - /> + + + )} + error={fetchPermissionError} + /> + + + ); } @@ -182,14 +187,15 @@ export const App = injectI18n(

} body={

} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js b/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js index 4d8c913a0b06a..1463560909edb 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js @@ -66,6 +66,7 @@ export class AutoFollowPatternFormUI extends PureComponent { apiStatus: PropTypes.string.isRequired, currentUrl: PropTypes.string.isRequired, remoteClusters: PropTypes.array, + saveButtonLabel: PropTypes.node, } constructor(props) { @@ -216,9 +217,15 @@ export class AutoFollowPatternFormUI extends PureComponent { if (apiError) { const title = intl.formatMessage({ id: 'xpack.crossClusterReplication.autoFollowPatternForm.savingErrorTitle', - defaultMessage: 'Error creating auto-follow pattern', + defaultMessage: `Can't create auto-follow pattern`, }); - return ; + + return ( + + + + + ); } return null; @@ -295,20 +302,35 @@ export class AutoFollowPatternFormUI extends PureComponent { const { remoteClusters, currentUrl } = this.props; const errorMessages = { - noClusterFound: () => (), - remoteClusterNotConnectedNotEditable: () => (), - remoteClusterDoesNotExist: () => () + noClusterFound: () => ( + + ), + remoteClusterNotConnectedNotEditable: (name) => ({ + title: ( + + ), + description: ( + + ), + }), + remoteClusterDoesNotExist: (name) => ( + + ), }; return ( @@ -379,7 +401,7 @@ export class AutoFollowPatternFormUI extends PureComponent {

- + ); }; @@ -558,7 +580,7 @@ export class AutoFollowPatternFormUI extends PureComponent { * Form Actions */ const renderActions = () => { - const { apiStatus } = this.props; + const { apiStatus, saveButtonLabel } = this.props; const { areErrorsVisible } = this.state; if (apiStatus === API_STATUS.SAVING) { @@ -592,10 +614,7 @@ export class AutoFollowPatternFormUI extends PureComponent { fill disabled={isSaveDisabled} > - + {saveButtonLabel} @@ -623,7 +642,7 @@ export class AutoFollowPatternFormUI extends PureComponent { {renderAutoFollowPatternPrefixSuffix()} {renderFormErrorWarning()} - + {this.renderApiErrors()} {renderActions()} ); @@ -645,7 +664,6 @@ export class AutoFollowPatternFormUI extends PureComponent { render() { return ( - {this.renderApiErrors()} {this.renderForm()} {this.renderLoading()} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/advanced_settings_fields.js b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/advanced_settings_fields.js index cb1857473b817..84e0d58191d27 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/advanced_settings_fields.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/advanced_settings_fields.js @@ -18,7 +18,7 @@ const byteUnitsHelpText = ( ) }} @@ -33,7 +33,7 @@ const timeUnitsHelpText = ( ) }} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.js b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.js index 9cd906889b4e8..1d3bf8d60db21 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.js @@ -92,6 +92,7 @@ export const FollowerIndexForm = injectI18n( apiError: PropTypes.object, apiStatus: PropTypes.string.isRequired, remoteClusters: PropTypes.array, + saveButtonLabel: PropTypes.node, } constructor(props) { @@ -288,7 +289,7 @@ export const FollowerIndexForm = injectI18n( if (apiError) { const title = intl.formatMessage({ id: 'xpack.crossClusterReplication.followerIndexForm.savingErrorTitle', - defaultMessage: 'Error creating follower index', + defaultMessage: `Can't create follower index`, }); const { leaderIndex } = this.state.followerIndex; const error = apiError.status === 404 @@ -296,12 +297,18 @@ export const FollowerIndexForm = injectI18n( data: { message: intl.formatMessage({ id: 'xpack.crossClusterReplication.followerIndexForm.leaderIndexNotFoundError', - defaultMessage: `The leader index '{leaderIndex}' you want to replicate from does not exist.`, + defaultMessage: `The leader index '{leaderIndex}' does not exist.`, }, { leaderIndex }) } } : apiError; - return ; + + return ( + + + + + ); } return null; @@ -360,7 +367,7 @@ export const FollowerIndexForm = injectI18n( )} label={indexNameLabel} description={i18n.translate('xpack.crossClusterReplication.followerIndexForm.sectionFollowerIndexNameDescription', { - defaultMessage: 'A name for the follower index.' + defaultMessage: 'A unique name for your index.' })} helpText={indexNameHelpText} isLoading={isValidatingIndexName} @@ -377,20 +384,35 @@ export const FollowerIndexForm = injectI18n( const { remoteClusters, currentUrl } = this.props; const errorMessages = { - noClusterFound: () => (), - remoteClusterNotConnectedNotEditable: () => (), - remoteClusterDoesNotExist: () => () + noClusterFound: () => ( + + ), + remoteClusterNotConnectedNotEditable: (name) => ({ + title: ( + + ), + description: ( + + ), + }), + remoteClusterDoesNotExist: (name) => ( + + ), }; return ( @@ -408,7 +430,7 @@ export const FollowerIndexForm = injectI18n( description={( )} fullWidth @@ -450,11 +472,30 @@ export const FollowerIndexForm = injectI18n( )} label={leaderIndexLabel} - description={i18n.translate( - 'xpack.crossClusterReplication.followerIndexForm.sectionLeaderIndexDescription', - { - defaultMessage: 'The leader index you want to replicate from the remote cluster.' - } + description={( + +

+ +

+ +

+ + + + ) }} + /> +

+ )} helpText={(

@@ -561,7 +602,6 @@ export const FollowerIndexForm = injectI18n( return ( - { - const { apiStatus } = this.props; + const { apiStatus, saveButtonLabel } = this.props; const { areErrorsVisible } = this.state; if (apiStatus === API_STATUS.SAVING) { @@ -616,10 +656,7 @@ export const FollowerIndexForm = injectI18n( fill disabled={isSaveDisabled} > - + {saveButtonLabel} @@ -649,6 +686,7 @@ export const FollowerIndexForm = injectI18n( {renderFormErrorWarning()} + {this.renderApiErrors()} {renderActions()} ); @@ -670,7 +708,6 @@ export const FollowerIndexForm = injectI18n( render() { return ( - {this.renderApiErrors()} {this.renderForm()} {this.renderLoading()} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_pause_provider.js b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_pause_provider.js index 2b6804770a421..a745022e12f6a 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_pause_provider.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_pause_provider.js @@ -56,11 +56,11 @@ class Provider extends PureComponent { const title = isSingle ? intl.formatMessage({ id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.pauseSingleTitle', - defaultMessage: 'Pause follower index \'{name}\'?', + defaultMessage: 'Pause replication to follower index \'{name}\'?', }, { name: indices[0].name }) : intl.formatMessage({ id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.pauseMultipleTitle', - defaultMessage: 'Pause {count} follower indices?', + defaultMessage: 'Pause replication to {count} follower indices?', }, { count: indices.length }); const hasCustomSettings = indices.some(index => !areAllSettingsDefault(index)); @@ -78,50 +78,42 @@ class Provider extends PureComponent { }) } buttonColor={hasCustomSettings ? 'danger' : 'primary'} - confirmButtonText={ - hasCustomSettings ? intl.formatMessage({ - id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.confirmButtonTextWithSettingWarning', - defaultMessage: 'Pause and revert advanced settings to defaults', - }) : intl.formatMessage({ - id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.confirmButtonText', - defaultMessage: 'Pause', - }) - } + confirmButtonText={intl.formatMessage({ + id: 'xpack.crossClusterReplication.pauseFollowerIndex.confirmModal.confirmButtonText', + defaultMessage: 'Pause replication', + })} onMouseOver={this.onMouseOverModal} > - {isSingle ? ( - - { - hasCustomSettings ? ( -

- -

- ) : null - } - - ) : ( + {hasCustomSettings && ( +

+ {isSingle ? ( + + ) : ( + + )} +

+ )} + + {!isSingle && (

- { - hasCustomSettings ? ( - - ) : ( - - ) - } +

-
    {indices.map(index =>
  • {index.name}
    • )}
+ +
    + {indices.map(index =>
  • {index.name}
    • )} +
)} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_resume_provider.js b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_resume_provider.js index 9338af8fca96a..a97153f314287 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_resume_provider.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_resume_provider.js @@ -57,11 +57,11 @@ class Provider extends PureComponent { const title = isSingle ? intl.formatMessage({ id: 'xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.resumeSingleTitle', - defaultMessage: 'Resume follower index \'{name}\'?', + defaultMessage: 'Resume replication to follower index \'{name}\'?', }, { name: ids[0] }) : intl.formatMessage({ id: 'xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.resumeMultipleTitle', - defaultMessage: 'Resume {count} follower indices?', + defaultMessage: 'Resume replication to {count} follower indices?', }, { count: ids.length }); return ( @@ -81,7 +81,7 @@ class Provider extends PureComponent { confirmButtonText={ intl.formatMessage({ id: 'xpack.crossClusterReplication.resumeFollowerIndex.confirmModal.confirmButtonText', - defaultMessage: 'Resume using default advanced settings', + defaultMessage: 'Resume replication', }) } onMouseOver={this.onMouseOverModal} @@ -90,14 +90,14 @@ class Provider extends PureComponent {

), @@ -106,14 +106,23 @@ class Provider extends PureComponent {

) : ( +

+ +

+

-
    {ids.map(id =>
  • {id}
    • )}
+ +
    + {ids.map(id =>
  • {id}
    • )} +
)} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_unfollow_provider.js b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_unfollow_provider.js index 8e058e29d594f..2b0f6931044af 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_unfollow_provider.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_unfollow_provider.js @@ -55,11 +55,11 @@ class Provider extends PureComponent { const title = isSingle ? intl.formatMessage({ id: 'xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.unfollowSingleTitle', - defaultMessage: 'Unfollow leader index of follower index \'{name}\'?', + defaultMessage: `Unfollow leader index of '{name}'?`, }, { name: ids[0] }) : intl.formatMessage({ id: 'xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.unfollowMultipleTitle', - defaultMessage: 'Unfollow leader indices of {count} follower indices?', + defaultMessage: 'Unfollow {count} leader indices?', }, { count: ids.length }); return ( @@ -79,7 +79,7 @@ class Provider extends PureComponent { confirmButtonText={ intl.formatMessage({ id: 'xpack.crossClusterReplication.unfollowLeaderIndex.confirmModal.confirmButtonText', - defaultMessage: 'Unfollow', + defaultMessage: 'Unfollow leader', }) } onMouseOver={this.onMouseOverModal} @@ -89,9 +89,9 @@ class Provider extends PureComponent {

@@ -100,9 +100,9 @@ class Provider extends PureComponent {

    {ids.map(id =>
  • {id}
    • )}
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/remote_clusters_form_field.js b/x-pack/plugins/cross_cluster_replication/public/app/components/remote_clusters_form_field.js index 7e6465f00a198..224b5f295f7ce 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/components/remote_clusters_form_field.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/components/remote_clusters_form_field.js @@ -22,14 +22,27 @@ import routing from '../services/routing'; import { BASE_PATH_REMOTE_CLUSTERS } from '../../../common/constants'; const errorMessages = { - noClusterFound: () => (), - remoteClusterNotConnectedEditable: () => (), + noClusterFound: () => ( + + ), + remoteClusterNotConnectedEditable: (name) => ({ + title: ( + + ), + description: ( + + ), + }), }; export const RemoteClustersFormField = injectI18n( @@ -131,7 +144,7 @@ export const RemoteClustersFormField = injectI18n( > @@ -144,7 +157,7 @@ export const RemoteClustersFormField = injectI18n( const { intl, currentUrl } = this.props; const title = intl.formatMessage({ id: 'xpack.crossClusterReplication.forms.emptyRemoteClustersCallOutTitle', - defaultMessage: 'No remote cluster found' + defaultMessage: `You don't have any remote clusters`, }); return ( @@ -165,7 +178,7 @@ export const RemoteClustersFormField = injectI18n( > @@ -174,11 +187,15 @@ export const RemoteClustersFormField = injectI18n( }; renderCurrentRemoteClusterNotConnected = (name, fatal) => { - const { intl, isEditable, currentUrl } = this.props; - const title = intl.formatMessage({ - id: 'xpack.crossClusterReplication.forms.remoteClusterConnectionErrorTitle', - defaultMessage: `The remote cluster '{name}' is not connected` - }, { name }); + const { isEditable, currentUrl } = this.props; + const { + remoteClusterNotConnectedEditable, + remoteClusterNotConnectedNotEditable, + } = this.errorMessages; + + const { title, description } = isEditable + ? remoteClusterNotConnectedEditable(name) + : remoteClusterNotConnectedNotEditable(name); return (

- { isEditable && this.errorMessages.remoteClusterNotConnectedEditable()} - { !isEditable && this.errorMessages.remoteClusterNotConnectedNotEditable()} + { description }

+ @@ -208,7 +224,7 @@ export const RemoteClustersFormField = injectI18n( const { intl, currentUrl } = this.props; const title = intl.formatMessage({ id: 'xpack.crossClusterReplication.forms.remoteClusterNotFoundTitle', - defaultMessage: `The remote cluster '{name}' was not found`, + defaultMessage: `Couldn't find remote cluster '{name}'`, }, { name }); return ( @@ -218,7 +234,7 @@ export const RemoteClustersFormField = injectI18n( iconType="cross" >

- { this.errorMessages.remoteClusterDoesNotExist() } + { this.errorMessages.remoteClusterDoesNotExist(name) }

diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/section_error.js b/x-pack/plugins/cross_cluster_replication/public/app/components/section_error.js index 922a2178c44ee..4e4abfa571c70 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/components/section_error.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/components/section_error.js @@ -6,8 +6,8 @@ import React, { Fragment } from 'react'; import { - EuiSpacer, EuiCallOut, + EuiSpacer, } from '@elastic/eui'; export function SectionError({ title, error }) { @@ -18,23 +18,20 @@ export function SectionError({ title, error }) { } = error.data; return ( - - -
{message || errorString}
- { cause && ( - - -
    - { cause.map((message, i) =>
  • {message}
    • ) } -
- - )} - - - + +
{message || errorString}
+ { cause && ( + + +
    + { cause.map((message, i) =>
  • {message}
    • ) } +
+ + )} + ); } diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_add/auto_follow_pattern_add.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_add/auto_follow_pattern_add.js index 99900d0fdd596..23b7a5b77295e 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_add/auto_follow_pattern_add.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_add/auto_follow_pattern_add.js @@ -73,6 +73,12 @@ export const AutoFollowPatternAdd = injectI18n( currentUrl={currentUrl} remoteClusters={error ? [] : remoteClusters} saveAutoFollowPattern={saveAutoFollowPattern} + saveButtonLabel={( + + )} /> ); }} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js index 5099555daa6d8..fe365d0315efd 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/auto_follow_pattern_edit/auto_follow_pattern_edit.js @@ -11,10 +11,11 @@ import chrome from 'ui/chrome'; import { MANAGEMENT_BREADCRUMB } from 'ui/management'; import { - EuiPageContent, EuiButtonEmpty, EuiFlexGroup, - EuiFlexItem + EuiFlexItem, + EuiPageContent, + EuiSpacer, } from '@elastic/eui'; import { listBreadcrumb, editBreadcrumb } from '../../services/breadcrumbs'; @@ -89,6 +90,9 @@ export const AutoFollowPatternEdit = injectI18n( return ( + + + + )} /> ); }} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_add/follower_index_add.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_add/follower_index_add.js index 460c22393db1b..e335d1a1318e0 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_add/follower_index_add.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_add/follower_index_add.js @@ -77,6 +77,12 @@ export const FollowerIndexAdd = injectI18n( remoteClusters={error ? [] : remoteClusters} saveFollowerIndex={saveFollowerIndex} clearApiError={clearApiError} + saveButtonLabel={( + + )} /> ); }} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js index 370d4f53aca53..48d8e1894e9a4 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/follower_index_edit/follower_index_edit.js @@ -11,12 +11,13 @@ import chrome from 'ui/chrome'; import { MANAGEMENT_BREADCRUMB } from 'ui/management'; import { - EuiPageContent, EuiButtonEmpty, + EuiConfirmModal, EuiFlexGroup, EuiFlexItem, EuiOverlayMask, - EuiConfirmModal, + EuiPageContent, + EuiSpacer, } from '@elastic/eui'; import { listBreadcrumb, editBreadcrumb } from '../../services/breadcrumbs'; @@ -129,6 +130,9 @@ export const FollowerIndexEdit = injectI18n( return ( + + + ) : ( )}

@@ -251,6 +255,12 @@ export const FollowerIndexEdit = injectI18n( remoteClusters={error ? [] : remoteClusters} saveFollowerIndex={this.saveFollowerIndex} clearApiError={clearApiError} + saveButtonLabel={( + + )} /> ); }} 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 51e80271063b4..d9243be3c774a 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 @@ -105,8 +105,8 @@ export const AutoFollowPatternList = injectI18n(

@@ -158,7 +158,13 @@ export const AutoFollowPatternList = injectI18n( id: 'xpack.crossClusterReplication.autoFollowPatternList.loadingErrorTitle', defaultMessage: 'Error loading auto-follow patterns', }); - return ; + + return ( + + + + + ); } if (isEmpty) { diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js index 91baccb42b9fe..58ea095782836 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/auto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js @@ -82,7 +82,7 @@ export const AutoFollowPatternTable = injectI18n( field: 'remoteCluster', name: intl.formatMessage({ id: 'xpack.crossClusterReplication.autoFollowPatternList.table.clusterColumnTitle', - defaultMessage: 'Cluster', + defaultMessage: 'Remote cluster', }), truncateText: true, sortable: true, @@ -97,14 +97,14 @@ export const AutoFollowPatternTable = injectI18n( field: 'followIndexPatternPrefix', name: intl.formatMessage({ id: 'xpack.crossClusterReplication.autoFollowPatternList.table.prefixColumnTitle', - defaultMessage: 'Follower pattern prefix', + defaultMessage: 'Follower index prefix', }), sortable: true, }, { field: 'followIndexPatternSuffix', name: intl.formatMessage({ id: 'xpack.crossClusterReplication.autoFollowPatternList.table.suffixColumnTitle', - defaultMessage: 'Follower pattern suffix', + defaultMessage: 'Follower index suffix', }), sortable: true, }, { diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/context_menu/context_menu.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/context_menu/context_menu.js index 0c2bda19441a1..2f3ffb4cedb74 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/context_menu/context_menu.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/context_menu/context_menu.js @@ -115,8 +115,7 @@ export class ContextMenuUi extends PureComponent { > )} @@ -134,8 +133,7 @@ export class ContextMenuUi extends PureComponent { > )} diff --git a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js index aa112af3e3a6c..8fe4ecc4f3477 100644 --- a/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js +++ b/x-pack/plugins/cross_cluster_replication/public/app/sections/home/follower_indices_list/components/follower_indices_table/follower_indices_table.js @@ -78,11 +78,11 @@ export const FollowerIndicesTable = injectI18n( const label = isPaused ? intl.formatMessage({ id: 'xpack.crossClusterReplication.followerIndexList.table.actionResumeDescription', - defaultMessage: 'Resume follower index', + defaultMessage: 'Resume replication', }) : intl.formatMessage({ id: 'xpack.crossClusterReplication.followerIndexList.table.actionPauseDescription', - defaultMessage: 'Pause follower index', + defaultMessage: 'Pause replication', }); return isPaused ? ( @@ -204,7 +204,7 @@ export const FollowerIndicesTable = injectI18n( field: 'remoteCluster', name: intl.formatMessage({ id: 'xpack.crossClusterReplication.followerIndexList.table.clusterColumnTitle', - defaultMessage: 'Cluster', + defaultMessage: 'Remote cluster', }), truncateText: true, sortable: true, 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 5de818123dccd..693bb304ea306 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 @@ -102,7 +102,7 @@ export const FollowerIndicesList = injectI18n(

@@ -155,7 +155,13 @@ export const FollowerIndicesList = injectI18n( id: 'xpack.crossClusterReplication.followerIndexList.loadingErrorTitle', defaultMessage: 'Error loading follower indices', }); - return ; + + return ( + + + + + ); } if (isEmpty) { @@ -182,8 +188,7 @@ export const FollowerIndicesList = injectI18n(