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

4 files changed, 114 insertions, 14 deletions

diff --git a/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js b/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js
new file mode 100644
index 00000000..d32a5c60
--- /dev/null
+++ b/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js
@@ -0,0 +1,47 @@
+import { connect } from 'react-redux'
+import { withRouter } from 'react-router-dom'
+import PortfolioListComponent from '../../../../components/app/sidebars/project/PortfolioListComponent'
+import { deletePortfolio, setCurrentPortfolio } from '../../../../actions/portfolios'
+import { openNewPortfolioModal } from '../../../../actions/modals/portfolios'
+import { getState } from '../../../../util/state-utils'
+import { setCurrentTopology } from '../../../../actions/topology/building'
+
+const mapStateToProps = state => {
+    let portfolios = state.objects.project[state.currentProjectId] ? state.objects.project[state.currentProjectId].portfolioIds.map(t => (
+        state.objects.portfolio[t]
+    )) : []
+    if (portfolios.filter(t => !t).length > 0) {
+        portfolios = []
+    }
+
+    return {
+        currentProjectId: state.currentProjectId,
+        currentPortfolioId: state.currentPortfolioId,
+        portfolios,
+    }
+}
+
+const mapDispatchToProps = (dispatch, ownProps) => {
+    return {
+        onNewPortfolio: () => {
+            dispatch(openNewPortfolioModal())
+        },
+        onChoosePortfolio: (portfolioId) => {
+            dispatch(setCurrentPortfolio(portfolioId))
+        },
+        onDeletePortfolio: async (id) => {
+            if (id) {
+                const state = await getState(dispatch)
+                dispatch(deletePortfolio(id))
+                dispatch(setCurrentTopology(state.objects.project[state.currentProjectId].topologyIds[0]))
+                ownProps.history.push(`/projects/${state.currentProjectId}`)
+            }
+        },
+    }
+}
+
+const PortfolioListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(
+    PortfolioListComponent,
+))
+
+export default PortfolioListContainer
diff --git a/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js b/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js
index ced0b18b..3951c24a 100644
--- a/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js
+++ b/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js
@@ -1,5 +1,10 @@
+import React from 'react'
+import { withRouter } from 'react-router-dom'
 import ProjectSidebarComponent from '../../../../components/app/sidebars/project/ProjectSidebarComponent'
 
-const ProjectSidebarContainer = ProjectSidebarComponent
+const ProjectSidebarContainer = withRouter(({ location, ...props }) => (
+    <ProjectSidebarComponent
+        collapsible={location.pathname.indexOf('portfolios') === -1 && location.pathname.indexOf('scenarios') === -1} {...props}/>
+))
 
 export default ProjectSidebarContainer
diff --git a/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js b/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js
new file mode 100644
index 00000000..2fd56d2b
--- /dev/null
+++ b/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js
@@ -0,0 +1,45 @@
+import { connect } from 'react-redux'
+import ScenarioListComponent from '../../../../components/app/sidebars/project/ScenarioListComponent'
+import { openNewScenarioModal } from '../../../../actions/modals/scenarios'
+import { deleteScenario, setCurrentScenario } from '../../../../actions/scenarios'
+import { setCurrentPortfolio } from '../../../../actions/portfolios'
+
+const mapStateToProps = (state, ownProps) => {
+    let scenarios = state.objects.portfolio[ownProps.portfolioId] ? state.objects.portfolio[ownProps.portfolioId].scenarioIds.map(t => (
+        state.objects.scenario[t]
+    )) : []
+    if (scenarios.filter(t => !t).length > 0) {
+        scenarios = []
+    }
+
+    return {
+        currentProjectId: state.currentProjectId,
+        currentScenarioId: state.currentScenarioId,
+        scenarios,
+    }
+}
+
+const mapDispatchToProps = dispatch => {
+    return {
+        onNewScenario: (currentPortfolioId) => {
+            dispatch(setCurrentPortfolio(currentPortfolioId))
+            dispatch(openNewScenarioModal())
+        },
+        onChooseScenario: (portfolioId, scenarioId) => {
+            dispatch(setCurrentScenario(portfolioId, scenarioId))
+        },
+        onDeleteScenario: (id) => {
+            if (id) {
+                dispatch(
+                    deleteScenario(id),
+                )
+            }
+        },
+    }
+}
+
+const ScenarioListContainer = connect(mapStateToProps, mapDispatchToProps)(
+    ScenarioListComponent,
+)
+
+export default ScenarioListContainer
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