Merge remote-tracking branch 'upstream/dev' into fix/documents

surfsense_web/components/layout/providers/LayoutDataProvider.tsx

@@ -2,7 +2,7 @@
 
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtomValue, useSetAtom } from "jotai";
-import { AlertTriangle, Inbox, LogOut, SquareLibrary, Trash2 } from "lucide-react";
+import { AlertTriangle, Inbox, LogOut, PencilIcon, SquareLibrary, Trash2 } from "lucide-react";
 import { useParams, usePathname, useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { useTheme } from "next-themes";
@@ -21,10 +21,12 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
 import { isPageLimitExceededMetadata } from "@/contracts/types/inbox.types";
 import { useInbox } from "@/hooks/use-inbox";
 import { searchSpacesApiService } from "@/lib/apis/search-spaces-api.service";
 import { deleteThread, fetchThreads, updateThread } from "@/lib/chat/thread-persistence";
+import { logout } from "@/lib/auth-utils";
 import { cleanupElectric } from "@/lib/electric/client";
 import { resetUser, trackLogout } from "@/lib/posthog/events";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
@@ -109,7 +111,6 @@ export function LayoutDataProvider({
 	// This ensures each tab has independent pagination and data loading
 	const userId = user?.id ? String(user.id) : null;
 
-	// Mentions: Only fetch "new_mention" type notifications
 	const {
 		inboxItems: mentionItems,
 		unreadCount: mentionUnreadCount,
@@ -121,11 +122,9 @@ export function LayoutDataProvider({
 		markAllAsRead: markAllMentionsAsRead,
 	} = useInbox(userId, Number(searchSpaceId) || null, "new_mention");
 
-	// Status: Fetch all types (will be filtered client-side to status types)
-	// We pass null to get all, then InboxSidebar filters to status types
 	const {
 		inboxItems: statusItems,
-		unreadCount: statusUnreadCount,
+		unreadCount: allUnreadCount,
 		loading: statusLoading,
 		loadingMore: statusLoadingMore,
 		hasMore: statusHasMore,
@@ -134,8 +133,8 @@ export function LayoutDataProvider({
 		markAllAsRead: markAllStatusAsRead,
 	} = useInbox(userId, Number(searchSpaceId) || null, null);
 
-	// Combined unread count for nav badge (mentions take priority for visibility)
-	const totalUnreadCount = mentionUnreadCount + statusUnreadCount;
+	const totalUnreadCount = allUnreadCount;
+	const statusOnlyUnreadCount = Math.max(0, allUnreadCount - mentionUnreadCount);
 
 	// Track seen notification IDs to detect new page_limit_exceeded notifications
 	const seenPageLimitNotifications = useRef<Set<number>>(new Set());
@@ -207,6 +206,12 @@ export function LayoutDataProvider({
 	const [chatToDelete, setChatToDelete] = useState<{ id: number; name: string } | null>(null);
 	const [isDeletingChat, setIsDeletingChat] = useState(false);
 
+	// Rename dialog state
+	const [showRenameChatDialog, setShowRenameChatDialog] = useState(false);
+	const [chatToRename, setChatToRename] = useState<{ id: number; name: string } | null>(null);
+	const [newChatTitle, setNewChatTitle] = useState("");
+	const [isRenamingChat, setIsRenamingChat] = useState(false);
+
 	// Delete/Leave search space dialog state
 	const [showDeleteSearchSpaceDialog, setShowDeleteSearchSpaceDialog] = useState(false);
 	const [showLeaveSearchSpaceDialog, setShowLeaveSearchSpaceDialog] = useState(false);
@@ -421,6 +426,12 @@ export function LayoutDataProvider({
 		setShowDeleteChatDialog(true);
 	}, []);
 
+	const handleChatRename = useCallback((chat: ChatItem) => {
+		setChatToRename({ id: chat.id, name: chat.name });
+		setNewChatTitle(chat.name);
+		setShowRenameChatDialog(true);
+	}, []);
+
 	const handleChatArchive = useCallback(
 		async (chat: ChatItem) => {
 			const newArchivedState = !chat.archived;
@@ -464,12 +475,15 @@ export function LayoutDataProvider({
 				console.warn("[Logout] Electric cleanup failed (will be handled on next login):", err);
 			}
 
+			// Revoke refresh token on server and clear all tokens from localStorage
+			await logout();
+
 			if (typeof window !== "undefined") {
-				localStorage.removeItem("surfsense_bearer_token");
 				router.push("/");
 			}
 		} catch (error) {
 			console.error("Error during logout:", error);
+			await logout();
 			router.push("/");
 		}
 	}, [router]);
@@ -501,6 +515,29 @@ export function LayoutDataProvider({
 		}
 	}, [chatToDelete, queryClient, searchSpaceId, router, currentChatId]);
 
+	// Rename handler
+	const confirmRenameChat = useCallback(async () => {
+		if (!chatToRename || !newChatTitle.trim()) return;
+		setIsRenamingChat(true);
+		try {
+			await updateThread(chatToRename.id, { title: newChatTitle.trim() });
+			toast.success(tSidebar("chat_renamed") || "Chat renamed");
+			queryClient.invalidateQueries({ queryKey: ["threads", searchSpaceId] });
+			queryClient.invalidateQueries({ queryKey: ["all-threads", searchSpaceId] });
+			queryClient.invalidateQueries({ queryKey: ["search-threads", searchSpaceId] });
+			// Invalidate thread detail for breadcrumb update
+			queryClient.invalidateQueries({ queryKey: ["threads", searchSpaceId, "detail", String(chatToRename.id)] });
+		} catch (error) {
+			console.error("Error renaming thread:", error);
+			toast.error(tSidebar("error_renaming_chat") || "Failed to rename chat");
+		} finally {
+			setIsRenamingChat(false);
+			setShowRenameChatDialog(false);
+			setChatToRename(null);
+			setNewChatTitle("");
+		}
+	}, [chatToRename, newChatTitle, queryClient, searchSpaceId, tSidebar]);
+
 	// Page usage
 	const pageUsage = user
 		? {
@@ -529,6 +566,7 @@ export function LayoutDataProvider({
 				activeChatId={currentChatId}
 				onNewChat={handleNewChat}
 				onChatSelect={handleChatSelect}
+				onChatRename={handleChatRename}
 				onChatDelete={handleChatDelete}
 				onChatArchive={handleChatArchive}
 				onViewAllSharedChats={handleViewAllSharedChats}
@@ -562,7 +600,7 @@ export function LayoutDataProvider({
 					},
 					status: {
 						items: statusItems,
-						unreadCount: statusUnreadCount,
+						unreadCount: statusOnlyUnreadCount,
 						loading: statusLoading,
 						loadingMore: statusLoadingMore,
 						hasMore: statusHasMore,
@@ -621,6 +659,57 @@ export function LayoutDataProvider({
 				</DialogContent>
 			</Dialog>
 
+			{/* Rename Chat Dialog */}
+			<Dialog open={showRenameChatDialog} onOpenChange={setShowRenameChatDialog}>
+				<DialogContent className="sm:max-w-md">
+					<DialogHeader>
+						<DialogTitle className="flex items-center gap-2">
+							<PencilIcon className="h-5 w-5" />
+							<span>{tSidebar("rename_chat") || "Rename Chat"}</span>
+						</DialogTitle>
+						<DialogDescription>
+							{tSidebar("rename_chat_description") || "Enter a new name for this conversation."}
+						</DialogDescription>
+					</DialogHeader>
+					<Input
+						value={newChatTitle}
+						onChange={(e) => setNewChatTitle(e.target.value)}
+						placeholder={tSidebar("chat_title_placeholder") || "Chat title"}
+						onKeyDown={(e) => {
+							if (e.key === "Enter" && !isRenamingChat && newChatTitle.trim()) {
+								confirmRenameChat();
+							}
+						}}
+					/>
+					<DialogFooter className="flex gap-2 sm:justify-end">
+						<Button
+							variant="outline"
+							onClick={() => setShowRenameChatDialog(false)}
+							disabled={isRenamingChat}
+						>
+							{tCommon("cancel")}
+						</Button>
+						<Button
+							onClick={confirmRenameChat}
+							disabled={isRenamingChat || !newChatTitle.trim()}
+							className="gap-2"
+						>
+							{isRenamingChat ? (
+								<>
+									<span className="h-4 w-4 animate-spin rounded-full border-2 border-current border-t-transparent" />
+									{tSidebar("renaming") || "Renaming..."}
+								</>
+							) : (
+								<>
+									<PencilIcon className="h-4 w-4" />
+									{tSidebar("rename") || "Rename"}
+								</>
+							)}
+						</Button>
+					</DialogFooter>
+				</DialogContent>
+			</Dialog>
+
 			{/* Delete Search Space Dialog */}
 			<Dialog open={showDeleteSearchSpaceDialog} onOpenChange={setShowDeleteSearchSpaceDialog}>
 				<DialogContent className="sm:max-w-md">