From ab7b01ec1021e2ab47ee0ed0579e67fc8c199c7b Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 14 Apr 2021 12:22:00 -0400
Subject: [PATCH] Elasticsearch: Force re-rendering of each editor row type
 change (#32993) (#32996)

(cherry picked from commit 136460d3694e3783370a71d3d25090a1927fcb3e)

Co-authored-by: Giordano Ricci <me@giordanoricci.com>
---
 .../components/QueryEditor/BucketAggregationsEditor/index.tsx   | 2 +-
 .../components/QueryEditor/MetricAggregationsEditor/index.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/index.tsx
index 841d12e634a..0f8dc087495 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/index.tsx
@@ -21,7 +21,7 @@ export const BucketAggregationsEditor: FunctionComponent<Props> = ({ nextId }) =
     <>
       {bucketAggs!.map((bucketAgg, index) => (
         <QueryEditorRow
-          key={bucketAgg.id}
+          key={`${bucketAgg.type}-${bucketAgg.id}`}
           label={index === 0 ? 'Group By' : 'Then By'}
           onRemoveClick={totalBucketAggs > 1 && (() => dispatch(removeBucketAggregation(bucketAgg.id)))}
         >
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
index 8c81bcc81be..73ac3ea9e21 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/index.tsx
@@ -22,7 +22,7 @@ export const MetricAggregationsEditor: FunctionComponent<Props> = ({ nextId }) =
     <>
       {metrics?.map((metric, index) => (
         <QueryEditorRow
-          key={metric.id}
+          key={`${metric.type}-${metric.id}`}
           label={`Metric (${metric.id})`}
           hidden={metric.hide}
           onHideClick={() => dispatch(toggleMetricVisibility(metric.id))}