1 files changed, 42 insertions, 31 deletions

diff --git a/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/TopologyListContainer.js b/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/TopologyListContainer.js
index 954284a6..266ca495 100644
--- a/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/TopologyListContainer.js
+++ b/opendc-web/opendc-web-ui/src/containers/app/sidebars/project/TopologyListContainer.js
@@ -1,53 +1,64 @@
-import React from 'react'
-import { useDispatch, useSelector } from 'react-redux'
+import React, { useState } from 'react'
+import { useDispatch } from 'react-redux'
 import TopologyListComponent from '../../../../components/app/sidebars/project/TopologyListComponent'
-import { setCurrentTopology } from '../../../../actions/topology/building'
-import { openNewTopologyModal } from '../../../../actions/modals/topology'
-import { useHistory } from 'react-router-dom'
+import { setCurrentTopology } from '../../../../redux/actions/topology/building'
+import { useRouter } from 'next/router'
 import { getState } from '../../../../util/state-utils'
-import { deleteTopology } from '../../../../actions/topologies'
+import { addTopology, deleteTopology } from '../../../../redux/actions/topologies'
+import NewTopologyModalComponent from '../../../../components/modals/custom-components/NewTopologyModalComponent'
+import { useActiveTopology, useProjectTopologies } from '../../../../data/topology'
 
 const TopologyListContainer = () => {
     const dispatch = useDispatch()
-    const history = useHistory()
-
-    const topologies = useSelector((state) => {
-        let topologies = state.objects.project[state.currentProjectId]
-            ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t])
-            : []
-        if (topologies.filter((t) => !t).length > 0) {
-            topologies = []
-        }
-
-        return topologies
-    })
-    const currentTopologyId = useSelector((state) => state.currentTopologyId)
+    const router = useRouter()
+    const topologies = useProjectTopologies()
+    const currentTopologyId = useActiveTopology()?._id
+    const [isVisible, setVisible] = useState(false)
 
     const onChooseTopology = async (id) => {
         dispatch(setCurrentTopology(id))
         const state = await getState(dispatch)
-        history.push(`/projects/${state.currentProjectId}`)
-    }
-    const onNewTopology = () => {
-        dispatch(openNewTopologyModal())
+        router.push(`/projects/${state.currentProjectId}`)
     }
     const onDeleteTopology = async (id) => {
         if (id) {
             const state = await getState(dispatch)
             dispatch(deleteTopology(id))
             dispatch(setCurrentTopology(state.objects.project[state.currentProjectId].topologyIds[0]))
-            history.push(`/projects/${state.currentProjectId}`)
+            router.push(`/projects/${state.currentProjectId}`)
+        }
+    }
+    const onCreateTopology = (name) => {
+        if (name) {
+            dispatch(addTopology(name, undefined))
+        }
+        setVisible(false)
+    }
+    const onDuplicateTopology = (name, id) => {
+        if (name) {
+            dispatch(addTopology(name, id))
         }
+        setVisible(false)
     }
+    const onCancel = () => setVisible(false)
 
     return (
-        <TopologyListComponent
-            topologies={topologies}
-            currentTopologyId={currentTopologyId}
-            onChooseTopology={onChooseTopology}
-            onNewTopology={onNewTopology}
-            onDeleteTopology={onDeleteTopology}
-        />
+        <>
+            <TopologyListComponent
+                topologies={topologies}
+                currentTopologyId={currentTopologyId}
+                onChooseTopology={onChooseTopology}
+                onNewTopology={() => setVisible(true)}
+                onDeleteTopology={onDeleteTopology}
+            />
+            <NewTopologyModalComponent
+                show={isVisible}
+                topologies={topologies}
+                onCreateTopology={onCreateTopology}
+                onDuplicateTopology={onDuplicateTopology}
+                onCancel={onCancel}
+            />
+        </>
     )
 }