Skip to content

Commit 79e41e3

Browse files
alisonelizabethalisonelizabeth
committed
address copy feedback
1 parent dd680c7 commit 79e41e3

6 files changed

Lines changed: 67 additions & 64 deletions

File tree

‎x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ import {
3434
htmlIdGenerator,
3535
} from '@elastic/eui';
3636

37-
import {
38-
skippingDisconnectedClustersUrl,
39-
transportPortUrl,
40-
proxyModeUrl,
41-
} from '../../../services/documentation';
37+
import { skippingDisconnectedClustersUrl, transportPortUrl } from '../../../services/documentation';
4238

4339
import { RequestFlyout } from './request_flyout';
4440

@@ -456,33 +452,14 @@ export class RemoteClusterForm extends Component {
456452
<>
457453
<FormattedMessage
458454
id="xpack.remoteClusters.remoteClusterForm.sectionModeDescription"
459-
defaultMessage="Remote cluster connections work by configuring a remote cluster and connecting only to a limited number of nodes in that remote cluster."
455+
defaultMessage="Use seed nodes by default, or switch to a single proxy address."
460456
/>
461-
<EuiFormRow
462-
hasEmptyLabelSpace
463-
fullWidth
464-
helpText={
465-
<FormattedMessage
466-
id="xpack.remoteClusters.remoteClusterForm.fieldModeDescription"
467-
defaultMessage="Configure a remote cluster with a single proxy address. {learnMoreLink}"
468-
values={{
469-
learnMoreLink: (
470-
<EuiLink href={proxyModeUrl} target="_blank">
471-
<FormattedMessage
472-
id="xpack.remoteClusters.remoteClusterForm.fieldModeDescription.learnMoreLinkLabel"
473-
defaultMessage="Learn more."
474-
/>
475-
</EuiLink>
476-
),
477-
}}
478-
/>
479-
}
480-
>
457+
<EuiFormRow hasEmptyLabelSpace fullWidth>
481458
<EuiSwitch
482459
label={
483460
<FormattedMessage
484461
id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
485-
defaultMessage="Use proxy mode"
462+
defaultMessage="Use a single proxy address"
486463
/>
487464
}
488465
checked={mode === PROXY_MODE}
@@ -523,9 +500,7 @@ export class RemoteClusterForm extends Component {
523500
<p>
524501
<FormattedMessage
525502
id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription"
526-
defaultMessage="By default, a request fails if any of the queried remote clusters
527-
are unavailable. To continue sending a request to other remote clusters if this
528-
cluster is unavailable, enable {optionName}. {learnMoreLink}"
503+
defaultMessage="A request fails if any of the queried remote clusters are unavailable. To send requests to other remote clusters if this cluster is unavailable, enable {optionName}. {learnMoreLink}"
529504
values={{
530505
optionName: (
531506
<strong>
@@ -839,7 +814,7 @@ export class RemoteClusterForm extends Component {
839814
description={
840815
<FormattedMessage
841816
id="xpack.remoteClusters.remoteClusterForm.sectionNameDescription"
842-
defaultMessage="A unique name for the remote cluster."
817+
defaultMessage="A unique name for the cluster."
843818
/>
844819
}
845820
fullWidth

‎x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/remote_cluster_page_title.js‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,22 @@
77
import React, { Fragment } from 'react';
88
import PropTypes from 'prop-types';
99
import { FormattedMessage } from '@kbn/i18n/react';
10+
import { remoteClustersUrl } from '../../../services/documentation';
1011

1112
import {
1213
EuiButtonEmpty,
1314
EuiFlexGroup,
1415
EuiFlexItem,
15-
EuiPageContentHeader,
1616
EuiSpacer,
17+
EuiText,
1718
EuiTitle,
1819
} from '@elastic/eui';
1920

20-
import { remoteClustersUrl } from '../../../services/documentation';
21-
22-
export const RemoteClusterPageTitle = ({ title }) => (
21+
export const RemoteClusterPageTitle = ({ title, description }) => (
2322
<Fragment>
2423
<EuiSpacer size="xs" />
2524

26-
<EuiPageContentHeader>
25+
<EuiTitle size="l">
2726
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
2827
<EuiFlexItem grow={false}>
2928
<EuiTitle size="l" data-test-subj="remoteClusterPageTitle">
@@ -47,10 +46,23 @@ export const RemoteClusterPageTitle = ({ title }) => (
4746
</EuiButtonEmpty>
4847
</EuiFlexItem>
4948
</EuiFlexGroup>
50-
</EuiPageContentHeader>
49+
</EuiTitle>
50+
51+
{description ? (
52+
<>
53+
<EuiSpacer size="s" />
54+
55+
<EuiTitle size="s">
56+
<EuiText color="subdued">{description}</EuiText>
57+
</EuiTitle>
58+
</>
59+
) : null}
60+
61+
<EuiSpacer size="m" />
5162
</Fragment>
5263
);
5364

5465
RemoteClusterPageTitle.propTypes = {
5566
title: PropTypes.node.isRequired,
67+
description: PropTypes.node,
5668
};

‎x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ export class RemoteClusterAdd extends PureComponent {
6565
defaultMessage="Add remote cluster"
6666
/>
6767
}
68+
description={
69+
<FormattedMessage
70+
id="xpack.remoteClusters.remoteClustersDescription"
71+
defaultMessage="Add a remote cluster that is connected to either seed nodes or a single proxy address."
72+
/>
73+
}
6874
/>
6975

7076
<RemoteClusterForm

‎x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export class RemoteClusterEdit extends Component {
193193
>
194194
<FormattedMessage
195195
id="xpack.remoteClusters.edit.deprecatedSettingsMessage"
196-
defaultMessage="This remote cluster contains deprecated settings. We have attempted to resolve them. Please verify all changes before saving."
196+
defaultMessage="This remote cluster has deprecated settings that we tried to resolve. Verify all changes before saving."
197197
/>
198198
</EuiCallOut>
199199
<EuiSpacer />

‎x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export class DetailPanel extends Component {
125125
title={
126126
<FormattedMessage
127127
id="xpack.remoteClusters.detailPanel.deprecatedSettingsTitle"
128-
defaultMessage='"{remoteCluster}" contains deprecated settings'
128+
defaultMessage="'{remoteCluster}' has deprecated settings"
129129
values={{
130130
remoteCluster: clusterName,
131131
}}
@@ -134,28 +134,38 @@ export class DetailPanel extends Component {
134134
color="warning"
135135
iconType="help"
136136
>
137-
<FormattedMessage
138-
id="xpack.remoteClusters.detailPanel.deprecatedSettingsMessage"
139-
defaultMessage="We recommend updating this remote cluster to use the correct settings. {helpLink}"
140-
values={{
141-
helpLink: isConfiguredByNode ? (
142-
// A remote cluster is not editable if configured in elasticsearch.yml, so we direct the user to documentation instead
143-
<EuiLink href={proxyModeUrl} target="_blank">
144-
<FormattedMessage
145-
id="xpack.remoteClusters.detailPanel.deprecatedSettingsLearnMoreLinkLabel"
146-
defaultMessage="Learn more."
147-
/>
148-
</EuiLink>
149-
) : (
150-
<EuiLink {...getRouterLinkProps(`${CRUD_APP_BASE_PATH}/edit/${clusterName}`)}>
151-
<FormattedMessage
152-
id="xpack.remoteClusters.detailPanel.deprecatedSettingsEditLinkLabel"
153-
defaultMessage="Edit remote cluster."
154-
/>
155-
</EuiLink>
156-
),
157-
}}
158-
/>
137+
{/* A remote cluster is not editable if configured in elasticsearch.yml, so we direct the user to documentation instead */}
138+
{isConfiguredByNode ? (
139+
<FormattedMessage
140+
id="xpack.remoteClusters.detailPanel.deprecatedSettingsConfiguredByNodeMessage"
141+
defaultMessage="Edit the cluster to update the settings. {helpLink}"
142+
values={{
143+
helpLink: (
144+
<EuiLink href={proxyModeUrl} target="_blank">
145+
<FormattedMessage
146+
id="xpack.remoteClusters.detailPanel.deprecatedSettingsLearnMoreLinkLabel"
147+
defaultMessage="Learn more."
148+
/>
149+
</EuiLink>
150+
),
151+
}}
152+
/>
153+
) : (
154+
<FormattedMessage
155+
id="xpack.remoteClusters.detailPanel.deprecatedSettingsMessage"
156+
defaultMessage="{editLink} to update the settings."
157+
values={{
158+
editLink: (
159+
<EuiLink {...getRouterLinkProps(`${CRUD_APP_BASE_PATH}/edit/${clusterName}`)}>
160+
<FormattedMessage
161+
id="xpack.remoteClusters.detailPanel.deprecatedSettingsEditLinkLabel"
162+
defaultMessage="Edit the cluster"
163+
/>
164+
</EuiLink>
165+
),
166+
}}
167+
/>
168+
)}
159169
</EuiCallOut>
160170
<EuiSpacer size="l" />
161171
</>
@@ -249,7 +259,7 @@ export class DetailPanel extends Component {
249259
<EuiTitle size="xs">
250260
<FormattedMessage
251261
id="xpack.remoteClusters.detailPanel.maxConnectionsPerClusterLabel"
252-
defaultMessage="Maximum number of connections"
262+
defaultMessage="Maximum connections"
253263
/>
254264
</EuiTitle>
255265
</EuiDescriptionListTitle>
@@ -363,7 +373,7 @@ export class DetailPanel extends Component {
363373
<EuiTitle size="xs">
364374
<FormattedMessage
365375
id="xpack.remoteClusters.detailPanel.maxSocketConnectionsLabel"
366-
defaultMessage="Maximum number of socket connections"
376+
defaultMessage="Maximum socket connections"
367377
/>
368378
</EuiTitle>
369379
</EuiDescriptionListTitle>

‎x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export class RemoteClusterTable extends Component {
141141
content={
142142
<FormattedMessage
143143
id="xpack.remoteClusters.remoteClusterList.table.hasDeprecatedSettingMessage"
144-
defaultMessage="This remote cluster contains deprecated settings. Edit the remote cluster to resolve."
144+
defaultMessage="Edit this cluster to update deprecated settings."
145145
/>
146146
}
147147
/>

0 commit comments

Comments
 (0)