diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-09-20 11:04:34 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-09-20 16:07:06 +0200 |
| commit | 0b3d0ba3193ebcdeadc6a4b0a192eeb06e9add29 (patch) | |
| tree | f01e4990efd17b1ab0ed520ec39cd3aa5a0a0b09 /opendc-web/opendc-web-ui/src/components/topologies/map/RoomContainer.js | |
| parent | 98bc4c3e9458aea98890b770493f14327a7bc7c4 (diff) | |
fix(web/ui): Do not fail on stale Redux state
This change fixes an issue where switching between different topologies
would fail due to stale Redux state. We have updated the components to
take into account that ids may not exist in the Redux store.
Diffstat (limited to 'opendc-web/opendc-web-ui/src/components/topologies/map/RoomContainer.js')
| -rw-r--r-- | opendc-web/opendc-web-ui/src/components/topologies/map/RoomContainer.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/opendc-web/opendc-web-ui/src/components/topologies/map/RoomContainer.js b/opendc-web/opendc-web-ui/src/components/topologies/map/RoomContainer.js index 65189891..191318ee 100644 --- a/opendc-web/opendc-web-ui/src/components/topologies/map/RoomContainer.js +++ b/opendc-web/opendc-web-ui/src/components/topologies/map/RoomContainer.js @@ -27,15 +27,16 @@ import { goFromBuildingToRoom } from '../../../redux/actions/interaction-level' import RoomGroup from './groups/RoomGroup' function RoomContainer({ roomId, ...props }) { - const state = useSelector((state) => { - return { - interactionLevel: state.interactionLevel, - currentRoomInConstruction: state.construction.currentRoomInConstruction, - room: state.topology.rooms[roomId], - } - }) + const interactionLevel = useSelector((state) => state.interactionLevel) + const currentRoomInConstruction = useSelector((state) => state.construction.currentRoomInConstruction) + const room = useSelector((state) => state.topology.rooms[roomId]) const dispatch = useDispatch() - return <RoomGroup {...props} {...state} onClick={() => dispatch(goFromBuildingToRoom(roomId))} /> + + if (!room) { + return null + } + + return <RoomGroup {...props} interactionLevel={interactionLevel} currentRoomInConstruction={currentRoomInConstruction} room={room} onClick={() => dispatch(goFromBuildingToRoom(roomId))} /> } RoomContainer.propTypes = { |
