From 7da6543fb9c58736c2fa8c000b25290be4f78de4 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 14 Sep 2022 14:12:41 +0200
Subject: fix(web/ui): Fix duplication of topology

This change addresses an issue where a new topology did not correctly
clone an existing topology.
---
 .../src/components/projects/NewTopologyModal.js              | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'opendc-web/opendc-web-ui')

diff --git a/opendc-web/opendc-web-ui/src/components/projects/NewTopologyModal.js b/opendc-web/opendc-web-ui/src/components/projects/NewTopologyModal.js
index be4256e3..780ec034 100644
--- a/opendc-web/opendc-web-ui/src/components/projects/NewTopologyModal.js
+++ b/opendc-web/opendc-web-ui/src/components/projects/NewTopologyModal.js
@@ -57,9 +57,10 @@ const NewTopologyModal = ({ projectId, isOpen, onSubmit: onSubmitUpstream, onCan
             setErrors({ name: true })
             return false
         } else {
-            const candidate = topologies.find((topology) => topology.id === originTopology) || { projectId, rooms: [] }
+            const candidate = topologies.find((topology) => topology.id === originTopology) || { rooms: [] }
             const topology = produce(candidate, (draft) => {
-                delete draft.id
+                delete draft.project
+                draft.projectId = projectId
                 draft.name = name
             })
             onSubmitUpstream(topology)
@@ -87,7 +88,12 @@ const NewTopologyModal = ({ projectId, isOpen, onSubmit: onSubmitUpstream, onCan
                     <TextInput id="name" name="name" type="text" isRequired ref={nameInput} />
                 </FormGroup>
                 <FormGroup label="Topology to duplicate" fieldId="origin" isRequired>
-                    <FormSelect id="origin" name="origin" value={originTopology} onChange={setOriginTopology}>
+                    <FormSelect
+                        id="origin"
+                        name="origin"
+                        value={originTopology}
+                        onChange={(v) => setOriginTopology(+v)}
+                    >
                         <FormSelectOption value={-1} key={-1} label="None - start from scratch" />
                         {topologies.map((topology) => (
                             <FormSelectOption value={topology.id} key={topology.id} label={topology.name} />
-- 
cgit v1.2.3