diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx index e44a7c15..2ea5714c 100644 --- a/src/app/admin/layout.tsx +++ b/src/app/admin/layout.tsx @@ -10,7 +10,8 @@ import { AdminTopbar } from "@/components/admin/admin-topbar"; import { LanguageSwitcher } from "@/components/language-switcher"; import { ThemeSwitcher } from "@/components/theme-switcher"; import { requireStaff } from "@/lib/admin/guard"; -import { allEnabledNavGroups } from "@/lib/admin-nav"; +import { allNavGroups } from "@/lib/admin-nav"; +import { getAllPluginStates } from "@/lib/plugins/store"; import { prisma } from "@/lib/prisma"; import { siteSettings } from "@/lib/services/site-settings"; @@ -32,7 +33,8 @@ export default async function AdminLayout({ if (!u?.twoFactorConfirmedAt) redirect("/settings/2fa?error=staffrequired"); } - const navGroups = await allEnabledNavGroups(); + const pluginStates = await getAllPluginStates(); + const navGroups = allNavGroups(pluginStates.enabled); return ( }> diff --git a/src/lib/admin-nav.ts b/src/lib/admin-nav.ts index 66595aaf..39244f1a 100644 --- a/src/lib/admin-nav.ts +++ b/src/lib/admin-nav.ts @@ -18,7 +18,6 @@ import { Wrench, } from "lucide-react"; import { pluginRegistry } from "@/lib/plugins"; -import { getAllPluginStates } from "@/lib/plugins/store"; import "@/lib/plugins/loader"; export interface AdminHubTab { @@ -411,15 +410,7 @@ export function allNavGroups(enabled?: Record): AdminNavGroup[] ]; } -export async function allEnabledHubs(): Promise { - const states = await getAllPluginStates(); - return allHubs(states.enabled); -} -export async function allEnabledNavGroups(): Promise { - const states = await getAllPluginStates(); - return allNavGroups(states.enabled); -} function hubPrefixes(id: string): string[] { return ADMIN_HUBS.find((h) => h.id === id)?.prefixes ?? [];