Await for callback

Author: tassoevan

apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx

@@ -111,8 +111,8 @@ const ExportMessages = () => {
 	// Remove HTML from download options
 	const downloadOutputOptions = outputOptions.slice(1);
 
-	const roomExportMutation = useRoomExportMutation();
-	const downloadExportMutation = useDownloadExportMutation();
+	const { mutateAsync: exportRoom } = useRoomExportMutation();
+	const { mutateAsync: exportAndDownload } = useDownloadExportMutation();
 
 	const { selectedMessageStore } = useContext(SelectedMessageContext);
 	const messageCount = useCountSelected();
@@ -145,32 +145,43 @@ const ExportMessages = () => {
 
 	const { mutateAsync: exportAsPDF } = useExportMessagesAsPDFMutation();
 
-	const handleExport = async ({ type, toUsers, dateFrom, dateTo, format, subject, additionalEmails }: ExportMessagesFormValues) => {
+	const handleExport = async ({
+		type,
+		toUsers,
+		dateFrom,
+		dateTo,
+		format,
+		subject,
+		additionalEmails,
+	}: ExportMessagesFormValues): Promise<void> => {
 		const messages = selectedMessageStore.getSelectedMessages();
 
 		if (type === 'download') {
 			if (format === 'pdf') {
-				return exportAsPDF(messages);
+				await exportAsPDF(messages);
+				return;
 			}
 
 			if (format === 'json') {
-				return downloadExportMutation.mutateAsync({
+				await exportAndDownload({
 					mids: messages,
 				});
+				return;
 			}
 		}
 
 		if (type === 'file') {
-			return roomExportMutation.mutateAsync({
+			await exportRoom({
 				rid: room._id,
 				type: 'file',
 				...(dateFrom && { dateFrom }),
 				...(dateTo && { dateTo }),
 				format: format as 'html' | 'json',
 			});
+			return;
 		}
 
-		roomExportMutation.mutateAsync({
+		await exportRoom({
 			rid: room._id,
 			type: 'email',
 			toUsers,

apps/meteor/client/views/room/contextualBar/ExportMessages/useExportMessagesAsPDFMutation.tsx

@@ -107,22 +107,27 @@ export const useExportMessagesAsPDFMutation = () => {
 
 			const instance = pdf();
 
-			const callback = async () => {
-				const link = document.createElement('a');
-				link.href = URL.createObjectURL(await instance.toBlob());
-				link.download = `exportedMessages-${new Date().toISOString()}.pdf`;
-				document.body.appendChild(link);
-				link.click();
-				document.body.removeChild(link);
-				URL.revokeObjectURL(link.href);
-			};
+			await new Promise<void>((resolve, reject) => {
+				const callback = async () => {
+					const link = document.createElement('a');
+					link.href = URL.createObjectURL(await instance.toBlob());
+					link.download = `exportedMessages-${new Date().toISOString()}.pdf`;
+					document.body.appendChild(link);
+					link.click();
+					document.body.removeChild(link);
+					URL.revokeObjectURL(link.href);
+					resolve();
+				};
 
-			try {
-				instance.on('change', callback);
-				instance.updateContainer(jsx);
-			} finally {
-				instance.removeListener('change', callback);
-			}
+				try {
+					instance.on('change', callback);
+					instance.updateContainer(jsx);
+				} catch (error) {
+					reject(error);
+				} finally {
+					instance.removeListener('change', callback);
+				}
+			});
 		},
 		onError: (error) => {
 			dispatchToastMessage({ type: 'error', message: error });