bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Chat with last_message when current_user is sending a message

Browse source
This commit is contained in:
Chewbacca 2022-11-10 16:41:24 -05:00
parent 0164bf35a0
commit c453bbb687
2 changed files with 54 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/soapbox/queries/chats.ts
View file

@ -237,7 +237,7 @@ const useChatActions = (chatId: string) => {
const createChatMessage = useMutation(
(
{ chatId, content }: { chatId: string, content: string },
) => api.post<IChat>(`/api/v1/pleroma/chats/${chatId}/messages`, { content }),
) => api.post<IChatMessage>(`/api/v1/pleroma/chats/${chatId}/messages`, { content }),
{
retry: false,
onMutate: async (variables) => {
@ -281,7 +281,10 @@ const useChatActions = (chatId: string) => {
onError: (_error: any, variables, context: any) => {
queryClient.setQueryData(['chats', 'messages', variables.chatId], context.prevChatMessages);
},
onSuccess: (_data: any, variables) => {
onSuccess: (response, variables) => {
const nextChat = { ...chat, last_message: response.data };
updatePageItem(ChatKeys.chatSearch(), nextChat, (o, n) => o.id === n.id);
queryClient.invalidateQueries(ChatKeys.chatMessages(variables.chatId));
},
},

52
app/soapbox/utils/__tests__/queries.test.ts
View file

@ -2,17 +2,63 @@ import { InfiniteData } from '@tanstack/react-query';
import { queryClient } from 'soapbox/queries/client';
import { PaginatedResult, sortQueryData } from '../queries';
import { PaginatedResult, sortQueryData, updatePageItem } from '../queries';
interface Item {
id: number
id: number,
text: string
}
const buildItem = (id: number): Item => ({ id });
const buildItem = (id: number): Item => ({ id, text: `item ${id}` });
const queryKey = ['test', 'query'];
describe('updatePageItem()', () => {
beforeEach(() => {
queryClient.clear();
});
describe('without cached data', () => {
it('safely returns undefined', () => {
updatePageItem<Item>(queryKey, buildItem(1), (o, n) => o.id === n.id);
const nextQueryData = queryClient.getQueryData<InfiniteData<PaginatedResult<Item>>>(queryKey);
expect(nextQueryData).toBeUndefined();
});
});
describe('with cached data', () => {
const cachedQueryData = {
pages: [
{
result: [buildItem(1), buildItem(2), buildItem(3)],
hasMore: false,
link: undefined,
},
],
pageParams: [undefined],
};
beforeEach(() => {
queryClient.setQueryData(queryKey, cachedQueryData);
});
it('updates the correct item in the cached data', () => {
const initialQueryData = queryClient.getQueryData<InfiniteData<PaginatedResult<Item>>>(queryKey);
expect(initialQueryData?.pages[0].result.map((r) => r.id)).toEqual([1, 2, 3]);
expect(initialQueryData?.pages[0].result.find((r) => r.id === 2)?.text).toEqual('item 2');
updatePageItem<Item>(queryKey, { id: 2, text: 'new text' }, (o, n) => o.id === n.id);
const nextQueryData = queryClient.getQueryData<InfiniteData<PaginatedResult<Item>>>(queryKey);
expect(nextQueryData?.pages[0].result.map((r) => r.id)).toEqual([1, 2, 3]);
expect(nextQueryData?.pages[0].result.find((r) => r.id === 2)?.text).toEqual('new text');
});
});
});
describe('sortQueryData()', () => {
beforeEach(() => {
queryClient.clear();
});
describe('without cached data', () => {
it('safely returns undefined', () => {
sortQueryData<Item>(queryKey, (a, b) => b.id - a.id);