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, 38 insertions, 30 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/ScenarioListContainer.js b/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/ScenarioListContainer.js
index 415e2792..18d0735e 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/ScenarioListContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/ScenarioListContainer.js
@@ -1,41 +1,49 @@
-import { connect } from 'react-redux'
+import React from 'react'
+import { useDispatch, useSelector } 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 = []
-    }
+const ScenarioListContainer = ({ portfolioId, children }) => {
+    const currentProjectId = useSelector((state) => state.currentProjectId)
+    const currentScenarioId = useSelector((state) => state.currentScenarioId)
+    const scenarios = useSelector((state) => {
+        let scenarios = state.objects.portfolio[portfolioId]
+            ? state.objects.portfolio[portfolioId].scenarioIds.map((t) => state.objects.scenario[t])
+            : []
+        if (scenarios.filter((t) => !t).length > 0) {
+            scenarios = []
+        }
 
-    return {
-        currentProjectId: state.currentProjectId,
-        currentScenarioId: state.currentScenarioId,
-        scenarios,
-    }
-}
+        return 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 dispatch = useDispatch()
+    const onNewScenario = (currentPortfolioId) => {
+        dispatch(setCurrentPortfolio(currentPortfolioId))
+        dispatch(openNewScenarioModal())
+    }
+    const onChooseScenario = (portfolioId, scenarioId) => {
+        dispatch(setCurrentScenario(portfolioId, scenarioId))
+    }
+    const onDeleteScenario = (id) => {
+        if (id) {
+            dispatch(deleteScenario(id))
+        }
     }
-}
 
-const ScenarioListContainer = connect(mapStateToProps, mapDispatchToProps)(ScenarioListComponent)
+    return (
+        <ScenarioListComponent
+            portfolioId={portfolioId}
+            currentProjectId={currentProjectId}
+            currentScenarioId={currentScenarioId}
+            scenarios={scenarios}
+            onNewScenario={onNewScenario}
+            onChooseScenario={onChooseScenario}
+            onDeleteScenario={onDeleteScenario}
+        />
+    )
+}
 
 export default ScenarioListContainer