diff --git a/apps/dashboard/app/(app)/authorization/permissions/page.tsx b/apps/dashboard/app/(app)/authorization/permissions/page.tsx index 0f679cfbdc..9865d67916 100644 --- a/apps/dashboard/app/(app)/authorization/permissions/page.tsx +++ b/apps/dashboard/app/(app)/authorization/permissions/page.tsx @@ -3,11 +3,11 @@ import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; import { getTenantId } from "@/lib/auth"; import { asc, db } from "@/lib/db"; +import { permissions } from "@unkey/db/src/schema"; import { ChevronRight, Scan } from "lucide-react"; import Link from "next/link"; import { redirect } from "next/navigation"; import { CreateNewPermission } from "./create-new-permission"; -import { permissions } from "@unkey/db/src/schema"; export const revalidate = 0; @@ -19,7 +19,7 @@ export default async function RolesPage() { and(eq(table.tenantId, tenantId), isNull(table.deletedAt)), with: { permissions: { - orderBy:[asc(permissions.name)], + orderBy: [asc(permissions.name)], with: { keys: { with: { diff --git a/apps/dashboard/app/(app)/desktop-sidebar.tsx b/apps/dashboard/app/(app)/desktop-sidebar.tsx index 900ff8dcdc..bdaa813267 100644 --- a/apps/dashboard/app/(app)/desktop-sidebar.tsx +++ b/apps/dashboard/app/(app)/desktop-sidebar.tsx @@ -3,6 +3,7 @@ import { Feedback } from "@/components/dashboard/feedback-component"; import { Badge } from "@/components/ui/badge"; import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"; import type { Workspace } from "@/lib/db"; +import { useDelayLoader } from "@/lib/hooks/useDelayLoader"; import { cn } from "@/lib/utils"; import { BookOpen, @@ -219,6 +220,7 @@ export const DesktopSidebar: React.FC = ({ workspace, className }) => { const NavLink: React.FC<{ item: NavItem }> = ({ item }) => { const [isPending, startTransition] = useTransition(); + const showLoader = useDelayLoader(isPending); const router = useRouter(); const link = ( = ({ item }) => { >
- {isPending ? ( + {showLoader ? ( ) : (