From a0c36d1c0e79f35ac9ff88aef33c7f0a81d6a153 Mon Sep 17 00:00:00 2001
From: Beto Dealmeida <roberto@dealmeida.net>
Date: Wed, 19 Sep 2018 13:32:07 -0700
Subject: [PATCH] Allow removing legend (#5932)

(cherry picked from commit 71f014e9b69c5961fd091b4d29b6de5aceeb4bca)
---
 superset/assets/src/explore/controls.jsx      | 1 +
 superset/assets/src/visualizations/Legend.jsx | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index 3632e8dc79976..d2ee20b11ebb8 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -257,6 +257,7 @@ export const controls = {
     clearable: false,
     default: 'tr',
     choices: [
+      [null, 'None'],
       ['tl', 'Top left'],
       ['tr', 'Top right'],
       ['bl', 'Bottom left'],
diff --git a/superset/assets/src/visualizations/Legend.jsx b/superset/assets/src/visualizations/Legend.jsx
index 57bd430dc9d53..41f60b9bbd098 100644
--- a/superset/assets/src/visualizations/Legend.jsx
+++ b/superset/assets/src/visualizations/Legend.jsx
@@ -7,7 +7,7 @@ const propTypes = {
   categories: PropTypes.object,
   toggleCategory: PropTypes.func,
   showSingleCategory: PropTypes.func,
-  position: PropTypes.oneOf(['tl', 'tr', 'bl', 'br']),
+  position: PropTypes.oneOf([null, 'tl', 'tr', 'bl', 'br']),
 };
 
 const defaultProps = {
@@ -19,7 +19,7 @@ const defaultProps = {
 
 export default class Legend extends React.PureComponent {
   render() {
-    if (Object.keys(this.props.categories).length === 0) {
+    if (Object.keys(this.props.categories).length === 0 || this.props.position === null) {
       return null;
     }
 
@@ -27,7 +27,7 @@ export default class Legend extends React.PureComponent {
       const style = { color: 'rgba(' + v.color.join(', ') + ')' };
       const icon = v.enabled ? '\u25CF' : '\u25CB';
       return (
-        <li>
+        <li key={k}>
           <a
             href="#"
             onClick={() => this.props.toggleCategory(k)}