ui: Do not clutter component tree with Redux connects

This change refactors the frontend to use hooks for obtaining state
within the Redux store as opposed to using Higher-Order Components
(HOCs). This eliminates a lot of clutter in the components.

1 files changed, 11 insertions, 18 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/app/map/TileContainer.js b/opendc-web/opendc-web-ui/src/containers/app/map/TileContainer.js
index 04d6c8d6..ad7301a7 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/map/TileContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/map/TileContainer.js
@@ -1,26 +1,19 @@
-import { connect } from 'react-redux'
+import React from 'react'
+import { useDispatch, useSelector } from 'react-redux'
 import { goFromRoomToRack } from '../../../actions/interaction-level'
 import TileGroup from '../../../components/app/map/groups/TileGroup'
 
-const mapStateToProps = (state, ownProps) => {
-    const tile = state.objects.tile[ownProps.tileId]
+const TileContainer = (props) => {
+    const interactionLevel = useSelector((state) => state.interactionLevel)
+    const tile = useSelector((state) => state.objects.tile[props.tileId])
 
-    return {
-        interactionLevel: state.interactionLevel,
-        tile,
+    const dispatch = useDispatch()
+    const onClick = (tile) => {
+        if (tile.rackId) {
+            dispatch(goFromRoomToRack(tile._id))
+        }
     }
+    return <TileGroup {...props} onClick={onClick} tile={tile} interactionLevel={interactionLevel} />
 }
 
-const mapDispatchToProps = (dispatch) => {
-    return {
-        onClick: (tile) => {
-            if (tile.rackId) {
-                dispatch(goFromRoomToRack(tile._id))
-            }
-        },
-    }
-}
-
-const TileContainer = connect(mapStateToProps, mapDispatchToProps)(TileGroup)
-
 export default TileContainer