@planningcenter/chat-react-native 4.2.2 → 4.2.3-qa-staging.0

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.
Files changed (245) hide show
  1. package/build/components/conversation/attachments/giphy_attachment.d.ts.map +1 -1
  2. package/build/components/conversation/attachments/giphy_attachment.js +2 -2
  3. package/build/components/conversation/attachments/giphy_attachment.js.map +1 -1
  4. package/build/components/conversation/message_form.d.ts +2 -1
  5. package/build/components/conversation/message_form.d.ts.map +1 -1
  6. package/build/components/conversation/message_form.js +168 -371
  7. package/build/components/conversation/message_form.js.map +1 -1
  8. package/build/components/conversation/message_list.d.ts +5 -2
  9. package/build/components/conversation/message_list.d.ts.map +1 -1
  10. package/build/components/conversation/message_list.js +187 -67
  11. package/build/components/conversation/message_list.js.map +1 -1
  12. package/build/components/conversation/missing_message.d.ts +2 -0
  13. package/build/components/conversation/missing_message.d.ts.map +1 -0
  14. package/build/components/conversation/missing_message.js +139 -0
  15. package/build/components/conversation/missing_message.js.map +1 -0
  16. package/build/components/conversation/system_message.js +3 -3
  17. package/build/components/conversation/system_message.js.map +1 -1
  18. package/build/components/display/conversation_avatar.d.ts +1 -2
  19. package/build/components/display/conversation_avatar.d.ts.map +1 -1
  20. package/build/components/display/conversation_avatar.js.map +1 -1
  21. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts +4 -3
  22. package/build/hooks/groups/use_group_members_for_new_conversation.d.ts.map +1 -1
  23. package/build/hooks/index.d.ts +1 -0
  24. package/build/hooks/index.d.ts.map +1 -1
  25. package/build/hooks/index.js +1 -0
  26. package/build/hooks/index.js.map +1 -1
  27. package/build/hooks/use_conversation_messages.d.ts +14 -5
  28. package/build/hooks/use_conversation_messages.d.ts.map +1 -1
  29. package/build/hooks/use_conversation_messages.js +218 -42
  30. package/build/hooks/use_conversation_messages.js.map +1 -1
  31. package/build/hooks/use_conversation_messages_jolt_events.d.ts.map +1 -1
  32. package/build/hooks/use_conversation_messages_jolt_events.js +58 -42
  33. package/build/hooks/use_conversation_messages_jolt_events.js.map +1 -1
  34. package/build/hooks/use_debounced_search_term.d.ts +2 -0
  35. package/build/hooks/use_debounced_search_term.d.ts.map +1 -0
  36. package/build/hooks/use_debounced_search_term.js +40 -0
  37. package/build/hooks/use_debounced_search_term.js.map +1 -0
  38. package/build/hooks/use_direct_message_eligibility.d.ts +14 -0
  39. package/build/hooks/use_direct_message_eligibility.d.ts.map +1 -0
  40. package/build/hooks/use_direct_message_eligibility.js +87 -0
  41. package/build/hooks/use_direct_message_eligibility.js.map +1 -0
  42. package/build/hooks/use_features.d.ts +2 -1
  43. package/build/hooks/use_features.d.ts.map +1 -1
  44. package/build/hooks/use_features.js +2 -1
  45. package/build/hooks/use_features.js.map +1 -1
  46. package/build/hooks/use_mark_latest_message_read.d.ts +2 -1
  47. package/build/hooks/use_mark_latest_message_read.d.ts.map +1 -1
  48. package/build/hooks/use_mark_latest_message_read.js +4 -3
  49. package/build/hooks/use_mark_latest_message_read.js.map +1 -1
  50. package/build/hooks/use_read_receipts.d.ts +4 -3
  51. package/build/hooks/use_read_receipts.d.ts.map +1 -1
  52. package/build/hooks/use_search_results.d.ts +19 -0
  53. package/build/hooks/use_search_results.d.ts.map +1 -0
  54. package/build/hooks/use_search_results.js +153 -0
  55. package/build/hooks/use_search_results.js.map +1 -0
  56. package/build/hooks/use_suspense_api.d.ts +10 -6
  57. package/build/hooks/use_suspense_api.d.ts.map +1 -1
  58. package/build/hooks/use_suspense_api.js +83 -63
  59. package/build/hooks/use_suspense_api.js.map +1 -1
  60. package/build/navigation/index.d.ts +5 -0
  61. package/build/navigation/index.d.ts.map +1 -1
  62. package/build/navigation/index.js +5 -0
  63. package/build/navigation/index.js.map +1 -1
  64. package/build/screens/age_check/age_check_underage_screen.d.ts.map +1 -1
  65. package/build/screens/age_check/age_check_underage_screen.js +3 -2
  66. package/build/screens/age_check/age_check_underage_screen.js.map +1 -1
  67. package/build/screens/bug_report_screen.d.ts.map +1 -1
  68. package/build/screens/bug_report_screen.js +2 -2
  69. package/build/screens/bug_report_screen.js.map +1 -1
  70. package/build/screens/conversation_new/components/services_form.js +9 -8
  71. package/build/screens/conversation_new/components/services_form.js.map +1 -1
  72. package/build/screens/conversation_screen.d.ts +1 -0
  73. package/build/screens/conversation_screen.d.ts.map +1 -1
  74. package/build/screens/conversation_screen.js +305 -203
  75. package/build/screens/conversation_screen.js.map +1 -1
  76. package/build/screens/conversation_select_recipients/components/view_more_link_row.d.ts +2 -1
  77. package/build/screens/conversation_select_recipients/components/view_more_link_row.d.ts.map +1 -1
  78. package/build/screens/conversation_select_recipients/components/view_more_link_row.js +39 -24
  79. package/build/screens/conversation_select_recipients/components/view_more_link_row.js.map +1 -1
  80. package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.d.ts.map +1 -1
  81. package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.js +142 -158
  82. package/build/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.js.map +1 -1
  83. package/build/screens/conversations/components/search_list_header_component.d.ts.map +1 -1
  84. package/build/screens/conversations/components/search_list_header_component.js +159 -133
  85. package/build/screens/conversations/components/search_list_header_component.js.map +1 -1
  86. package/build/screens/get_help_screen.js +4 -4
  87. package/build/screens/get_help_screen.js.map +1 -1
  88. package/build/screens/message_actions_screen.d.ts.map +1 -1
  89. package/build/screens/message_actions_screen.js +109 -94
  90. package/build/screens/message_actions_screen.js.map +1 -1
  91. package/build/screens/notification_settings/hooks/groups.d.ts +4 -3
  92. package/build/screens/notification_settings/hooks/groups.d.ts.map +1 -1
  93. package/build/screens/search/components/conversation_result_row.d.ts +8 -0
  94. package/build/screens/search/components/conversation_result_row.d.ts.map +1 -0
  95. package/build/screens/search/components/conversation_result_row.js +80 -0
  96. package/build/screens/search/components/conversation_result_row.js.map +1 -0
  97. package/build/screens/search/components/conversation_results.d.ts +8 -0
  98. package/build/screens/search/components/conversation_results.d.ts.map +1 -0
  99. package/build/screens/search/components/conversation_results.js +77 -0
  100. package/build/screens/search/components/conversation_results.js.map +1 -0
  101. package/build/screens/search/components/message_result_row.d.ts +8 -0
  102. package/build/screens/search/components/message_result_row.d.ts.map +1 -0
  103. package/build/screens/search/components/message_result_row.js +152 -0
  104. package/build/screens/search/components/message_result_row.js.map +1 -0
  105. package/build/screens/search/components/result_row.d.ts +10 -0
  106. package/build/screens/search/components/result_row.d.ts.map +1 -0
  107. package/build/screens/search/components/result_row.js +102 -0
  108. package/build/screens/search/components/result_row.js.map +1 -0
  109. package/build/screens/search/components/results_section.d.ts +9 -0
  110. package/build/screens/search/components/results_section.d.ts.map +1 -0
  111. package/build/screens/search/components/results_section.js +51 -0
  112. package/build/screens/search/components/results_section.js.map +1 -0
  113. package/build/screens/search/components/search_blank_states.d.ts +7 -0
  114. package/build/screens/search/components/search_blank_states.d.ts.map +1 -0
  115. package/build/screens/search/components/search_blank_states.js +72 -0
  116. package/build/screens/search/components/search_blank_states.js.map +1 -0
  117. package/build/screens/search/components/search_field.d.ts +7 -0
  118. package/build/screens/search/components/search_field.d.ts.map +1 -0
  119. package/build/screens/search/components/search_field.js +152 -0
  120. package/build/screens/search/components/search_field.js.map +1 -0
  121. package/build/screens/search/components/search_results_list.d.ts +8 -0
  122. package/build/screens/search/components/search_results_list.d.ts.map +1 -0
  123. package/build/screens/search/components/search_results_list.js +314 -0
  124. package/build/screens/search/components/search_results_list.js.map +1 -0
  125. package/build/screens/search/components/snippet.d.ts +8 -0
  126. package/build/screens/search/components/snippet.d.ts.map +1 -0
  127. package/build/screens/search/components/snippet.js +68 -0
  128. package/build/screens/search/components/snippet.js.map +1 -0
  129. package/build/screens/search/search_screen.d.ts +5 -0
  130. package/build/screens/search/search_screen.d.ts.map +1 -0
  131. package/build/screens/search/search_screen.js +68 -0
  132. package/build/screens/search/search_screen.js.map +1 -0
  133. package/build/types/api_primitives.d.ts +1 -0
  134. package/build/types/api_primitives.d.ts.map +1 -1
  135. package/build/types/api_primitives.js.map +1 -1
  136. package/build/types/resources/conversation.d.ts +1 -0
  137. package/build/types/resources/conversation.d.ts.map +1 -1
  138. package/build/types/resources/conversation.js.map +1 -1
  139. package/build/types/resources/index.d.ts +1 -0
  140. package/build/types/resources/index.d.ts.map +1 -1
  141. package/build/types/resources/index.js +1 -0
  142. package/build/types/resources/index.js.map +1 -1
  143. package/build/types/resources/member.d.ts +1 -0
  144. package/build/types/resources/member.d.ts.map +1 -1
  145. package/build/types/resources/member.js.map +1 -1
  146. package/build/types/resources/search_result.d.ts +29 -0
  147. package/build/types/resources/search_result.d.ts.map +1 -0
  148. package/build/types/resources/search_result.js +2 -0
  149. package/build/types/resources/search_result.js.map +1 -0
  150. package/build/utils/cache/messages_cache.d.ts +1 -0
  151. package/build/utils/cache/messages_cache.d.ts.map +1 -1
  152. package/build/utils/cache/messages_cache.js +37 -1
  153. package/build/utils/cache/messages_cache.js.map +1 -1
  154. package/build/utils/cache/messages_window.d.ts +11 -0
  155. package/build/utils/cache/messages_window.d.ts.map +1 -0
  156. package/build/utils/cache/messages_window.js +51 -0
  157. package/build/utils/cache/messages_window.js.map +1 -0
  158. package/build/utils/client/request_helpers.js +1 -1
  159. package/build/utils/client/request_helpers.js.map +1 -1
  160. package/build/utils/client/types.d.ts +1 -0
  161. package/build/utils/client/types.d.ts.map +1 -1
  162. package/build/utils/client/types.js.map +1 -1
  163. package/build/utils/group_messages.js +4 -1
  164. package/build/utils/group_messages.js.map +1 -1
  165. package/build/utils/request/get_search_results.d.ts +13 -0
  166. package/build/utils/request/get_search_results.d.ts.map +1 -0
  167. package/build/utils/request/get_search_results.js +20 -0
  168. package/build/utils/request/get_search_results.js.map +1 -0
  169. package/package.json +3 -3
  170. package/src/__tests__/components/conversation/attachments/giphy_attachment.test.tsx +76 -0
  171. package/src/__tests__/hooks/use_direct_message_eligibility.test.tsx +83 -0
  172. package/src/__tests__/hooks/use_features.test.ts +10 -2
  173. package/src/__tests__/screens/conversation_new/components/services_form.test.tsx +91 -0
  174. package/src/__tests__/screens/get_help_screen.test.ts +40 -0
  175. package/src/__tests__/screens/message_actions_screen.test.tsx +136 -0
  176. package/src/__tests__/utils/client.ts +3 -4
  177. package/src/__utils__/query_client.ts +3 -0
  178. package/src/components/conversation/__tests__/message_form.test.tsx +78 -0
  179. package/src/components/conversation/attachments/giphy_attachment.tsx +2 -3
  180. package/src/components/conversation/message_form.tsx +31 -3
  181. package/src/components/conversation/message_list.tsx +88 -4
  182. package/src/components/conversation/missing_message.tsx +66 -0
  183. package/src/components/conversation/system_message.tsx +3 -3
  184. package/src/components/display/conversation_avatar.tsx +1 -10
  185. package/src/hooks/__tests__/use_conversation_messages.test.tsx +333 -0
  186. package/src/hooks/__tests__/use_conversation_messages_jolt_events.test.tsx +87 -0
  187. package/src/hooks/__tests__/use_debounced_search_term.test.tsx +38 -0
  188. package/src/hooks/__tests__/use_mark_latest_message_read.test.tsx +33 -0
  189. package/src/hooks/__tests__/use_message_create_or_update.test.tsx +2 -7
  190. package/src/hooks/__tests__/use_search_results.test.tsx +88 -0
  191. package/src/hooks/index.ts +1 -0
  192. package/src/hooks/use_conversation_messages.ts +103 -17
  193. package/src/hooks/use_conversation_messages_jolt_events.ts +12 -2
  194. package/src/hooks/use_debounced_search_term.ts +20 -0
  195. package/src/hooks/use_direct_message_eligibility.ts +40 -0
  196. package/src/hooks/use_features.ts +3 -2
  197. package/src/hooks/use_mark_latest_message_read.ts +4 -3
  198. package/src/hooks/use_search_results.ts +78 -0
  199. package/src/hooks/use_suspense_api.ts +14 -6
  200. package/src/navigation/index.tsx +5 -0
  201. package/src/screens/age_check/age_check_underage_screen.tsx +3 -2
  202. package/src/screens/bug_report_screen.tsx +2 -10
  203. package/src/screens/conversation_new/components/services_form.tsx +5 -5
  204. package/src/screens/conversation_screen.tsx +62 -13
  205. package/src/screens/conversation_select_recipients/components/view_more_link_row.tsx +12 -3
  206. package/src/screens/conversation_select_recipients/conversation_select_direct_message_recipients_screen.tsx +3 -8
  207. package/src/screens/conversations/components/__tests__/search_list_header_component.test.tsx +62 -0
  208. package/src/screens/conversations/components/search_list_header_component.tsx +11 -0
  209. package/src/screens/get_help_screen.tsx +4 -4
  210. package/src/screens/message_actions_screen.tsx +18 -3
  211. package/src/screens/search/__tests__/search_screen.test.tsx +64 -0
  212. package/src/screens/search/components/__tests__/conversation_results.test.tsx +55 -0
  213. package/src/screens/search/components/__tests__/message_result_row.test.tsx +65 -0
  214. package/src/screens/search/components/__tests__/result_row.test.tsx +33 -0
  215. package/src/screens/search/components/__tests__/search_blank_states.test.tsx +20 -0
  216. package/src/screens/search/components/__tests__/search_field.test.tsx +29 -0
  217. package/src/screens/search/components/__tests__/search_results_list.test.tsx +135 -0
  218. package/src/screens/search/components/conversation_result_row.tsx +36 -0
  219. package/src/screens/search/components/conversation_results.tsx +39 -0
  220. package/src/screens/search/components/message_result_row.tsx +48 -0
  221. package/src/screens/search/components/result_row.tsx +58 -0
  222. package/src/screens/search/components/results_section.tsx +34 -0
  223. package/src/screens/search/components/search_blank_states.tsx +34 -0
  224. package/src/screens/search/components/search_field.tsx +81 -0
  225. package/src/screens/search/components/search_results_list.tsx +147 -0
  226. package/src/screens/search/components/snippet.tsx +37 -0
  227. package/src/screens/search/search_screen.tsx +49 -0
  228. package/src/types/api_primitives.ts +1 -0
  229. package/src/types/resources/conversation.ts +9 -0
  230. package/src/types/resources/index.ts +1 -0
  231. package/src/types/resources/member.ts +1 -0
  232. package/src/types/resources/search_result.ts +32 -0
  233. package/src/utils/__tests__/get_search_results.test.ts +24 -0
  234. package/src/utils/__tests__/group_messages.test.ts +29 -0
  235. package/src/utils/cache/__tests__/messages_cache.test.ts +2 -1
  236. package/src/utils/cache/__tests__/messages_cache_deletion.test.ts +97 -0
  237. package/src/utils/cache/__tests__/messages_cache_reply_roots.test.ts +3 -2
  238. package/src/utils/cache/__tests__/messages_window.test.ts +78 -0
  239. package/src/utils/cache/messages_cache.ts +45 -1
  240. package/src/utils/cache/messages_window.ts +55 -0
  241. package/src/utils/client/__tests__/request_helpers.test.ts +40 -0
  242. package/src/utils/client/request_helpers.ts +1 -1
  243. package/src/utils/client/types.ts +1 -0
  244. package/src/utils/group_messages.ts +4 -1
  245. package/src/utils/request/get_search_results.ts +23 -0
