@planningcenter/chat-react-native 4.2.1-qa-staging.3 → 4.2.1-qa-staging.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/contexts/api_provider.d.ts.map +1 -1
- package/build/contexts/api_provider.js +2 -1
- package/build/contexts/api_provider.js.map +1 -1
- package/build/hooks/use_fetch_newer_messages.d.ts +2 -1
- package/build/hooks/use_fetch_newer_messages.d.ts.map +1 -1
- package/build/hooks/use_fetch_newer_messages.js +16 -9
- package/build/hooks/use_fetch_newer_messages.js.map +1 -1
- package/build/screens/conversation_screen.d.ts.map +1 -1
- package/build/screens/conversation_screen.js +286 -274
- package/build/screens/conversation_screen.js.map +1 -1
- package/build/screens/message_actions_screen.d.ts.map +1 -1
- package/build/screens/message_actions_screen.js +103 -92
- package/build/screens/message_actions_screen.js.map +1 -1
- package/build/utils/cache/invalidate_refetchable_queries.d.ts +3 -0
- package/build/utils/cache/invalidate_refetchable_queries.d.ts.map +1 -0
- package/build/utils/cache/invalidate_refetchable_queries.js +8 -0
- package/build/utils/cache/invalidate_refetchable_queries.js.map +1 -0
- package/build/utils/cache/messages_cache.d.ts +2 -0
- package/build/utils/cache/messages_cache.d.ts.map +1 -1
- package/build/utils/cache/messages_cache.js +40 -1
- package/build/utils/cache/messages_cache.js.map +1 -1
- package/package.json +3 -3
- package/src/contexts/api_provider.tsx +2 -1
- package/src/hooks/__tests__/use_fetch_newer_messages.test.tsx +27 -0
- package/src/hooks/use_fetch_newer_messages.ts +11 -3
- package/src/screens/conversation_screen.tsx +8 -2
- package/src/screens/message_actions_screen.tsx +12 -1
- package/src/utils/cache/__tests__/invalidate_refetchable_queries.test.ts +23 -0
- package/src/utils/cache/__tests__/messages_cache.test.ts +14 -1
- package/src/utils/cache/__tests__/messages_cache_deletion.test.ts +96 -0
- package/src/utils/cache/invalidate_refetchable_queries.ts +9 -0
- package/src/utils/cache/messages_cache.ts +48 -1
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import { InfiniteData, QueryClient } from '@tanstack/react-query'
|
|
2
|
+
import type { ApiCollection, ApiResource, MessageResource } from '../../../types'
|
|
3
|
+
import type { PersonResource } from '../../../types/resources/person'
|
|
4
|
+
import { getMessageQueryKey } from '../../request/get_message'
|
|
5
|
+
import { getMessagesQueryKey } from '../../request/get_messages'
|
|
6
|
+
import { applyMessageDeletionToCaches, getThreadedMessagesQueryKey } from '../messages_cache'
|
|
7
|
+
|
|
8
|
+
type MessagesQueryData = InfiniteData<ApiCollection<MessageResource>>
|
|
9
|
+
|
|
10
|
+
const conversation_id = 7
|
|
11
|
+
const author = { id: 1, type: 'Person', name: 'Gina', avatar: null } as unknown as PersonResource
|
|
12
|
+
|
|
13
|
+
const message = (id: string, overrides: Partial<MessageResource> = {}): MessageResource =>
|
|
14
|
+
({
|
|
15
|
+
type: 'Message',
|
|
16
|
+
id,
|
|
17
|
+
text: `msg ${id}`,
|
|
18
|
+
html: '',
|
|
19
|
+
createdAt: '2026-01-01T00:00:00Z',
|
|
20
|
+
deletedAt: null,
|
|
21
|
+
textEditedAt: null,
|
|
22
|
+
mine: true,
|
|
23
|
+
attachments: [],
|
|
24
|
+
author,
|
|
25
|
+
reactionCounts: [],
|
|
26
|
+
replyCount: 0,
|
|
27
|
+
replyRootId: null,
|
|
28
|
+
messageType: 'message',
|
|
29
|
+
...overrides,
|
|
30
|
+
}) as MessageResource
|
|
31
|
+
|
|
32
|
+
const mainKey = getMessagesQueryKey({ conversation_id })
|
|
33
|
+
const threadKey = getThreadedMessagesQueryKey(conversation_id, 'root')
|
|
34
|
+
const rootKey = getMessageQueryKey({ conversation_id, messageId: 'root' })
|
|
35
|
+
|
|
36
|
+
const seedPages = (queryClient: QueryClient, queryKey: unknown[], messages: MessageResource[]) =>
|
|
37
|
+
queryClient.setQueryData<MessagesQueryData>(queryKey, {
|
|
38
|
+
pageParams: [{}],
|
|
39
|
+
pages: [{ data: messages, links: {}, meta: { count: messages.length, totalCount: 1 } }],
|
|
40
|
+
})
|
|
41
|
+
|
|
42
|
+
const pageMessages = (queryClient: QueryClient, queryKey: unknown[]) =>
|
|
43
|
+
queryClient.getQueryData<MessagesQueryData>(queryKey)!.pages[0].data
|
|
44
|
+
|
|
45
|
+
describe('applyMessageDeletionToCaches', () => {
|
|
46
|
+
let queryClient: QueryClient
|
|
47
|
+
const root = message('root', {
|
|
48
|
+
replyRootId: 'root',
|
|
49
|
+
replyCount: 1,
|
|
50
|
+
text: 'What are our prayer requests?',
|
|
51
|
+
})
|
|
52
|
+
const reply = message('reply', { replyRootId: 'root', replyRoot: root, text: 'Smith family' })
|
|
53
|
+
|
|
54
|
+
beforeEach(() => {
|
|
55
|
+
queryClient = new QueryClient()
|
|
56
|
+
seedPages(queryClient, mainKey, [reply, message('other'), root])
|
|
57
|
+
seedPages(queryClient, threadKey, [reply, root])
|
|
58
|
+
queryClient.setQueryData<ApiResource<MessageResource>>(rootKey, {
|
|
59
|
+
data: root,
|
|
60
|
+
links: {},
|
|
61
|
+
meta: {},
|
|
62
|
+
})
|
|
63
|
+
})
|
|
64
|
+
|
|
65
|
+
it('marks a deleted reply root as deleted everywhere it is cached and keeps its replies', () => {
|
|
66
|
+
applyMessageDeletionToCaches(queryClient, conversation_id, root)
|
|
67
|
+
|
|
68
|
+
const [threadReply, threadRoot] = pageMessages(queryClient, threadKey)
|
|
69
|
+
expect(threadRoot.deletedAt).toEqual(expect.any(String))
|
|
70
|
+
expect(threadReply).toMatchObject({ id: 'reply', text: 'Smith family' })
|
|
71
|
+
expect(threadReply.replyRoot?.deletedAt).toEqual(expect.any(String))
|
|
72
|
+
|
|
73
|
+
const [mainReply, , mainRoot] = pageMessages(queryClient, mainKey)
|
|
74
|
+
expect(mainRoot.deletedAt).toEqual(expect.any(String))
|
|
75
|
+
expect(mainReply.replyRoot?.deletedAt).toEqual(expect.any(String))
|
|
76
|
+
|
|
77
|
+
expect(queryClient.getQueryData<ApiResource<MessageResource>>(rootKey)!.data.deletedAt).toEqual(
|
|
78
|
+
expect.any(String)
|
|
79
|
+
)
|
|
80
|
+
})
|
|
81
|
+
|
|
82
|
+
it('removes a deleted reply from the thread and conversation caches but leaves the root', () => {
|
|
83
|
+
applyMessageDeletionToCaches(queryClient, conversation_id, reply)
|
|
84
|
+
|
|
85
|
+
expect(pageMessages(queryClient, threadKey).map(m => m.id)).toEqual(['root'])
|
|
86
|
+
expect(pageMessages(queryClient, mainKey).map(m => m.id)).toEqual(['other', 'root'])
|
|
87
|
+
expect(pageMessages(queryClient, threadKey)[0].deletedAt).toBeNull()
|
|
88
|
+
})
|
|
89
|
+
|
|
90
|
+
it('removes a plain message from the conversation cache without touching thread caches', () => {
|
|
91
|
+
applyMessageDeletionToCaches(queryClient, conversation_id, message('other'))
|
|
92
|
+
|
|
93
|
+
expect(pageMessages(queryClient, mainKey).map(m => m.id)).toEqual(['reply', 'root'])
|
|
94
|
+
expect(pageMessages(queryClient, threadKey).map(m => m.id)).toEqual(['reply', 'root'])
|
|
95
|
+
})
|
|
96
|
+
})
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Query, QueryClient } from '@tanstack/react-query'
|
|
2
|
+
|
|
3
|
+
const isAnchoredMessagesWindow = (query: Query) => {
|
|
4
|
+
const [, params] = query.queryKey as [unknown, { where?: { id_around?: string } } | undefined]
|
|
5
|
+
return !!params?.where?.id_around
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export const invalidateRefetchableQueries = (queryClient: QueryClient) =>
|
|
9
|
+
queryClient.invalidateQueries({ predicate: query => !isAnchoredMessagesWindow(query) })
|
|
@@ -3,7 +3,8 @@ import { getRequestQueryKey } from '../../hooks/use_suspense_api'
|
|
|
3
3
|
import { ApiCollection, ApiResource, MessageResource } from '../../types'
|
|
4
4
|
import { JoltReactionEvent } from '../../types/jolt_events'
|
|
5
5
|
import { transformReactionEventDataToReactionCountResource } from '../jolt/transform_reaction_event_data_to_reaction_count_resource'
|
|
6
|
-
import {
|
|
6
|
+
import { getMessageQueryKey } from '../request/get_message'
|
|
7
|
+
import { getMessagesQueryKey, getMessagesRequestArgs } from '../request/get_messages'
|
|
7
8
|
import {
|
|
8
9
|
updateAllRecordsInPagesData,
|
|
9
10
|
updateOrCreateRecordInPagesData,
|
|
@@ -135,6 +136,9 @@ type MessagesQueryData = InfiniteData<ApiCollection<MessageResource>>
|
|
|
135
136
|
export function isTemporaryMessageId(messageId?: string | null): boolean {
|
|
136
137
|
return !!messageId && messageId.endsWith('-temp')
|
|
137
138
|
}
|
|
139
|
+
export function newestPersistedMessageId(messages: MessageResource[]): string | undefined {
|
|
140
|
+
return messages.find(message => !isTemporaryMessageId(message.id))?.id
|
|
141
|
+
}
|
|
138
142
|
export function isNewMessage(message?: MessageResource): boolean {
|
|
139
143
|
return !message?.id || isTemporaryMessageId(message.id)
|
|
140
144
|
}
|
|
@@ -147,6 +151,49 @@ export function getThreadedMessagesQueryKey(conversationId: number, replyRootId:
|
|
|
147
151
|
return getRequestQueryKey(requestArgs)
|
|
148
152
|
}
|
|
149
153
|
|
|
154
|
+
export function applyMessageDeletionToCaches(
|
|
155
|
+
queryClient: QueryClient,
|
|
156
|
+
conversationId: number,
|
|
157
|
+
message: MessageResource
|
|
158
|
+
) {
|
|
159
|
+
const messagesQueryKey = getMessagesQueryKey({ conversation_id: conversationId })
|
|
160
|
+
const isReplyRoot = message.replyRootId === message.id
|
|
161
|
+
|
|
162
|
+
if (isReplyRoot) {
|
|
163
|
+
const deletedRoot: MessageResource = {
|
|
164
|
+
...message,
|
|
165
|
+
deletedAt: message.deletedAt ?? new Date().toISOString(),
|
|
166
|
+
attachments: [],
|
|
167
|
+
}
|
|
168
|
+
const threadedMessagesQueryKey = getThreadedMessagesQueryKey(conversationId, message.id)
|
|
169
|
+
const individualMessageQueryKey = getMessageQueryKey({
|
|
170
|
+
conversation_id: conversationId,
|
|
171
|
+
messageId: message.id,
|
|
172
|
+
})
|
|
173
|
+
|
|
174
|
+
updateCacheWithMessage(queryClient, messagesQueryKey, deletedRoot, 'message.updated')
|
|
175
|
+
updateCacheWithMessage(queryClient, threadedMessagesQueryKey, deletedRoot, 'message.updated')
|
|
176
|
+
updateCacheReplyRoots(queryClient, messagesQueryKey, deletedRoot)
|
|
177
|
+
updateCacheReplyRoots(queryClient, threadedMessagesQueryKey, deletedRoot)
|
|
178
|
+
updateCacheWithIndividualMessage(queryClient, individualMessageQueryKey, deletedRoot)
|
|
179
|
+
return
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
queryClient.setQueryData<MessagesQueryData>(messagesQueryKey, prev =>
|
|
183
|
+
deleteRecordInPagesData({ data: prev, record: message })
|
|
184
|
+
)
|
|
185
|
+
|
|
186
|
+
if (message.replyRootId) {
|
|
187
|
+
const threadedMessagesQueryKey = getThreadedMessagesQueryKey(
|
|
188
|
+
conversationId,
|
|
189
|
+
message.replyRootId
|
|
190
|
+
)
|
|
191
|
+
queryClient.setQueryData<MessagesQueryData>(threadedMessagesQueryKey, prev =>
|
|
192
|
+
deleteRecordInPagesData({ data: prev, record: message })
|
|
193
|
+
)
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
|
|
150
197
|
export function mergeMessageUpdate(
|
|
151
198
|
record: MessageResource,
|
|
152
199
|
current?: MessageResource
|