QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-13 21:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[bugfix] only filterable columns should show up in FilterBox list (#3105)

Browse Source 
* [bugfix] only filterable columns should show up in FilterBox list

* Touchups
This commit is contained in:
Maxime Beauchemin
2017-07-25 20:50:41 -07:00
committed by GitHub
parent 49ab09101b
commit 95509f2000
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
View File

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { Alert } from 'react-bootstrap';
import { sectionsToRender } from '../stores/visTypes';
import { sectionsToRender, visTypes } from '../stores/visTypes';
import ControlPanelSection from './ControlPanelSection';
import ControlRow from './ControlRow';
import Control from './Control';
@@ -28,7 +28,15 @@ class ControlPanelsContainer extends React.Component {
this.getControlData = this.getControlData.bind(this);
}
getControlData(controlName) {
const mapF = controls[controlName].mapStateToProps;
// Identifying mapStateToProps function to apply (logic can't be in store)
let mapF = controls[controlName].mapStateToProps;
// Looking to find mapStateToProps override for this viz type
const controlOverrides = visTypes[this.props.controls.viz_type.value].controlOverrides || {};
if (controlOverrides[controlName] && controlOverrides[controlName].mapStateToProps) {
mapF = controlOverrides[controlName].mapStateToProps;
}
// Applying mapStateToProps if needed
if (mapF) {
return Object.assign({}, this.props.controls[controlName], mapF(this.props.exploreState));
}