1 files changed, 15 insertions, 8 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 1de838e4..b588b4bc 100644
--- a/opendc-web/opendc-web-ui/src/containers/modals/NewScenarioModal.js
+++ b/opendc-web/opendc-web-ui/src/containers/modals/NewScenarioModal.js
@@ -5,15 +5,22 @@ import { addScenario } from '../../actions/scenarios'
 import { closeNewScenarioModal } from '../../actions/modals/scenarios'
 
 const NewScenarioModal = (props) => {
-    const state = useSelector((state) => {
-        let topologies =
-            state.currentProjectId !== '-1'
-                ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t])
-                : []
+    const topologies = useSelector(({ currentProjectId, objects }) => {
+        console.log(currentProjectId, objects)
+
+        if (currentProjectId === '-1' || !objects.project[currentProjectId]) {
+            return []
+        }
+
+        const topologies = objects.project[currentProjectId].topologyIds.map((t) => objects.topology[t])
+
         if (topologies.filter((t) => !t).length > 0) {
-            topologies = []
+            return []
         }
 
+        return topologies
+    })
+    const state = useSelector((state) => {
         return {
             show: state.modals.newScenarioModalVisible,
             currentPortfolioId: state.currentPortfolioId,
@@ -22,7 +29,6 @@ const NewScenarioModal = (props) => {
                     ? state.objects.portfolio[state.currentPortfolioId].scenarioIds
                     : [],
             traces: Object.values(state.objects.trace),
-            topologies,
             schedulers: Object.values(state.objects.scheduler),
         }
     })
@@ -42,7 +48,8 @@ const NewScenarioModal = (props) => {
         }
         dispatch(closeNewScenarioModal())
     }
-    return <NewScenarioModalComponent {...props} {...state} callback={callback} />
+
+    return <NewScenarioModalComponent {...props} {...state} topologies={topologies} callback={callback} />
 }
 
 export default NewScenarioModal