Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CCR] Accessibility fixes #27268

Merged
merged 3 commits into from
Dec 17, 2018
Merged

[CCR] Accessibility fixes #27268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bbcb0b
Fix screen reader accessibility of remote clusters table column headers.
cjcenizal Dec 14, 2018
27f20ef
Fix 'Actionss' typo.
cjcenizal Dec 14, 2018
625d45b
Fix screen reader accessibility of auto-follow patterns table column …
cjcenizal Dec 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 25 additions & 32 deletions ...uto_follow_pattern_list/components/auto_follow_pattern_table/auto_follow_pattern_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,59 +61,52 @@ export class AutoFollowPatternTableUI extends PureComponent {

return [{
field: 'name',
name: (
<FormattedMessage
id="xpack.cross_cluster_replication.autofollow_pattern_list.table.name_column_title"
defaultMessage="Name"
/>
),
name: intl.formatMessage({
id: 'xpack.crossClusterReplication.autoFollowPatternList.table.nameColumnTitle',
defaultMessage: 'Name',
}),
sortable: true,
truncateText: false,
}, {
field: 'remoteCluster',
name: (
<FormattedMessage
id="xpack.cross_cluster_replication.autofollow_pattern_list.table.cluster_column_title"
defaultMessage="Cluster"
/>
),
name: intl.formatMessage({
id: 'xpack.crossClusterReplication.autoFollowPatternList.table.clusterColumnTitle',
defaultMessage: 'Cluster',
}),
truncateText: true,
sortable: true,
}, {
field: 'leaderIndexPatterns',
name: (
<FormattedMessage
id="xpack.cross_cluster_replication.autofollow_pattern_list.table.leader_patterns_column_title"
defaultMessage="Leader patterns"
/>
),
name: intl.formatMessage({
id: 'xpack.crossClusterReplication.autoFollowPatternList.table.leaderPatternsColumnTitle',
defaultMessage: 'Leader patterns',
}),
render: (leaderPatterns) => leaderPatterns.join(', '),
}, {
field: 'followIndexPattern',
name: (
<FormattedMessage
id="xpack.cross_cluster_replication.autofollow_pattern_list.table.connected_nodes_column_title"
defaultMessage="Follower pattern prefix"
/>
),
name: intl.formatMessage({
id: 'xpack.crossClusterReplication.autoFollowPatternList.table.prefixColumnTitle',
defaultMessage: 'Follower pattern prefix',
}),
render: (followIndexPattern) => {
const { followIndexPatternPrefix } = getPrefixSuffixFromFollowPattern(followIndexPattern);
return followIndexPatternPrefix;
}
}, {
field: 'followIndexPattern',
name: (
<FormattedMessage
id="xpack.cross_cluster_replication.autofollow_pattern_list.table.connected_nodes_column_title"
defaultMessage="Follower pattern suffix"
/>
),
name: intl.formatMessage({
id: 'xpack.crossClusterReplication.autoFollowPatternList.table.suffixColumnTitle',
defaultMessage: 'Follower pattern suffix',
}),
render: (followIndexPattern) => {
const { followIndexPatternSuffix } = getPrefixSuffixFromFollowPattern(followIndexPattern);
return followIndexPatternSuffix;
}
}, {
name: '',
name: intl.formatMessage({
id: 'xpack.crossClusterReplication.autoFollowPatternList.table.actionsColumnTitle',
defaultMessage: 'Actions',
}),
actions: [
{
render: ({ name }) => {
Expand Down Expand Up @@ -152,7 +145,7 @@ export class AutoFollowPatternTableUI extends PureComponent {
type: 'icon',
},
],
width: '40px',
width: '100px',
}];
}

Expand Down
51 changes: 21 additions & 30 deletions ...clusters/public/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export class RemoteClusterTableUi extends Component {
render() {
const {
openDetailPanel,
intl,
} = this.props;

const {
Expand All @@ -78,12 +79,10 @@ export class RemoteClusterTableUi extends Component {

const columns = [{
field: 'name',
name: (
<FormattedMessage
id="xpack.remoteClusters.remoteClusterList.table.nameColumnTitle"
defaultMessage="Name"
/>
),
name: intl.formatMessage({
id: 'xpack.remoteClusters.remoteClusterList.table.nameColumnTitle',
defaultMessage: 'Name',
}),
sortable: true,
truncateText: false,
render: (name, { isConfiguredByNode }) => {
Expand Down Expand Up @@ -120,42 +119,34 @@ export class RemoteClusterTableUi extends Component {
}
}, {
field: 'seeds',
name: (
<FormattedMessage
id="xpack.remoteClusters.remoteClusterList.table.seedsColumnTitle"
defaultMessage="Seeds"
/>
),
name: intl.formatMessage({
id: 'xpack.remoteClusters.remoteClusterList.table.seedsColumnTitle',
defaultMessage: 'Seeds',
}),
truncateText: true,
render: (seeds) => seeds.join(', '),
}, {
field: 'isConnected',
name: (
<FormattedMessage
id="xpack.remoteClusters.remoteClusterList.table.connectedColumnTitle"
defaultMessage="Connection"
/>
),
name: intl.formatMessage({
id: 'xpack.remoteClusters.remoteClusterList.table.connectedColumnTitle',
defaultMessage: 'Connection',
}),
sortable: true,
render: (isConnected) => <ConnectionStatus isConnected={isConnected} />,
width: '160px',
}, {
field: 'connectedNodesCount',
name: (
<FormattedMessage
id="xpack.remoteClusters.remoteClusterList.table.connectedNodesColumnTitle"
defaultMessage="Connected nodes"
/>
),
name: intl.formatMessage({
id: 'xpack.remoteClusters.remoteClusterList.table.connectedNodesColumnTitle',
defaultMessage: 'Connected nodes',
}),
sortable: true,
width: '160px',
}, {
name: (
<FormattedMessage
id="xpack.remoteClusters.remoteClusterList.table.actionsColumnTitle"
defaultMessage="Actions"
/>
),
name: intl.formatMessage({
id: 'xpack.remoteClusters.remoteClusterList.table.actionsColumnTitle',
defaultMessage: 'Actions',
}),
width: '100px',
actions: [{
render: ({ name, isConfiguredByNode }) => {
Expand Down