Fix integer IDs and topology deletion

5 files changed, 8 insertions, 6 deletions

diff --git a/frontend/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js b/frontend/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js
index 362483bf..75b00c54 100644
--- a/frontend/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js
+++ b/frontend/src/components/app/sidebars/topology/building/NewRoomConstructionComponent.js
@@ -6,7 +6,7 @@ const NewRoomConstructionComponent = ({
                                           onCancel,
                                           currentRoomInConstruction,
                                       }) => {
-    if (currentRoomInConstruction === -1) {
+    if (currentRoomInConstruction === '-1') {
         return (
             <div className="btn btn-outline-primary btn-block" onClick={onStart}>
                 <span className="fa fa-plus mr-2"/>
diff --git a/frontend/src/components/modals/Modal.js b/frontend/src/components/modals/Modal.js
index ec6080f2..dd8cea8e 100644
--- a/frontend/src/components/modals/Modal.js
+++ b/frontend/src/components/modals/Modal.js
@@ -50,8 +50,10 @@ class Modal extends React.Component {
     }
 
     componentDidUpdate() {
-        this.visible = this.props.show
-        this.openOrCloseModal()
+        if (this.visible !== this.props.show) {
+            this.visible = this.props.show
+            this.openOrCloseModal()
+        }
     }
 
     onSubmit() {
diff --git a/frontend/src/components/modals/custom-components/ChangeTopologyModalComponent.js b/frontend/src/components/modals/custom-components/ChangeTopologyModalComponent.js
index f1645dcf..c7c81706 100644
--- a/frontend/src/components/modals/custom-components/ChangeTopologyModalComponent.js
+++ b/frontend/src/components/modals/custom-components/ChangeTopologyModalComponent.js
@@ -7,7 +7,7 @@ class ChangeTopologyModalComponent extends React.Component {
     static propTypes = {
         show: PropTypes.bool.isRequired,
         topologies: PropTypes.arrayOf(Shapes.Topology),
-        currentTopologyId: PropTypes.number,
+        currentTopologyId: PropTypes.string,
         onChooseTopology: PropTypes.func.isRequired,
         onCreateTopology: PropTypes.func.isRequired,
         onDuplicateTopology: PropTypes.func.isRequired,
diff --git a/frontend/src/components/navigation/AppNavbar.js b/frontend/src/components/navigation/AppNavbar.js
index c3ab3c47..15f08b5f 100644
--- a/frontend/src/components/navigation/AppNavbar.js
+++ b/frontend/src/components/navigation/AppNavbar.js
@@ -26,7 +26,7 @@ const AppNavbar = ({ simulationId, inSimulation, fullWidth, onViewTopologies })
                 </NavItem>
                 <NavItem route="topologies">
                     <span
-                        className="nav-link clickable"
+                        className="nav-link"
                         title="Topologies"
                         onClick={onViewTopologies}
                     >
diff --git a/frontend/src/components/navigation/Navbar.js b/frontend/src/components/navigation/Navbar.js
index d22f637e..b47f1f94 100644
--- a/frontend/src/components/navigation/Navbar.js
+++ b/frontend/src/components/navigation/Navbar.js
@@ -27,7 +27,7 @@ const GitHubLink = () => (
 const NavItemWithoutRoute = ({ route, location, children }) => (
     <li
         className={classNames(
-            'nav-item',
+            'nav-item clickable',
             location.pathname === route ? 'active' : undefined,
         )}
     >