@@ -0,0 +1,49 @@
1
+ import { ParamListBase } from '@react-navigation/native'
2
+ import {
3
+ NativeStackNavigationOptions,
4
+ NativeStackScreenProps,
5
+ } from '@react-navigation/native-stack'
6
+ import { noop } from 'lodash'
7
+ import React, { useState } from 'react'
8
+ import { StyleSheet, View } from 'react-native'
9
+ import { KeyboardView } from '../../components'
10
+ import {
11
+ composeOptions,
12
+ withMinimalBack,
13
+ } from '../../components/display/platform_modal_header_buttons'
14
+ import { useDebouncedSearchTerm } from '../../hooks/use_debounced_search_term'
15
+ import { SearchPromptBlankState } from './components/search_blank_states'
16
+ import { SearchField } from './components/search_field'
17
+ import { SearchResultsList } from './components/search_results_list'
18
+
19
+ export const SearchScreenOptions = ({
20
+ navigation,
21
+ }: NativeStackScreenProps<ParamListBase>): NativeStackNavigationOptions =>
22
+ composeOptions(
23
+ { title: 'Search', animation: 'fade' },
24
+ withMinimalBack({ onPress: () => navigation.goBack() })
25
+ )
26
+
27
+ export function SearchScreen() {
28
+ const [term, setTerm] = useState('')
29
+ const debouncedTerm = useDebouncedSearchTerm(term)
30
+
31
+ return (
32
+ <KeyboardView>
33
+ <View style={styles.container} testID="search-screen">
34
+ <SearchField term={term} onChange={setTerm} />
35
+ {debouncedTerm.length > 0 ? (
36
+ <SearchResultsList key={debouncedTerm} term={debouncedTerm} onSelect={noop} />
37
+ ) : (
38
+ <SearchPromptBlankState />
39
+ )}
40
+ </View>
41
+ </KeyboardView>
42
+ )
43
+ }
44
+
45
+ const styles = StyleSheet.create({
46
+ container: {
47
+ flex: 1,
48
+ },
49
+ })
@@ -39,6 +39,7 @@ export interface CollectionMeta {
39
39
  count: number
40
40
  totalCount: number
41
41
  next?: NextPageCursor
42
+ prev?: NextPageCursor
42
43
  parent?: ResourceObject
43
44
  [attributeName: string]: unknown
44
45
  }
