Progress

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)}
       />

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 (

superset/assets/javascripts/explorev2/components/SelectField.jsx

 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>
     );