@planningcenter/chat-react-native 4.5.1-qa-staging.9 → 4.5.1-qa-staging.10

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.
@@ -1 +1 @@
1
- {"version":3,"file":"use_conversation_avatar_update.d.ts","sourceRoot":"","sources":["../../src/hooks/use_conversation_avatar_update.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAEzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,EAAE,SAAS,EAAgB,MAAM,kBAAkB,CAAA;AAG1D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;AAEnD,MAAM,MAAM,mBAAmB,GAC3B;IAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC3E;IAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAAC,UAAU,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnF;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAA;AAIrB,eAAO,MAAM,kCAAkC,GAAI,gBAAgB,MAAM,GAAG,SAAS,oCAOpF,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,oBAAoB;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE;;EAyDzF,CAAA;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAChD,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,OAAO,CAAC,mBAAmB,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,iBAiBzD;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,sBAAsB,EAChE,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,mBAAmB,GAC3B,CAAC,CAmCH"}
1
+ {"version":3,"file":"use_conversation_avatar_update.d.ts","sourceRoot":"","sources":["../../src/hooks/use_conversation_avatar_update.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,WAAW,EACX,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,UAAU,CAAA;AAGjB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,EAAE,SAAS,EAAgB,MAAM,kBAAkB,CAAA;AAG1D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;AAEnD,MAAM,MAAM,mBAAmB,GAC3B;IAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC3E;IAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAAC,UAAU,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnF;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAA;AAIrB,eAAO,MAAM,kCAAkC,GAAI,gBAAgB,MAAM,GAAG,SAAS,oCAQpF,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,oBAAoB;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE;;EAoEzF,CAAA;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,EAChD,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,OAAO,CAAC,mBAAmB,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,iBAiBzD;AAeD,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,sBAAsB,EAChE,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,mBAAmB,GAC3B,CAAC,CAmCH"}
@@ -1,6 +1,7 @@
1
1
  import { c as _c } from "react/compiler-runtime";
2
2
  import { useMutation, useMutationState, useQueryClient } from '@tanstack/react-query';
3
3
  import { Alert, Image } from 'react-native';
4
+ import { updateAllRecordsInPagesData } from '../utils/cache/page_mutations';
4
5
  import { transformGetToPost } from '../utils/client/request_helpers';
5
6
  import { useApiClient } from './use_api_client';
6
7
  import { getConversationRequestArgs } from './use_conversation';
@@ -8,14 +9,13 @@ import { getRequestQueryKey } from './use_suspense_api';
8
9
  import { useUploadClient } from './use_upload_client';
9
10
  const MUTATION_KEY = 'updateConversationAvatar';
10
11
  export const usePendingConversationAvatarUpdate = conversationId => {
11
- const $ = _c(5);
12
+ const $ = _c(4);
12
13
  let t0;
13
14
  if ($[0] !== conversationId) {
14
15
  t0 = {
15
16
  filters: {
16
17
  mutationKey: [MUTATION_KEY, conversationId],
17
- exact: true,
18
- status: "pending"
18
+ exact: true
19
19
  },
20
20
  select: _temp
21
21
  };
@@ -24,20 +24,23 @@ export const usePendingConversationAvatarUpdate = conversationId => {
24
24
  } else {
25
25
  t0 = $[1];
26
26
  }
27
- const pendingPayloads = useMutationState(t0);
28
- let t1;
29
- if ($[2] !== conversationId || $[3] !== pendingPayloads) {
30
- t1 = conversationId === undefined ? undefined : pendingPayloads.at(-1);
31
- $[2] = conversationId;
32
- $[3] = pendingPayloads;
33
- $[4] = t1;
27
+ const t1 = useMutationState(t0);
28
+ let t2;
29
+ if ($[2] !== t1) {
30
+ t2 = t1.at(-1);
31
+ $[2] = t1;
32
+ $[3] = t2;
34
33
  } else {
35
- t1 = $[4];
34
+ t2 = $[3];
35
+ }
36
+ const newest = t2;
37
+ if (conversationId === undefined || newest?.status !== "pending") {
38
+ return;
36
39
  }
37
- return t1;
40
+ return newest.variables;
38
41
  };
39
42
  export const useConversationAvatarUpdate = t0 => {
40
- const $ = _c(28);
43
+ const $ = _c(31);
41
44
  const {
42
45
  conversationId
43
46
  } = t0;
@@ -109,7 +112,6 @@ export const useConversationAvatarUpdate = t0 => {
109
112
  t4 = $[13];
110
113
  }
111
114
  let t5;
112
- let t6;
113
115
  if ($[14] !== queryClient || $[15] !== queryKey) {
114
116
  t5 = async payload_1 => {
115
117
  await queryClient.cancelQueries({
@@ -129,26 +131,47 @@ export const useConversationAvatarUpdate = t0 => {
129
131
  previous
130
132
  };
131
133
  };
134
+ $[14] = queryClient;
135
+ $[15] = queryKey;
136
+ $[16] = t5;
137
+ } else {
138
+ t5 = $[16];
139
+ }
140
+ let t6;
141
+ if ($[17] !== conversationId || $[18] !== queryClient || $[19] !== queryKey) {
132
142
  t6 = async (response, _payload, _context) => {
133
143
  if (!response) {
134
144
  return;
135
145
  }
136
146
  queryClient.setQueryData(queryKey, () => response);
137
- const imageUrl = response.data.customAvatarImageUrl;
138
- await Promise.all([imageUrl && Image.prefetch(imageUrl).catch(_temp2), queryClient.invalidateQueries({
147
+ queryClient.setQueriesData({
139
148
  queryKey: ["/me/conversations"]
140
- })]);
149
+ }, prev_0 => {
150
+ if (!prev_0?.pages) {
151
+ return prev_0;
152
+ }
153
+ return updateAllRecordsInPagesData({
154
+ data: prev_0,
155
+ processRecord: record => record.id === conversationId ? applySavedAvatar(record, response.data) : record
156
+ });
157
+ });
158
+ queryClient.invalidateQueries({
159
+ queryKey: ["/me/conversations"]
160
+ });
161
+ const imageUrl = response.data.customAvatarImageUrl;
162
+ if (imageUrl) {
163
+ await Image.prefetch(imageUrl).catch(_temp2);
164
+ }
141
165
  };
142
- $[14] = queryClient;
143
- $[15] = queryKey;
144
- $[16] = t5;
145
- $[17] = t6;
166
+ $[17] = conversationId;
167
+ $[18] = queryClient;
168
+ $[19] = queryKey;
169
+ $[20] = t6;
146
170
  } else {
147
- t5 = $[16];
148
- t6 = $[17];
171
+ t6 = $[20];
149
172
  }
150
173
  let t7;
151
- if ($[18] !== isSuperseded || $[19] !== queryClient || $[20] !== queryKey) {
174
+ if ($[21] !== isSuperseded || $[22] !== queryClient || $[23] !== queryKey) {
152
175
  t7 = (_error, payload_2, context) => {
153
176
  if (isSuperseded(payload_2)) {
154
177
  return;
@@ -158,15 +181,15 @@ export const useConversationAvatarUpdate = t0 => {
158
181
  }
159
182
  Alert.alert("Error", "Failed to update conversation avatar. Please try again.");
160
183
  };
161
- $[18] = isSuperseded;
162
- $[19] = queryClient;
163
- $[20] = queryKey;
164
- $[21] = t7;
184
+ $[21] = isSuperseded;
185
+ $[22] = queryClient;
186
+ $[23] = queryKey;
187
+ $[24] = t7;
165
188
  } else {
166
- t7 = $[21];
189
+ t7 = $[24];
167
190
  }
168
191
  let t8;
169
- if ($[22] !== t3 || $[23] !== t4 || $[24] !== t5 || $[25] !== t6 || $[26] !== t7) {
192
+ if ($[25] !== t3 || $[26] !== t4 || $[27] !== t5 || $[28] !== t6 || $[29] !== t7) {
170
193
  t8 = {
171
194
  mutationKey: t3,
172
195
  mutationFn: t4,
@@ -174,14 +197,14 @@ export const useConversationAvatarUpdate = t0 => {
174
197
  onSuccess: t6,
175
198
  onError: t7
176
199
  };
177
- $[22] = t3;
178
- $[23] = t4;
179
- $[24] = t5;
180
- $[25] = t6;
181
- $[26] = t7;
182
- $[27] = t8;
200
+ $[25] = t3;
201
+ $[26] = t4;
202
+ $[27] = t5;
203
+ $[28] = t6;
204
+ $[29] = t7;
205
+ $[30] = t8;
183
206
  } else {
184
- t8 = $[27];
207
+ t8 = $[30];
185
208
  }
186
209
  return useMutation(t8);
187
210
  };
@@ -206,6 +229,15 @@ export async function patchConversationAvatar(apiClient, uploadClient, conversat
206
229
  Alert.alert('Avatar not saved', 'The conversation was created, but the avatar could not be saved. You can update it from the conversation details.');
207
230
  }
208
231
  }
232
+ function applySavedAvatar(data, saved) {
233
+ return {
234
+ ...data,
235
+ customAvatarType: saved.customAvatarType,
236
+ customAvatarKey: saved.customAvatarKey,
237
+ customAvatarColor: saved.customAvatarColor,
238
+ customAvatarImageUrl: saved.customAvatarImageUrl
239
+ };
240
+ }
209
241
  export function applyAvatarUpdate(data, payload) {
210
242
  switch (payload.kind) {
211
243
  case 'icon':
@@ -278,7 +310,7 @@ async function buildAttributes(payload, uploadClient) {
278
310
  }
279
311
  }
280
312
  function _temp(mutation) {
281
- return mutation.state.variables;
313
+ return mutation.state;
282
314
  }
283
315
  function _temp2() {
284
316
  return false;
@@ -1 +1 @@
1
- {"version":3,"file":"use_conversation_avatar_update.js","names":["useMutation","useMutationState","useQueryClient","Alert","Image","transformGetToPost","useApiClient","getConversationRequestArgs","getRequestQueryKey","useUploadClient","MUTATION_KEY","usePendingConversationAvatarUpdate","conversationId","$","_c","t0","filters","mutationKey","exact","status","select","_temp","pendingPayloads","t1","undefined","at","useConversationAvatarUpdate","apiClient","uploadClient","queryClient","requestArgs","conversation_id","queryKey","t2","payload","getMutationCache","findAll","state","variables","isSuperseded","t3","t4","payload_0","postArgs","data","attributes","buildAttributes","chat","patch","url","type","t5","t6","payload_1","cancelQueries","previous","getQueryData","setQueryData","prev","applyAvatarUpdate","response","_payload","_context","imageUrl","customAvatarImageUrl","Promise","all","prefetch","catch","_temp2","invalidateQueries","t7","_error","payload_2","context","alert","t8","mutationFn","onMutate","onSuccess","onError","patchConversationAvatar","kind","customAvatarType","customAvatarKey","key","customAvatarColor","color","imageAsset","uri","custom_avatar_type","custom_avatar_key","custom_avatar_color","uploaded","uploadFile","name","fileName","mimeType","avatar_uploaded_file_id","id","mutation"],"sources":["../../src/hooks/use_conversation_avatar_update.ts"],"sourcesContent":["import { useMutation, useMutationState, useQueryClient } from '@tanstack/react-query'\nimport { Alert, Image } from 'react-native'\nimport type { ApiResource, ConversationAvatarData, ConversationResource } from '../types'\nimport { transformGetToPost } from '../utils/client/request_helpers'\nimport type { ImagePickerAsset } from '../utils/native_adapters/image_picker'\nimport { ApiClient, useApiClient } from './use_api_client'\nimport { getConversationRequestArgs } from './use_conversation'\nimport { getRequestQueryKey } from './use_suspense_api'\nimport { useUploadClient } from './use_upload_client'\n\nexport type AvatarType = 'icon' | 'emoji' | 'image'\n\nexport type AvatarUpdatePayload =\n | { kind: Extract<AvatarType, 'icon' | 'emoji'>; key: string; color: string }\n | { kind: Extract<AvatarType, 'image'>; imageAsset: ImagePickerAsset; color: string }\n | { kind: 'clear' }\n\nconst MUTATION_KEY = 'updateConversationAvatar'\n\nexport const usePendingConversationAvatarUpdate = (conversationId: number | undefined) => {\n const pendingPayloads = useMutationState({\n filters: { mutationKey: [MUTATION_KEY, conversationId], exact: true, status: 'pending' },\n select: mutation => mutation.state.variables as AvatarUpdatePayload,\n })\n\n return conversationId === undefined ? undefined : pendingPayloads.at(-1)\n}\n\nexport const useConversationAvatarUpdate = ({ conversationId }: { conversationId: number }) => {\n const apiClient = useApiClient()\n const uploadClient = useUploadClient()\n const queryClient = useQueryClient()\n const requestArgs = getConversationRequestArgs({ conversation_id: conversationId })\n const queryKey = getRequestQueryKey(requestArgs)\n\n const isSuperseded = (payload: AvatarUpdatePayload) =>\n queryClient\n .getMutationCache()\n .findAll({ mutationKey: [MUTATION_KEY, conversationId], exact: true })\n .at(-1)?.state.variables !== payload\n\n return useMutation({\n mutationKey: [MUTATION_KEY, conversationId],\n mutationFn: async (payload: AvatarUpdatePayload) => {\n const postArgs = transformGetToPost(requestArgs).data\n const attributes = await buildAttributes(payload, uploadClient)\n if (isSuperseded(payload)) return null\n\n return apiClient.chat.patch<ApiResource<ConversationResource>>({\n url: `/me/conversations/${conversationId}/`,\n data: { data: { type: '', attributes }, ...postArgs },\n })\n },\n onMutate: async (payload: AvatarUpdatePayload) => {\n await queryClient.cancelQueries({ queryKey })\n\n const previous = queryClient.getQueryData<ApiResource<ConversationResource>>(queryKey)\n\n queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, prev => {\n if (!prev?.data) return prev\n return { ...prev, data: applyAvatarUpdate(prev.data, payload) }\n })\n\n return { previous }\n },\n onSuccess: async (response, _payload, _context) => {\n if (!response) return\n\n queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, () => response)\n const imageUrl = response.data.customAvatarImageUrl\n await Promise.all([\n imageUrl && Image.prefetch(imageUrl).catch(() => false),\n queryClient.invalidateQueries({ queryKey: ['/me/conversations'] }),\n ])\n },\n onError: (_error, payload, context) => {\n if (isSuperseded(payload)) return\n\n if (context?.previous) {\n queryClient.setQueryData(queryKey, context.previous)\n }\n\n Alert.alert('Error', 'Failed to update conversation avatar. Please try again.')\n },\n })\n}\n\nexport async function patchConversationAvatar(\n apiClient: ApiClient,\n uploadClient: ReturnType<typeof useUploadClient>,\n conversationId: number,\n payload: Exclude<AvatarUpdatePayload, { kind: 'clear' }>\n) {\n const requestArgs = getConversationRequestArgs({ conversation_id: conversationId })\n const postArgs = transformGetToPost(requestArgs).data\n\n try {\n const attributes = await buildAttributes(payload, uploadClient)\n await apiClient.chat.patch({\n url: `/me/conversations/${conversationId}/`,\n data: { data: { type: '', attributes }, ...postArgs },\n })\n } catch {\n Alert.alert(\n 'Avatar not saved',\n 'The conversation was created, but the avatar could not be saved. You can update it from the conversation details.'\n )\n }\n}\n\nexport function applyAvatarUpdate<T extends ConversationAvatarData>(\n data: T,\n payload: AvatarUpdatePayload\n): T {\n switch (payload.kind) {\n case 'icon':\n return {\n ...data,\n customAvatarType: 'icon',\n customAvatarKey: payload.key,\n customAvatarColor: payload.color,\n customAvatarImageUrl: null,\n }\n case 'emoji':\n return {\n ...data,\n customAvatarType: 'emoji',\n customAvatarKey: payload.key,\n customAvatarColor: payload.color,\n customAvatarImageUrl: null,\n }\n case 'image':\n return {\n ...data,\n customAvatarType: 'image',\n customAvatarKey: null,\n customAvatarColor: payload.color,\n customAvatarImageUrl: payload.imageAsset.uri,\n }\n case 'clear':\n return {\n ...data,\n customAvatarType: null,\n customAvatarKey: null,\n customAvatarColor: null,\n customAvatarImageUrl: null,\n }\n }\n}\n\nasync function buildAttributes(\n payload: AvatarUpdatePayload,\n uploadClient: ReturnType<typeof useUploadClient>\n) {\n switch (payload.kind) {\n case 'icon':\n return {\n custom_avatar_type: 'icon',\n custom_avatar_key: payload.key,\n custom_avatar_color: payload.color,\n }\n case 'emoji':\n return {\n custom_avatar_type: 'emoji',\n custom_avatar_key: payload.key,\n custom_avatar_color: payload.color,\n }\n case 'image': {\n const uploaded = await uploadClient.uploadFile({\n uri: payload.imageAsset.uri,\n name: payload.imageAsset.fileName || 'avatar.jpg',\n type: payload.imageAsset.mimeType || 'image/jpeg',\n })\n\n return {\n custom_avatar_type: 'image',\n custom_avatar_color: payload.color,\n avatar_uploaded_file_id: uploaded.id,\n }\n }\n case 'clear':\n return {\n custom_avatar_type: null,\n custom_avatar_key: null,\n custom_avatar_color: null,\n }\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"use_conversation_avatar_update.js","names":["useMutation","useMutationState","useQueryClient","Alert","Image","updateAllRecordsInPagesData","transformGetToPost","useApiClient","getConversationRequestArgs","getRequestQueryKey","useUploadClient","MUTATION_KEY","usePendingConversationAvatarUpdate","conversationId","$","_c","t0","filters","mutationKey","exact","select","_temp","t1","t2","at","newest","undefined","status","variables","useConversationAvatarUpdate","apiClient","uploadClient","queryClient","requestArgs","conversation_id","queryKey","payload","getMutationCache","findAll","state","isSuperseded","t3","t4","payload_0","postArgs","data","attributes","buildAttributes","chat","patch","url","type","t5","payload_1","cancelQueries","previous","getQueryData","setQueryData","prev","applyAvatarUpdate","t6","response","_payload","_context","setQueriesData","prev_0","pages","processRecord","record","id","applySavedAvatar","invalidateQueries","imageUrl","customAvatarImageUrl","prefetch","catch","_temp2","t7","_error","payload_2","context","alert","t8","mutationFn","onMutate","onSuccess","onError","patchConversationAvatar","saved","customAvatarType","customAvatarKey","customAvatarColor","kind","key","color","imageAsset","uri","custom_avatar_type","custom_avatar_key","custom_avatar_color","uploaded","uploadFile","name","fileName","mimeType","avatar_uploaded_file_id","mutation"],"sources":["../../src/hooks/use_conversation_avatar_update.ts"],"sourcesContent":["import { InfiniteData, useMutation, useMutationState, useQueryClient } from '@tanstack/react-query'\nimport { Alert, Image } from 'react-native'\nimport type {\n ApiCollection,\n ApiResource,\n ConversationAvatarData,\n ConversationResource,\n} from '../types'\nimport { updateAllRecordsInPagesData } from '../utils/cache/page_mutations'\nimport { transformGetToPost } from '../utils/client/request_helpers'\nimport type { ImagePickerAsset } from '../utils/native_adapters/image_picker'\nimport { ApiClient, useApiClient } from './use_api_client'\nimport { getConversationRequestArgs } from './use_conversation'\nimport { getRequestQueryKey } from './use_suspense_api'\nimport { useUploadClient } from './use_upload_client'\n\nexport type AvatarType = 'icon' | 'emoji' | 'image'\n\nexport type AvatarUpdatePayload =\n | { kind: Extract<AvatarType, 'icon' | 'emoji'>; key: string; color: string }\n | { kind: Extract<AvatarType, 'image'>; imageAsset: ImagePickerAsset; color: string }\n | { kind: 'clear' }\n\nconst MUTATION_KEY = 'updateConversationAvatar'\n\nexport const usePendingConversationAvatarUpdate = (conversationId: number | undefined) => {\n const newest = useMutationState({\n filters: { mutationKey: [MUTATION_KEY, conversationId], exact: true },\n select: mutation => mutation.state,\n }).at(-1)\n\n if (conversationId === undefined || newest?.status !== 'pending') return undefined\n return newest.variables as AvatarUpdatePayload\n}\n\nexport const useConversationAvatarUpdate = ({ conversationId }: { conversationId: number }) => {\n const apiClient = useApiClient()\n const uploadClient = useUploadClient()\n const queryClient = useQueryClient()\n const requestArgs = getConversationRequestArgs({ conversation_id: conversationId })\n const queryKey = getRequestQueryKey(requestArgs)\n\n const isSuperseded = (payload: AvatarUpdatePayload) =>\n queryClient\n .getMutationCache()\n .findAll({ mutationKey: [MUTATION_KEY, conversationId], exact: true })\n .at(-1)?.state.variables !== payload\n\n return useMutation({\n mutationKey: [MUTATION_KEY, conversationId],\n mutationFn: async (payload: AvatarUpdatePayload) => {\n const postArgs = transformGetToPost(requestArgs).data\n const attributes = await buildAttributes(payload, uploadClient)\n if (isSuperseded(payload)) return null\n\n return apiClient.chat.patch<ApiResource<ConversationResource>>({\n url: `/me/conversations/${conversationId}/`,\n data: { data: { type: '', attributes }, ...postArgs },\n })\n },\n onMutate: async (payload: AvatarUpdatePayload) => {\n await queryClient.cancelQueries({ queryKey })\n\n const previous = queryClient.getQueryData<ApiResource<ConversationResource>>(queryKey)\n\n queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, prev => {\n if (!prev?.data) return prev\n return { ...prev, data: applyAvatarUpdate(prev.data, payload) }\n })\n\n return { previous }\n },\n onSuccess: async (response, _payload, _context) => {\n if (!response) return\n\n queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, () => response)\n queryClient.setQueriesData<InfiniteData<ApiCollection<ConversationResource>>>(\n { queryKey: ['/me/conversations'] },\n prev => {\n if (!prev?.pages) return prev\n\n return updateAllRecordsInPagesData({\n data: prev,\n processRecord: record =>\n record.id === conversationId ? applySavedAvatar(record, response.data) : record,\n })\n }\n )\n queryClient.invalidateQueries({ queryKey: ['/me/conversations'] })\n\n const imageUrl = response.data.customAvatarImageUrl\n if (imageUrl) await Image.prefetch(imageUrl).catch(() => false)\n },\n onError: (_error, payload, context) => {\n if (isSuperseded(payload)) return\n\n if (context?.previous) {\n queryClient.setQueryData(queryKey, context.previous)\n }\n\n Alert.alert('Error', 'Failed to update conversation avatar. Please try again.')\n },\n })\n}\n\nexport async function patchConversationAvatar(\n apiClient: ApiClient,\n uploadClient: ReturnType<typeof useUploadClient>,\n conversationId: number,\n payload: Exclude<AvatarUpdatePayload, { kind: 'clear' }>\n) {\n const requestArgs = getConversationRequestArgs({ conversation_id: conversationId })\n const postArgs = transformGetToPost(requestArgs).data\n\n try {\n const attributes = await buildAttributes(payload, uploadClient)\n await apiClient.chat.patch({\n url: `/me/conversations/${conversationId}/`,\n data: { data: { type: '', attributes }, ...postArgs },\n })\n } catch {\n Alert.alert(\n 'Avatar not saved',\n 'The conversation was created, but the avatar could not be saved. You can update it from the conversation details.'\n )\n }\n}\n\nfunction applySavedAvatar<T extends ConversationAvatarData>(\n data: T,\n saved: ConversationAvatarData\n): T {\n return {\n ...data,\n customAvatarType: saved.customAvatarType,\n customAvatarKey: saved.customAvatarKey,\n customAvatarColor: saved.customAvatarColor,\n customAvatarImageUrl: saved.customAvatarImageUrl,\n }\n}\n\nexport function applyAvatarUpdate<T extends ConversationAvatarData>(\n data: T,\n payload: AvatarUpdatePayload\n): T {\n switch (payload.kind) {\n case 'icon':\n return {\n ...data,\n customAvatarType: 'icon',\n customAvatarKey: payload.key,\n customAvatarColor: payload.color,\n customAvatarImageUrl: null,\n }\n case 'emoji':\n return {\n ...data,\n customAvatarType: 'emoji',\n customAvatarKey: payload.key,\n customAvatarColor: payload.color,\n customAvatarImageUrl: null,\n }\n case 'image':\n return {\n ...data,\n customAvatarType: 'image',\n customAvatarKey: null,\n customAvatarColor: payload.color,\n customAvatarImageUrl: payload.imageAsset.uri,\n }\n case 'clear':\n return {\n ...data,\n customAvatarType: null,\n customAvatarKey: null,\n customAvatarColor: null,\n customAvatarImageUrl: null,\n }\n }\n}\n\nasync function buildAttributes(\n payload: AvatarUpdatePayload,\n uploadClient: ReturnType<typeof useUploadClient>\n) {\n switch (payload.kind) {\n case 'icon':\n return {\n custom_avatar_type: 'icon',\n custom_avatar_key: payload.key,\n custom_avatar_color: payload.color,\n }\n case 'emoji':\n return {\n custom_avatar_type: 'emoji',\n custom_avatar_key: payload.key,\n custom_avatar_color: payload.color,\n }\n case 'image': {\n const uploaded = await uploadClient.uploadFile({\n uri: payload.imageAsset.uri,\n name: payload.imageAsset.fileName || 'avatar.jpg',\n type: payload.imageAsset.mimeType || 'image/jpeg',\n })\n\n return {\n custom_avatar_type: 'image',\n custom_avatar_color: payload.color,\n avatar_uploaded_file_id: uploaded.id,\n }\n }\n case 'clear':\n return {\n custom_avatar_type: null,\n custom_avatar_key: null,\n custom_avatar_color: null,\n }\n }\n}\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@planningcenter/chat-react-native",
3
- "version": "4.5.1-qa-staging.9",
3
+ "version": "4.5.1-qa-staging.10",
4
4
  "description": "",
5
5
  "repository": {
6
6
  "type": "git",
@@ -33,7 +33,7 @@
33
33
  "dependencies": {
34
34
  "@fortawesome/fontawesome-svg-core": "^7.2.0",
35
35
  "@fortawesome/react-native-fontawesome": "^0.3.2",
36
- "@planningcenter/emoji-keyboard": "4.5.1-qa-staging.9",
36
+ "@planningcenter/emoji-keyboard": "4.5.1-qa-staging.10",
37
37
  "lodash-inflection": "^1.5.0"
38
38
  },
39
39
  "peerDependencies": {
@@ -84,5 +84,5 @@
84
84
  "sf-symbols-typescript": "^2.2.0",
85
85
  "typescript": "~6.0.3"
86
86
  },
87
- "gitHead": "77a13b9c526855111ab67a013fa7b9c6693b25b9"
87
+ "gitHead": "ce53fe1589c3b813a9cd8370322296a7bf43c003"
88
88
  }
@@ -81,4 +81,14 @@ describe('ConversationAvatar', () => {
81
81
 
82
82
  await waitFor(() => expect(view.getByText('🎉')).toBeTruthy())
83
83
  })
84
+
85
+ it('ignores an older pending update once a newer one has settled', async () => {
86
+ startAvatarUpdate(conversation.id)
87
+ const settleNewer = startAvatarUpdate(conversation.id)
88
+ const view = renderAvatar()
89
+
90
+ settleNewer()
91
+
92
+ await waitFor(() => expect(view.getByText('🎉')).toBeTruthy())
93
+ })
84
94
  })
@@ -1,6 +1,12 @@
1
- import { useMutation, useMutationState, useQueryClient } from '@tanstack/react-query'
1
+ import { InfiniteData, useMutation, useMutationState, useQueryClient } from '@tanstack/react-query'
2
2
  import { Alert, Image } from 'react-native'
3
- import type { ApiResource, ConversationAvatarData, ConversationResource } from '../types'
3
+ import type {
4
+ ApiCollection,
5
+ ApiResource,
6
+ ConversationAvatarData,
7
+ ConversationResource,
8
+ } from '../types'
9
+ import { updateAllRecordsInPagesData } from '../utils/cache/page_mutations'
4
10
  import { transformGetToPost } from '../utils/client/request_helpers'
5
11
  import type { ImagePickerAsset } from '../utils/native_adapters/image_picker'
6
12
  import { ApiClient, useApiClient } from './use_api_client'
@@ -18,12 +24,13 @@ export type AvatarUpdatePayload =
18
24
  const MUTATION_KEY = 'updateConversationAvatar'
19
25
 
20
26
  export const usePendingConversationAvatarUpdate = (conversationId: number | undefined) => {
21
- const pendingPayloads = useMutationState({
22
- filters: { mutationKey: [MUTATION_KEY, conversationId], exact: true, status: 'pending' },
23
- select: mutation => mutation.state.variables as AvatarUpdatePayload,
24
- })
27
+ const newest = useMutationState({
28
+ filters: { mutationKey: [MUTATION_KEY, conversationId], exact: true },
29
+ select: mutation => mutation.state,
30
+ }).at(-1)
25
31
 
26
- return conversationId === undefined ? undefined : pendingPayloads.at(-1)
32
+ if (conversationId === undefined || newest?.status !== 'pending') return undefined
33
+ return newest.variables as AvatarUpdatePayload
27
34
  }
28
35
 
29
36
  export const useConversationAvatarUpdate = ({ conversationId }: { conversationId: number }) => {
@@ -67,11 +74,22 @@ export const useConversationAvatarUpdate = ({ conversationId }: { conversationId
67
74
  if (!response) return
68
75
 
69
76
  queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, () => response)
77
+ queryClient.setQueriesData<InfiniteData<ApiCollection<ConversationResource>>>(
78
+ { queryKey: ['/me/conversations'] },
79
+ prev => {
80
+ if (!prev?.pages) return prev
81
+
82
+ return updateAllRecordsInPagesData({
83
+ data: prev,
84
+ processRecord: record =>
85
+ record.id === conversationId ? applySavedAvatar(record, response.data) : record,
86
+ })
87
+ }
88
+ )
89
+ queryClient.invalidateQueries({ queryKey: ['/me/conversations'] })
90
+
70
91
  const imageUrl = response.data.customAvatarImageUrl
71
- await Promise.all([
72
- imageUrl && Image.prefetch(imageUrl).catch(() => false),
73
- queryClient.invalidateQueries({ queryKey: ['/me/conversations'] }),
74
- ])
92
+ if (imageUrl) await Image.prefetch(imageUrl).catch(() => false)
75
93
  },
76
94
  onError: (_error, payload, context) => {
77
95
  if (isSuperseded(payload)) return
@@ -108,6 +126,19 @@ export async function patchConversationAvatar(
108
126
  }
109
127
  }
110
128
 
129
+ function applySavedAvatar<T extends ConversationAvatarData>(
130
+ data: T,
131
+ saved: ConversationAvatarData
132
+ ): T {
133
+ return {
134
+ ...data,
135
+ customAvatarType: saved.customAvatarType,
136
+ customAvatarKey: saved.customAvatarKey,
137
+ customAvatarColor: saved.customAvatarColor,
138
+ customAvatarImageUrl: saved.customAvatarImageUrl,
139
+ }
140
+ }
141
+
111
142
  export function applyAvatarUpdate<T extends ConversationAvatarData>(
112
143
  data: T,
113
144
  payload: AvatarUpdatePayload