From 6d5a2eebb609da67239ea37d12d6b2d3bbfef76e Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 28 Oct 2020 16:41:53 +0100
Subject: 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.
---
 .../src/containers/modals/NewProjectModal.js       | 31 +++++++---------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/containers/modals/NewProjectModal.js')

diff --git a/opendc-web/opendc-web-ui/src/containers/modals/NewProjectModal.js b/opendc-web/opendc-web-ui/src/containers/modals/NewProjectModal.js
index d306dc45..e63ba76b 100644
--- a/opendc-web/opendc-web-ui/src/containers/modals/NewProjectModal.js
+++ b/opendc-web/opendc-web-ui/src/containers/modals/NewProjectModal.js
@@ -1,30 +1,19 @@
 import React from 'react'
-import { connect } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { closeNewProjectModal } from '../../actions/modals/projects'
 import { addProject } from '../../actions/projects'
 import TextInputModal from '../../components/modals/TextInputModal'
 
-const NewProjectModalComponent = ({ visible, callback }) => (
-    <TextInputModal title="New Project" label="Project title" show={visible} callback={callback} />
-)
-
-const mapStateToProps = (state) => {
-    return {
-        visible: state.modals.newProjectModalVisible,
+const NewProjectModal = (props) => {
+    const visible = useSelector((state) => state.modals.newProjectModalVisible)
+    const dispatch = useDispatch()
+    const callback = (text) => {
+        if (text) {
+            dispatch(addProject(text))
+        }
+        dispatch(closeNewProjectModal())
     }
+    return <TextInputModal title="New Project" label="Project title" show={visible} callback={callback} {...props} />
 }
 
-const mapDispatchToProps = (dispatch) => {
-    return {
-        callback: (text) => {
-            if (text) {
-                dispatch(addProject(text))
-            }
-            dispatch(closeNewProjectModal())
-        },
-    }
-}
-
-const NewProjectModal = connect(mapStateToProps, mapDispatchToProps)(NewProjectModalComponent)
-
 export default NewProjectModal
-- 
cgit v1.2.3