|
|
@ -151,40 +151,79 @@ function NavLinkChat() {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
const deleteConversation = useMutation(
|
|
|
|
const deleteConversation = useMutation(
|
|
|
|
trpc.chat.conversations.deleteOne.mutationOptions({
|
|
|
|
trpc.chat.conversations.deleteOne.mutationOptions({
|
|
|
|
onSuccess: () => {
|
|
|
|
onMutate: async ({ id: conversationIdToDelete }) => {
|
|
|
|
queryClient.invalidateQueries({
|
|
|
|
/** Cancel affected queries that may be in-flight: */
|
|
|
|
|
|
|
|
await queryClient.cancelQueries({
|
|
|
|
|
|
|
|
queryKey: trpc.chat.conversations.fetchAll.queryKey(),
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** Optimistically update the affected queries in react-query's cache: */
|
|
|
|
|
|
|
|
const previousConversations = await queryClient.getQueryData(
|
|
|
|
|
|
|
|
trpc.chat.conversations.fetchAll.queryKey()
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
if (!previousConversations) {
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
|
|
|
previousConversations: [],
|
|
|
|
|
|
|
|
newConversations: [],
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
const newConversations = previousConversations.filter(
|
|
|
|
|
|
|
|
(c) => c.id !== conversationIdToDelete
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
queryClient.setQueryData(
|
|
|
|
|
|
|
|
trpc.chat.conversations.fetchAll.queryKey(),
|
|
|
|
|
|
|
|
newConversations
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return { previousConversations, newConversations };
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
onSettled: async (data, variables, context) => {
|
|
|
|
|
|
|
|
await queryClient.invalidateQueries({
|
|
|
|
queryKey: trpc.chat.conversations.fetchAll.queryKey(),
|
|
|
|
queryKey: trpc.chat.conversations.fetchAll.queryKey(),
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
onError: async (error, variables, context) => {
|
|
|
|
|
|
|
|
console.error(error);
|
|
|
|
|
|
|
|
if (!context) return;
|
|
|
|
|
|
|
|
queryClient.setQueryData(
|
|
|
|
|
|
|
|
trpc.chat.conversations.fetchAll.queryKey(),
|
|
|
|
|
|
|
|
context.previousConversations
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
const { data: conversations } = useQuery(
|
|
|
|
const { data: conversations } = useQuery(
|
|
|
|
trpc.chat.conversations.fetchAll.queryOptions()
|
|
|
|
trpc.chat.conversations.fetchAll.queryOptions()
|
|
|
|
);
|
|
|
|
);
|
|
|
|
// TODO: should we be using zustand for this, or trpc/react-query's useMutation?
|
|
|
|
const selectedConversationId = useStore(
|
|
|
|
const addConversation = useStore((state) => state.addConversation);
|
|
|
|
(state) => state.selectedConversationId
|
|
|
|
const removeConversation = useStore((state) => state.removeConversation);
|
|
|
|
|
|
|
|
const conversationId = useStore((state) => state.selectedConversationId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async function handleDeleteConversation(conversationId: string) {
|
|
|
|
|
|
|
|
await deleteConversation.mutateAsync(
|
|
|
|
|
|
|
|
{ id: conversationId }
|
|
|
|
|
|
|
|
// {
|
|
|
|
|
|
|
|
// onSuccess: () => {
|
|
|
|
|
|
|
|
// queryClient.invalidateQueries({
|
|
|
|
|
|
|
|
// queryKey: trpc.chat.conversations.fetchAll.queryKey(),
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
);
|
|
|
|
);
|
|
|
|
removeConversation(conversationId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
async function handleDeleteConversation(conversationIdToDelete: string) {
|
|
|
|
|
|
|
|
await deleteConversation.mutateAsync(
|
|
|
|
|
|
|
|
{ id: conversationIdToDelete },
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
onSuccess: async (x, y, { newConversations }) => {
|
|
|
|
|
|
|
|
/** If the selected conversation was deleted, navigate/select a
|
|
|
|
|
|
|
|
* different conversation (creating a new one if necessary): */
|
|
|
|
|
|
|
|
if (conversationIdToDelete === selectedConversationId) {
|
|
|
|
|
|
|
|
if (newConversations && newConversations.length > 0) {
|
|
|
|
|
|
|
|
// Navigate to the first conversation
|
|
|
|
|
|
|
|
const lastConversation =
|
|
|
|
|
|
|
|
newConversations[newConversations.length - 1];
|
|
|
|
|
|
|
|
await navigate(`/chat/${lastConversation.id}`);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
// No conversations left, create a new one
|
|
|
|
const newConversation = await startConversation.mutateAsync();
|
|
|
|
const newConversation = await startConversation.mutateAsync();
|
|
|
|
if (!newConversation?.id) return;
|
|
|
|
if (!newConversation?.id) return;
|
|
|
|
addConversation(newConversation);
|
|
|
|
|
|
|
|
await navigate(`/chat/${newConversation.id}`);
|
|
|
|
await navigate(`/chat/${newConversation.id}`);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<NavLink
|
|
|
|
<NavLink
|
|
|
@ -202,7 +241,7 @@ function NavLinkChat() {
|
|
|
|
e.stopPropagation();
|
|
|
|
e.stopPropagation();
|
|
|
|
startConversation.mutateAsync().then((res) => {
|
|
|
|
startConversation.mutateAsync().then((res) => {
|
|
|
|
if (!res?.id) return;
|
|
|
|
if (!res?.id) return;
|
|
|
|
addConversation(res);
|
|
|
|
// addConversation(res);
|
|
|
|
navigate(`/chat/${res.id}`);
|
|
|
|
navigate(`/chat/${res.id}`);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}}
|
|
|
|
}}
|
|
|
@ -262,7 +301,7 @@ function NavLinkChat() {
|
|
|
|
</>
|
|
|
|
</>
|
|
|
|
}
|
|
|
|
}
|
|
|
|
variant="subtle"
|
|
|
|
variant="subtle"
|
|
|
|
active={conversation.id === conversationId}
|
|
|
|
active={conversation.id === selectedConversationId}
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
))}
|
|
|
|
))}
|
|
|
|
</NavLink>
|
|
|
|
</NavLink>
|
|
|
|