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, 27 insertions, 30 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/modals/EditRackNameModal.js b/opendc-web/opendc-web-ui/src/containers/modals/EditRackNameModal.js
index 9128f449..edb57217 100644
--- a/opendc-web/opendc-web-ui/src/containers/modals/EditRackNameModal.js
+++ b/opendc-web/opendc-web-ui/src/containers/modals/EditRackNameModal.js
@@ -1,40 +1,37 @@
 import React from 'react'
-import { connect } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { closeEditRackNameModal } from '../../actions/modals/topology'
 import { editRackName } from '../../actions/topology/rack'
 import TextInputModal from '../../components/modals/TextInputModal'
 
-const EditRackNameModalComponent = ({ visible, previousName, callback }) => (
-    <TextInputModal
-        title="Edit rack name"
-        label="Rack name"
-        show={visible}
-        initialValue={previousName}
-        callback={callback}
-    />
-)
+const EditRackNameModal = (props) => {
+    const { visible, previousName } = useSelector((state) => {
+        return {
+            visible: state.modals.editRackNameModalVisible,
+            previousName:
+                state.interactionLevel.mode === 'RACK'
+                    ? state.objects.rack[state.objects.tile[state.interactionLevel.tileId].rackId].name
+                    : '',
+        }
+    })
 
-const mapStateToProps = (state) => {
-    return {
-        visible: state.modals.editRackNameModalVisible,
-        previousName:
-            state.interactionLevel.mode === 'RACK'
-                ? state.objects.rack[state.objects.tile[state.interactionLevel.tileId].rackId].name
-                : '',
+    const dispatch = useDispatch()
+    const callback = (name) => {
+        if (name) {
+            dispatch(editRackName(name))
+        }
+        dispatch(closeEditRackNameModal())
     }
+    return (
+        <TextInputModal
+            title="Edit rack name"
+            label="Rack name"
+            show={visible}
+            initialValue={previousName}
+            callback={callback}
+            {...props}
+        />
+    )
 }
 
-const mapDispatchToProps = (dispatch) => {
-    return {
-        callback: (name) => {
-            if (name) {
-                dispatch(editRackName(name))
-            }
-            dispatch(closeEditRackNameModal())
-        },
-    }
-}
-
-const EditRackNameModal = connect(mapStateToProps, mapDispatchToProps)(EditRackNameModalComponent)
-
 export default EditRackNameModal