Merge remote-tracking branch 'upstream/dev' into feat/composio

surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx

@@ -41,14 +41,14 @@ import { Spinner } from "@/components/ui/spinner";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
-import type { InboxItem } from "@/hooks/use-inbox";
-import { useMediaQuery } from "@/hooks/use-media-query";
 import {
 	type ConnectorIndexingMetadata,
-	type NewMentionMetadata,
 	isConnectorIndexingMetadata,
 	isNewMentionMetadata,
+	type NewMentionMetadata,
 } from "@/contracts/types/inbox.types";
+import type { InboxItem } from "@/hooks/use-inbox";
+import { useMediaQuery } from "@/hooks/use-media-query";
 import { cn } from "@/lib/utils";
 
 /**

surfsense_web/components/layout/ui/sidebar/Sidebar.tsx

@@ -119,11 +119,6 @@ export function Sidebar({
 				)}
 			</div>
 
-			{/* Platform navigation */}
-			{navItems.length > 0 && (
-				<NavSection items={navItems} onItemClick={onNavItemClick} isCollapsed={isCollapsed} />
-			)}
-
 			{/* Scrollable content */}
 			<ScrollArea className="flex-1">
 				{isCollapsed ? (
@@ -235,7 +230,12 @@ export function Sidebar({
 			</ScrollArea>
 
 			{/* Footer */}
-			<div className="mt-auto">
+			<div className="mt-auto border-t">
+				{/* Platform navigation */}
+				{navItems.length > 0 && (
+					<NavSection items={navItems} onItemClick={onNavItemClick} isCollapsed={isCollapsed} />
+				)}
+
 				{pageUsage && !isCollapsed && (
 					<PageUsageDisplay pagesUsed={pageUsage.pagesUsed} pagesLimit={pageUsage.pagesLimit} />
 				)}

surfsense_web/components/layout/ui/sidebar/SidebarHeader.tsx

@@ -1,6 +1,7 @@
 "use client";
 
-import { ChevronsUpDown, Settings, Users } from "lucide-react";
+import { ChevronsUpDown, ScrollText, Settings, Users } from "lucide-react";
+import { useParams, useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { Button } from "@/components/ui/button";
 import {
@@ -29,6 +30,9 @@ export function SidebarHeader({
 	className,
 }: SidebarHeaderProps) {
 	const t = useTranslations("sidebar");
+	const router = useRouter();
+	const params = useParams();
+	const searchSpaceId = params.search_space_id as string;
 
 	return (
 		<div className={cn("flex shrink-0 items-center", className)}>
@@ -52,6 +56,10 @@ export function SidebarHeader({
 						<Users className="mr-2 h-4 w-4" />
 						{t("manage_members")}
 					</DropdownMenuItem>
+					<DropdownMenuItem onClick={() => router.push(`/dashboard/${searchSpaceId}/logs`)}>
+						<ScrollText className="mr-2 h-4 w-4" />
+						{t("logs")}
+					</DropdownMenuItem>
 					<DropdownMenuSeparator />
 					<DropdownMenuItem onClick={onSettings}>
 						<Settings className="mr-2 h-4 w-4" />

surfsense_web/components/layout/ui/sidebar/SidebarUserProfile.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { ChevronUp, Laptop, Languages, LogOut, Moon, Settings, Sun } from "lucide-react";
+import { ChevronUp, Languages, Laptop, LogOut, Moon, Settings, Sun } from "lucide-react";
 import { useTranslations } from "next-intl";
 import {
 	DropdownMenu,