1 files changed, 38 insertions, 40 deletions
diff --git a/opendc-web/opendc-web-ui/src/containers/modals/NewScenarioModal.js b/opendc-web/opendc-web-ui/src/containers/modals/NewScenarioModal.js
index 7d774fa4..1de838e4 100644
--- a/opendc-web/opendc-web-ui/src/containers/modals/NewScenarioModal.js
+++ b/opendc-web/opendc-web-ui/src/containers/modals/NewScenarioModal.js
@@ -1,50 +1,48 @@
-import { connect } from 'react-redux'
+import React from 'react'
+import { useDispatch, useSelector } from 'react-redux'
 import NewScenarioModalComponent from '../../components/modals/custom-components/NewScenarioModalComponent'
 import { addScenario } from '../../actions/scenarios'
 import { closeNewScenarioModal } from '../../actions/modals/scenarios'
 
-const mapStateToProps = (state) => {
-    let topologies =
-        state.currentProjectId !== '-1'
-            ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t])
-            : []
-    if (topologies.filter((t) => !t).length > 0) {
-        topologies = []
-    }
+const NewScenarioModal = (props) => {
+    const state = useSelector((state) => {
+        let topologies =
+            state.currentProjectId !== '-1'
+                ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t])
+                : []
+        if (topologies.filter((t) => !t).length > 0) {
+            topologies = []
+        }
 
-    return {
-        show: state.modals.newScenarioModalVisible,
-        currentPortfolioId: state.currentPortfolioId,
-        currentPortfolioScenarioIds:
-            state.currentPortfolioId !== '-1' && state.objects.portfolio[state.currentPortfolioId]
-                ? state.objects.portfolio[state.currentPortfolioId].scenarioIds
-                : [],
-        traces: Object.values(state.objects.trace),
-        topologies,
-        schedulers: Object.values(state.objects.scheduler),
-    }
-}
+        return {
+            show: state.modals.newScenarioModalVisible,
+            currentPortfolioId: state.currentPortfolioId,
+            currentPortfolioScenarioIds:
+                state.currentPortfolioId !== '-1' && state.objects.portfolio[state.currentPortfolioId]
+                    ? state.objects.portfolio[state.currentPortfolioId].scenarioIds
+                    : [],
+            traces: Object.values(state.objects.trace),
+            topologies,
+            schedulers: Object.values(state.objects.scheduler),
+        }
+    })
 
-const mapDispatchToProps = (dispatch) => {
-    return {
-        callback: (name, portfolioId, trace, topology, operational) => {
-            if (name) {
-                dispatch(
-                    addScenario({
-                        portfolioId,
-                        name,
-                        trace,
-                        topology,
-                        operational,
-                    })
-                )
-            }
-
-            dispatch(closeNewScenarioModal())
-        },
+    const dispatch = useDispatch()
+    const callback = (name, portfolioId, trace, topology, operational) => {
+        if (name) {
+            dispatch(
+                addScenario({
+                    portfolioId,
+                    name,
+                    trace,
+                    topology,
+                    operational,
+                })
+            )
+        }
+        dispatch(closeNewScenarioModal())
     }
+    return <NewScenarioModalComponent {...props} {...state} callback={callback} />
 }
 
-const NewScenarioModal = connect(mapStateToProps, mapDispatchToProps)(NewScenarioModalComponent)
-
 export default NewScenarioModal