Merge pull request #12 from atlarge-research/feature/scenario-plots

Plotting of portfolio results

4 files changed, 21 insertions, 30 deletions

diff --git a/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js b/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js
index d32a5c60..b32c8b1d 100644
--- a/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js
+++ b/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js
@@ -6,11 +6,11 @@ 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) {
+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 = []
     }
 
@@ -40,8 +40,6 @@ const mapDispatchToProps = (dispatch, ownProps) => {
     }
 }
 
-const PortfolioListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(
-    PortfolioListComponent,
-))
+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 3951c24a..49001099 100644
--- a/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js
+++ b/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js
@@ -1,10 +1,10 @@
 import React from 'react'
 import { withRouter } from 'react-router-dom'
 import ProjectSidebarComponent from '../../../../components/app/sidebars/project/ProjectSidebarComponent'
+import { isCollapsible } from '../../../../util/sidebar-space'
 
 const ProjectSidebarContainer = withRouter(({ location, ...props }) => (
-    <ProjectSidebarComponent
-        collapsible={location.pathname.indexOf('portfolios') === -1 && location.pathname.indexOf('scenarios') === -1} {...props}/>
+    <ProjectSidebarComponent collapsible={isCollapsible(location)} {...props} />
 ))
 
 export default ProjectSidebarContainer
diff --git a/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js b/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js
index 2fd56d2b..415e2792 100644
--- a/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js
+++ b/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js
@@ -5,10 +5,10 @@ import { deleteScenario, setCurrentScenario } from '../../../../actions/scenario
 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) {
+    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 = []
     }
 
@@ -19,7 +19,7 @@ const mapStateToProps = (state, ownProps) => {
     }
 }
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
     return {
         onNewScenario: (currentPortfolioId) => {
             dispatch(setCurrentPortfolio(currentPortfolioId))
@@ -30,16 +30,12 @@ const mapDispatchToProps = dispatch => {
         },
         onDeleteScenario: (id) => {
             if (id) {
-                dispatch(
-                    deleteScenario(id),
-                )
+                dispatch(deleteScenario(id))
             }
         },
     }
 }
 
-const ScenarioListContainer = connect(mapStateToProps, mapDispatchToProps)(
-    ScenarioListComponent,
-)
+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 6905c7c5..f65982ef 100644
--- a/frontend/src/containers/app/sidebars/project/TopologyListContainer.js
+++ b/frontend/src/containers/app/sidebars/project/TopologyListContainer.js
@@ -6,18 +6,17 @@ 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 => (
-        state.objects.topology[t]
-    )) : []
-    if (topologies.filter(t => !t).length > 0) {
+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 = []
     }
 
     return {
         currentTopologyId: state.currentTopologyId,
         topologies,
-
     }
 }
 
@@ -42,8 +41,6 @@ const mapDispatchToProps = (dispatch, ownProps) => {
     }
 }
 
-const TopologyListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(
-    TopologyListComponent,
-))
+const TopologyListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(TopologyListComponent))
 
 export default TopologyListContainer