[ML] [Accessibility] Add job ID to select row checkbox aria-label in …

…Jobs List (#40149) * [ML] [Accessibility] Add job ID to select row checkbox in Jobs List * [ML] Add job ID to cannot select checkbox message in Jobs List row * [ML] Update translations files for select job checkbox
elastic · Jul 3, 2019 · 7c79427 · 7c79427
1 parent 1e1153e
commit 7c79427
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/jobs_list/jobs_list.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/jobs_list/jobs_list.js
@@ -23,6 +23,7 @@ import {
   EuiButtonIcon,
 } from '@elastic/eui';
 import { injectI18n } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 
 const PAGE_SIZE = 10;
 const PAGE_SIZE_OPTIONS = [10, 25, 50];
@@ -102,10 +103,27 @@ class JobsListUI extends Component {
     const { intl, loading } = this.props;
     const selectionControls = {
       selectable: job => (job.deleting !== true),
-      selectableMessage: (selectable) => (!selectable) ? intl.formatMessage({
-        id: 'xpack.ml.jobsList.cannotSelectJobTooltip',
-        defaultMessage: 'Cannot select job' })
-        : undefined,
+      selectableMessage: (selectable, rowItem) => (
+        (selectable === false)
+          ? i18n.translate(
+            'xpack.ml.jobsList.cannotSelectRowForJobMessage',
+            {
+              defaultMessage: 'Cannot select job ID {jobId}',
+              values: {
+                jobId: rowItem.id,
+              }
+            }
+          )
+          : i18n.translate(
+            'xpack.ml.jobsList.selectRowForJobMessage',
+            {
+              defaultMessage: 'Select the row for job ID {jobId}',
+              values: {
+                jobId: rowItem.id,
+              }
+            }
+          )
+      ),
       onSelectionChange: this.props.selectJobChange
     };
 

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -6641,7 +6641,6 @@
     "xpack.ml.jobsList.actionExecuteSuccessfullyNotificationMessage": "{successesJobsCount, plural, one{{successJob}} other{# 件のジョブ}} {actionTextPT}成功",
     "xpack.ml.jobsList.actionFailedNotificationMessage": "{failureId} が {actionText} に失敗しました",
     "xpack.ml.jobsList.actionsLabel": "アクション",
-    "xpack.ml.jobsList.cannotSelectJobTooltip": "ジョブを選択できません",
     "xpack.ml.jobsList.cloneJobErrorMessage": "{jobId} のクローンを作成できませんでした。ジョブが見つかりませんでした",
     "xpack.ml.jobsList.closeActionStatusText": "閉じる",
     "xpack.ml.jobsList.closedActionStatusText": "クローズ済み",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -6641,7 +6641,6 @@
     "xpack.ml.jobsList.actionExecuteSuccessfullyNotificationMessage": "{successesJobsCount, plural, one{{successJob}} other{# 个作业}}{actionTextPT}已成功",
     "xpack.ml.jobsList.actionFailedNotificationMessage": "{failureId} 未能{actionText}",
     "xpack.ml.jobsList.actionsLabel": "操作",
-    "xpack.ml.jobsList.cannotSelectJobTooltip": "无法选择作业",
     "xpack.ml.jobsList.cloneJobErrorMessage": "无法克隆 {jobId}。找不到作业",
     "xpack.ml.jobsList.closeActionStatusText": "关闭",
     "xpack.ml.jobsList.closedActionStatusText": "已关闭",