@@ -46,3 +46,12 @@ export interface ConversationResource {
46
46
  unreadReaction: boolean
47
47
  updatedAt: string
48
48
  }
49
+
50
+ export type ConversationAvatarData = Pick<
51
+ ConversationResource,
52
+ | 'customAvatarType'
53
+ | 'customAvatarKey'
54
+ | 'customAvatarColor'
55
+ | 'customAvatarImageUrl'
56
+ | 'previewAvatarUrls'
57
+ >
@@ -14,3 +14,4 @@ export * from './services'
14
14
  export * from './organization'
15
15
  export * from './group_membership'
16
16
  export * from './group_resource'
17
+ export * from './search_result'
@@ -6,6 +6,7 @@ export interface MemberResource {
6
6
  badges: MemberBadge[]
7
7
  child: boolean
8
8
  directMessagesDisabled?: boolean
9
+ canDirectMessage?: boolean
9
10
  gender: string | null
10
11
  role?: string
11
12
  }
@@ -0,0 +1,32 @@
1
+ import type { ConversationAvatarData } from './conversation'
2
+
3
+ interface BaseSearchResultResource {
4
+ id: string
5
+ title: string
6
+ url: string
7
+ }
8
+
9
+ export interface SnippetSegment {
10
+ text: string
11
+ match: boolean
12
+ }
13
+
14
+ export interface ConversationSearchResultResource extends BaseSearchResultResource {
15
+ type: 'conversation'
16
+ extra: {
17
+ avatar: ConversationAvatarData
18
+ }
19
+ }
20
+
21
+ export interface MessageSearchResultResource extends BaseSearchResultResource {
22
+ type: 'message'
23
+ extra: {
24
+ conversationId: number
25
+ authorName: string
26
+ snippet: SnippetSegment[]
27
+ createdAt: string
28
+ avatar: ConversationAvatarData
29
+ }
30
+ }
31
+
32
+ export type SearchResultResource = ConversationSearchResultResource | MessageSearchResultResource
@@ -0,0 +1,24 @@
1
+ import {
2
+ getSearchResultsQueryKey,
3
+ getSearchResultsRequestArgs,
4
+ } from '../request/get_search_results'
5
+
6
+ describe('getSearchResultsRequestArgs', () => {
7
+ it('requests the first page of search results for the term', () => {
8
+ expect(getSearchResultsRequestArgs('potluck')).toEqual({
9
+ url: '/search_results',
10
+ data: {
11
+ q: 'potluck',
12
+ perPage: 20,
13
+ fields: { SearchResult: ['type', 'title', 'url', 'extra'] },
14
+ },
15
+ })
16
+ })
17
+ })
18
+
19
+ describe('getSearchResultsQueryKey', () => {
20
+ it('changes with the term', () => {
21
+ expect(getSearchResultsQueryKey('potluck')).not.toEqual(getSearchResultsQueryKey('picnic'))
22
+ expect(getSearchResultsQueryKey('potluck')).toEqual(getSearchResultsQueryKey('potluck'))
23
+ })
24
+ })
@@ -170,6 +170,35 @@ describe('groupMessages — reply roots', () => {
170
170
 
171
171
  expect(findShadow(enriched, '02-rootA')).toMatchObject({ replyRoot: null })
172
172
  })
