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/DeleteMachineModal.js    | 43 +++++++++-------------
 1 file changed, 17 insertions(+), 26 deletions(-)

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

diff --git a/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js b/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js
index f30febdb..33b2612f 100644
--- a/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js
+++ b/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js
@@ -1,35 +1,26 @@
 import React from 'react'
-import { connect } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { closeDeleteMachineModal } from '../../actions/modals/topology'
 import { deleteMachine } from '../../actions/topology/machine'
 import ConfirmationModal from '../../components/modals/ConfirmationModal'
 
-const DeleteMachineModalComponent = ({ visible, callback }) => (
-    <ConfirmationModal
-        title="Delete this machine"
-        message="Are you sure you want to delete this machine?"
-        show={visible}
-        callback={callback}
-    />
-)
-
-const mapStateToProps = (state) => {
-    return {
-        visible: state.modals.deleteMachineModalVisible,
+const DeleteMachineModal = () => {
+    const dispatch = useDispatch()
+    const callback = (isConfirmed) => {
+        if (isConfirmed) {
+            dispatch(deleteMachine())
+        }
+        dispatch(closeDeleteMachineModal())
     }
+    const visible = useSelector((state) => state.modals.deleteMachineModalVisible)
+    return (
+        <ConfirmationModal
+            title="Delete this machine"
+            message="Are you sure you want to delete this machine?"
+            show={visible}
+            callback={callback}
+        />
+    )
 }
 
-const mapDispatchToProps = (dispatch) => {
-    return {
-        callback: (isConfirmed) => {
-            if (isConfirmed) {
-                dispatch(deleteMachine())
-            }
-            dispatch(closeDeleteMachineModal())
-        },
-    }
-}
-
-const DeleteMachineModal = connect(mapStateToProps, mapDispatchToProps)(DeleteMachineModalComponent)
-
 export default DeleteMachineModal
-- 
cgit v1.2.3


From 1edbae1a0224e30bafb98638f419e1f967a9286f Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 13 May 2021 17:42:53 +0200
Subject: ui: Move modal state outside of Redux

This change updates the frontend so that the modal state is not stored
inside Redux but instead is stored using the useState hook. This
simplifies the design of the modal components.
---
 .../src/containers/modals/DeleteMachineModal.js    | 26 ----------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js

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

diff --git a/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js b/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js
deleted file mode 100644
index 33b2612f..00000000
--- a/opendc-web/opendc-web-ui/src/containers/modals/DeleteMachineModal.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { closeDeleteMachineModal } from '../../actions/modals/topology'
-import { deleteMachine } from '../../actions/topology/machine'
-import ConfirmationModal from '../../components/modals/ConfirmationModal'
-
-const DeleteMachineModal = () => {
-    const dispatch = useDispatch()
-    const callback = (isConfirmed) => {
-        if (isConfirmed) {
-            dispatch(deleteMachine())
-        }
-        dispatch(closeDeleteMachineModal())
-    }
-    const visible = useSelector((state) => state.modals.deleteMachineModalVisible)
-    return (
-        <ConfirmationModal
-            title="Delete this machine"
-            message="Are you sure you want to delete this machine?"
-            show={visible}
-            callback={callback}
-        />
-    )
-}
-
-export default DeleteMachineModal
-- 
cgit v1.2.3