Merge pull request #166 from IBM/gateway_ui_reload

UI reload issue

Author: crivetimihai

mcpgateway/admin.py

@@ -733,7 +733,7 @@ async def admin_get_gateway(gateway_id: int, db: Session = Depends(get_db), user
 
 
 @admin_router.post("/gateways")
-async def admin_add_gateway(request: Request, db: Session = Depends(get_db), user: str = Depends(require_auth)) -> RedirectResponse:
+async def admin_add_gateway(request: Request, db: Session = Depends(get_db), user: str = Depends(require_auth)) -> JSONResponse:
     """Add a gateway via the admin UI.
 
     Expects form fields:
@@ -763,19 +763,21 @@ async def admin_add_gateway(request: Request, db: Session = Depends(get_db), use
         auth_header_key=form.get("auth_header_key", ""),
         auth_header_value=form.get("auth_header_value", ""),
     )
-    root_path = request.scope.get("root_path", "")
     try:
         await gateway_service.register_gateway(db, gateway)
-        return RedirectResponse(f"{root_path}/admin#gateways", status_code=303)
+        return JSONResponse(
+            content={"message": "Gateway registered successfully!", "success": True},
+            status_code=200,
+        )
+
     except Exception as ex:
         if isinstance(ex, GatewayConnectionError):
-            return RedirectResponse(f"{root_path}/admin#gateways", status_code=502)
+            return JSONResponse(content={"message": str(ex), "success": False}, status_code=502)
         if isinstance(ex, ValueError):
-            return RedirectResponse(f"{root_path}/admin#gateways", status_code=400)
+            return JSONResponse(content={"message": str(ex), "success": False}, status_code=400)
         if isinstance(ex, RuntimeError):
-            return RedirectResponse(f"{root_path}/admin#gateways", status_code=500)
-
-        return RedirectResponse(f"{root_path}/admin#gateways", status_code=500)
+            return JSONResponse(content={"message": str(ex), "success": False}, status_code=500)
+        return JSONResponse(content={"message": str(ex), "success": False}, status_code=500)
 
 
 @admin_router.post("/gateways/{gateway_id}/edit")

mcpgateway/static/admin.js

@@ -147,43 +147,42 @@ document.addEventListener("DOMContentLoaded", function () {
       }
     });
 
-  document
-  .getElementById("add-gateway-form")
-  .addEventListener("submit", (e) => {
-    e.preventDefault();
+    document.getElementById("add-gateway-form")
+      .addEventListener("submit", async (e) => {
+        e.preventDefault();
 
-    const form = e.target;
-    const formData = new FormData(form);
+        const form = e.target;
+        const formData = new FormData(form);
 
-    const status = document.getElementById("status-gateways");
-    const loading = document.getElementById("add-gateway-loading");
+        const status = document.getElementById("status-gateways");
+        const loading = document.getElementById("add-gateway-loading");
 
-    // Show loading and clear previous status
-    loading.style.display = "block";
-    status.textContent = "";
-    status.classList.remove("error-status");
+        // Show loading and clear previous status
+        loading.style.display = "block";
+        status.textContent = "";
+        status.classList.remove("error-status");
 
-    fetch(`${window.ROOT_PATH}/admin/gateways`, {
-      method: "POST",
-      body: formData,
-    })
-      .then((response) => {
-        if (!response.ok) {
-          status.textContent = "Connection failed!";
+        try {
+          const response = await fetch(`${window.ROOT_PATH}/admin/gateways`, {
+            method: "POST",
+            body: formData,
+          });
+
+          let result = await response.json();
+            if (!result.success) {
+              alert(result.message || "An error occurred");
+            } else {
+              window.location.href = `${window.ROOT_PATH}/admin#gateways`; // Redirect on success
+            }
+
+        } catch (error) {
+          console.error("Error:", error);
+          status.textContent = error.message || "An error occurred!";
           status.classList.add("error-status");
-        } else {
-          location.reload(); // Will exit before hiding spinner
+        } finally {
+          loading.style.display = "none"; // Hide loading spinner
         }
-      })
-      .catch((error) => {
-        console.error("Error:", error);
-        status.textContent = "An error occurred!";
-        status.classList.add("error-status");
-      })
-      .finally(() => {
-        loading.style.display = "none"; // Hide loading
       });
-  });
 
 
   document
@@ -305,7 +304,7 @@ document.addEventListener("DOMContentLoaded", function () {
         if (!result.success) {
           alert(result.message || "An error occurred");
         } else {
-          window.location.href = "/admin#tools"; // Redirect on success
+          window.location.href = `${window.ROOT_PATH}/admin#tools`; // Redirect on success
         }
       } catch (error) {
         console.error("Fetch error:", error);

tests/unit/mcpgateway/test_admin.py

@@ -561,9 +561,8 @@ async def test_admin_add_gateway(self, mock_register_gateway, mock_request, mock
 
         # Assert
         mock_register_gateway.assert_called_once()
-        assert isinstance(result, RedirectResponse)
-        assert result.status_code == 303
-        assert "/admin#gateways" in result.headers["location"]
+        assert isinstance(result, JSONResponse) 
+        assert result.status_code == 200
 
     @patch.object(GatewayService, "update_gateway")
     async def test_admin_edit_gateway(self, mock_update_gateway, mock_request, mock_db):