edit server

Signed-off-by: RAKHI DUTTA <[email protected]>

Author: rakdutta1

mcpgateway/admin.py

@@ -545,7 +545,6 @@ async def admin_edit_server(
         >>> server_service.update_server = original_update_server
     """
     form = await request.form()
-    # is_inactive_checked = form.get("is_inactive_checked", "false")
     try:
         logger.debug(f"User {user} is editing server ID {server_id} with name: {form.get('name')}")
         server = ServerUpdate(
@@ -558,11 +557,6 @@ async def admin_edit_server(
         )
         await server_service.update_server(db, server_id, server)
 
-        # root_path = request.scope.get("root_path", "")
-
-        # if is_inactive_checked.lower() == "true":
-        #     return RedirectResponse(f"{root_path}/admin/?include_inactive=true#catalog", status_code=303)
-        # return RedirectResponse(f"{root_path}/admin#catalog", status_code=303)
         return JSONResponse(
             content={"message": "Server update successfully!", "success": True},
             status_code=200,

mcpgateway/main.py

@@ -848,6 +848,12 @@ async def create_server(
         raise HTTPException(status_code=409, detail=str(e))
     except ServerError as e:
         raise HTTPException(status_code=400, detail=str(e))
+    except ValidationError as e:
+        logger.error(f"Validation error while creating server: {e}")
+        raise HTTPException(status_code=422, detail=ErrorFormatter.format_validation_error(e))
+    except IntegrityError as e:
+        logger.error(f"Integrity error while creating server: {e}")
+        raise HTTPException(status_code=409, detail=ErrorFormatter.format_database_error(e))
 
 
 @server_router.put("/{server_id}", response_model=ServerRead)
@@ -881,6 +887,12 @@ async def update_server(
         raise HTTPException(status_code=409, detail=str(e))
     except ServerError as e:
         raise HTTPException(status_code=400, detail=str(e))
+    except ValidationError as e:
+        logger.error(f"Validation error while updating server {server_id}: {e}")
+        raise HTTPException(status_code=422, detail=ErrorFormatter.format_validation_error(e))
+    except IntegrityError as e:
+        logger.error(f"Integrity error while updating server {server_id}: {e}")
+        raise HTTPException(status_code=409, detail=ErrorFormatter.format_database_error(e))            
 
 
 @server_router.post("/{server_id}/toggle", response_model=ServerRead)
@@ -1403,7 +1415,7 @@ async def create_resource(
         ResourceRead: The created resource.
 
     Raises:
-        HTTPException: On conflict or validation errors.
+        HTTPException: On conflict or validation errors or IntegrityError.
     """
     logger.debug(f"User {user} is creating a new resource")
     try:
@@ -1413,8 +1425,13 @@ async def create_resource(
         raise HTTPException(status_code=409, detail=str(e))
     except ResourceError as e:
         raise HTTPException(status_code=400, detail=str(e))
-
-
+    except ValidationError as e:
+        logger.error(f"Validation error while creating resource {uri}: {e}")
+        raise HTTPException(status_code=422, detail=ErrorFormatter.format_validation_error(e))
+    except IntegrityError as e:
+        logger.error(f"Integrity error while creating resource {uri}: {e}")
+        raise HTTPException(status_code=409, detail=ErrorFormatter.format_database_error(e))    
+  
 @resource_router.get("/{uri:path}")
 async def read_resource(uri: str, db: Session = Depends(get_db), user: str = Depends(require_auth)) -> ResourceContent:
     """
@@ -1470,6 +1487,12 @@ async def update_resource(
         result = await resource_service.update_resource(db, uri, resource)
     except ResourceNotFoundError as e:
         raise HTTPException(status_code=404, detail=str(e))
+    except ValidationError as e:
+        logger.error(f"Validation error while updating resource {uri}: {e}")
+        raise HTTPException(status_code=422, detail=ErrorFormatter.format_validation_error(e))
+    except IntegrityError as e:
+        logger.error(f"Integrity error while updating resource {uri}: {e}")
+        raise HTTPException(status_code=409, detail=ErrorFormatter.format_database_error(e))
     await invalidate_resource_cache(uri)
     return result
 

mcpgateway/services/server_service.py

@@ -503,6 +503,10 @@ async def update_server(self, db: Session, server_id: str, server_update: Server
             db.rollback()
             logger.error(f"IntegrityErrors in group: {ie}")
             raise ie
+        except ServerNameConflictError as snce:
+            db.rollback()
+            logger.error(f"Server name conflict: {snce}")
+            raise snce    
         except Exception as e:
             db.rollback()
             raise ServerError(f"Failed to update server: {str(e)}")

mcpgateway/static/admin.js

@@ -4774,6 +4774,53 @@ async function handleEditToolFormSubmit(event) {
     }
 }
 
+async function handleEditServerFormSubmit(e) {
+    e.preventDefault();
+    const form = e.target;
+    const formData = new FormData(form);
+
+    try {
+        // Validate inputs
+        const name = formData.get("name");
+        const nameValidation = validateInputName(name, "server");
+        if (!nameValidation.valid) {
+            throw new Error(nameValidation.error);
+        }
+
+        // Save CodeMirror editors' contents if present
+        if (window.promptToolHeadersEditor) {
+            window.promptToolHeadersEditor.save();
+        }
+        if (window.promptToolSchemaEditor) {
+            window.promptToolSchemaEditor.save();
+        }
+
+        const isInactiveCheckedBool = isInactiveChecked("servers");
+        formData.append("is_inactive_checked", isInactiveCheckedBool);
+
+        // Submit via fetch
+        const response = await fetch(form.action, {
+            method: "POST",
+            body: formData,
+        });
+
+        const result = await response.json();
+        if (!result.success) {
+            throw new Error(result.message || "An error occurred");
+        }
+        // Only redirect on success
+        else {
+            // Redirect to the appropriate page based on inactivity checkbox
+            const redirectUrl = isInactiveCheckedBool
+                    ? `${window.ROOT_PATH}/admin?include_inactive=true#catalog`
+                    : `${window.ROOT_PATH}/admin#catalog`;
+                window.location.href = redirectUrl;
+        }
+    } catch (error) {
+        console.error("Error:", error);
+        showErrorMessage(error.message);
+    }
+}
 // ===================================================================
 // ENHANCED FORM VALIDATION for All Forms
 // ===================================================================
@@ -5318,6 +5365,16 @@ function setupFormHandlers() {
         serverForm.addEventListener("submit", handleServerFormSubmit);
     }
 
+    const editServerForm = safeGetElement("edit-server-form");
+    if (editServerForm) {
+        editServerForm.addEventListener("submit", handleEditServerFormSubmit);
+        editServerForm.addEventListener("click", () => {
+            if (getComputedStyle(editServerForm).display !== "none") {
+                refreshEditors();
+            }
+        });
+    }
+
     const editResourceForm = safeGetElement("edit-resource-form");
     if (editResourceForm) {
         editResourceForm.addEventListener("submit", () => {