Resolve minor copilot feedback

Author: Turnlings

gcs/src/components/toolbar/simulationModal.jsx

@@ -150,7 +150,7 @@ export default function SimulationModal() {
                 : emitStartSimulation(),
             )
           }}
-          loading={simulationStatus == SimulationStatus.Starting}
+          loading={simulationStatus === SimulationStatus.Starting}
         >
           {isSimulationRunning ? "Stop Simulation" : "Start Simulation"}
         </Button>

gcs/src/redux/middleware/emitters.js

@@ -203,7 +203,6 @@ export function handleEmitters(socket, store, action) {
       callback: () => {
         const storeState = store.getState()
         const simParams = storeState.droneConnection.simParams
-        console.log(simParams)
         socket.socket.emit("start_docker_simulation", {
           port: simParams.port,
           vehicleType: simParams.vehicleType,

gcs/src/redux/middleware/socketMiddleware.js

@@ -432,9 +432,10 @@ const socketMiddleware = (store) => {
           if (msg.success && msg.running) {
             const storeState = store.getState()
             if (storeState.droneConnection.simParams.connectAfterStart) {
+              const port = storeState.droneConnection.simParams.port
               store.dispatch(
                 emitConnectToDrone({
-                  port: "tcp:127.0.0.1:5760",
+                  port: `tcp:127.0.0.1:${port}`,
                   baud: 115200,
                   wireless: true,
                   connectionType: ConnectionType.Network,

gcs/src/redux/slices/droneConnectionSlice.js

@@ -178,7 +178,8 @@ const droneConnectionSlice = createSlice({
     },
     setSimulationParam: (state, action) => {
       const { key, value } = action.payload
-      state.simParams[key] = value === "" ? null : value
+      state.simParams[key] =
+        value === "" || value === undefined ? null : value
     },
 
     // Emits

radio/app/endpoints/simulation.py

@@ -17,7 +17,7 @@ def get_docker_client():
         return None
 
 
-def ensure_image(client) -> bool:
+def pull_image_if_needed(client) -> bool:
     """
     Checks if the client contains the given image.
     If not it attempts to download it.
@@ -63,7 +63,7 @@ def ensure_image(client) -> bool:
 
 def build_command(data):
     """
-    Parses tbe socketio data into the form required for the docker command.
+    Parses the socketio data into the form required for the docker command.
 
     Args:
         data: The parameters that the simulator should start with.
@@ -115,7 +115,7 @@ def container_already_running(client, container_name) -> bool:
 def wait_for_container_running_result(container, timeout=30):
     """
     Waits for if the container runs successfully and thus prints:
-        "YOU CAN NOW CONNECT"
+        "YOU CAN NOW CONNECT" (With the spaces missing)
 
     Args:
         container: The container to wait for.
@@ -173,16 +173,27 @@ def start_docker_simulation(data) -> None:
         )
         return
 
-    image_result = ensure_image(client)
+    image_result = pull_image_if_needed(client)
     if image_result is False:
         return  # Error already given in function
 
     if container_already_running(client, CONTAINER_NAME):
         return  # Error already given in function
 
-    try:
+    if "port" in data:
         port = data["port"]
+    else:
+        socketio.emit(
+            "simulation_result",
+            {
+                "success": False,
+                "running": False,
+                "message": "Invalid port",
+            },
+        )
+        return
 
+    try:
         container = client.containers.run(
             IMAGE_NAME,
             name=CONTAINER_NAME,

radio/tests/test_simulation.py

@@ -1,5 +1,6 @@
 from flask_socketio.test_client import SocketIOTestClient
 import docker
+from docker.errors import DockerException
 from . import falcon_test
 
 client = docker.from_env()
@@ -13,27 +14,25 @@ def cleanup_container():
         container = client.containers.get("fgcs_ardupilot_sitl")
         container.stop()
         container.remove()
-    except docker.errors.NotFound:
-        pass
+    except DockerException:
+        pass  # Container does not exist and therefore no cleanup required
 
 
 @falcon_test()
 def test_start_docker_simulation_success(socketio_client: SocketIOTestClient):
     """
     Test successfully starting the simulation using Docker.
     """
+    cleanup_container()
+
     socketio_client.emit("start_docker_simulation", {"port": 5763})
     result = socketio_client.get_received()[-1]
 
     assert result["name"] == "simulation_result"
     assert result["args"][0]["success"] is True
     assert "Simulation started" in result["args"][0]["message"]
 
-    # Cleanup
-    socketio_client.emit("stop_docker_simulation")
-    stop_result = socketio_client.get_received()[-1]
-
-    assert stop_result["args"][0]["success"] is True
+    cleanup_container()
 
 
 @falcon_test()
@@ -73,6 +72,7 @@ def test_stop_docker_simulation(socketio_client: SocketIOTestClient):
     client.containers.run(
         "kushmakkapati/ardupilot_sitl",
         name="fgcs_ardupilot_sitl",
+        ports={5765: 5765},
         detach=True,
         tty=True,
     )
@@ -84,8 +84,6 @@ def test_stop_docker_simulation(socketio_client: SocketIOTestClient):
     assert result["args"][0]["success"] is True
     assert "Simulation stopped" in result["args"][0]["message"]
 
-    cleanup_container()
-
 
 @falcon_test()
 def test_build_command(socketio_client: SocketIOTestClient):