[explore] a bit less margin in left panel (#2758)

* [explore] a bit less margin in left panel * fix tests * forcing react-select 1.0.0-rc.3
apache · May 16, 2017 · ecc00bd · ecc00bd
1 parent e794645
commit ecc00bd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/superset/assets/javascripts/SqlLab/components/SaveQuery.jsx b/superset/assets/javascripts/SqlLab/components/SaveQuery.jsx
@@ -1,4 +1,3 @@
-/* global notify */
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormControl, FormGroup, Overlay, Popover, Row, Col } from 'react-bootstrap';

diff --git a/superset/assets/javascripts/explorev2/components/ControlPanelsContainer.jsx b/superset/assets/javascripts/explorev2/components/ControlPanelsContainer.jsx
@@ -3,7 +3,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { Panel, Alert } from 'react-bootstrap';
+import { Alert } from 'react-bootstrap';
 import { sectionsToRender } from '../stores/visTypes';
 import ControlPanelSection from './ControlPanelSection';
 import ControlRow from './ControlRow';
@@ -44,7 +44,7 @@ class ControlPanelsContainer extends React.Component {
   render() {
     return (
       <div className="scrollbar-container">
-        <Panel className="scrollbar-content">
+        <div className="scrollbar-content">
           {this.props.alert &&
             <Alert bsStyle="warning">
               {this.props.alert}
@@ -78,7 +78,7 @@ class ControlPanelsContainer extends React.Component {
               ))}
             </ControlPanelSection>
           ))}
-        </Panel>
+        </div>
       </div>
     );
   }

diff --git a/superset/assets/package.json b/superset/assets/package.json
@@ -79,7 +79,7 @@
     "react-map-gl": "^1.7.0",
     "react-redux": "^5.0.2",
     "react-resizable": "^1.3.3",
-    "react-select": "^1.0.0-rc.2",
+    "react-select": "1.0.0-rc.3",
     "react-select-fast-filter-options": "^0.2.1",
     "react-syntax-highlighter": "^5.0.0",
     "react-virtualized": "^9.3.0",

diff --git a/superset/assets/spec/javascripts/explorev2/components/ControlPanelsContainer_spec.jsx b/superset/assets/spec/javascripts/explorev2/components/ControlPanelsContainer_spec.jsx
@@ -2,12 +2,12 @@ import React from 'react';
 import { expect } from 'chai';
 import { describe, it, beforeEach } from 'mocha';
 import { shallow } from 'enzyme';
-import { Panel } from 'react-bootstrap';
 import { getFormDataFromControls, defaultControls }
   from '../../../../javascripts/explorev2/stores/store';
 import {
   ControlPanelsContainer,
 } from '../../../../javascripts/explorev2/components/ControlPanelsContainer';
+import ControlPanelSection from '../../../../javascripts/explorev2/components/ControlPanelSection';
 
 const defaultProps = {
   datasource_type: 'table',
@@ -25,7 +25,7 @@ describe('ControlPanelsContainer', () => {
     wrapper = shallow(<ControlPanelsContainer {...defaultProps} />);
   });
 
-  it('renders a Panel', () => {
-    expect(wrapper.find(Panel)).to.have.lengthOf(1);
+  it('renders ControlPanelSections', () => {
+    expect(wrapper.find(ControlPanelSection)).to.have.lengthOf(7);
   });
 });