Merge remote-tracking branch 'origin/master' into ji

frontend-web/src/pages/AdminUserHubPage.tsx

@@ -0,0 +1,5 @@
+import { AdminUserHub } from "@/components/workspace/admin/admin-user-hub";
+
+export default function AdminUserHubPage() {
+  return <AdminUserHub />;
+}

frontend-web/src/pages/WorkspaceRoutes.tsx

@@ -29,6 +29,7 @@ import SkillsPage from "./SkillsPage";
 import UsersPage from "./UsersPage";
 import AdminUserActivityPage from "./AdminUserActivityPage";
 import AdminMemoryPage from "./AdminMemoryPage";
+import AdminUserHubPage from "./AdminUserHubPage";
 import TagsPage from "./TagsPage";
 import RecommendedQuestionsPage from "./RecommendedQuestionsPage";
 import AIWritingPage from "@/open-canvas/pages/AIWritingPage";
@@ -206,18 +207,32 @@ export default function WorkspaceRoutes({
           </WorkspaceLayout>
         }
       />
+      {/* Unified admin user hub */}
       <Route
-        path="admin/users"
+        path="admin"
         element={
           getStoredAuth()?.system_role === "admin" ? (
-            <WorkspaceLayout {...layoutProps}>
-              <UsersPage />
+            <WorkspaceLayout {...layoutProps} pageSidebarHidden>
+              <AdminUserHubPage />
             </WorkspaceLayout>
           ) : (
             <Navigate to="/page/workspace/chats/new" replace />
           )
         }
       />
+      {/* Legacy redirects */}
+      <Route
+        path="admin/users"
+        element={<Navigate to="/page/workspace/admin" replace />}
+      />
+      <Route
+        path="admin/user-activity"
+        element={<Navigate to="/page/workspace/admin" replace />}
+      />
+      <Route
+        path="admin/memory"
+        element={<Navigate to="/page/workspace/admin" replace />}
+      />
       <Route
         path="admin/scheduled-tasks"
         element={
@@ -230,30 +245,6 @@ export default function WorkspaceRoutes({
           )
         }
       />
-      <Route
-        path="admin/user-activity"
-        element={
-          getStoredAuth()?.system_role === "admin" ? (
-            <WorkspaceLayout {...layoutProps}>
-              <AdminUserActivityPage />
-            </WorkspaceLayout>
-          ) : (
-            <Navigate to="/page/workspace/chats/new" replace />
-          )
-        }
-      />
-      <Route
-        path="admin/memory"
-        element={
-          getStoredAuth()?.system_role === "admin" ? (
-            <WorkspaceLayout {...layoutProps}>
-              <AdminMemoryPage />
-            </WorkspaceLayout>
-          ) : (
-            <Navigate to="/page/workspace/chats/new" replace />
-          )
-        }
-      />
       <Route
         path="admin/tags"
         element={