From 58901c9036529e57d49b43ec8ee46055276229da Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Fri, 12 Aug 2022 12:15:36 -0400
Subject: [PATCH] Redirect admin client routes

---
 client/src/entry/analysis/router.js           |  2 +
 lib/galaxy/webapps/galaxy/buildapp.py         | 43 ++++++++++---------
 .../webapps/galaxy/controllers/admin.py       |  2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index cfab1173ad5..a85c6f4e02f 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -9,6 +9,7 @@ import Home from "entry/analysis/modules/Home";
 import WorkflowEditorModule from "entry/analysis/modules/WorkflowEditor";
 
 // routes
+import AdminRoutes from "entry/analysis/routes/admin-routes";
 import LibraryRoutes from "entry/analysis/routes/library-routes";
 
 // child components
@@ -420,6 +421,7 @@ export function getRouter(Galaxy) {
             },
             { path: "/workflows/edit", component: WorkflowEditorModule },
             ...LibraryRoutes,
+            ...AdminRoutes,
         ],
     });
 }
diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py
index a3b7192dc91..51b7366ad16 100644
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -186,27 +186,28 @@ def app_pair(global_conf, load_app_kwds=None, wsgi_preflight=True, **kwargs):
     # base analysis interface at which point the application takes over.
 
     webapp.add_client_route("/about")
-    webapp.add_client_route("/admin/data_tables", "admin")
-    webapp.add_client_route("/admin/data_types", "admin")
-    webapp.add_client_route("/admin/jobs", "admin")
-    webapp.add_client_route("/admin/invocations", "admin")
-    webapp.add_client_route("/admin/toolbox_dependencies", "admin")
-    webapp.add_client_route("/admin/data_manager{path_info:.*}", "admin")
-    webapp.add_client_route("/admin/error_stack", "admin")
-    webapp.add_client_route("/admin/users", "admin")
-    webapp.add_client_route("/admin/users/create", "admin")
-    webapp.add_client_route("/admin/display_applications", "admin")
-    webapp.add_client_route("/admin/reset_metadata", "admin")
-    webapp.add_client_route("/admin/roles", "admin")
-    webapp.add_client_route("/admin/forms", "admin")
-    webapp.add_client_route("/admin/groups", "admin")
-    webapp.add_client_route("/admin/repositories", "admin")
-    webapp.add_client_route("/admin/sanitize_allow", "admin")
-    webapp.add_client_route("/admin/tool_versions", "admin")
-    webapp.add_client_route("/admin/toolshed", "admin")
-    webapp.add_client_route("/admin/quotas", "admin")
-    webapp.add_client_route("/admin/form/{form_id}", "admin")
-    webapp.add_client_route("/admin/api_keys", "admin")
+    webapp.add_client_route("/admin")
+    webapp.add_client_route("/admin/data_tables")
+    webapp.add_client_route("/admin/data_types")
+    webapp.add_client_route("/admin/jobs")
+    webapp.add_client_route("/admin/invocations")
+    webapp.add_client_route("/admin/toolbox_dependencies")
+    webapp.add_client_route("/admin/data_manager{path_info:.*}")
+    webapp.add_client_route("/admin/error_stack")
+    webapp.add_client_route("/admin/users")
+    webapp.add_client_route("/admin/users/create")
+    webapp.add_client_route("/admin/display_applications")
+    webapp.add_client_route("/admin/reset_metadata")
+    webapp.add_client_route("/admin/roles")
+    webapp.add_client_route("/admin/forms")
+    webapp.add_client_route("/admin/groups")
+    webapp.add_client_route("/admin/repositories")
+    webapp.add_client_route("/admin/sanitize_allow")
+    webapp.add_client_route("/admin/tool_versions")
+    webapp.add_client_route("/admin/toolshed")
+    webapp.add_client_route("/admin/quotas")
+    webapp.add_client_route("/admin/form/{form_id}")
+    webapp.add_client_route("/admin/api_keys")
     webapp.add_client_route("/login/confirm")
     webapp.add_client_route("/tools/view")
     webapp.add_client_route("/tools/json")
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py
index 1edfd57d9d0..f1cf6367723 100644
--- a/lib/galaxy/webapps/galaxy/controllers/admin.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin.py
@@ -588,7 +588,7 @@ class AdminGalaxy(controller.JSAppLauncher):
             "installing_repository_ids": get_ids_of_tool_shed_repositories_being_installed(trans.app, as_string=True),
             "is_tool_shed_installed": bool(trans.app.tool_shed_registry and trans.app.tool_shed_registry.tool_sheds),
         }
-        return self._bootstrapped_client(trans, app_name="admin", settings=settings, message=message, status=status)
+        return self._bootstrapped_client(trans, settings=settings, message=message, status=status)
 
     @web.expose
     @web.json