From 4f35689668c0ceb9a1b7d50f6875694e46dc956a Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Fri, 11 Jun 2021 10:26:17 +0300
Subject: [PATCH] chore(plugin-chart-echarts): bump echarts to 5.1.2 (#1159)

---
 .../superset-ui/plugins/plugin-chart-echarts/package.json    | 2 +-
 .../plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx   | 2 +-
 .../plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx      | 1 -
 .../plugins/plugin-chart-echarts/src/components/Echart.tsx   | 5 -----
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/package.json
index 8ef75c05eb3f6..6e9695560e900 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/package.json
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/package.json
@@ -30,7 +30,7 @@
     "@superset-ui/core": "0.17.56",
     "@types/mathjs": "^6.0.7",
     "d3-array": "^1.2.0",
-    "echarts": "^5.1.1",
+    "echarts": "^5.1.2",
     "lodash": "^4.17.15",
     "mathjs": "^8.0.1"
   },
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
index b85d1a32e18d4..e6b65107cd0e5 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
@@ -70,10 +70,10 @@ const controlPanel: ControlPanelConfig = {
         ],
         [
           {
-            // TODO: Set renderTrigger to true without getting intermittent errors in echart
             name: 'root_node_id',
             config: {
               ...optionalEntity,
+              renderTrigger: true,
               type: 'TextControl',
               label: t('Root node id'),
               description: t('Id of root node of the tree.'),
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx
index 9c8d466ef99a3..2932dc327ddc7 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx
@@ -93,7 +93,6 @@ export default function EchartsTreemap({
       echartOptions={echartOptions}
       eventHandlers={eventHandlers}
       selectedValues={selectedValues}
-      forceClear
     />
   );
 }
diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/components/Echart.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/components/Echart.tsx
index 5502af3f3f670..5ab0011120b5f 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/components/Echart.tsx
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/components/Echart.tsx
@@ -32,7 +32,6 @@ export default function Echart({
   echartOptions,
   eventHandlers,
   selectedValues = {},
-  forceClear = false,
 }: EchartsProps) {
   const divRef = useRef<HTMLDivElement>(null);
   const chartRef = useRef<ECharts>();
@@ -50,10 +49,6 @@ export default function Echart({
       chartRef.current?.on(name, handler);
     });
 
-    if (forceClear) {
-      chartRef.current.clear();
-    }
-
     chartRef.current.setOption(echartOptions, true);
 
     chartRef.current.dispatchAction({