Merge branch 'master' onto working copy

1 files changed, 28 insertions, 0 deletions

diff --git a/frontend/src/containers/app/results/PortfolioResultsContainer.js b/frontend/src/containers/app/results/PortfolioResultsContainer.js
new file mode 100644
index 00000000..4b430e54
--- /dev/null
+++ b/frontend/src/containers/app/results/PortfolioResultsContainer.js
@@ -0,0 +1,28 @@
+import { connect } from 'react-redux'
+import PortfolioResultsComponent from '../../../components/app/results/PortfolioResultsComponent'
+
+const mapStateToProps = (state) => {
+    if (
+        state.currentPortfolioId === '-1' ||
+        !state.objects.portfolio[state.currentPortfolioId] ||
+        state.objects.portfolio[state.currentPortfolioId].scenarioIds
+            .map((scenarioId) => state.objects.scenario[scenarioId])
+            .some((s) => s === undefined)
+    ) {
+        return {
+            portfolio: undefined,
+            scenarios: [],
+        }
+    }
+
+    return {
+        portfolio: state.objects.portfolio[state.currentPortfolioId],
+        scenarios: state.objects.portfolio[state.currentPortfolioId].scenarioIds.map(
+            (scenarioId) => state.objects.scenario[scenarioId]
+        ),
+    }
+}
+
+const PortfolioResultsContainer = connect(mapStateToProps)(PortfolioResultsComponent)
+
+export default PortfolioResultsContainer