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, 18 insertions, 25 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/modals/DeleteRoomModal.js b/opendc-web/opendc-web-ui/src/containers/modals/DeleteRoomModal.js
index 1f6eef92..9a7be6a6 100644
--- a/opendc-web/opendc-web-ui/src/containers/modals/DeleteRoomModal.js
+++ b/opendc-web/opendc-web-ui/src/containers/modals/DeleteRoomModal.js
@@ -1,35 +1,28 @@
 import React from 'react'
-import { connect } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { closeDeleteRoomModal } from '../../actions/modals/topology'
 import { deleteRoom } from '../../actions/topology/room'
 import ConfirmationModal from '../../components/modals/ConfirmationModal'
 
-const DeleteRoomModalComponent = ({ visible, callback }) => (
-    <ConfirmationModal
-        title="Delete this room"
-        message="Are you sure you want to delete this room?"
-        show={visible}
-        callback={callback}
-    />
-)
+const DeleteRoomModal = (props) => {
+    const visible = useSelector((state) => state.modals.deleteRoomModalVisible)
 
-const mapStateToProps = (state) => {
-    return {
-        visible: state.modals.deleteRoomModalVisible,
+    const dispatch = useDispatch()
+    const callback = (isConfirmed) => {
+        if (isConfirmed) {
+            dispatch(deleteRoom())
+        }
+        dispatch(closeDeleteRoomModal())
     }
+    return (
+        <ConfirmationModal
+            title="Delete this room"
+            message="Are you sure you want to delete this room?"
+            show={visible}
+            callback={callback}
+            {...props}
+        />
+    )
 }
 
-const mapDispatchToProps = (dispatch) => {
-    return {
-        callback: (isConfirmed) => {
-            if (isConfirmed) {
-                dispatch(deleteRoom())
-            }
-            dispatch(closeDeleteRoomModal())
-        },
-    }
-}
-
-const DeleteRoomModal = connect(mapStateToProps, mapDispatchToProps)(DeleteRoomModalComponent)
-
 export default DeleteRoomModal