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, 17 insertions, 26 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js b/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js
index f30febdb..33b2612f 100644
--- a/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js
+++ b/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js
@@ -1,35 +1,26 @@
 import React from 'react'
-import { connect } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { closeDeleteMachineModal } from '../../actions/modals/topology'
 import { deleteMachine } from '../../actions/topology/machine'
 import ConfirmationModal from '../../components/modals/ConfirmationModal'
 
-const DeleteMachineModalComponent = ({ visible, callback }) => (
-    <ConfirmationModal
-        title="Delete this machine"
-        message="Are you sure you want to delete this machine?"
-        show={visible}
-        callback={callback}
-    />
-)
-
-const mapStateToProps = (state) => {
-    return {
-        visible: state.modals.deleteMachineModalVisible,
+const DeleteMachineModal = () => {
+    const dispatch = useDispatch()
+    const callback = (isConfirmed) => {
+        if (isConfirmed) {
+            dispatch(deleteMachine())
+        }
+        dispatch(closeDeleteMachineModal())
     }
+    const visible = useSelector((state) => state.modals.deleteMachineModalVisible)
+    return (
+        <ConfirmationModal
+            title="Delete this machine"
+            message="Are you sure you want to delete this machine?"
+            show={visible}
+            callback={callback}
+        />
+    )
 }
 
-const mapDispatchToProps = (dispatch) => {
-    return {
-        callback: (isConfirmed) => {
-            if (isConfirmed) {
-                dispatch(deleteMachine())
-            }
-            dispatch(closeDeleteMachineModal())
-        },
-    }
-}
-
-const DeleteMachineModal = connect(mapStateToProps, mapDispatchToProps)(DeleteMachineModalComponent)
-
 export default DeleteMachineModal