Skip to content

Commit

Permalink
[explore] fixing bugs in controls (#2496)
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch authored Mar 28, 2017
1 parent 56f2885 commit e14b74f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ operatorsArr.forEach(op => {
});

const propTypes = {
choices: PropTypes.array,
changeFilter: PropTypes.func,
removeFilter: PropTypes.func,
filter: PropTypes.object.isRequired,
Expand All @@ -32,7 +31,6 @@ const propTypes = {
const defaultProps = {
changeFilter: () => {},
removeFilter: () => {},
choices: [],
datasource: null,
};

Expand All @@ -54,8 +52,7 @@ export default class Filter extends React.Component {
type: 'GET',
url: `/superset/filter/${datasource.type}/${datasource.id}/${col}/`,
success: (data) => {
this.props.changeFilter('choices', data);
this.setState({ valuesLoading: false });
this.setState({ valuesLoading: false, valueChoices: data });
},
});
}
Expand Down Expand Up @@ -100,7 +97,7 @@ export default class Filter extends React.Component {
name="filter-value"
value={filter.val}
isLoading={this.state.valuesLoading}
choices={filter.choices}
choices={this.state.valueChoices}
onChange={this.changeSelect.bind(this)}
/>
);
Expand Down
9 changes: 6 additions & 3 deletions superset/connectors/druid/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,7 @@ def values_for_column(self,
client = self.cluster.get_pydruid_client()
client.topn(**qry)
df = client.export_pandas()

return [row[0] for row in df.to_records(index=False)]
return [row[column_name] for row in df.to_records(index=False)]

def get_query_str( # noqa / druid
self,
Expand Down Expand Up @@ -981,7 +980,11 @@ def get_filters(self, raw_filters): # noqa
eq = flt['val']
cond = None
if op in ('in', 'not in'):
eq = [types.replace("'", '').strip() for types in eq]
eq = [
types.replace("'", '').strip()
if isinstance(types, basestring)
else types
for types in eq]
elif not isinstance(flt['val'], basestring):
eq = eq[0] if len(eq) > 0 else ''
if col in self.num_cols:
Expand Down

0 comments on commit e14b74f

Please sign in to comment.