Skip to content

Commit

Permalink
Check null value to avoid crash on category widget (#439)
Browse files Browse the repository at this point in the history
  • Loading branch information
moicalcob authored Jun 28, 2022
1 parent 665172d commit 8fb5ac1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
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

0 comments on commit 8fb5ac1

Please sign in to comment.