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

Check null value to avoid crash on category widget #439

Merged
merged 3 commits into from
Jun 28, 2022
Merged

Check null value to avoid crash on category widget #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
415540b
Check null value to avoid crash on category widget
moicalcob Jun 27, 2022
648a154
Add change to changelog
moicalcob Jun 27, 2022
9c34c5c
Check undefined values
moicalcob Jun 28, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Not released

- Fix CategoryWidget search if there are null values [#439](https://github.com/CartoDB/carto-react/pull/439)
- Layout improvements in BarWidgetUI [#438](https://github.com/CartoDB/carto-react/pull/438)
- Fix FormulaWidget column check [#437](https://github.com/CartoDB/carto-react/pull/437)

Expand Down
16 changes: 10 additions & 6 deletions packages/react-ui/src/widgets/CategoryWidgetUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,14 @@ function CategoryWidgetUI(props) {
return searchValue
? list.filter((elem) => {
return (
elem.name.toLowerCase().indexOf(searchValue.toLowerCase()) !== -1 ||
(labels[elem.name]
? labels[elem.name].toLowerCase().indexOf(searchValue.toLowerCase()) !==
-1
: false)
elem.name !== null &&
elem.name !== undefined &&
(elem.name.toLowerCase().indexOf(searchValue.toLowerCase()) !== -1 ||
(labels[elem.name]
? labels[elem.name]
.toLowerCase()
.indexOf(searchValue.toLowerCase()) !== -1
: false))
);
})
: list;
Expand Down Expand Up @@ -614,7 +617,8 @@ CategoryWidgetUI.defaultProps = {
CategoryWidgetUI.propTypes = {
data: PropTypes.arrayOf(
PropTypes.shape({
name: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool]).isRequired,
name: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool])
.isRequired,
value: PropTypes.number
})
),
Expand Down