Merge branch 'master' of github.com:atlarge-research/opendc-dev

1 files changed, 16 insertions, 13 deletions

diff --git a/frontend/src/containers/app/sidebars/project/TopologyListContainer.js b/frontend/src/containers/app/sidebars/project/TopologyListContainer.js
index cab47c8d..6905c7c5 100644
--- a/frontend/src/containers/app/sidebars/project/TopologyListContainer.js
+++ b/frontend/src/containers/app/sidebars/project/TopologyListContainer.js
@@ -2,7 +2,9 @@ import { connect } from 'react-redux'
 import TopologyListComponent from '../../../../components/app/sidebars/project/TopologyListComponent'
 import { setCurrentTopology } from '../../../../actions/topology/building'
 import { openNewTopologyModal } from '../../../../actions/modals/topology'
-import { deleteTopology } from '../../../../actions/topologies'
+import { withRouter } from 'react-router-dom'
+import { getState } from '../../../../util/state-utils'
+import { deleteScenario } from '../../../../actions/scenarios'
 
 const mapStateToProps = state => {
     let topologies = state.objects.project[state.currentProjectId] ? state.objects.project[state.currentProjectId].topologyIds.map(t => (
@@ -13,34 +15,35 @@ const mapStateToProps = state => {
     }
 
     return {
-        show: state.modals.changeTopologyModalVisible,
         currentTopologyId: state.currentTopologyId,
         topologies,
+
     }
 }
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch, ownProps) => {
     return {
-        onChooseTopology: (id) => {
-            dispatch(
-                setCurrentTopology(id),
-            )
+        onChooseTopology: async (id) => {
+            dispatch(setCurrentTopology(id))
+            const state = await getState(dispatch)
+            ownProps.history.push(`/projects/${state.currentProjectId}`)
         },
         onNewTopology: () => {
             dispatch(openNewTopologyModal())
         },
-        onDeleteTopology: (id) => {
+        onDeleteTopology: async (id) => {
             if (id) {
-                dispatch(
-                    deleteTopology(id),
-                )
+                const state = await getState(dispatch)
+                dispatch(deleteScenario(id))
+                dispatch(setCurrentTopology(state.objects.project[state.currentProjectId].topologyIds[0]))
+                ownProps.history.push(`/projects/${state.currentProjectId}`)
             }
         },
     }
 }
 
-const TopologyListContainer = connect(mapStateToProps, mapDispatchToProps)(
+const TopologyListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(
     TopologyListComponent,
-)
+))
 
 export default TopologyListContainer