Merge pull request #555 from rakdutta/dev_363_js

Improve Error Messages #363 for add resources

Author: madhav165

mcpgateway/admin.py

@@ -2638,7 +2638,7 @@ async def admin_add_resource(request: Request, db: Session = Depends(get_db), us
         >>>
         >>> async def test_admin_add_resource():
         ...     response = await admin_add_resource(mock_request, mock_db, mock_user)
-        ...     return isinstance(response, RedirectResponse) and response.status_code == 303
+        ...     return isinstance(response, JSONResponse) and response.status_code == 200 and response.body.decode() == '{"message":"Add resource registered successfully!","success":true}'
         >>>
         >>> import asyncio; asyncio.run(test_admin_add_resource())
         True
@@ -2656,9 +2656,10 @@ async def admin_add_resource(request: Request, db: Session = Depends(get_db), us
             content=form["content"],
         )
         await resource_service.register_resource(db, resource)
-
-        root_path = request.scope.get("root_path", "")
-        return RedirectResponse(f"{root_path}/admin#resources", status_code=303)
+        return JSONResponse(
+            content={"message": "Add resource registered successfully!", "success": True},
+            status_code=200,
+        )
     except Exception as ex:
         if isinstance(ex, ValidationError):
             logger.error(f"ValidationError in admin_add_resource: {ErrorFormatter.format_validation_error(ex)}")
@@ -2667,6 +2668,7 @@ async def admin_add_resource(request: Request, db: Session = Depends(get_db), us
             error_message = ErrorFormatter.format_database_error(ex)
             logger.error(f"IntegrityError in admin_add_resource: {error_message}")
             return JSONResponse(status_code=409, content=error_message)
+
         logger.error(f"Error in admin_add_resource: {ex}")
         return JSONResponse(content={"message": str(ex), "success": False}, status_code=500)
 

mcpgateway/static/admin.js

@@ -4183,48 +4183,70 @@ async function handleGatewayFormSubmit(e) {
     }
 }
 
-function handleResourceFormSubmit(e) {
+async function handleResourceFormSubmit(e) {
     e.preventDefault();
     const form = e.target;
     const formData = new FormData(form);
+    const status = safeGetElement("status-resources");
+    const loading = safeGetElement("add-gateway-loading");
+    try {
+        // Validate inputs
+        const name = formData.get("name");
+        const uri = formData.get("uri");
+        const nameValidation = validateInputName(name, "resource");
+        const uriValidation = validateInputName(uri, "resource URI");
 
-    // Validate inputs
-    const name = formData.get("name");
-    const uri = formData.get("uri");
+        if (!nameValidation.valid) {
+            showErrorMessage(nameValidation.error);
+            return;
+        }
 
-    const nameValidation = validateInputName(name, "resource");
-    const uriValidation = validateInputName(uri, "resource URI");
+        if (!uriValidation.valid) {
+            showErrorMessage(uriValidation.error);
+            return;
+        }
 
-    if (!nameValidation.valid) {
-        showErrorMessage(nameValidation.error);
-        return;
-    }
+        if (loading) {
+            loading.style.display = "block";
+        }
+        if (status) {
+            status.textContent = "";
+            status.classList.remove("error-status");
+        }
+        
+        const isInactiveCheckedBool = isInactiveChecked("resources");
+        formData.append("is_inactive_checked", isInactiveCheckedBool);
 
-    if (!uriValidation.valid) {
-        showErrorMessage(uriValidation.error);
-        return;
-    }
+        const response = await fetchWithTimeout(
+                `${window.ROOT_PATH}/admin/resources`,
+                {
+                    method: "POST",
+                    body: formData,
+                },
+            );
 
-    fetchWithTimeout(`${window.ROOT_PATH}/admin/resources`, {
-        method: "POST",
-        body: formData,
-    })
-        .then((response) => {
-            if (!response.ok) {
-                const status = safeGetElement("status-resources");
-                if (status) {
-                    status.textContent = "Connection failed!";
-                    status.classList.add("error-status");
-                }
-                throw new Error("Network response was not ok");
-            } else {
-                location.reload();
+        const result = await response.json();
+        if (!result.success) {
+            throw new Error(result.message || "An error occurred");
+        } else {
+            const redirectUrl = isInactiveCheckedBool
+                ? `${window.ROOT_PATH}/admin?include_inactive=true#resources`
+                : `${window.ROOT_PATH}/admin#resources`;
+            window.location.href = redirectUrl;
             }
-        })
-        .catch((error) => {
+        } catch (error) {
             console.error("Error:", error);
-            showErrorMessage("Failed to create resource");
-        });
+            if (status) {
+                status.textContent = error.message || "An error occurred!";
+                status.classList.add("error-status");
+            }
+            showErrorMessage(error.message);
+        } finally {
+            // location.reload();
+            if (loading) {
+                loading.style.display = "none";
+            }
+        }		
 }
 
 async function handleToolFormSubmit(event) {

mcpgateway/templates/admin.html

@@ -799,7 +799,9 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">Add New Resource</h3>
                 class="mt-1 block w-full rounded-md border border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 dark:bg-gray-900 dark:placeholder-gray-300 dark:text-gray-300"
                 placeholder=""></textarea>
             </div>
-
+            <div id="add-resources-loading" style="display: none;">
+              <div class="spinner"></div>
+            </div>
             <div id="status-resources"></div>
           </div>
           <div class="mt-6">

tests/conftest.py

@@ -10,12 +10,15 @@
 # Standard
 import asyncio
 import os
+import tempfile
 from unittest.mock import AsyncMock, patch
 
 # Third-Party
+from _pytest.monkeypatch import MonkeyPatch
 import pytest
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
+from sqlalchemy.pool import StaticPool
 
 # First-Party
 from mcpgateway.config import Settings
@@ -107,3 +110,57 @@ def mock_websocket():
 #     import mcpgateway.translate as translate
 #     translate._run_stdio_to_sse = AsyncMock(return_value=None)
 #     translate._run_sse_to_stdio = AsyncMock(return_value=None)
+
+
+@pytest.fixture(scope="module")  # one DB per test module is usually fine
+def app_with_temp_db():
+    """Return a FastAPI app wired to a fresh SQLite database."""
+    mp = MonkeyPatch()
+
+    # 1) create temp SQLite file
+    fd, path = tempfile.mkstemp(suffix=".db")
+    url = f"sqlite:///{path}"
+
+    # 2) patch settings
+    # First-Party
+    from mcpgateway.config import settings
+
+    mp.setattr(settings, "database_url", url, raising=False)
+
+    # First-Party
+    import mcpgateway.db as db_mod
+
+    engine = create_engine(url, connect_args={"check_same_thread": False}, poolclass=StaticPool)
+    TestSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+    mp.setattr(db_mod, "engine", engine, raising=False)
+    mp.setattr(db_mod, "SessionLocal", TestSessionLocal, raising=False)
+
+    # 4) patch the already‑imported main module **without reloading**
+    # First-Party
+    import mcpgateway.main as main_mod
+
+    mp.setattr(main_mod, "SessionLocal", TestSessionLocal, raising=False)
+    # (patch engine too if your code references it)
+    mp.setattr(main_mod, "engine", engine, raising=False)
+
+    # 4) create schema
+    db_mod.Base.metadata.create_all(bind=engine)
+
+    # 5) reload main so routers, deps pick up new SessionLocal
+    # if "mcpgateway.main" in sys.modules:
+    #     import importlib
+
+    #     importlib.reload(sys.modules["mcpgateway.main"])
+    # else:
+    #     import mcpgateway.main  # noqa: F401
+
+    # First-Party
+    from mcpgateway.main import app
+
+    yield app
+
+    # 6) teardown
+    mp.undo()
+    engine.dispose()
+    os.close(fd)
+    os.unlink(path)