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 #732: Fix RoomSelector when getHouse return houses without rooms #738

Merged
merged 1 commit into from
Apr 13, 2020
Merged

Fix #732: Fix RoomSelector when getHouse return houses without rooms #738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 24 additions & 18 deletions front/src/components/house/RoomSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,30 @@ class RoomSelector extends Component {

componentWillReceiveProps = newProps => {
let selectedRoom;
const houseOptions = newProps.houses.map(house => {
return {
label: house.name,
options: house.rooms.map(room => {
const option = {
label: room.name,
value: room.selector,
room
};

if (newProps.selectedRoom === room.selector) {
selectedRoom = option;
}

return option;
})
};
});
let houseOptions = [];
if (newProps.houses) {
houseOptions = newProps.houses.map(house => {
return {
label: house.name,
options:
house && house.rooms
? house.rooms.map(room => {
const option = {
label: room.name,
value: room.selector,
room
};

if (newProps.selectedRoom === room.selector) {
selectedRoom = option;
}

return option;
})
: []
};
});
}

this.setState({ houseOptions, selectedRoom });
};
Expand Down