173
+
174
+ it.each([
175
+ ['is still saving', { pending: true }],
176
+ ['failed to save', { error: 'Failed to send message' }],
177
+ ])('keeps the saved snapshot while a root edit %s', (_label, unsavedState) => {
178
+ const snapshot = message('rootA', { replyRootId: 'rootA', text: 'saved' })
179
+ const messages = [
180
+ message('03', { replyRootId: 'rootA', replyRoot: snapshot }),
181
+ message('02'),
182
+ message('rootA', { replyRootId: 'rootA', text: 'unsaved', ...unsavedState }),
183
+ ]
184
+
185
+ const enriched = groupMessages({ ms: messages })
186
+
187
+ expect(findShadow(enriched, '03-rootA')).toMatchObject({ replyRoot: { text: 'saved' } })
188
+ expect((findEnriched(enriched, 'rootA') as MessageResource).text).toBe('unsaved')
189
+ })
190
+
191
+ it('shows the unsaved root edit when the reply carries no snapshot to fall back on', () => {
192
+ const messages = [
193
+ message('03', { replyRootId: 'rootA' }),
194
+ message('02'),
195
+ message('rootA', { replyRootId: 'rootA', text: 'unsaved', pending: true }),
196
+ ]
197
+
198
+ const enriched = groupMessages({ ms: messages })
199
+
200
+ expect(findShadow(enriched, '03-rootA')).toMatchObject({ replyRoot: { text: 'unsaved' } })
201
+ })
173
202
  })
