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

Revert "[hotfix] Fix druid filters" (#2292)

Browse Source
This commit is contained in:
vera-liu
2017-02-27 20:46:12 -08:00
committed by GitHub
parent 09f1083c50
commit 675b819e0a
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
superset/assets/javascripts/explorev2/components/controls/Filter.jsx
View File

@@ -4,9 +4,6 @@ import Select from 'react-select';
import { Button, Row, Col } from 'react-bootstrap';
import SelectControl from './SelectControl';
const arrayFilterOps = ['in', 'not in'];
const strFilterOps = ['==', '!=', '>', '<', '>=', '<=', 'regex'];
const propTypes = {
choices: PropTypes.array,
changeFilter: PropTypes.func,
@@ -58,15 +55,6 @@ export default class Filter extends React.Component {
if (event && event.value) {
value = event.value;
}
if (control === 'op') {
if (arrayFilterOps.indexOf(this.props.filter.op) !== -1
&& strFilterOps.indexOf(value) !== -1) {
this.props.changeFilter('val', this.props.filter.val[0]);
} else if (strFilterOps.indexOf(this.props.filter.op) !== -1
&& arrayFilterOps.indexOf(value) !== -1) {
this.props.changeFilter('val', [this.props.filter.val]);
}
}
this.props.changeFilter(control, value);
if (control === 'col' && value !== null && this.props.datasource.filter_select) {
this.fetchFilterValues(value);
@@ -82,13 +70,13 @@ export default class Filter extends React.Component {
this.fetchFilterValues(filter.col);
}
}
if (this.props.having || StrFilterOps.indexOf(filter.op) !== -1) {
// druid having filter or regex/==/!= filters
if (this.props.having) {
// druid having filter
return (
<input
type="text"
onChange={this.changeFilter.bind(this, 'val')}
value={filter.val}
value={filter.value}
className="form-control input-sm"
placeholder="Filter value"
/>