ui: Do not clutter component tree with Redux connects

This change refactors the frontend to use hooks for obtaining state
within the Redux store as opposed to using Higher-Order Components
(HOCs). This eliminates a lot of clutter in the components.

1 files changed, 23 insertions, 20 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/app/results/PortfolioResultsContainer.js b/opendc-web/opendc-web-ui/src/containers/app/results/PortfolioResultsContainer.js
index 4b430e54..e60abe18 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/results/PortfolioResultsContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/results/PortfolioResultsContainer.js
@@ -1,28 +1,31 @@
-import { connect } from 'react-redux'
+import React from 'react'
+import { useSelector } 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)
-    ) {
+const PortfolioResultsContainer = (props) => {
+    const { scenarios, portfolio } = useSelector((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: undefined,
-            scenarios: [],
+            portfolio: state.objects.portfolio[state.currentPortfolioId],
+            scenarios: state.objects.portfolio[state.currentPortfolioId].scenarioIds.map(
+                (scenarioId) => state.objects.scenario[scenarioId]
+            ),
         }
-    }
+    })
 
-    return {
-        portfolio: state.objects.portfolio[state.currentPortfolioId],
-        scenarios: state.objects.portfolio[state.currentPortfolioId].scenarioIds.map(
-            (scenarioId) => state.objects.scenario[scenarioId]
-        ),
-    }
+    return <PortfolioResultsComponent {...props} scenarios={scenarios} portfolio={portfolio} />
 }
 
-const PortfolioResultsContainer = connect(mapStateToProps)(PortfolioResultsComponent)
-
 export default PortfolioResultsContainer