From 19151d1e4a6d735f4229a28eae2c6b00e1409227 Mon Sep 17 00:00:00 2001
From: SBIN2010 <Sbin2010@mail.ru>
Date: Tue, 22 Oct 2024 23:07:40 +0300
Subject: [PATCH 1/3] fix: fixed Add Metrics to Tree Chart (#29158)

---
 .../plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
index 34d65a27d315d..26fafbdc1b7f9 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
@@ -89,9 +89,7 @@ const controlPanel: ControlPanelConfig = {
           {
             name: 'metric',
             config: {
-              ...optionalEntity,
-              type: 'DndMetricSelect',
-              label: t('Metric'),
+              ...sharedControls.metric,
               description: t('Metric for node values'),
             },
           },

From 35aaeb66bf9d01a4e3f1cb7c9c92989b1503b25e Mon Sep 17 00:00:00 2001
From: SBIN2010 <Sbin2010@mail.ru>
Date: Tue, 22 Oct 2024 23:45:27 +0300
Subject: [PATCH 2/3] fix: clear modal after CSS templates is added

---
 .../src/features/cssTemplates/CssTemplateModal.tsx           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
index 16af9e7039d3a..74f0491543ea3 100644
--- a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
+++ b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
@@ -131,7 +131,10 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
         if (onCssTemplateAdd) {
           onCssTemplateAdd();
         }
-
+        setCurrentCssTemplate({
+          template_name: '',
+          css: '',
+        });
         hide();
       });
     }

From db3afda17db52cf217af4f20b09a4d1e09848117 Mon Sep 17 00:00:00 2001
From: SBIN2010 <Sbin2010@mail.ru>
Date: Wed, 23 Oct 2024 22:15:52 +0300
Subject: [PATCH 3/3] Revert "fix: clear modal after CSS templates is added"

This reverts commit 35aaeb66bf9d01a4e3f1cb7c9c92989b1503b25e.
---
 .../src/features/cssTemplates/CssTemplateModal.tsx           | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
index 74f0491543ea3..16af9e7039d3a 100644
--- a/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
+++ b/superset-frontend/src/features/cssTemplates/CssTemplateModal.tsx
@@ -131,10 +131,7 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
         if (onCssTemplateAdd) {
           onCssTemplateAdd();
         }
-        setCurrentCssTemplate({
-          template_name: '',
-          css: '',
-        });
+
         hide();
       });
     }