174
203
 
175
204
  describe('groupMessages — system messages', () => {
@@ -1,4 +1,5 @@
1
1
  import { InfiniteData, QueryClient } from '@tanstack/react-query'
2
+ import { buildTestQueryClient } from '../../../__utils__/query_client'
2
3
  import type { ApiCollection, MessageResource } from '../../../types'
3
4
  import type { PersonResource } from '../../../types/resources/person'
4
5
  import { updateCacheWithMessage } from '../messages_cache'
@@ -44,7 +45,7 @@ describe('updateCacheWithMessage on message.created', () => {
44
45
  let queryClient: QueryClient
45
46
 
46
47
  beforeEach(() => {
47
- queryClient = new QueryClient()
48
+ queryClient = buildTestQueryClient()
48
49
  seed(
49
50
  queryClient,
50
51
  message({ id: '01B-temp', idempotentKey: 'key-b', pending: true }),
@@ -0,0 +1,97 @@
1
+ import { InfiniteData, QueryClient } from '@tanstack/react-query'
2
+ import { buildTestQueryClient } from '../../../__utils__/query_client'
3
+ import type { ApiCollection, ApiResource, MessageResource } from '../../../types'
4
+ import type { PersonResource } from '../../../types/resources/person'
5
+ import { getMessageQueryKey } from '../../request/get_message'
6
+ import { getMessagesQueryKey } from '../../request/get_messages'
7
+ import { applyMessageDeletionToCaches, getThreadedMessagesQueryKey } from '../messages_cache'
8
+
9
+ type MessagesQueryData = InfiniteData<ApiCollection<MessageResource>>
10
+
11
+ const conversation_id = 7
12
+ const author = { id: 1, type: 'Person', name: 'Gina', avatar: null } as unknown as PersonResource
13
+
14
+ const message = (id: string, overrides: Partial<MessageResource> = {}): MessageResource =>
15
+ ({
16
+ type: 'Message',
17
+ id,
18
+ text: `msg ${id}`,
19
+ html: '',
20
+ createdAt: '2026-01-01T00:00:00Z',
21
+ deletedAt: null,
22
+ textEditedAt: null,
23
+ mine: true,
24
+ attachments: [],
25
+ author,
26
+ reactionCounts: [],
27
+ replyCount: 0,
28
+ replyRootId: null,
29
+ messageType: 'message',
30
+ ...overrides,
31
+ }) as MessageResource
32
+
33
+ const mainKey = getMessagesQueryKey({ conversation_id })
34
+ const threadKey = getThreadedMessagesQueryKey(conversation_id, 'root')
35
+ const rootKey = getMessageQueryKey({ conversation_id, messageId: 'root' })
36
+
37
+ const seedPages = (queryClient: QueryClient, queryKey: unknown[], messages: MessageResource[]) =>
38
+ queryClient.setQueryData<MessagesQueryData>(queryKey, {
39
+ pageParams: [{}],
40
+ pages: [{ data: messages, links: {}, meta: { count: messages.length, totalCount: 1 } }],
41
+ })
42
+
43
+ const pageMessages = (queryClient: QueryClient, queryKey: unknown[]) =>
44
+ queryClient.getQueryData<MessagesQueryData>(queryKey)!.pages[0].data
45
+
46
+ describe('applyMessageDeletionToCaches', () => {
47
+ let queryClient: QueryClient
48
+ const root = message('root', {
49
+ replyRootId: 'root',
50
+ replyCount: 1,
51
+ text: 'What are our prayer requests?',
52
+ })
53
+ const reply = message('reply', { replyRootId: 'root', replyRoot: root, text: 'Smith family' })
54
+
55
+ beforeEach(() => {
56
+ queryClient = buildTestQueryClient()
57
+ seedPages(queryClient, mainKey, [reply, message('other'), root])
58
+ seedPages(queryClient, threadKey, [reply, root])
59
+ queryClient.setQueryData<ApiResource<MessageResource>>(rootKey, {
60
+ data: root,
61
+ links: {},
62
+ meta: {},
63
+ })
64
+ })
65
+
66
+ it('marks a deleted reply root as deleted everywhere it is cached and keeps its replies', () => {
67
+ applyMessageDeletionToCaches(queryClient, conversation_id, root)
68
+
69
+ const [threadReply, threadRoot] = pageMessages(queryClient, threadKey)
70
+ expect(threadRoot.deletedAt).toEqual(expect.any(String))
71
+ expect(threadReply).toMatchObject({ id: 'reply', text: 'Smith family' })
72
+ expect(threadReply.replyRoot?.deletedAt).toEqual(expect.any(String))
73
+
74
+ const [mainReply, , mainRoot] = pageMessages(queryClient, mainKey)
75
+ expect(mainRoot.deletedAt).toEqual(expect.any(String))
76
+ expect(mainReply.replyRoot?.deletedAt).toEqual(expect.any(String))
77
+
78
+ expect(queryClient.getQueryData<ApiResource<MessageResource>>(rootKey)!.data.deletedAt).toEqual(
79
+ expect.any(String)
80
+ )
81
+ })
82
+
83
+ it('removes a deleted reply from the thread and conversation caches but leaves the root', () => {
84
+ applyMessageDeletionToCaches(queryClient, conversation_id, reply)
85
+
86
+ expect(pageMessages(queryClient, threadKey).map(m => m.id)).toEqual(['root'])
87
+ expect(pageMessages(queryClient, mainKey).map(m => m.id)).toEqual(['other', 'root'])
88
+ expect(pageMessages(queryClient, threadKey)[0].deletedAt).toBeNull()
89
+ })
90
+
91
+ it('removes a plain message from the conversation cache without touching thread caches', () => {
92
+ applyMessageDeletionToCaches(queryClient, conversation_id, message('other'))
93
+
94
+ expect(pageMessages(queryClient, mainKey).map(m => m.id)).toEqual(['reply', 'root'])
95
+ expect(pageMessages(queryClient, threadKey).map(m => m.id)).toEqual(['reply', 'root'])
96
+ })
97
+ })
@@ -1,4 +1,5 @@
1
1
  import { InfiniteData, QueryClient } from '@tanstack/react-query'
2
+ import { buildTestQueryClient } from '../../../__utils__/query_client'
2
3
  import type { ApiCollection } from '../../../types'
3
4
  import type { MessageResource } from '../../../types/resources/message'
4
5
  import type { PersonResource } from '../../../types/resources/person'
@@ -39,7 +40,7 @@ const pageMessages = (queryClient: QueryClient) =>
39
40
 
40
41
  describe('updateCacheReplyRoots', () => {
41
42
  it('merges a root update into every reply carrying that root', () => {
42
- const queryClient = new QueryClient()
43
+ const queryClient = buildTestQueryClient()
43
44
  const root = message('rootA', { replyRootId: 'rootA', text: 'before' })
44
45
  seedPages(queryClient, [
45
46
  message('03', { replyRootId: 'rootA', replyRoot: root }),
@@ -60,7 +61,7 @@ describe('updateCacheReplyRoots', () => {
60
61
  })
61
62
 
62
63
  it('ignores replies without an inline root', () => {
63
- const queryClient = new QueryClient()
64
+ const queryClient = buildTestQueryClient()
64
65
  seedPages(queryClient, [message('01', { replyRootId: 'rootA' })])
65
66
 
66
67
  updateCacheReplyRoots(queryClient, queryKey, message('rootA', { replyRootId: 'rootA' }))
@@ -0,0 +1,78 @@
1
+ import type { ApiCollection, MessageResource } from '../../../types'
2
+ import {
3
+ anchoredPageParam,
4
+ isBehindLiveEdge,
5
+ livePageParam,
6
+ markLiveIfCaughtUp,
7
+ MessagesWindow,
8
+ newestFirst,
9
+ } from '../messages_window'
10
+
11
+ const page = (meta: Partial<ApiCollection<MessageResource>['meta']> = {}) => ({
12
+ data: [],
13
+ links: {},
14
+ meta: { count: 0, totalCount: 0, ...meta },
15
+ })
16
+
17
+ const window = (
18
+ pageParam: MessagesWindow['pageParams'][number],
19
+ meta?: Partial<ApiCollection<MessageResource>['meta']>
20
+ ): MessagesWindow => ({ pages: [page(meta)], pageParams: [pageParam] })
21
+
22
+ describe('isBehindLiveEdge', () => {
23
+ it('is behind while the first page reports newer messages', () => {
24
+ expect(isBehindLiveEdge(window(anchoredPageParam('A'), { prev: { idGt: 'A' } }))).toBe(true)
25
+ })
26
+
27
+ it('is live otherwise', () => {
28
+ expect(isBehindLiveEdge(window(livePageParam))).toBe(false)
29
+ expect(isBehindLiveEdge(window(anchoredPageParam('A')))).toBe(false)
30
+ expect(isBehindLiveEdge(undefined)).toBe(false)
31
+ })
32
+ })
33
+
34
+ describe('markLiveIfCaughtUp', () => {
35
+ it('turns an anchored window with no newer side into the live window', () => {
36
+ const data = window(anchoredPageParam('A'))
37
+
38
+ expect(markLiveIfCaughtUp(data)?.pageParams).toEqual([livePageParam])
39
+ })
40
+
41
+ it('turns a window topped by a newer page into the live window once it catches up', () => {
42
+ const data = window({ where: { id_gt: 'A' }, order: 'asc' })
43
+
44
+ expect(markLiveIfCaughtUp(data)?.pageParams).toEqual([livePageParam])
45
+ })
46
+
47
+ it('leaves an anchored window that is still behind untouched', () => {
48
+ const data = window(anchoredPageParam('A'), { prev: { idGt: 'A' } })
49
+
50
+ expect(markLiveIfCaughtUp(data)).toBe(data)
51
+ })
52
+
53
+ it('leaves a live window untouched', () => {
54
+ const data = window(livePageParam)
55
+
56
+ expect(markLiveIfCaughtUp(data)).toBe(data)
57
+ })
58
+ })
59
+
60
+ describe('newestFirst', () => {
61
+ const row = (id: string) => ({ id, type: 'Message' }) as MessageResource
62
+ const ascPage = {
63
+ ...page({ next: { idGt: 'E' } }),
64
+ data: [row('D'), row('E')],
65
+ }
66
+
67
+ it('stores a newer page newest first, linking newer onward and back to older rows', () => {
68
+ const result = newestFirst(ascPage, { where: { id_gt: 'C' }, order: 'asc' })
69
+
70
+ expect(result.data.map(m => m.id)).toEqual(['E', 'D'])
71
+ expect(result.meta.prev).toEqual({ idGt: 'E' })
72
+ expect(result.meta.next).toEqual({ idLt: 'D' })
73
+ })
74
+
75
+ it('leaves newest-first pages alone', () => {
76
+ expect(newestFirst(ascPage, anchoredPageParam('A'))).toBe(ascPage)
77
+ })
78
+ })
@@ -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 { getMessagesRequestArgs } from '../request/get_messages'
6
+ import { getMessageQueryKey } from '../request/get_message'
7
+ import { getMessagesQueryKey, getMessagesRequestArgs } from '../request/get_messages'
7
8
  import {
8
9
  updateAllRecordsInPagesData,
9
10
  updateOrCreateRecordInPagesData,
@@ -147,6 +148,49 @@ export function getThreadedMessagesQueryKey(conversationId: number, replyRootId:
147
148
  return getRequestQueryKey(requestArgs)
148
149
  }
149
150
 
151
+ export function applyMessageDeletionToCaches(
152
+ queryClient: QueryClient,
153
+ conversationId: number,
154
+ message: MessageResource
155
+ ) {
156
+ const messagesQueryKey = getMessagesQueryKey({ conversation_id: conversationId })
157
+ const isReplyRoot = message.replyRootId === message.id
158
+
159
+ if (isReplyRoot) {
160
+ const deletedRoot: MessageResource = {
161
+ ...message,
162
+ deletedAt: message.deletedAt ?? new Date().toISOString(),
163
+ attachments: [],
164
+ }
165
+ const threadedMessagesQueryKey = getThreadedMessagesQueryKey(conversationId, message.id)
166
+ const individualMessageQueryKey = getMessageQueryKey({
167
+ conversation_id: conversationId,
168
+ messageId: message.id,
169
+ })
170
+
171
+ updateCacheWithMessage(queryClient, messagesQueryKey, deletedRoot, 'message.updated')
172
+ updateCacheWithMessage(queryClient, threadedMessagesQueryKey, deletedRoot, 'message.updated')
173
+ updateCacheReplyRoots(queryClient, messagesQueryKey, deletedRoot)
174
+ updateCacheReplyRoots(queryClient, threadedMessagesQueryKey, deletedRoot)
175
+ updateCacheWithIndividualMessage(queryClient, individualMessageQueryKey, deletedRoot)
176
+ return
177
+ }
178
+
179
+ queryClient.setQueryData<MessagesQueryData>(messagesQueryKey, prev =>
180
+ deleteRecordInPagesData({ data: prev, record: message })
181
+ )
182
+
183
+ if (message.replyRootId) {
184
+ const threadedMessagesQueryKey = getThreadedMessagesQueryKey(
185
+ conversationId,
186
+ message.replyRootId
187
+ )
188
+ queryClient.setQueryData<MessagesQueryData>(threadedMessagesQueryKey, prev =>
189
+ deleteRecordInPagesData({ data: prev, record: message })
190
+ )
191
+ }
192
+ }
193
+
150
194
  export function mergeMessageUpdate(
151
195
  record: MessageResource,
152
196
  current?: MessageResource
@@ -0,0 +1,55 @@
1
+ import { InfiniteData } from '@tanstack/react-query'
2
+ import { ApiCollection, MessageResource } from '../../types'
3
+ import { RequestData } from '../client'
4
+
5
+ export type MessagesWindow = InfiniteData<
6
+ ApiCollection<MessageResource>,
7
+ Partial<RequestData> | undefined
8
+ >
9
+
10
+ export const livePageParam: Partial<RequestData> = {}
11
+
12
+ export const anchoredPageParam = (anchor: string): Partial<RequestData> => ({
13
+ where: { id_around: anchor },
14
+ })
15
+
16
+ export function isBehindLiveEdge(data: MessagesWindow | undefined): boolean {
17
+ return !!data?.pages[0]?.meta?.prev
18
+ }
19
+
20
+ export function newerPageParam(
21
+ firstPage: ApiCollection<MessageResource>
22
+ ): Partial<RequestData> | undefined {
23
+ const newestId = firstPage.meta?.prev?.idGt
24
+ if (!newestId) return undefined
25
+
26
+ // Without asc the server hands back the newest page instead, leaving a gap.
27
+ return { where: { id_gt: newestId }, order: 'asc' }
28
+ }
29
+
30
+ // The server returns newer pages oldest first, linking only to the next newer page.
31
+ // Storing them newest first with an older link lets a refetch replay the window
32
+ // forward from its top page like any other.
33
+ export function newestFirst<Page extends ApiCollection<MessageResource>>(
34
+ page: Page,
35
+ pageParam: Partial<RequestData> | undefined
36
+ ): Page {
37
+ if (pageParam?.order !== 'asc') return page
38
+
39
+ const data = [...page.data].reverse()
40
+ const oldest = data[data.length - 1]
41
+ return {
42
+ ...page,
43
+ data,
44
+ meta: { ...page.meta, prev: page.meta?.next, next: oldest && { idLt: oldest.id } },
45
+ }
46
+ }
47
+
48
+ export function markLiveIfCaughtUp(data: MessagesWindow | undefined): MessagesWindow | undefined {
49
+ if (!data) return data
50
+
51
+ const topIsLive = !data.pageParams[0]?.where
52
+ if (topIsLive || isBehindLiveEdge(data)) return data
53
+
54
+ return { ...data, pageParams: [livePageParam, ...data.pageParams.slice(1)] }
55
+ }
@@ -0,0 +1,40 @@
1
+ import { instrumentedFetch } from '../instrumented_fetch'
2
+ import { makeRequest } from '../request_helpers'
3
+
4
+ jest.mock('../instrumented_fetch', () => ({ instrumentedFetch: jest.fn() }))
5
+
6
+ const mockFetch = jest.mocked(instrumentedFetch)
7
+
8
+ const fetchedUrl = () => new URL(mockFetch.mock.calls[0][0])
9
+
10
+ const get = (data: Record<string, unknown>) =>
11
+ makeRequest({ action: 'GET', url: 'https://api.example.com/search_results', data, headers: {} })
12
+
13
+ describe('makeRequest', () => {
14
+ beforeEach(() => {
15
+ mockFetch.mockResolvedValue(new Response('{}', { status: 200 }))
16
+ })
17
+
18
+ afterEach(() => {
19
+ mockFetch.mockReset()
20
+ })
21
+
22
+ it('serializes data as snake_case query params', async () => {
23
+ await get({ q: 'potluck', perPage: 20 })
24
+
25
+ const { searchParams } = fetchedUrl()
26
+ expect(searchParams.get('q')).toBe('potluck')
27
+ expect(searchParams.get('per_page')).toBe('20')
28
+ })
29
+
30
+ it.each(['Pastor Bob', 'café', '#potluck', 'Q&A', '100%'])(
31
+ 'sends %p so the server reads it back unchanged',
32
+ async term => {
33
+ await get({ q: term })
34
+
35
+ const { search, searchParams } = fetchedUrl()
36
+ expect(searchParams.get('q')).toBe(term)
37
+ expect(() => decodeURIComponent(search)).not.toThrow()
38
+ }
39
+ )
40
+ })
@@ -33,7 +33,7 @@ export const makeRequest = ({ action = 'GET', url, data = {}, headers = {} }: Ma
33
33
 
34
34
  const body = ['POST', 'PATCH'].includes(action) ? JSON.stringify(data) : undefined
35
35
 
36
- return instrumentedFetch(decodeURIComponent(uri.toString()), {
36
+ return instrumentedFetch(uri.toString(), {
37
37
  method: action,
38
38
  headers,
39
39
  body,
@@ -65,4 +65,5 @@ export type RequestData = {
65
65
  data: Record<string, unknown>
66
66
  perPage: number
67
67
  offset: number
68
+ order: string
68
69
  }
@@ -74,7 +74,10 @@ function resolveReplyRoot(
74
74
  messagesById: Map<string, MessageResource>
75
75
  ): MessageResource | null {
76
76
  if (!message.replyRootId || message.replyRootId === message.id) return null
77
- return messagesById.get(message.replyRootId) ?? message.replyRoot ?? null
77
+ const loadedRoot = messagesById.get(message.replyRootId)
78
+ const loadedRootIsSaved = !!loadedRoot && !loadedRoot.pending && !loadedRoot.error
79
+ if (loadedRootIsSaved) return loadedRoot
80
+ return message.replyRoot ?? loadedRoot ?? null
78
81
  }
79
82
 
80
83
  function enrichSystemMessage(
@@ -0,0 +1,23 @@
1
+ import { getRequestQueryKey } from '../../hooks/use_suspense_api'
2
+
3
+ export const SEARCH_RESULTS_PAGE_SIZE = 20
4
+
5
+ export const getSearchResultsRequestArgs = (term: string) => {
6
+ const url = '/search_results'
7
+
8
+ return {
9
+ url,
10
+ data: {
11
+ q: term,
12
+ perPage: SEARCH_RESULTS_PAGE_SIZE,
13
+ fields: {
14
+ SearchResult: ['type', 'title', 'url', 'extra'],
15
+ },
16
+ },
17
+ }
18
+ }
19
+
20
+ export const getSearchResultsQueryKey = (term: string) => {
21
+ const requestArgs = getSearchResultsRequestArgs(term)
22
+ return getRequestQueryKey(requestArgs)
23
+ }