Skip to content

Commit

Permalink
[explorev2] Breaking down large files, fixing JS warnings (#1773)
Browse files Browse the repository at this point in the history
* Breaking down large files, fixing JS warnings

* fix unit tests
  • Loading branch information
mistercrunch authored Dec 6, 2016
1 parent 3597fdb commit c155857
Show file tree
Hide file tree
Showing 10 changed files with 1,734 additions and 1,739 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class ChartContainer extends React.Component {
id={this.props.containerId}
ref={(ref) => { this.chartContainerRef = ref; }}
className={this.props.viz_type}
style={{ 'overflow-x': 'scroll' }}
style={{ overflowX: 'scroll' }}
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { bindActionCreators } from 'redux';
import * as actions from '../actions/exploreActions';
import { connect } from 'react-redux';
import { Panel, Alert } from 'react-bootstrap';
import { visTypes, sectionsToRender, commonControlPanelSections } from '../stores/store';
import visTypes, { sectionsToRender, commonControlPanelSections } from '../stores/visTypes';
import ControlPanelSection from './ControlPanelSection';
import FieldSetRow from './FieldSetRow';
import Filters from './Filters';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ChartContainer from './ChartContainer';
import ControlPanelsContainer from './ControlPanelsContainer';
import SaveModal from './SaveModal';
import QueryAndSaveBtns from '../../explore/components/QueryAndSaveBtns';
import { autoQueryFields } from '../stores/store';
import { autoQueryFields } from '../stores/fields';
import { getParamObject } from '../exploreUtils';

const $ = require('jquery');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import TextField from './TextField';
import CheckboxField from './CheckboxField';
import TextAreaField from './TextAreaField';
import SelectField from './SelectField';
import { fieldTypes } from '../stores/store';
import { fieldTypes } from '../stores/fields';

const propTypes = {
name: PropTypes.string.isRequired,
Expand Down
3 changes: 3 additions & 0 deletions superset/assets/javascripts/explorev2/components/Filters.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,14 @@ class Filters extends React.Component {
}
render() {
const filters = [];
let i = 0;
this.props.filters.forEach((filter) => {
// only display filters with current prefix
i++;
if (filter.prefix === this.props.prefix) {
filters.push(
<Filter
key={i}
filterColumnOpts={this.props.filterColumnOpts}
actions={this.props.actions}
prefix={this.props.prefix}
Expand Down
Loading

0 comments on commit c155857

Please sign in to comment.