1 files changed, 41 insertions, 33 deletions
diff --git a/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/TopologyListContainer.js b/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/TopologyListContainer.js
index e1de18f9..954284a6 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/TopologyListContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/TopologyListContainer.js
@@ -1,46 +1,54 @@
-import { connect } from 'react-redux'
+import React from 'react'
+import { useDispatch, useSelector } from 'react-redux'
 import TopologyListComponent from '../../../../components/app/sidebars/project/TopologyListComponent'
 import { setCurrentTopology } from '../../../../actions/topology/building'
 import { openNewTopologyModal } from '../../../../actions/modals/topology'
-import { withRouter } from 'react-router-dom'
+import { useHistory } from 'react-router-dom'
 import { getState } from '../../../../util/state-utils'
 import { deleteTopology } from '../../../../actions/topologies'
 
-const mapStateToProps = (state) => {
-    let topologies = state.objects.project[state.currentProjectId]
-        ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t])
-        : []
-    if (topologies.filter((t) => !t).length > 0) {
-        topologies = []
-    }
+const TopologyListContainer = () => {
+    const dispatch = useDispatch()
+    const history = useHistory()
 
-    return {
-        currentTopologyId: state.currentTopologyId,
-        topologies,
-    }
-}
+    const topologies = useSelector((state) => {
+        let topologies = state.objects.project[state.currentProjectId]
+            ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t])
+            : []
+        if (topologies.filter((t) => !t).length > 0) {
+            topologies = []
+        }
+
+        return topologies
+    })
+    const currentTopologyId = useSelector((state) => state.currentTopologyId)
 
-const mapDispatchToProps = (dispatch, ownProps) => {
-    return {
-        onChooseTopology: async (id) => {
-            dispatch(setCurrentTopology(id))
+    const onChooseTopology = async (id) => {
+        dispatch(setCurrentTopology(id))
+        const state = await getState(dispatch)
+        history.push(`/projects/${state.currentProjectId}`)
+    }
+    const onNewTopology = () => {
+        dispatch(openNewTopologyModal())
+    }
+    const onDeleteTopology = async (id) => {
+        if (id) {
             const state = await getState(dispatch)
-            ownProps.history.push(`/projects/${state.currentProjectId}`)
-        },
-        onNewTopology: () => {
-            dispatch(openNewTopologyModal())
-        },
-        onDeleteTopology: async (id) => {
-            if (id) {
-                const state = await getState(dispatch)
-                dispatch(deleteTopology(id))
-                dispatch(setCurrentTopology(state.objects.project[state.currentProjectId].topologyIds[0]))
-                ownProps.history.push(`/projects/${state.currentProjectId}`)
-            }
-        },
+            dispatch(deleteTopology(id))
+            dispatch(setCurrentTopology(state.objects.project[state.currentProjectId].topologyIds[0]))
+            history.push(`/projects/${state.currentProjectId}`)
+        }
     }
-}
 
-const TopologyListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(TopologyListComponent))
+    return (
+        <TopologyListComponent
+            topologies={topologies}
+            currentTopologyId={currentTopologyId}
+            onChooseTopology={onChooseTopology}
+            onNewTopology={onNewTopology}
+            onDeleteTopology={onDeleteTopology}
+        />
+    )
+}
 
 export default TopologyListContainer