From cda2e1e6145ac4fd879a8cef1a2c27076f52effa Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 19 Dec 2016 10:20:19 -0800
Subject: [PATCH] Progress

---
 .../explorev2/components/CheckboxField.jsx        |  1 -
 .../javascripts/explorev2/components/FieldSet.jsx |  3 +--
 .../explorev2/components/SelectField.jsx          | 15 ++-------------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/superset/assets/javascripts/explorev2/components/CheckboxField.jsx b/superset/assets/javascripts/explorev2/components/CheckboxField.jsx
index 699c0e023..98a3013bb 100644
--- a/superset/assets/javascripts/explorev2/components/CheckboxField.jsx
+++ b/superset/assets/javascripts/explorev2/components/CheckboxField.jsx
@@ -23,7 +23,6 @@ export default class CheckboxField extends React.Component {
   render() {
     return (
       <Checkbox
-        inline
         checked={this.props.value}
         onChange={this.onToggle.bind(this)}
       />
diff --git a/superset/assets/javascripts/explorev2/components/FieldSet.jsx b/superset/assets/javascripts/explorev2/components/FieldSet.jsx
index 38d1be57b..09e08102e 100644
--- a/superset/assets/javascripts/explorev2/components/FieldSet.jsx
+++ b/superset/assets/javascripts/explorev2/components/FieldSet.jsx
@@ -34,8 +34,7 @@ const defaultProps = {
   onChange: () => {},
 };
 
-export default class FieldSet extends React.Component {
-
+export default class FieldSet extends React.PureComponent {
   render() {
     const FieldClass = fieldMap[this.props.type];
     return (
diff --git a/superset/assets/javascripts/explorev2/components/SelectField.jsx b/superset/assets/javascripts/explorev2/components/SelectField.jsx
index d6225ef8c..f9686e06b 100644
--- a/superset/assets/javascripts/explorev2/components/SelectField.jsx
+++ b/superset/assets/javascripts/explorev2/components/SelectField.jsx
@@ -1,5 +1,4 @@
 import React, { PropTypes } from 'react';
-import { slugify } from '../../modules/utils';
 import Select, { Creatable } from 'react-select';
 
 
@@ -86,19 +85,9 @@ export default class SelectField extends React.Component {
     //  Tab, comma or Enter will trigger a new option created for FreeFormSelect
     const selectWrap = this.props.freeForm ?
       (<Creatable {...selectProps} />) : (<Select {...selectProps} />);
-    if (this.props.label) {
-      return (
-        <div id={`formControlsSelect-${slugify(this.props.label)}`}>
-          <ControlLabelWithTooltip
-            label={this.props.label}
-            description={this.props.description}
-          />
-          {selectWrap}
-        </div>
-      );
-    }
+
     return (
-      <div id={`formControlsSelect-${slugify(this.props.label)}`}>
+      <div>
         {selectWrap}
       </div>
     );
-- 
GitLab