mirror of
https://github.com/MODSetter/SurfSense.git
synced 2026-06-08 20:25:19 +02:00
feat: enhance chat query handling and sidebar updates
- Updated chat query to include ordering by creation date for better organization. - Improved optimistic updates in chat deletion and creation mutations to ensure UI consistency. - Invalidate chat queries after mutations to refresh sidebar and components effectively. - Adjusted cache key structure for chat queries to include additional parameters for better cache management.
This commit is contained in:
parent
5fcaadf60b
commit
ee46a43afc
4 changed files with 40 additions and 13 deletions
|
|
@ -319,15 +319,19 @@ async def read_chats(
|
|||
"You don't have permission to read chats in this search space",
|
||||
)
|
||||
# Select specific fields excluding messages
|
||||
query = select(
|
||||
Chat.id,
|
||||
Chat.type,
|
||||
Chat.title,
|
||||
Chat.initial_connectors,
|
||||
Chat.search_space_id,
|
||||
Chat.created_at,
|
||||
Chat.state_version,
|
||||
).filter(Chat.search_space_id == search_space_id)
|
||||
query = (
|
||||
select(
|
||||
Chat.id,
|
||||
Chat.type,
|
||||
Chat.title,
|
||||
Chat.initial_connectors,
|
||||
Chat.search_space_id,
|
||||
Chat.created_at,
|
||||
Chat.state_version,
|
||||
)
|
||||
.filter(Chat.search_space_id == search_space_id)
|
||||
.order_by(Chat.created_at.desc())
|
||||
)
|
||||
else:
|
||||
# Get chats from all search spaces user has membership in
|
||||
query = (
|
||||
|
|
@ -343,6 +347,7 @@ async def read_chats(
|
|||
.join(SearchSpace)
|
||||
.join(SearchSpaceMembership)
|
||||
.filter(SearchSpaceMembership.user_id == user.id)
|
||||
.order_by(Chat.created_at.desc())
|
||||
)
|
||||
|
||||
result = await session.execute(query.offset(skip).limit(limit))
|
||||
|
|
|
|||
|
|
@ -27,12 +27,21 @@ export const deleteChatMutationAtom = atomWithMutation((get) => {
|
|||
|
||||
onSuccess: (_, request: DeleteChatRequest) => {
|
||||
toast.success("Chat deleted successfully");
|
||||
// Optimistically update the current query
|
||||
queryClient.setQueryData(
|
||||
cacheKeys.chats.globalQueryParams(chatsQueryParams),
|
||||
(oldData: ChatSummary[]) => {
|
||||
return oldData.filter((chat) => chat.id !== request.id);
|
||||
return oldData?.filter((chat) => chat.id !== request.id) ?? [];
|
||||
}
|
||||
);
|
||||
// Invalidate all chat queries to ensure consistency across components
|
||||
queryClient.invalidateQueries({
|
||||
queryKey: ["chats"],
|
||||
});
|
||||
// Also invalidate the "all-chats" query used by AllChatsSidebar
|
||||
queryClient.invalidateQueries({
|
||||
queryKey: ["all-chats"],
|
||||
});
|
||||
},
|
||||
};
|
||||
});
|
||||
|
|
@ -50,8 +59,14 @@ export const createChatMutationAtom = atomWithMutation((get) => {
|
|||
},
|
||||
|
||||
onSuccess: () => {
|
||||
// Invalidate ALL chat queries to ensure sidebar and other components refresh
|
||||
// Using a partial key match to avoid stale closure issues with specific query params
|
||||
queryClient.invalidateQueries({
|
||||
queryKey: cacheKeys.chats.globalQueryParams(chatsQueryParams),
|
||||
queryKey: ["chats"],
|
||||
});
|
||||
// Also invalidate the "all-chats" query used by AllChatsSidebar
|
||||
queryClient.invalidateQueries({
|
||||
queryKey: ["all-chats"],
|
||||
});
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ export function AppSidebarProvider({
|
|||
|
||||
useEffect(() => {
|
||||
setChatsQueryParams((prev) => ({ ...prev, search_space_id: searchSpaceId, skip: 0, limit: 4 }));
|
||||
}, [searchSpaceId]);
|
||||
}, [searchSpaceId, setChatsQueryParams]);
|
||||
|
||||
const {
|
||||
data: searchSpace,
|
||||
|
|
|
|||
|
|
@ -10,7 +10,14 @@ export const cacheKeys = {
|
|||
chats: {
|
||||
activeChat: (chatId: string) => ["active-chat", chatId] as const,
|
||||
globalQueryParams: (queries: GetChatsRequest["queryParams"]) =>
|
||||
["chats", ...(queries ? Object.values(queries) : [])] as const,
|
||||
[
|
||||
"chats",
|
||||
queries?.search_space_id,
|
||||
queries?.limit,
|
||||
queries?.skip,
|
||||
queries?.page,
|
||||
queries?.page_size,
|
||||
] as const,
|
||||
},
|
||||
podcasts: {
|
||||
globalQueryParams: (queries: GetPodcastsRequest["queryParams"]) =>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue