Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: show label for filters in filter box in explore #10412

Merged
merged 7 commits into from
Aug 5, 2020
Merged

fix: show label for filters in filter box in explore #10412

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7419a39
fix: show label for filters in filter box in explore
simcha90 Jul 23, 2020
c12c9ff
test: add test for label in filter box
simcha90 Jul 23, 2020
1be4c12
Merge branch 'master' of github.com:apache/incubator-superset into fi…
simcha90 Jul 26, 2020
9426ed0
test: add test / fix lint
simcha90 Jul 26, 2020
594704a
Merge branch 'master' of github.com:apache/incubator-superset into fi…
simcha90 Aug 2, 2020
a0502f7
fix: fix CR notes
simcha90 Aug 2, 2020
7a742a2
refactor: add label propType to FilterBoxItemControl.jsx
simcha90 Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions superset-frontend/spec/javascripts/explore/components/FilterBoxItemControl_spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import FilterBoxItemControl from 'src/explore/components/controls/FilterBoxItemC
import FormRow from 'src/components/FormRow';
import datasources from '../../../fixtures/mockDatasource';

const TEST_LABEL = 'some label';
const defaultProps = {
label: TEST_LABEL,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As TEST_LABEL isn't being used anywhere else, I don't see a reason create a const for it.

Suggested change
const TEST_LABEL = 'some label';
const defaultProps = {
label: TEST_LABEL,
const defaultProps = {
label: 'some label',

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

datasource: datasources['7__table'],
onChange: sinon.spy(),
};
Expand Down
2 changes: 2 additions & 0 deletions superset-frontend/src/explore/components/controls/FilterBoxItemControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ export default class FilterBoxItemControl extends React.Component {
clearable,
multiple,
searchAllOptions,
label,
defaultValue,
} = props;
const state = {
column,
metric,
label,
asc,
clearable,
multiple,
Expand Down