Merge branch 'master' into perm_update

INTHEWILD.md

@@ -18,6 +18,7 @@ Organizations
  - [Tooploox](https://www.tooploox.com/)
  - [Tobii](http://www.tobii.com/)
  - [Endress+Hauser](http://www.endress.com/)
+ - [Tails.com](https://tails.com)
 
 Projects
 ----------

superset/assets/javascripts/SqlLab/components/SqlEditorLeftBar.jsx

@@ -35,7 +35,7 @@ class SqlEditorLeftBar extends React.PureComponent {
     this.fetchSchemas(this.props.queryEditor.dbId);
     this.fetchTables(this.props.queryEditor.dbId, this.props.queryEditor.schema);
   }
-  onChange(db) {
+  onDatabaseChange(db) {
     const val = db ? db.value : null;
     this.setState({ schemaOptions: [] });
     this.props.actions.queryEditorSetSchema(this.props.queryEditor, null);
@@ -144,7 +144,7 @@ class SqlEditorLeftBar extends React.PureComponent {
               '_oc_DatabaseView=database_name&' +
               '_od_DatabaseView=asc'
             }
-            onChange={this.onChange.bind(this)}
+            onChange={this.onDatabaseChange.bind(this)}
             value={this.props.queryEditor.dbId}
             databaseId={this.props.queryEditor.dbId}
             actions={this.props.actions}

superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx

@@ -146,7 +146,7 @@ class VisualizeModal extends React.PureComponent {
           formData.metric = mainMetric.name;
         }
         if (mainGroupBy) {
-          formData.groupby = mainGroupBy.name;
+          formData.groupby = [mainGroupBy.name];
         }
         window.open(getExploreUrl(formData));
       },

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

@@ -60,6 +60,7 @@ class ChartContainer extends React.PureComponent {
         ) && !this.props.queryResponse.error
         && this.props.chartStatus !== 'failed'
         && this.props.chartStatus !== 'stopped'
+        && this.props.chartStatus !== 'loading'
       ) {
       this.renderViz();
     }

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

@@ -51,17 +51,26 @@ export default class Control extends React.PureComponent {
     super(props);
     this.validate = this.validate.bind(this);
     this.onChange = this.onChange.bind(this);
-    this.validateAndSetValue(props.value, []);
+  }
+  componentDidMount() {
+    this.validateAndSetValue(this.props.value, []);
   }
   onChange(value, errors) {
     this.validateAndSetValue(value, errors);
   }
   validateAndSetValue(value, errors) {
-    let validationErrors = this.validate(value);
+    let validationErrors = this.props.validationErrors;
+    let currentErrors = this.validate(value);
     if (errors && errors.length > 0) {
-      validationErrors = validationErrors.concat(errors);
+      currentErrors = validationErrors.concat(errors);
+    }
+    if (validationErrors.length + currentErrors.length > 0) {
+      validationErrors = currentErrors;
+    }
+
+    if (value !== this.props.value || validationErrors !== this.props.validationErrors) {
+      this.props.actions.setControlValue(this.props.name, value, validationErrors);
     }
-    this.props.actions.setControlValue(this.props.name, value, validationErrors);
   }
   validate(value) {
     const validators = this.props.validators;

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

@@ -8,7 +8,7 @@ import DisplayQueryButton from './DisplayQueryButton';
 const propTypes = {
   canDownload: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]).isRequired,
   slice: PropTypes.object,
-  queryEndpoint: PropTypes.string,
+  queryEndpoint: PropTypes.string.isRequired,
   queryResponse: PropTypes.object,
   chartStatus: PropTypes.string,
 };

superset/assets/javascripts/explorev2/index.jsx

@@ -39,6 +39,7 @@ const bootstrappedState = Object.assign(
     queryResponse: null,
     triggerQuery: true,
     triggerRender: false,
+    alert: null,
   },
 );
 

superset/assets/javascripts/explorev2/stores/store.js

@@ -65,6 +65,7 @@ export function getControlsState(state, form_data) {
     if (typeof control.default === 'function') {
       control.default = control.default(control);
     }
+    control.validationErrors = [];
     control.value = formData[k] !== undefined ? formData[k] : control.default;
     controlsState[k] = control;
   });

superset/assets/package.json

@@ -62,7 +62,6 @@
     "lodash.throttle": "^4.1.1",
     "mapbox-gl": "^0.26.0",
     "moment": "^2.14.1",
-    "moments": "0.0.2",
     "mustache": "^2.2.1",
     "nvd3": "1.8.5",
     "prop-types": "^15.5.8",
@@ -97,7 +96,6 @@
     "viewport-mercator-project": "^2.1.0"
   },
   "devDependencies": {
-    "babel": "^6.3.26",
     "babel-cli": "^6.14.0",
     "babel-core": "^6.10.4",
     "babel-loader": "^6.2.4",

superset/assets/spec/javascripts/components/FilterableTable/FilterableTable_spec.jsx

@@ -4,7 +4,12 @@ import { expect } from 'chai';
 import FilterableTable from '../../../../javascripts/components/FilterableTable/FilterableTable';
 
 describe('FilterableTable', () => {
+  const mockedProps = {
+    orderedColumnKeys: [],
+    data: [],
+    height: 0,
+  };
   it('is valid element', () => {
-    expect(React.isValidElement(<FilterableTable />)).to.equal(true);
+    expect(React.isValidElement(<FilterableTable {...mockedProps} />)).to.equal(true);
   });
 });

superset/assets/spec/javascripts/dashboard/SliceCell_spec.jsx

@@ -10,7 +10,7 @@ describe('SliceCell', () => {
   const mockedProps = {
     slice,
     removeSlice: () => {},
-    expandedSlices: () => {},
+    expandedSlices: {},
   };
   it('is valid', () => {
     expect(

superset/assets/spec/javascripts/explorev2/components/ExploreActionButtons_spec.jsx

@@ -14,6 +14,7 @@ describe('ExploreActionButtons', () => {
         json_endpoint: '',
       },
     },
+    queryEndpoint: 'localhost',
   };
 
   it('renders', () => {

superset/assets/spec/javascripts/sqllab/QuerySearch_spec.jsx

@@ -11,6 +11,7 @@ import QuerySearch from '../../../javascripts/SqlLab/components/QuerySearch';
 describe('QuerySearch', () => {
   const mockedProps = {
     actions: {},
+    height: 0,
   };
   it('is valid', () => {
     expect(

superset/assets/spec/javascripts/sqllab/ResultSet_spec.jsx

@@ -9,14 +9,10 @@ import { queries } from './fixtures';
 describe('ResultSet', () => {
   const mockedProps = {
     query: queries[0],
+    height: 0,
   };
-  it('renders', () => {
-    expect(React.isValidElement(<ResultSet />)).to.equal(true);
-  });
-  it('renders with props', () => {
-    expect(
-      React.isValidElement(<ResultSet />),
-    ).to.equal(true);
+  it('is valid', () => {
+    expect(React.isValidElement(<ResultSet {...mockedProps} />)).to.equal(true);
   });
   it('renders a Table', () => {
     const wrapper = shallow(<ResultSet {...mockedProps} />);

superset/assets/spec/javascripts/sqllab/SqlEditorLeftBar_spec.jsx

@@ -12,6 +12,7 @@ describe('SqlEditorLeftBar', () => {
   const mockedProps = {
     tables: [table],
     queryEditor: defaultQueryEditor,
+    height: 0,
   };
   it('is valid', () => {
     expect(

superset/assets/spec/javascripts/sqllab/SqlEditor_spec.jsx

@@ -15,6 +15,9 @@ describe('SqlEditor', () => {
     latestQuery: queries[0],
     tables: [table],
     queries,
+    height: '',
+    editorQueries: [],
+    dataPreviewQueries: [],
   };
   it('is valid', () => {
     expect(

superset/assets/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx

@@ -15,6 +15,7 @@ describe('TabbedSqlEditors', () => {
     queries: {},
     queryEditors: initialState.queryEditors,
     tabHistory: initialState.tabHistory,
+    editorHeight: '',
   };
   it('is valid', () => {
     expect(

superset/assets/spec/javascripts/sqllab/Timer_spec.jsx

@@ -14,10 +14,7 @@ describe('Timer', () => {
     isRunning: true,
     state: 'warning',
   };
-  it('renders', () => {
-    expect(React.isValidElement(<Timer />)).to.equal(true);
-  });
-  it('renders with props', () => {
+  it('is valid', () => {
     expect(React.isValidElement(<Timer {...mockedProps} />))
     .to.equal(true);
   });

superset/assets/visualizations/filter_box.jsx

@@ -1,6 +1,7 @@
 // JS
 import d3 from 'd3';
 import React from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import Select from 'react-select';
 import { Button } from 'react-bootstrap';
@@ -10,11 +11,11 @@ import { TIME_CHOICES } from './constants';
 import './filter_box.css';
 
 const propTypes = {
-  origSelectedValues: React.PropTypes.object,
-  instantFiltering: React.PropTypes.bool,
-  filtersChoices: React.PropTypes.object,
-  onChange: React.PropTypes.func,
-  showDateFilter: React.PropTypes.bool,
+  origSelectedValues: PropTypes.object,
+  instantFiltering: PropTypes.bool,
+  filtersChoices: PropTypes.object,
+  onChange: PropTypes.func,
+  showDateFilter: PropTypes.bool,
 };
 
 const defaultProps = {

superset/assets/visualizations/mapbox.jsx

@@ -1,6 +1,7 @@
 /* eslint-disable no-param-reassign */
 import d3 from 'd3';
 import React from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import MapGL from 'react-map-gl';
 import ScatterPlotOverlay from 'react-map-gl/dist/overlays/scatterplot.react';
@@ -256,20 +257,20 @@ class MapboxViz extends React.Component {
   }
 }
 MapboxViz.propTypes = {
-  aggregatorName: React.PropTypes.string,
-  clusterer: React.PropTypes.object,
-  globalOpacity: React.PropTypes.number,
-  mapStyle: React.PropTypes.string,
-  mapboxApiKey: React.PropTypes.string,
-  pointRadius: React.PropTypes.number,
-  pointRadiusUnit: React.PropTypes.string,
-  renderWhileDragging: React.PropTypes.bool,
-  rgb: React.PropTypes.array,
-  sliceHeight: React.PropTypes.number,
-  sliceWidth: React.PropTypes.number,
-  viewportLatitude: React.PropTypes.number,
-  viewportLongitude: React.PropTypes.number,
-  viewportZoom: React.PropTypes.number,
+  aggregatorName: PropTypes.string,
+  clusterer: PropTypes.object,
+  globalOpacity: PropTypes.number,
+  mapStyle: PropTypes.string,
+  mapboxApiKey: PropTypes.string,
+  pointRadius: PropTypes.number,
+  pointRadiusUnit: PropTypes.string,
+  renderWhileDragging: PropTypes.bool,
+  rgb: PropTypes.array,
+  sliceHeight: PropTypes.number,
+  sliceWidth: PropTypes.number,
+  viewportLatitude: PropTypes.number,
+  viewportLongitude: PropTypes.number,
+  viewportZoom: PropTypes.number,
 };
 
 function mapbox(slice, json) {