@planningcenter/chat-react-native 4.5.1-qa-staging.8 → 4.5.1-qa-staging.9
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/hooks/use_conversation_avatar_update.d.ts +1 -1
- package/build/hooks/use_conversation_avatar_update.d.ts.map +1 -1
- package/build/hooks/use_conversation_avatar_update.js +80 -47
- package/build/hooks/use_conversation_avatar_update.js.map +1 -1
- package/package.json +3 -3
- package/src/hooks/__tests__/use_conversation_avatar_update.test.tsx +40 -0
- package/src/hooks/use_conversation_avatar_update.ts +19 -4
|
@@ -17,7 +17,7 @@ export type AvatarUpdatePayload = {
|
|
|
17
17
|
export declare const usePendingConversationAvatarUpdate: (conversationId: number | undefined) => AvatarUpdatePayload | undefined;
|
|
18
18
|
export declare const useConversationAvatarUpdate: ({ conversationId }: {
|
|
19
19
|
conversationId: number;
|
|
20
|
-
}) => import("@tanstack/react-query").UseMutationResult<ApiResource<ConversationResource
|
|
20
|
+
}) => import("@tanstack/react-query").UseMutationResult<ApiResource<ConversationResource> | null, Error, AvatarUpdatePayload, {
|
|
21
21
|
previous: ApiResource<ConversationResource> | undefined;
|
|
22
22
|
}>;
|
|
23
23
|
export declare function patchConversationAvatar(apiClient: ApiClient, uploadClient: ReturnType<typeof useUploadClient>, conversationId: number, payload: Exclude<AvatarUpdatePayload, {
|
|
@@ -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;;
|
|
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,6 +1,6 @@
|
|
|
1
1
|
import { c as _c } from "react/compiler-runtime";
|
|
2
2
|
import { useMutation, useMutationState, useQueryClient } from '@tanstack/react-query';
|
|
3
|
-
import { Alert } from 'react-native';
|
|
3
|
+
import { Alert, Image } from 'react-native';
|
|
4
4
|
import { transformGetToPost } from '../utils/client/request_helpers';
|
|
5
5
|
import { useApiClient } from './use_api_client';
|
|
6
6
|
import { getConversationRequestArgs } from './use_conversation';
|
|
@@ -37,7 +37,7 @@ export const usePendingConversationAvatarUpdate = conversationId => {
|
|
|
37
37
|
return t1;
|
|
38
38
|
};
|
|
39
39
|
export const useConversationAvatarUpdate = t0 => {
|
|
40
|
-
const $ = _c(
|
|
40
|
+
const $ = _c(28);
|
|
41
41
|
const {
|
|
42
42
|
conversationId
|
|
43
43
|
} = t0;
|
|
@@ -60,18 +60,34 @@ export const useConversationAvatarUpdate = t0 => {
|
|
|
60
60
|
}
|
|
61
61
|
const queryKey = t1;
|
|
62
62
|
let t2;
|
|
63
|
-
if ($[3] !== conversationId) {
|
|
64
|
-
t2 =
|
|
63
|
+
if ($[3] !== conversationId || $[4] !== queryClient) {
|
|
64
|
+
t2 = payload => queryClient.getMutationCache().findAll({
|
|
65
|
+
mutationKey: [MUTATION_KEY, conversationId],
|
|
66
|
+
exact: true
|
|
67
|
+
}).at(-1)?.state.variables !== payload;
|
|
65
68
|
$[3] = conversationId;
|
|
66
|
-
$[4] =
|
|
69
|
+
$[4] = queryClient;
|
|
70
|
+
$[5] = t2;
|
|
67
71
|
} else {
|
|
68
|
-
t2 = $[
|
|
72
|
+
t2 = $[5];
|
|
69
73
|
}
|
|
74
|
+
const isSuperseded = t2;
|
|
70
75
|
let t3;
|
|
71
|
-
if ($[
|
|
72
|
-
t3 =
|
|
76
|
+
if ($[6] !== conversationId) {
|
|
77
|
+
t3 = [MUTATION_KEY, conversationId];
|
|
78
|
+
$[6] = conversationId;
|
|
79
|
+
$[7] = t3;
|
|
80
|
+
} else {
|
|
81
|
+
t3 = $[7];
|
|
82
|
+
}
|
|
83
|
+
let t4;
|
|
84
|
+
if ($[8] !== apiClient || $[9] !== conversationId || $[10] !== isSuperseded || $[11] !== requestArgs || $[12] !== uploadClient) {
|
|
85
|
+
t4 = async payload_0 => {
|
|
73
86
|
const postArgs = transformGetToPost(requestArgs).data;
|
|
74
|
-
const attributes = await buildAttributes(
|
|
87
|
+
const attributes = await buildAttributes(payload_0, uploadClient);
|
|
88
|
+
if (isSuperseded(payload_0)) {
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
75
91
|
return apiClient.chat.patch({
|
|
76
92
|
url: `/me/conversations/${conversationId}/`,
|
|
77
93
|
data: {
|
|
@@ -83,19 +99,19 @@ export const useConversationAvatarUpdate = t0 => {
|
|
|
83
99
|
}
|
|
84
100
|
});
|
|
85
101
|
};
|
|
86
|
-
$[
|
|
87
|
-
$[
|
|
88
|
-
$[
|
|
89
|
-
$[
|
|
90
|
-
$[
|
|
102
|
+
$[8] = apiClient;
|
|
103
|
+
$[9] = conversationId;
|
|
104
|
+
$[10] = isSuperseded;
|
|
105
|
+
$[11] = requestArgs;
|
|
106
|
+
$[12] = uploadClient;
|
|
107
|
+
$[13] = t4;
|
|
91
108
|
} else {
|
|
92
|
-
|
|
109
|
+
t4 = $[13];
|
|
93
110
|
}
|
|
94
|
-
let t4;
|
|
95
111
|
let t5;
|
|
96
112
|
let t6;
|
|
97
|
-
if ($[
|
|
98
|
-
|
|
113
|
+
if ($[14] !== queryClient || $[15] !== queryKey) {
|
|
114
|
+
t5 = async payload_1 => {
|
|
99
115
|
await queryClient.cancelQueries({
|
|
100
116
|
queryKey
|
|
101
117
|
});
|
|
@@ -106,54 +122,68 @@ export const useConversationAvatarUpdate = t0 => {
|
|
|
106
122
|
}
|
|
107
123
|
return {
|
|
108
124
|
...prev,
|
|
109
|
-
data: applyAvatarUpdate(prev.data,
|
|
125
|
+
data: applyAvatarUpdate(prev.data, payload_1)
|
|
110
126
|
};
|
|
111
127
|
});
|
|
112
128
|
return {
|
|
113
129
|
previous
|
|
114
130
|
};
|
|
115
131
|
};
|
|
116
|
-
|
|
132
|
+
t6 = async (response, _payload, _context) => {
|
|
133
|
+
if (!response) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
117
136
|
queryClient.setQueryData(queryKey, () => response);
|
|
118
|
-
|
|
137
|
+
const imageUrl = response.data.customAvatarImageUrl;
|
|
138
|
+
await Promise.all([imageUrl && Image.prefetch(imageUrl).catch(_temp2), queryClient.invalidateQueries({
|
|
119
139
|
queryKey: ["/me/conversations"]
|
|
120
|
-
});
|
|
140
|
+
})]);
|
|
121
141
|
};
|
|
122
|
-
|
|
142
|
+
$[14] = queryClient;
|
|
143
|
+
$[15] = queryKey;
|
|
144
|
+
$[16] = t5;
|
|
145
|
+
$[17] = t6;
|
|
146
|
+
} else {
|
|
147
|
+
t5 = $[16];
|
|
148
|
+
t6 = $[17];
|
|
149
|
+
}
|
|
150
|
+
let t7;
|
|
151
|
+
if ($[18] !== isSuperseded || $[19] !== queryClient || $[20] !== queryKey) {
|
|
152
|
+
t7 = (_error, payload_2, context) => {
|
|
153
|
+
if (isSuperseded(payload_2)) {
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
123
156
|
if (context?.previous) {
|
|
124
157
|
queryClient.setQueryData(queryKey, context.previous);
|
|
125
158
|
}
|
|
126
159
|
Alert.alert("Error", "Failed to update conversation avatar. Please try again.");
|
|
127
160
|
};
|
|
128
|
-
$[
|
|
129
|
-
$[
|
|
130
|
-
$[
|
|
131
|
-
$[
|
|
132
|
-
$[14] = t6;
|
|
161
|
+
$[18] = isSuperseded;
|
|
162
|
+
$[19] = queryClient;
|
|
163
|
+
$[20] = queryKey;
|
|
164
|
+
$[21] = t7;
|
|
133
165
|
} else {
|
|
134
|
-
|
|
135
|
-
t5 = $[13];
|
|
136
|
-
t6 = $[14];
|
|
166
|
+
t7 = $[21];
|
|
137
167
|
}
|
|
138
|
-
let
|
|
139
|
-
if ($[
|
|
140
|
-
|
|
141
|
-
mutationKey:
|
|
142
|
-
mutationFn:
|
|
143
|
-
onMutate:
|
|
144
|
-
onSuccess:
|
|
145
|
-
onError:
|
|
168
|
+
let t8;
|
|
169
|
+
if ($[22] !== t3 || $[23] !== t4 || $[24] !== t5 || $[25] !== t6 || $[26] !== t7) {
|
|
170
|
+
t8 = {
|
|
171
|
+
mutationKey: t3,
|
|
172
|
+
mutationFn: t4,
|
|
173
|
+
onMutate: t5,
|
|
174
|
+
onSuccess: t6,
|
|
175
|
+
onError: t7
|
|
146
176
|
};
|
|
147
|
-
$[
|
|
148
|
-
$[
|
|
149
|
-
$[
|
|
150
|
-
$[
|
|
151
|
-
$[
|
|
152
|
-
$[
|
|
177
|
+
$[22] = t3;
|
|
178
|
+
$[23] = t4;
|
|
179
|
+
$[24] = t5;
|
|
180
|
+
$[25] = t6;
|
|
181
|
+
$[26] = t7;
|
|
182
|
+
$[27] = t8;
|
|
153
183
|
} else {
|
|
154
|
-
|
|
184
|
+
t8 = $[27];
|
|
155
185
|
}
|
|
156
|
-
return useMutation(
|
|
186
|
+
return useMutation(t8);
|
|
157
187
|
};
|
|
158
188
|
export async function patchConversationAvatar(apiClient, uploadClient, conversationId, payload) {
|
|
159
189
|
const requestArgs = getConversationRequestArgs({
|
|
@@ -250,4 +280,7 @@ async function buildAttributes(payload, uploadClient) {
|
|
|
250
280
|
function _temp(mutation) {
|
|
251
281
|
return mutation.state.variables;
|
|
252
282
|
}
|
|
283
|
+
function _temp2() {
|
|
284
|
+
return false;
|
|
285
|
+
}
|
|
253
286
|
//# sourceMappingURL=use_conversation_avatar_update.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use_conversation_avatar_update.js","names":["useMutation","useMutationState","useQueryClient","Alert","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","t3","payload","postArgs","data","attributes","buildAttributes","chat","patch","url","type","t4","t5","t6","payload_0","cancelQueries","previous","getQueryData","setQueryData","prev","applyAvatarUpdate","response","_payload","_context","invalidateQueries","_error","_payload_0","context","alert","t7","mutationFn","onMutate","onSuccess","onError","patchConversationAvatar","kind","customAvatarType","customAvatarKey","key","customAvatarColor","color","customAvatarImageUrl","imageAsset","uri","custom_avatar_type","custom_avatar_key","custom_avatar_color","uploaded","uploadFile","name","fileName","mimeType","avatar_uploaded_file_id","id","mutation","state","variables"],"sources":["../../src/hooks/use_conversation_avatar_update.ts"],"sourcesContent":["import { useMutation, useMutationState, useQueryClient } from '@tanstack/react-query'\nimport { Alert } 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 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\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: (response, _payload, _context) => {\n queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, () => response)\n queryClient.invalidateQueries({ queryKey: ['/me/conversations'] })\n },\n onError: (_error, _payload, context) => {\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":";AAAA,SAASA,WAAW,EAAEC,gBAAgB,EAAEC,cAAc,QAAQ,uBAAuB;AACrF,SAASC,KAAK,QAAQ,cAAc;AAEpC,SAASC,kBAAkB,QAAQ,iCAAiC;AAEpE,SAAoBC,YAAY,QAAQ,kBAAkB;AAC1D,SAASC,0BAA0B,QAAQ,oBAAoB;AAC/D,SAASC,kBAAkB,QAAQ,oBAAoB;AACvD,SAASC,eAAe,QAAQ,qBAAqB;AASrD,MAAMC,YAAY,GAAG,0BAA0B;AAE/C,OAAO,MAAMC,kCAAkC,GAAGC,cAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAAA,IAAAC,EAAA;EAAA,IAAAF,CAAA,QAAAD,cAAA;IACPG,EAAA;MAAAC,OAAA,EAC9B;QAAAC,WAAA,EAAe,CAACP,YAAY,EAAEE,cAAc,CAAC;QAAAM,KAAA,EAAS,IAAI;QAAAC,MAAA,EAAU;MAAU,CAAC;MAAAC,MAAA,EAChFC;IACV,CAAC;IAAAR,CAAA,MAAAD,cAAA;IAAAC,CAAA,MAAAE,EAAA;EAAA;IAAAA,EAAA,GAAAF,CAAA;EAAA;EAHD,MAAAS,eAAA,GAAwBpB,gBAAgB,CAACa,EAGxC,CAAC;EAAA,IAAAQ,EAAA;EAAA,IAAAV,CAAA,QAAAD,cAAA,IAAAC,CAAA,QAAAS,eAAA;IAEKC,EAAA,GAAAX,cAAc,KAAKY,SAA8C,GAAjEA,SAAiE,GAAtBF,eAAe,CAAAG,EAAG,CAAC,EAAE,CAAC;IAAAZ,CAAA,MAAAD,cAAA;IAAAC,CAAA,MAAAS,eAAA;IAAAT,CAAA,MAAAU,EAAA;EAAA;IAAAA,EAAA,GAAAV,CAAA;EAAA;EAAA,OAAjEU,EAAiE;AAAA,CACzE;AAED,OAAO,MAAMG,2BAA2B,GAAGX,EAAA;EAAA,MAAAF,CAAA,GAAAC,EAAA;EAAC;IAAAF;EAAA,IAAAG,EAA8C;EACxF,MAAAY,SAAA,GAAkBrB,YAAY,CAAC,CAAC;EAChC,MAAAsB,YAAA,GAAqBnB,eAAe,CAAC,CAAC;EACtC,MAAAoB,WAAA,GAAoB1B,cAAc,CAAC,CAAC;EAAA,IAAA2B,WAAA;EAAA,IAAAP,EAAA;EAAA,IAAAV,CAAA,QAAAD,cAAA;IACpCkB,WAAA,GAAoBvB,0BAA0B,CAAC;MAAAwB,eAAA,EAAmBnB;IAAe,CAAC,CAAC;IAClEW,EAAA,GAAAf,kBAAkB,CAACsB,WAAW,CAAC;IAAAjB,CAAA,MAAAD,cAAA;IAAAC,CAAA,MAAAiB,WAAA;IAAAjB,CAAA,MAAAU,EAAA;EAAA;IAAAO,WAAA,GAAAjB,CAAA;IAAAU,EAAA,GAAAV,CAAA;EAAA;EAAhD,MAAAmB,QAAA,GAAiBT,EAA+B;EAAA,IAAAU,EAAA;EAAA,IAAApB,CAAA,QAAAD,cAAA;IAGjCqB,EAAA,IAACvB,YAAY,EAAEE,cAAc,CAAC;IAAAC,CAAA,MAAAD,cAAA;IAAAC,CAAA,MAAAoB,EAAA;EAAA;IAAAA,EAAA,GAAApB,CAAA;EAAA;EAAA,IAAAqB,EAAA;EAAA,IAAArB,CAAA,QAAAc,SAAA,IAAAd,CAAA,QAAAD,cAAA,IAAAC,CAAA,QAAAiB,WAAA,IAAAjB,CAAA,QAAAe,YAAA;IAC/BM,EAAA,SAAAC,OAAA;MACV,MAAAC,QAAA,GAAiB/B,kBAAkB,CAACyB,WAAW,CAAC,CAAAO,IAAK;MACrD,MAAAC,UAAA,GAAmB,MAAMC,eAAe,CAACJ,OAAO,EAAEP,YAAY,CAAC;MAAA,OAExDD,SAAS,CAAAa,IAAK,CAAAC,KAAM,CAAoC;QAAAC,GAAA,EACxD,qBAAqB9B,cAAc,GAAG;QAAAyB,IAAA,EACrC;UAAAA,IAAA,EAAQ;YAAAM,IAAA,EAAQ,EAAE;YAAAL;UAAa,CAAC;UAAA,GAAKF;QAAS;MACtD,CAAC,CAAC;IAAA,CACH;IAAAvB,CAAA,MAAAc,SAAA;IAAAd,CAAA,MAAAD,cAAA;IAAAC,CAAA,MAAAiB,WAAA;IAAAjB,CAAA,MAAAe,YAAA;IAAAf,CAAA,MAAAqB,EAAA;EAAA;IAAAA,EAAA,GAAArB,CAAA;EAAA;EAAA,IAAA+B,EAAA;EAAA,IAAAC,EAAA;EAAA,IAAAC,EAAA;EAAA,IAAAjC,CAAA,SAAAgB,WAAA,IAAAhB,CAAA,SAAAmB,QAAA;IACSY,EAAA,SAAAG,SAAA;MACR,MAAMlB,WAAW,CAAAmB,aAAc,CAAC;QAAAhB;MAAW,CAAC,CAAC;MAE7C,MAAAiB,QAAA,GAAiBpB,WAAW,CAAAqB,YAAa,CAAoClB,QAAQ,CAAC;MAEtFH,WAAW,CAAAsB,YAAa,CAAoCnB,QAAQ,EAAEoB,IAAA;QACpE,IAAI,CAACA,IAAI,EAAAf,IAAM;UAAA,OAASe,IAAI;QAAA;QAAA,OACrB;UAAA,GAAKA,IAAI;UAAAf,IAAA,EAAQgB,iBAAiB,CAACD,IAAI,CAAAf,IAAK,EAAEF,SAAO;QAAE,CAAC;MAAA,CAChE,CAAC;MAAA,OAEK;QAAAc;MAAW,CAAC;IAAA,CACpB;IACUJ,EAAA,GAAAA,CAAAS,QAAA,EAAAC,QAAA,EAAAC,QAAA;MACT3B,WAAW,CAAAsB,YAAa,CAAoCnB,QAAQ,EAAE,MAAMsB,QAAQ,CAAC;MACrFzB,WAAW,CAAA4B,iBAAkB,CAAC;QAAAzB,QAAA,EAAY,CAAC,mBAAmB;MAAE,CAAC,CAAC;IAAA,CACnE;IACQc,EAAA,GAAAA,CAAAY,MAAA,EAAAC,UAAA,EAAAC,OAAA;MACP,IAAIA,OAAO,EAAAX,QAAU;QACnBpB,WAAW,CAAAsB,YAAa,CAACnB,QAAQ,EAAE4B,OAAO,CAAAX,QAAS,CAAC;MAAA;MAGtD7C,KAAK,CAAAyD,KAAM,CAAC,OAAO,EAAE,yDAAyD,CAAC;IAAA,CAChF;IAAAhD,CAAA,OAAAgB,WAAA;IAAAhB,CAAA,OAAAmB,QAAA;IAAAnB,CAAA,OAAA+B,EAAA;IAAA/B,CAAA,OAAAgC,EAAA;IAAAhC,CAAA,OAAAiC,EAAA;EAAA;IAAAF,EAAA,GAAA/B,CAAA;IAAAgC,EAAA,GAAAhC,CAAA;IAAAiC,EAAA,GAAAjC,CAAA;EAAA;EAAA,IAAAiD,EAAA;EAAA,IAAAjD,CAAA,SAAAoB,EAAA,IAAApB,CAAA,SAAAqB,EAAA,IAAArB,CAAA,SAAA+B,EAAA,IAAA/B,CAAA,SAAAgC,EAAA,IAAAhC,CAAA,SAAAiC,EAAA;IAjCgBgB,EAAA;MAAA7C,WAAA,EACJgB,EAA8B;MAAA8B,UAAA,EAC/B7B,EAQX;MAAA8B,QAAA,EACSpB,EAWT;MAAAqB,SAAA,EACUpB,EAGV;MAAAqB,OAAA,EACQpB;IAOX,CAAC;IAAAjC,CAAA,OAAAoB,EAAA;IAAApB,CAAA,OAAAqB,EAAA;IAAArB,CAAA,OAAA+B,EAAA;IAAA/B,CAAA,OAAAgC,EAAA;IAAAhC,CAAA,OAAAiC,EAAA;IAAAjC,CAAA,OAAAiD,EAAA;EAAA;IAAAA,EAAA,GAAAjD,CAAA;EAAA;EAAA,OAlCMZ,WAAW,CAAC6D,EAkClB,CAAC;AAAA,CACH;AAED,OAAO,eAAeK,uBAAuBA,CAC3CxC,SAAoB,EACpBC,YAAgD,EAChDhB,cAAsB,EACtBuB,OAAwD,EACxD;EACA,MAAML,WAAW,GAAGvB,0BAA0B,CAAC;IAAEwB,eAAe,EAAEnB;EAAe,CAAC,CAAC;EACnF,MAAMwB,QAAQ,GAAG/B,kBAAkB,CAACyB,WAAW,CAAC,CAACO,IAAI;EAErD,IAAI;IACF,MAAMC,UAAU,GAAG,MAAMC,eAAe,CAACJ,OAAO,EAAEP,YAAY,CAAC;IAC/D,MAAMD,SAAS,CAACa,IAAI,CAACC,KAAK,CAAC;MACzBC,GAAG,EAAE,qBAAqB9B,cAAc,GAAG;MAC3CyB,IAAI,EAAE;QAAEA,IAAI,EAAE;UAAEM,IAAI,EAAE,EAAE;UAAEL;QAAW,CAAC;QAAE,GAAGF;MAAS;IACtD,CAAC,CAAC;EACJ,CAAC,CAAC,MAAM;IACNhC,KAAK,CAACyD,KAAK,CACT,kBAAkB,EAClB,mHACF,CAAC;EACH;AACF;AAEA,OAAO,SAASR,iBAAiBA,CAC/BhB,IAAO,EACPF,OAA4B,EACzB;EACH,QAAQA,OAAO,CAACiC,IAAI;IAClB,KAAK,MAAM;MACT,OAAO;QACL,GAAG/B,IAAI;QACPgC,gBAAgB,EAAE,MAAM;QACxBC,eAAe,EAAEnC,OAAO,CAACoC,GAAG;QAC5BC,iBAAiB,EAAErC,OAAO,CAACsC,KAAK;QAChCC,oBAAoB,EAAE;MACxB,CAAC;IACH,KAAK,OAAO;MACV,OAAO;QACL,GAAGrC,IAAI;QACPgC,gBAAgB,EAAE,OAAO;QACzBC,eAAe,EAAEnC,OAAO,CAACoC,GAAG;QAC5BC,iBAAiB,EAAErC,OAAO,CAACsC,KAAK;QAChCC,oBAAoB,EAAE;MACxB,CAAC;IACH,KAAK,OAAO;MACV,OAAO;QACL,GAAGrC,IAAI;QACPgC,gBAAgB,EAAE,OAAO;QACzBC,eAAe,EAAE,IAAI;QACrBE,iBAAiB,EAAErC,OAAO,CAACsC,KAAK;QAChCC,oBAAoB,EAAEvC,OAAO,CAACwC,UAAU,CAACC;MAC3C,CAAC;IACH,KAAK,OAAO;MACV,OAAO;QACL,GAAGvC,IAAI;QACPgC,gBAAgB,EAAE,IAAI;QACtBC,eAAe,EAAE,IAAI;QACrBE,iBAAiB,EAAE,IAAI;QACvBE,oBAAoB,EAAE;MACxB,CAAC;EACL;AACF;AAEA,eAAenC,eAAeA,CAC5BJ,OAA4B,EAC5BP,YAAgD,EAChD;EACA,QAAQO,OAAO,CAACiC,IAAI;IAClB,KAAK,MAAM;MACT,OAAO;QACLS,kBAAkB,EAAE,MAAM;QAC1BC,iBAAiB,EAAE3C,OAAO,CAACoC,GAAG;QAC9BQ,mBAAmB,EAAE5C,OAAO,CAACsC;MAC/B,CAAC;IACH,KAAK,OAAO;MACV,OAAO;QACLI,kBAAkB,EAAE,OAAO;QAC3BC,iBAAiB,EAAE3C,OAAO,CAACoC,GAAG;QAC9BQ,mBAAmB,EAAE5C,OAAO,CAACsC;MAC/B,CAAC;IACH,KAAK,OAAO;MAAE;QACZ,MAAMO,QAAQ,GAAG,MAAMpD,YAAY,CAACqD,UAAU,CAAC;UAC7CL,GAAG,EAAEzC,OAAO,CAACwC,UAAU,CAACC,GAAG;UAC3BM,IAAI,EAAE/C,OAAO,CAACwC,UAAU,CAACQ,QAAQ,IAAI,YAAY;UACjDxC,IAAI,EAAER,OAAO,CAACwC,UAAU,CAACS,QAAQ,IAAI;QACvC,CAAC,CAAC;QAEF,OAAO;UACLP,kBAAkB,EAAE,OAAO;UAC3BE,mBAAmB,EAAE5C,OAAO,CAACsC,KAAK;UAClCY,uBAAuB,EAAEL,QAAQ,CAACM;QACpC,CAAC;MACH;IACA,KAAK,OAAO;MACV,OAAO;QACLT,kBAAkB,EAAE,IAAI;QACxBC,iBAAiB,EAAE,IAAI;QACvBC,mBAAmB,EAAE;MACvB,CAAC;EACL;AACF;AAzJkD,SAAA1D,MAAAkE,QAAA;EAAA,OAG1BA,QAAQ,CAAAC,KAAM,CAAAC,SAAU;AAAA","ignoreList":[]}
|
|
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":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@planningcenter/chat-react-native",
|
|
3
|
-
"version": "4.5.1-qa-staging.
|
|
3
|
+
"version": "4.5.1-qa-staging.9",
|
|
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.
|
|
36
|
+
"@planningcenter/emoji-keyboard": "4.5.1-qa-staging.9",
|
|
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": "
|
|
87
|
+
"gitHead": "77a13b9c526855111ab67a013fa7b9c6693b25b9"
|
|
88
88
|
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { QueryClientProvider } from '@tanstack/react-query'
|
|
2
|
+
import { act, renderHook } from '@testing-library/react-native'
|
|
3
|
+
import React from 'react'
|
|
4
|
+
import { buildTestQueryClient } from '../../__utils__/query_client'
|
|
5
|
+
import { useConversationAvatarUpdate } from '../use_conversation_avatar_update'
|
|
6
|
+
|
|
7
|
+
const mockPatch = jest.fn().mockResolvedValue({ data: { id: 7 } })
|
|
8
|
+
let finishUpload = () => {}
|
|
9
|
+
jest.mock('../use_api_client', () => ({ useApiClient: () => ({ chat: { patch: mockPatch } }) }))
|
|
10
|
+
jest.mock('../use_upload_client', () => ({
|
|
11
|
+
useUploadClient: () => ({
|
|
12
|
+
uploadFile: () => new Promise(resolve => (finishUpload = () => resolve({ id: 'upload-1' }))),
|
|
13
|
+
}),
|
|
14
|
+
}))
|
|
15
|
+
|
|
16
|
+
describe('useConversationAvatarUpdate', () => {
|
|
17
|
+
it('saves only the newest pick when an icon is chosen during a photo upload', async () => {
|
|
18
|
+
const queryClient = buildTestQueryClient({
|
|
19
|
+
defaultOptions: { mutations: { gcTime: Infinity } },
|
|
20
|
+
})
|
|
21
|
+
const wrapper = ({ children }: { children: React.ReactNode }) => (
|
|
22
|
+
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
|
|
23
|
+
)
|
|
24
|
+
const { result } = renderHook(() => useConversationAvatarUpdate({ conversationId: 7 }), {
|
|
25
|
+
wrapper,
|
|
26
|
+
})
|
|
27
|
+
|
|
28
|
+
const photoSave = result.current.mutateAsync({
|
|
29
|
+
kind: 'image',
|
|
30
|
+
color: 'cosmic',
|
|
31
|
+
imageAsset: { uri: 'file:///photo.jpg', width: 100, height: 100 },
|
|
32
|
+
})
|
|
33
|
+
await act(() => result.current.mutateAsync({ kind: 'icon', key: 'star', color: 'cosmic' }))
|
|
34
|
+
finishUpload()
|
|
35
|
+
await act(() => photoSave)
|
|
36
|
+
|
|
37
|
+
expect(mockPatch).toHaveBeenCalledTimes(1)
|
|
38
|
+
expect(mockPatch.mock.calls[0][0].data.data.attributes.custom_avatar_type).toBe('icon')
|
|
39
|
+
})
|
|
40
|
+
})
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useMutation, useMutationState, useQueryClient } from '@tanstack/react-query'
|
|
2
|
-
import { Alert } from 'react-native'
|
|
2
|
+
import { Alert, Image } from 'react-native'
|
|
3
3
|
import type { ApiResource, ConversationAvatarData, ConversationResource } from '../types'
|
|
4
4
|
import { transformGetToPost } from '../utils/client/request_helpers'
|
|
5
5
|
import type { ImagePickerAsset } from '../utils/native_adapters/image_picker'
|
|
@@ -33,11 +33,18 @@ export const useConversationAvatarUpdate = ({ conversationId }: { conversationId
|
|
|
33
33
|
const requestArgs = getConversationRequestArgs({ conversation_id: conversationId })
|
|
34
34
|
const queryKey = getRequestQueryKey(requestArgs)
|
|
35
35
|
|
|
36
|
+
const isSuperseded = (payload: AvatarUpdatePayload) =>
|
|
37
|
+
queryClient
|
|
38
|
+
.getMutationCache()
|
|
39
|
+
.findAll({ mutationKey: [MUTATION_KEY, conversationId], exact: true })
|
|
40
|
+
.at(-1)?.state.variables !== payload
|
|
41
|
+
|
|
36
42
|
return useMutation({
|
|
37
43
|
mutationKey: [MUTATION_KEY, conversationId],
|
|
38
44
|
mutationFn: async (payload: AvatarUpdatePayload) => {
|
|
39
45
|
const postArgs = transformGetToPost(requestArgs).data
|
|
40
46
|
const attributes = await buildAttributes(payload, uploadClient)
|
|
47
|
+
if (isSuperseded(payload)) return null
|
|
41
48
|
|
|
42
49
|
return apiClient.chat.patch<ApiResource<ConversationResource>>({
|
|
43
50
|
url: `/me/conversations/${conversationId}/`,
|
|
@@ -56,11 +63,19 @@ export const useConversationAvatarUpdate = ({ conversationId }: { conversationId
|
|
|
56
63
|
|
|
57
64
|
return { previous }
|
|
58
65
|
},
|
|
59
|
-
onSuccess: (response, _payload, _context) => {
|
|
66
|
+
onSuccess: async (response, _payload, _context) => {
|
|
67
|
+
if (!response) return
|
|
68
|
+
|
|
60
69
|
queryClient.setQueryData<ApiResource<ConversationResource>>(queryKey, () => response)
|
|
61
|
-
|
|
70
|
+
const imageUrl = response.data.customAvatarImageUrl
|
|
71
|
+
await Promise.all([
|
|
72
|
+
imageUrl && Image.prefetch(imageUrl).catch(() => false),
|
|
73
|
+
queryClient.invalidateQueries({ queryKey: ['/me/conversations'] }),
|
|
74
|
+
])
|
|
62
75
|
},
|
|
63
|
-
onError: (_error,
|
|
76
|
+
onError: (_error, payload, context) => {
|
|
77
|
+
if (isSuperseded(payload)) return
|
|
78
|
+
|
|
64
79
|
if (context?.previous) {
|
|
65
80
|
queryClient.setQueryData(queryKey, context.previous)
|
|
66
81
|
}
|