Skip to content

🙌 OpenHands: AI-Driven Development

feat: rename admin dashboard to usage & monitoring (#15146)

Saurya Velagapudi3216e0328076
diff --git a/frontend/__tests__/components/features/user/user-context-menu.test.tsx b/frontend/__tests__/components/features/user/user-context-menu.test.tsx
index 0bd3e5f091..5a30e54a96 100644
--- a/frontend/__tests__/components/features/user/user-context-menu.test.tsx
+++ b/frontend/__tests__/components/features/user/user-context-menu.test.tsx
@@ -196,7 +196,7 @@ describe("UserContextMenu", () => {
// In SaaS, personal LLM/Condenser/Verification routes are hidden in favor
// of /settings/org-defaults/* (visible only when an org is selected, which
// this test does not seed). Org-only and billing routes are also filtered.
- // The admin dashboard link is also hidden because the test renders as a
+ // The usage & monitoring link is also hidden because the test renders as a
// non-admin "member" user; useSettingsNavItems() suppresses it for members
// and personal orgs (see use-settings-nav-items.ts).
const personalLlmPaths = new Set([
@@ -209,7 +209,7 @@ describe("UserContextMenu", () => {
item.to !== "/settings/org-members" &&
item.to !== "/settings/org" &&
item.to !== "/settings/billing" &&
- item.to !== "/settings/admin-dashboard" &&
+ item.to !== "/settings/usage-monitoring" &&
!item.to.startsWith("/settings/org-defaults") &&
!personalLlmPaths.has(item.to),
);
diff --git a/frontend/src/components/features/admin-dashboard/admin-dashboard.tsx b/frontend/src/components/features/admin-dashboard/admin-dashboard.tsx
index 3d8c64f686..a49ad1244c 100644
--- a/frontend/src/components/features/admin-dashboard/admin-dashboard.tsx
+++ b/frontend/src/components/features/admin-dashboard/admin-dashboard.tsx
@@ -458,7 +458,7 @@ export function AdminDashboard() {
if (!orgId) {
return (
<div className="p-8 text-center text-[#8C8C8C]">
- Please select an organization to view the admin dashboard.
+ Please select an organization to view usage & monitoring.
</div>
);
}
diff --git a/frontend/src/components/shared/buttons/admin-dashboard-button.tsx b/frontend/src/components/shared/buttons/admin-dashboard-button.tsx
index b8b9ca010d..a7b7378c7a 100644
--- a/frontend/src/components/shared/buttons/admin-dashboard-button.tsx
+++ b/frontend/src/components/shared/buttons/admin-dashboard-button.tsx
@@ -25,19 +25,19 @@ export function AdminDashboardButton() {
return null;
}
- const isActive = location.pathname.startsWith("/settings/admin-dashboard");
+ const isActive = location.pathname.startsWith("/settings/usage-monitoring");
return (
<Link
- to="/settings/admin-dashboard"
+ to="/settings/usage-monitoring"
className={cn(
"flex items-center justify-center w-[34px] h-[34px] rounded-lg transition-colors",
isActive
? "bg-[#262626] text-white"
: "text-[#8C8C8C] hover:text-white hover:bg-[#1E1E1E]",
)}
- title="Admin Dashboard"
- aria-label="Admin Dashboard"
+ title="Usage & Monitoring"
+ aria-label="Usage & Monitoring"
>
<svg
width="20"
diff --git a/frontend/src/constants/settings-nav.tsx b/frontend/src/constants/settings-nav.tsx
index 44ad6bc872..d5f4c1a389 100644
--- a/frontend/src/constants/settings-nav.tsx
+++ b/frontend/src/constants/settings-nav.tsx
@@ -49,7 +49,7 @@ export const SAAS_NAV_ITEMS: SettingsNavItem[] = [
},
{
icon: <FiBarChart2 size={22} />,
- to: "/settings/admin-dashboard",
+ to: "/settings/usage-monitoring",
text: "SETTINGS$NAV_ADMIN_DASHBOARD",
section: "org",
},
diff --git a/frontend/src/hooks/use-settings-nav-items.ts b/frontend/src/hooks/use-settings-nav-items.ts
index 7bb7f96024..1091bf0872 100644
--- a/frontend/src/hooks/use-settings-nav-items.ts
+++ b/frontend/src/hooks/use-settings-nav-items.ts
@@ -92,7 +92,7 @@ export function useSettingsNavItems(): SettingsNavRenderedItem[] {
// Hide admin dashboard for non-admins/owners or personal orgs
if (!isAdminOrOwner || !organizationId || isPersonalOrg) {
- items = items.filter((item) => item.to !== "/settings/admin-dashboard");
+ items = items.filter((item) => item.to !== "/settings/usage-monitoring");
}
const PERSONAL_LLM_PATHS = new Set([
diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.json
index 92077e350e..e243c4b0eb 100644
--- a/frontend/src/i18n/translation.json
+++ b/frontend/src/i18n/translation.json
@@ -4947,21 +4947,21 @@
"ca": "Organització"
},
"SETTINGS$NAV_ADMIN_DASHBOARD": {
- "en": "Admin Dashboard",
- "ja": "管理ダッシュボード",
- "zh-CN": "管理仪表板",
- "zh-TW": "管理儀表板",
- "ko-KR": "관리자 대시보드",
- "no": "Admin Dashboard",
- "it": "Dashboard Admin",
- "pt": "Painel Admin",
- "es": "Panel de Admin",
- "ar": "لوحة الإدارة",
- "fr": "Tableau de Bord Admin",
- "tr": "Yönetici Panosu",
- "de": "Admin-Dashboard",
- "uk": "Панель адміністратора",
- "ca": "Tauler d'Admin"
+ "en": "Usage & Monitoring",
+ "ja": "利用状況と監視",
+ "zh-CN": "使用情况与监控",
+ "zh-TW": "使用情況與監控",
+ "ko-KR": "사용 현황 및 모니터링",
+ "no": "Bruk og overvåking",
+ "it": "Utilizzo e monitoraggio",
+ "pt": "Uso e monitoramento",
+ "es": "Uso y monitoreo",
+ "ar": "الاستخدام والمراقبة",
+ "fr": "Utilisation et surveillance",
+ "tr": "Kullanım ve İzleme",
+ "de": "Nutzung & Überwachung",
+ "uk": "Використання та моніторинг",
+ "ca": "Ús i monitoratge"
},
"SETTINGS$NAV_ORG_MEMBERS": {
"en": "Org Members",
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 1fc9616622..40806f7841 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -37,6 +37,7 @@ export default [
route("api-keys", "routes/api-keys.tsx"),
route("org-members", "routes/manage-organization-members.tsx"),
route("org", "routes/manage-org.tsx"),
+ route("usage-monitoring", "routes/usage-monitoring.tsx"),
route("admin-dashboard", "routes/admin-dashboard.tsx"),
]),
route("conversations/:conversationId", "routes/conversation.tsx"),
diff --git a/frontend/src/routes/admin-dashboard.tsx b/frontend/src/routes/admin-dashboard.tsx
index ba79cd2373..fcf44590db 100644
--- a/frontend/src/routes/admin-dashboard.tsx
+++ b/frontend/src/routes/admin-dashboard.tsx
@@ -1,6 +1,5 @@
-import React from "react";
-import { AdminDashboard } from "#/components/features/admin-dashboard/admin-dashboard";
+import { Navigate } from "react-router";
export default function AdminDashboardPage() {
- return <AdminDashboard />;
+ return <Navigate to="/settings/usage-monitoring" replace />;
}
diff --git a/frontend/src/routes/settings.tsx b/frontend/src/routes/settings.tsx
index 5d944ce86f..49474f0926 100644
--- a/frontend/src/routes/settings.tsx
+++ b/frontend/src/routes/settings.tsx
@@ -39,7 +39,7 @@ const SAAS_ONLY_PATHS = [
"/settings/org-defaults",
"/settings/org-defaults/condenser",
"/settings/org-defaults/verification",
- "/settings/admin-dashboard",
+ "/settings/usage-monitoring",
];
const ORG_WIDE_BADGE_PATHS = new Set<string>([
@@ -62,6 +62,10 @@ export const clientLoader = async ({ request }: Route.ClientLoaderArgs) => {
const isSaas = config?.app_mode === "saas";
const featureFlags = config?.feature_flags;
+ if (pathname === "/settings/admin-dashboard") {
+ return redirect(isSaas ? "/settings/usage-monitoring" : "/settings");
+ }
+
// Step 2: Check SAAS_ONLY_PATHS for OSS mode (no user data required)
if (!isSaas && SAAS_ONLY_PATHS.includes(pathname)) {
return redirect("/settings");
@@ -118,7 +122,7 @@ export const clientLoader = async ({ request }: Route.ClientLoaderArgs) => {
pathname === "/settings/billing" ||
pathname === "/settings/org" ||
pathname === "/settings/org-members" ||
- pathname === "/settings/admin-dashboard"
+ pathname === "/settings/usage-monitoring"
) {
const user = await getActiveOrganizationUser();
@@ -174,8 +178,8 @@ export const clientLoader = async ({ request }: Route.ClientLoaderArgs) => {
}
}
- // Admin Dashboard route protection: only admins and owners can access
- if (pathname === "/settings/admin-dashboard") {
+ // Usage & Monitoring route protection: only admins and owners can access
+ if (pathname === "/settings/usage-monitoring") {
const role = user?.role ?? "member";
if (!user || (role !== "admin" && role !== "owner") || isPersonalOrg) {
return redirect("/settings");
diff --git a/frontend/src/routes/usage-monitoring.tsx b/frontend/src/routes/usage-monitoring.tsx
new file mode 100644
index 0000000000..71dab4f435
--- /dev/null
+++ b/frontend/src/routes/usage-monitoring.tsx
@@ -0,0 +1,6 @@
+import React from "react";
+import { AdminDashboard } from "#/components/features/admin-dashboard/admin-dashboard";
+
+export default function UsageMonitoringPage() {
+ return <AdminDashboard />;
+}