Persisting checkbox state (#329)

* persist show_inactive state after activate/inactive

* make ruff,flake8,black

Signed-off-by: Keval Mahajan <[email protected]>

* delete call persists the show_inactive state

Signed-off-by: Keval Mahajan <[email protected]>

* delete, edit, add transactions support persistance of show_inactive checkbox

Signed-off-by: Keval Mahajan <[email protected]>

* make black, ruff, flake8

Signed-off-by: Keval Mahajan <[email protected]>

---------

Signed-off-by: Keval Mahajan <[email protected]>

Author: kevalmahajan

mcpgateway/admin.py

@@ -154,8 +154,10 @@ async def admin_add_server(request: Request, db: Session = Depends(get_db), user
         RedirectResponse: A redirect to the admin dashboard catalog section
     """
     form = await request.form()
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     try:
         logger.debug(f"User {user} is adding a new server with name: {form['name']}")
+
         server = ServerCreate(
             name=form.get("name"),
             description=form.get("description"),
@@ -167,11 +169,15 @@ async def admin_add_server(request: Request, db: Session = Depends(get_db), user
         await server_service.register_server(db, 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)
     except Exception as e:
         logger.error(f"Error adding server: {e}")
 
         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)
 
 
@@ -207,6 +213,7 @@ async def admin_edit_server(
         RedirectResponse: A redirect to the admin dashboard catalog section with a status code of 303
     """
     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(
@@ -220,11 +227,16 @@ 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)
     except Exception as e:
         logger.error(f"Error editing server: {e}")
 
         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)
 
 
@@ -256,12 +268,15 @@ async def admin_toggle_server(
     form = await request.form()
     logger.debug(f"User {user} is toggling server ID {server_id} with activate: {form.get('activate')}")
     activate = form.get("activate", "true").lower() == "true"
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     try:
         await server_service.toggle_server_status(db, server_id, activate)
     except Exception as e:
         logger.error(f"Error toggling server status: {e}")
 
     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)
 
 
@@ -289,7 +304,12 @@ async def admin_delete_server(server_id: str, request: Request, db: Session = De
     except Exception as e:
         logger.error(f"Error deleting server: {e}")
 
+    form = await request.form()
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     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)
 
 
@@ -398,12 +418,16 @@ async def admin_toggle_gateway(
     logger.debug(f"User {user} is toggling gateway ID {gateway_id}")
     form = await request.form()
     activate = form.get("activate", "true").lower() == "true"
+    is_inactive_checked = form.get("is_inactive_checked", "false")
+
     try:
         await gateway_service.toggle_gateway_status(db, gateway_id, activate)
     except Exception as e:
         logger.error(f"Error toggling gateway status: {e}")
 
     root_path = request.scope.get("root_path", "")
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#gateways", status_code=303)
     return RedirectResponse(f"{root_path}/admin#gateways", status_code=303)
 
 
@@ -650,6 +674,9 @@ async def admin_edit_tool(
         await tool_service.update_tool(db, tool_id, tool)
 
         root_path = request.scope.get("root_path", "")
+        is_inactive_checked = form.get("is_inactive_checked", "false")
+        if is_inactive_checked.lower() == "true":
+            return RedirectResponse(f"{root_path}/admin/?include_inactive=true#tools", status_code=303)
         return RedirectResponse(f"{root_path}/admin#tools", status_code=303)
     except ToolNameConflictError as e:
         return JSONResponse(content={"message": str(e), "success": False}, status_code=400)
@@ -679,7 +706,12 @@ async def admin_delete_tool(tool_id: str, request: Request, db: Session = Depend
     logger.debug(f"User {user} is deleting tool ID {tool_id}")
     await tool_service.delete_tool(db, tool_id)
 
+    form = await request.form()
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     root_path = request.scope.get("root_path", "")
+
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#tools", status_code=303)
     return RedirectResponse(f"{root_path}/admin#tools", status_code=303)
 
 
@@ -711,12 +743,15 @@ async def admin_toggle_tool(
     logger.debug(f"User {user} is toggling tool ID {tool_id}")
     form = await request.form()
     activate = form.get("activate", "true").lower() == "true"
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     try:
         await tool_service.toggle_tool_status(db, tool_id, activate, reachable=activate)
     except Exception as e:
         logger.error(f"Error toggling tool status: {e}")
 
     root_path = request.scope.get("root_path", "")
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#tools", status_code=303)
     return RedirectResponse(f"{root_path}/admin#tools", status_code=303)
 
 
@@ -825,6 +860,10 @@ async def admin_edit_gateway(
     await gateway_service.update_gateway(db, gateway_id, gateway)
 
     root_path = request.scope.get("root_path", "")
+    is_inactive_checked = form.get("is_inactive_checked", "false")
+
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#gateways", status_code=303)
     return RedirectResponse(f"{root_path}/admin#gateways", status_code=303)
 
 
@@ -850,7 +889,12 @@ async def admin_delete_gateway(gateway_id: str, request: Request, db: Session =
     logger.debug(f"User {user} is deleting gateway ID {gateway_id}")
     await gateway_service.delete_gateway(db, gateway_id)
 
+    form = await request.form()
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     root_path = request.scope.get("root_path", "")
+
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#gateways", status_code=303)
     return RedirectResponse(f"{root_path}/admin#gateways", status_code=303)
 
 
@@ -942,6 +986,10 @@ async def admin_edit_resource(
     await resource_service.update_resource(db, uri, resource)
 
     root_path = request.scope.get("root_path", "")
+    is_inactive_checked = form.get("is_inactive_checked", "false")
+
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#resources", status_code=303)
     return RedirectResponse(f"{root_path}/admin#resources", status_code=303)
 
 
@@ -967,7 +1015,12 @@ async def admin_delete_resource(uri: str, request: Request, db: Session = Depend
     logger.debug(f"User {user} is deleting resource URI {uri}")
     await resource_service.delete_resource(db, uri)
 
+    form = await request.form()
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     root_path = request.scope.get("root_path", "")
+
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#resources", status_code=303)
     return RedirectResponse(f"{root_path}/admin#resources", status_code=303)
 
 
@@ -999,12 +1052,15 @@ async def admin_toggle_resource(
     logger.debug(f"User {user} is toggling resource ID {resource_id}")
     form = await request.form()
     activate = form.get("activate", "true").lower() == "true"
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     try:
         await resource_service.toggle_resource_status(db, resource_id, activate)
     except Exception as e:
         logger.error(f"Error toggling resource status: {e}")
 
     root_path = request.scope.get("root_path", "")
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#resources", status_code=303)
     return RedirectResponse(f"{root_path}/admin#resources", status_code=303)
 
 
@@ -1098,6 +1154,10 @@ async def admin_edit_prompt(
     await prompt_service.update_prompt(db, name, prompt)
 
     root_path = request.scope.get("root_path", "")
+    is_inactive_checked = form.get("is_inactive_checked", "false")
+
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#prompts", status_code=303)
     return RedirectResponse(f"{root_path}/admin#prompts", status_code=303)
 
 
@@ -1123,7 +1183,12 @@ async def admin_delete_prompt(name: str, request: Request, db: Session = Depends
     logger.debug(f"User {user} is deleting prompt name {name}")
     await prompt_service.delete_prompt(db, name)
 
+    form = await request.form()
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     root_path = request.scope.get("root_path", "")
+
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#prompts", status_code=303)
     return RedirectResponse(f"{root_path}/admin#prompts", status_code=303)
 
 
@@ -1155,12 +1220,15 @@ async def admin_toggle_prompt(
     logger.debug(f"User {user} is toggling prompt ID {prompt_id}")
     form = await request.form()
     activate = form.get("activate", "true").lower() == "true"
+    is_inactive_checked = form.get("is_inactive_checked", "false")
     try:
         await prompt_service.toggle_prompt_status(db, prompt_id, activate)
     except Exception as e:
         logger.error(f"Error toggling prompt status: {e}")
 
     root_path = request.scope.get("root_path", "")
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#prompts", status_code=303)
     return RedirectResponse(f"{root_path}/admin#prompts", status_code=303)
 
 
@@ -1210,7 +1278,12 @@ async def admin_delete_root(uri: str, request: Request, user: str = Depends(requ
     logger.debug(f"User {user} is deleting root URI {uri}")
     await root_service.remove_root(uri)
 
+    form = await request.form()
     root_path = request.scope.get("root_path", "")
+    is_inactive_checked = form.get("is_inactive_checked", "false")
+
+    if is_inactive_checked.lower() == "true":
+        return RedirectResponse(f"{root_path}/admin/?include_inactive=true#roots", status_code=303)
     return RedirectResponse(f"{root_path}/admin#roots", status_code=303)