From 522c6b4a615a0537c39fc882229409d4de0a1520 Mon Sep 17 00:00:00 2001
From: Pete Harverson <peteharverson@users.noreply.github.com>
Date: Tue, 9 Jul 2019 15:21:12 +0100
Subject: [PATCH] [ML] Fixes anomalies table sort behavior when sorting on
 severity (#40600)

---
 .../components/anomalies_table/anomalies_table_columns.js  | 7 ++-----
 x-pack/plugins/translations/translations/ja-JP.json        | 1 -
 x-pack/plugins/translations/translations/zh-CN.json        | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/x-pack/legacy/plugins/ml/public/components/anomalies_table/anomalies_table_columns.js b/x-pack/legacy/plugins/ml/public/components/anomalies_table/anomalies_table_columns.js
index 856e89f144128..7537143c63971 100644
--- a/x-pack/legacy/plugins/ml/public/components/anomalies_table/anomalies_table_columns.js
+++ b/x-pack/legacy/plugins/ml/public/components/anomalies_table/anomalies_table_columns.js
@@ -98,9 +98,7 @@ export function getColumns(
     },
     {
       field: 'severity',
-      name: isAggregatedData === true ? i18n.translate('xpack.ml.anomaliesTable.maxSeverityColumnName', {
-        defaultMessage: 'max severity',
-      }) : i18n.translate('xpack.ml.anomaliesTable.severityColumnName', {
+      name: i18n.translate('xpack.ml.anomaliesTable.severityColumnName', {
         defaultMessage: 'severity',
       }),
       render: (score) => (
@@ -276,8 +274,7 @@ export function getColumns(
         } else {
           return null;
         }
-      },
-      sortable: false
+      }
     });
   }
 
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index d7c7e12895839..c964836b571f0 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -6065,7 +6065,6 @@
     "xpack.ml.anomaliesTable.linksMenu.unableToViewExamplesErrorMessage": "ジョブ ID {jobId} の詳細が見つからなかったため例を表示できません",
     "xpack.ml.anomaliesTable.linksMenu.viewExamplesLabel": "例を表示",
     "xpack.ml.anomaliesTable.linksMenu.viewSeriesLabel": "数列を表示",
-    "xpack.ml.anomaliesTable.maxSeverityColumnName": "最高深刻度",
     "xpack.ml.anomaliesTable.metricDescriptionSortColumnName": "説明",
     "xpack.ml.anomaliesTable.noMatchingAnomaliesFoundTitle": "一致する注釈が見つかりません",
     "xpack.ml.anomaliesTable.severityColumnName": "深刻度",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 7705c1be62ad5..a21e23e088646 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -6066,7 +6066,6 @@
     "xpack.ml.anomaliesTable.linksMenu.unableToViewExamplesErrorMessage": "无法查看示例，因为未找到作业 ID {jobId} 的详细信息",
     "xpack.ml.anomaliesTable.linksMenu.viewExamplesLabel": "查看示例",
     "xpack.ml.anomaliesTable.linksMenu.viewSeriesLabel": "查看序列",
-    "xpack.ml.anomaliesTable.maxSeverityColumnName": "最大严重性",
     "xpack.ml.anomaliesTable.metricDescriptionSortColumnName": "描述",
     "xpack.ml.anomaliesTable.noMatchingAnomaliesFoundTitle": "未找到任何匹配的异常",
     "xpack.ml.anomaliesTable.severityColumnName": "严重性",