Merge branch 'develop' into fix/autotranslate-e2e

RocketChat · Oct 10, 2023 · a1e6e4a · a1e6e4a
2 parents afc95a5 + 2124868
commit a1e6e4a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/.changeset/eleven-gorillas-deliver.md b/.changeset/eleven-gorillas-deliver.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix trying to upload same file again and again.
diff --git a/apps/meteor/client/lib/chats/ChatAPI.ts b/apps/meteor/client/lib/chats/ChatAPI.ts
@@ -144,7 +144,7 @@ export type ChatAPI = {
 	ActionManager: any;
 
 	readonly flows: {
-		readonly uploadFiles: (files: readonly File[]) => Promise<void>;
+		readonly uploadFiles: (files: readonly File[], resetFileInput?: () => void) => Promise<void>;
 		readonly sendMessage: ({ text, tshow }: { text: string; tshow?: boolean; previewUrls?: string[] }) => Promise<boolean>;
 		readonly processSlashCommand: (message: IMessage, userId: string | null) => Promise<boolean>;
 		readonly processTooLongMessage: (message: IMessage) => Promise<boolean>;

diff --git a/apps/meteor/client/lib/chats/flows/uploadFiles.ts b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
@@ -6,7 +6,7 @@ import { imperativeModal } from '../../imperativeModal';
 import { prependReplies } from '../../utils/prependReplies';
 import type { ChatAPI } from '../ChatAPI';
 
-export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promise<void> => {
+export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFileInput?: () => void): Promise<void> => {
 	const replies = chat.composer?.quotedMessages.get() ?? [];
 
 	const msg = await prependReplies('', replies);
@@ -52,4 +52,5 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[]): Promis
 	};
 
 	uploadNextFile();
+	resetFileInput?.();
 };
diff --git a/...ient/views/room/composer/messageBox/MessageBoxActionsToolbar/actions/FileUploadAction.tsx b/...ient/views/room/composer/messageBox/MessageBoxActionsToolbar/actions/FileUploadAction.tsx
@@ -18,6 +18,14 @@ const FileUploadAction = ({ collapsed, chatContext, disabled, ...props }: FileUp
 	const fileInputRef = useRef<HTMLInputElement>(null);
 	const chat = useChat() ?? chatContext;
 
+	const resetFileInput = () => {
+		if (!fileInputRef.current) {
+			return;
+		}
+
+		fileInputRef.current.value = '';
+	};
+
 	const handleUploadChange = async (e: ChangeEvent<HTMLInputElement>) => {
 		const { mime } = await import('../../../../../../../app/utils/lib/mimeTypes');
 		const filesToUpload = Array.from(e.target.files ?? []).map((file) => {
@@ -26,8 +34,7 @@ const FileUploadAction = ({ collapsed, chatContext, disabled, ...props }: FileUp
 			});
 			return file;
 		});
-
-		chat?.flows.uploadFiles(filesToUpload);
+		chat?.flows.uploadFiles(filesToUpload, resetFileInput);
 	};
 
 	const handleUpload = () => {