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/EditRoomNameModal.js     | 51 ++++++++++------------
 1 file changed, 22 insertions(+), 29 deletions(-)

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

diff --git a/opendc-web/opendc-web-ui/src/containers/modals/EditRoomNameModal.js b/opendc-web/opendc-web-ui/src/containers/modals/EditRoomNameModal.js
index 8032a5d1..a804c0b0 100644
--- a/opendc-web/opendc-web-ui/src/containers/modals/EditRoomNameModal.js
+++ b/opendc-web/opendc-web-ui/src/containers/modals/EditRoomNameModal.js
@@ -1,38 +1,31 @@
 import React from 'react'
-import { connect } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { closeEditRoomNameModal } from '../../actions/modals/topology'
 import { editRoomName } from '../../actions/topology/room'
 import TextInputModal from '../../components/modals/TextInputModal'
 
-const EditRoomNameModalComponent = ({ visible, previousName, callback }) => (
-    <TextInputModal
-        title="Edit room name"
-        label="Room name"
-        show={visible}
-        initialValue={previousName}
-        callback={callback}
-    />
-)
+const EditRoomNameModal = (props) => {
+    const visible = useSelector((state) => state.modals.editRoomNameModalVisible)
+    const previousName = useSelector((state) =>
+        state.interactionLevel.mode === 'ROOM' ? state.objects.room[state.interactionLevel.roomId].name : ''
+    )
 
-const mapStateToProps = (state) => {
-    return {
-        visible: state.modals.editRoomNameModalVisible,
-        previousName:
-            state.interactionLevel.mode === 'ROOM' ? state.objects.room[state.interactionLevel.roomId].name : '',
+    const dispatch = useDispatch()
+    const callback = (name) => {
+        if (name) {
+            dispatch(editRoomName(name))
+        }
+        dispatch(closeEditRoomNameModal())
     }
+    return (
+        <TextInputModal
+            title="Edit room name"
+            label="Room name"
+            show={visible}
+            initialValue={previousName}
+            callback={callback}
+            {...props}
+        />
+    )
 }
-
-const mapDispatchToProps = (dispatch) => {
-    return {
-        callback: (name) => {
-            if (name) {
-                dispatch(editRoomName(name))
-            }
-            dispatch(closeEditRoomNameModal())
-        },
-    }
-}
-
-const EditRoomNameModal = connect(mapStateToProps, mapDispatchToProps)(EditRoomNameModalComponent)
-
 export default EditRoomNameModal
-- 
cgit v1.2.3