williaster commented on a change in pull request #4909: [Explore] Adding Adhoc
Filters
URL:
https://github.com/apache/incubator-superset/pull/4909#discussion_r186496277
##########
File path:
superset/assets/src/explore/components/AdhocFilterEditPopoverSimpleTabContent.jsx
##########
@@ -0,0 +1,248 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormGroup } from 'react-bootstrap';
+import VirtualizedSelect from 'react-virtualized-select';
+
+import AdhocFilter, { EXPRESSION_TYPES, CLAUSES } from '../AdhocFilter';
+import adhocMetricType from '../propTypes/adhocMetricType';
+import columnType from '../propTypes/columnType';
+import { t } from '../../locales';
+import {
+ OPERATORS,
+ TABLE_ONLY_OPERATORS,
+ DRUID_ONLY_OPERATORS,
+ HAVING_OPERATORS,
+ MULTI_OPERATORS,
+} from '../constants';
+import FilterDefinitionOption from './FilterDefinitionOption';
+import OnPasteSelect from '../../components/OnPasteSelect';
+import SelectControl from './controls/SelectControl';
+import VirtualizedRendererWrap from '../../components/VirtualizedRendererWrap';
+
+const $ = window.$ = require('jquery');
+
+const propTypes = {
+ adhocFilter: PropTypes.instanceOf(AdhocFilter).isRequired,
+ onChange: PropTypes.func.isRequired,
+ options: PropTypes.arrayOf(PropTypes.oneOfType([
+ columnType,
+ PropTypes.shape({ saved_metric_name: PropTypes.string.isRequired }),
+ adhocMetricType,
+ ])).isRequired,
+ datasource: PropTypes.object,
+};
+
+const defaultProps = {
+ datasource: {},
+};
+
+export default class AdhocFilterEditPopoverSimpleTabContent extends
React.Component {
+ constructor(props) {
+ super(props);
+ this.onSubjectChange = this.onSubjectChange.bind(this);
+ this.onOperatorChange = this.onOperatorChange.bind(this);
+ this.onComparatorChange = this.onComparatorChange.bind(this);
+ this.onInputComparatorChange = this.onInputComparatorChange.bind(this);
+ this.isOperatorRelevant = this.isOperatorRelevant.bind(this);
+ this.refreshComparatorSuggestions =
this.refreshComparatorSuggestions.bind(this);
+
+ this.state = {
+ suggestions: [],
+ };
+
+ this.selectProps = {
+ multi: false,
+ name: 'select-column',
+ labelKey: 'label',
+ autosize: false,
+ clearable: false,
+ selectWrap: VirtualizedSelect,
+ };
+ }
+
+ componentWillMount() {
+ this.refreshComparatorSuggestions();
+ }
+
+ componentDidUpdate(prevProps) {
+ if (prevProps.adhocFilter.subject !== this.props.adhocFilter.subject) {
+ this.refreshComparatorSuggestions();
+ }
+ }
+
+ onSubjectChange(option) {
+ let subject;
+ let clause;
+ // infer the new clause based on what subject was selected.
+ if (option && option.column_name) {
+ subject = option.column_name;
+ clause = CLAUSES.WHERE;
+ } else if (option && (option.saved_metric_name || option.label)) {
+ subject = option.saved_metric_name || option.label;
+ clause = CLAUSES.HAVING;
+ }
+ this.props.onChange(this.props.adhocFilter.duplicateWith({
+ subject,
+ clause,
+ expressionType: EXPRESSION_TYPES.SIMPLE,
+ }));
+ }
+
+ onOperatorChange(operator) {
+ const currentComparator = this.props.adhocFilter.comparator;
+ let newComparator;
+ // convert between list of comparators and individual comparators
+ // (e.g. `in ('North America', 'Africa')` to `== 'North America'`)
+ if (MULTI_OPERATORS.indexOf(operator.operator) >= 0) {
+ newComparator = Array.isArray(currentComparator) ?
+ currentComparator :
+ [currentComparator].filter(element => element);
+ } else {
+ newComparator = Array.isArray(currentComparator) ? currentComparator[0]
: currentComparator;
+ }
+ this.props.onChange(this.props.adhocFilter.duplicateWith({
+ operator: operator && operator.operator,
+ comparator: newComparator,
+ expressionType: EXPRESSION_TYPES.SIMPLE,
+ }));
+ }
+
+ onInputComparatorChange(event) {
+ this.onComparatorChange(event.target.value);
+ }
+
+ onComparatorChange(comparator) {
+ this.props.onChange(this.props.adhocFilter.duplicateWith({
+ comparator,
+ expressionType: EXPRESSION_TYPES.SIMPLE,
+ }));
+ }
+
+ refreshComparatorSuggestions() {
+ const datasource = this.props.datasource;
+ const col = this.props.adhocFilter.subject;
+ const having = this.props.adhocFilter.clause === CLAUSES.HAVING;
+
+ if (col && datasource && datasource.filter_select && !having) {
+ if (this.state.activeRequest) {
+ this.state.activeRequest.abort();
+ }
+ this.setState({
+ activeRequest: $.ajax({
+ type: 'GET',
+ url: `/superset/filter/${datasource.type}/${datasource.id}/${col}/`,
+ success: data => this.setState({ suggestions: data, activeRequest:
null }),
+ }),
+ });
+ }
+ }
+
+ isOperatorRelevant(operator) {
+ return !(
+ (this.props.datasource.type === 'druid' &&
TABLE_ONLY_OPERATORS.indexOf(operator) >= 0) ||
+ (this.props.datasource.type === 'table' &&
DRUID_ONLY_OPERATORS.indexOf(operator) >= 0) ||
+ (
+ this.props.adhocFilter.clause === CLAUSES.HAVING &&
+ HAVING_OPERATORS.indexOf(operator) === -1
+ )
+ );
+ }
+
+ focusComparator(ref) {
+ if (ref) {
+ ref.focus();
+ }
+ }
+
+ render() {
+ const { adhocFilter, options, datasource } = this.props;
+
+ let subjectSelectProps = {
+ value: adhocFilter.subject ? { value: adhocFilter.subject } : undefined,
+ onChange: this.onSubjectChange,
+ optionRenderer: VirtualizedRendererWrap(option => (
+ <FilterDefinitionOption option={option} />
+ )),
+ valueRenderer: option => <span>{option.value}</span>,
+ valueKey: 'filterOptionName',
+ noResultsText: 'No such column found. To filter on a metric, try the
Custom SQL tab.',
+ };
+
+ if (datasource.type === 'druid') {
+ subjectSelectProps = {
+ ...subjectSelectProps,
+ placeholder: t('%s column(s) and metric(s)', options.length),
+ options,
+ };
+ } else {
+ // we cannot support simple ad-hoc filters for metrics because we don't
know what type
+ // the value should be cast to (without knowing the output type of the
aggregate, which
+ // becomes a rather complicated problem)
+ subjectSelectProps = {
+ ...subjectSelectProps,
+ placeholder: adhocFilter.clause === CLAUSES.WHERE ?
+ t('%s column(s)', options.length) :
+ t('To filter on a metric, use Custom SQL tab.'),
+ options: options.filter(option => option.column_name),
+ };
+ }
+
+ const operatorSelectProps = {
+ placeholder: t('%s operators(s)', Object.keys(OPERATORS).length),
+ options: Object.keys(OPERATORS).filter(this.isOperatorRelevant).map((
+ operator => ({ operator })
+ )),
+ value: adhocFilter.operator,
+ onChange: this.onOperatorChange,
+ optionRenderer: VirtualizedRendererWrap((
Review comment:
(to clarify, I think readable labels are good for the options dropdown, I
think the mathematical representation `>`, `!=` etc is still probably better
for the label since it needs to be concise.) not set on this though, I would
imagine most people would understand either. an alternative I think we
discussed would be to include both representations in the dropdown eg `!= (not
equal to)`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
