From 775ec3a377b3457977385cd0abb57f8a5e12c94b Mon Sep 17 00:00:00 2001
From: Kerry Gallagher <k.gallagher.05@gmail.com>
Date: Wed, 13 Mar 2019 13:06:15 +0000
Subject: [PATCH] [InfraUI] Fix group by "x" icon keyboard controls (#31960)

* First pass at ensuring click events do not swallow keyUp event, also ensure menu doesn't open / close for no reason

* Add comment

* Add key

* Revert changes

* Remove icons on badges within context menu

* Remove unused translation with script
---
 .../waffle/waffle_group_by_controls.tsx       | 19 +------------------
 .../translations/translations/zh-CN.json      |  1 -
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx b/x-pack/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
index b780372c75d47..0925d00ee6562 100644
--- a/x-pack/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
+++ b/x-pack/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
@@ -137,24 +137,7 @@ export const WaffleGroupByControls = injectI18n(
             .filter(o => o != null)
             // In this map the `o && o.field` is totally unnecessary but Typescript is
             // too stupid to realize that the filter above prevents the next map from being null
-            .map(o => (
-              <EuiBadge
-                key={o && o.field}
-                iconType="cross"
-                iconOnClick={this.handleRemove((o && o.field) || '')}
-                iconOnClickAriaLabel={intl.formatMessage(
-                  {
-                    id: 'xpack.infra.waffle.removeGroupingItemAriaLabel',
-                    defaultMessage: 'Remove {groupingItem} grouping',
-                  },
-                  {
-                    groupingItem: o && o.text,
-                  }
-                )}
-              >
-                {o && o.text}
-              </EuiBadge>
-            ))
+            .map(o => <EuiBadge key={o && o.field}>{o && o.text}</EuiBadge>)
         ) : (
           <FormattedMessage id="xpack.infra.waffle.groupByAllTitle" defaultMessage="All" />
         );
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index b021f0bbf2304..8574c9597b8a6 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4369,7 +4369,6 @@
     "xpack.infra.waffle.noDataDescription": "尝试调整您的时间或筛选。",
     "xpack.infra.waffle.noDataTitle": "没有可显示的数据。",
     "xpack.infra.waffle.nodeTypeSwitcher.hostsLabel": "主机",
-    "xpack.infra.waffle.removeGroupingItemAriaLabel": "删除 {groupingItem} 分组",
     "xpack.infra.waffle.selectTwoGroupingsTitle": "选择最多两个分组",
     "xpack.infra.waffle.unableToSelectGroupErrorMessage": "无法选择 {nodeType} 的分组依据选项",
     "xpack.infra.waffle.unableToSelectMetricErrorTitle": "无法选择指标选项或指标值。",