smarthut/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '105-room' into 'dev'

Browse source 
Resolve "Room view with no devices is now bugged and tells the user to create a room"

Closes #105

See merge request sa4-2020/the-sanmarinoes/frontend!132
This commit is contained in:
Andrea Brites Marto 2020-05-07 10:32:00 +02:00
commit 1dd25968be
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
smart-hut/src/components/dashboard/DevicePanel.js
View file

@ -25,7 +25,7 @@ class DevicePanel extends Component {
render() { render() {
return ( return (
<Card.Group centered style={{ paddingTop: "3rem" }}> <Card.Group centered style={{ paddingTop: "3rem" }}>
{this.props.devices.length !== 0 ? ( {this.props.numbeOfRooms > 0 ? (
<React.Fragment> <React.Fragment>
{this.props.devices.map((e, i) => { {this.props.devices.map((e, i) => {
return <Device key={i} tab={this.props.tab} id={e.id} />; return <Device key={i} tab={this.props.tab} id={e.id} />;
@ -70,6 +70,9 @@ const mapStateToProps = (state, _) => ({
return state.active.activeRoom === -1; return state.active.activeRoom === -1;
}, },
activeRoom: state.active.activeRoom, activeRoom: state.active.activeRoom,
get numbeOfRooms() {
return Object.keys(state.rooms).length;
},
}); });
const DevicePanelContainer = connect( const DevicePanelContainer = connect(
mapStateToProps, mapStateToProps,