Merge branch 'dev' into feat/apple-app-site-association

netbe · web-flow · commit 1dcdb8cd1af3 · 2025-10-17T16:45:45.000+02:00
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@wireapp/avs": "10.2.7",
     "@wireapp/avs-debugger": "0.0.7",
     "@wireapp/commons": "5.4.5",
-    "@wireapp/core": "46.39.7",
+    "@wireapp/core": "46.39.10",
     "@wireapp/kalium-backup": "0.0.4",
     "@wireapp/promise-queue": "2.4.5",
     "@wireapp/react-ui-kit": "9.68.0",
diff --git a/src/script/Config.ts b/src/script/Config.ts
@@ -89,7 +89,7 @@ const config = {
   ALLOWED_IMAGE_TYPES: ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png', 'image/webp'],
 
   /** Which min and max version of the backend api do we support */
-  SUPPORTED_API_RANGE: [MINIMUM_API_VERSION, 11],
+  SUPPORTED_API_RANGE: [MINIMUM_API_VERSION, env.ENABLE_DEV_BACKEND_API ? Infinity : 11],
 
   /** DataDog client api keys access */
   dataDog: {
diff --git a/src/script/components/Conversation/Conversation.tsx b/src/script/components/Conversation/Conversation.tsx
@@ -478,13 +478,14 @@ export const Conversation = ({
   const isCellsEnabled =
     Config.getConfig().FEATURE.ENABLE_CELLS && activeConversation?.cellsState() !== CONVERSATION_CELLS_STATE.DISABLED;
 
-  const {getRootProps, getInputProps, openAllFilesView, openImageFilesView, isDragAccept} = useFilesUploadDropzone({
-    isTeam: inTeam,
-    cellsRepository: repositories.cells,
-    conversation: activeConversation,
-    isCellsEnabled: isCellsEnabled,
-    isDisabled: isFileTabActive,
-  });
+  const {getRootProps, getInputProps, openAllFilesView, openImageFilesView, handlePastedFile, isDragAccept} =
+    useFilesUploadDropzone({
+      isTeam: inTeam,
+      cellsRepository: repositories.cells,
+      conversation: activeConversation,
+      isCellsEnabled: isCellsEnabled,
+      isDisabled: isFileTabActive,
+    });
 
   return (
     <ConversationFileDropzone
@@ -595,10 +596,12 @@ export const Conversation = ({
                   storageRepository={repositories.storage}
                   teamState={teamState}
                   selfUser={selfUser}
+                  isCellsEnabled={isCellsEnabled}
                   onShiftTab={() => setMsgElementsFocusable(false)}
                   uploadDroppedFiles={uploadDroppedFiles}
                   uploadImages={uploadImages}
                   uploadFiles={uploadFiles}
+                  uploadPastedFiles={checkFileSharingPermission(handlePastedFile)}
                   onCellImageUpload={openImageFilesView}
                   onCellAssetUpload={openAllFilesView}
                 />
diff --git a/src/script/components/Conversation/useFilesUploadDropzone/useFilesUploadDropzone.ts b/src/script/components/Conversation/useFilesUploadDropzone/useFilesUploadDropzone.ts
@@ -73,32 +73,7 @@ export const useFilesUploadDropzone = ({
     disabled: isDisabled,
     accept,
     onDrop: checkFileSharingPermission(async (acceptedFiles: File[], rejectedFiles: FileRejection[]) => {
-      const newFiles = [...acceptedFiles, ...rejectedFiles.map(file => file.file)];
-
-      const validationResult = validateFiles({
-        newFiles,
-        currentFiles: files,
-        maxSize: MAX_SIZE,
-        maxFiles: MAX_FILES,
-      });
-
-      if (!validationResult.isValid) {
-        const {error, invalidFiles} = validationResult as Extract<ValidationResult, {isValid: false}>;
-        showFileDropzoneErrorModal({
-          title: error.title,
-          message: error.message,
-          invalidFiles,
-        });
-        return;
-      }
-
-      const transformedAcceptedFiles = transformAcceptedFiles(acceptedFiles);
-
-      addFiles({conversationId: conversation.id, files: transformedAcceptedFiles});
-
-      await attatchMetadataToFiles(transformedAcceptedFiles);
-
-      await uploadFiles(transformedAcceptedFiles);
+      await processIncomingFiles(acceptedFiles, rejectedFiles, files, MAX_SIZE, MAX_FILES, conversation.id);
     }),
     onError: (error: Error) => {
       logger.error('Dropping files failed', error);
@@ -116,6 +91,46 @@ export const useFilesUploadDropzone = ({
     },
   });
 
+  const processIncomingFiles = async (
+    acceptedFiles: File[],
+    rejectedFiles: FileRejection[],
+    files: FileWithPreview[],
+    maxSize: number,
+    maxFiles: number,
+    conversationId: string,
+  ) => {
+    const newFiles = [...acceptedFiles, ...rejectedFiles.map(file => file.file)];
+
+    const validationResult = validateFiles({
+      newFiles,
+      currentFiles: files,
+      maxSize,
+      maxFiles,
+    });
+
+    if (!validationResult.isValid) {
+      const {error, invalidFiles} = validationResult as Extract<ValidationResult, {isValid: false}>;
+      showFileDropzoneErrorModal({
+        title: error.title,
+        message: error.message,
+        invalidFiles,
+      });
+      return;
+    }
+
+    const transformedAcceptedFiles = transformAcceptedFiles(acceptedFiles);
+
+    addFiles({conversationId, files: transformedAcceptedFiles});
+
+    await attatchMetadataToFiles(transformedAcceptedFiles);
+
+    await uploadFiles(transformedAcceptedFiles);
+  };
+
+  const handlePastedFile = async (file: File) => {
+    await processIncomingFiles([file], [], files, MAX_SIZE, MAX_FILES, conversation.id);
+  };
+
   const uploadFile = async (file: FileWithPreview) => {
     // Temporary solution to handle the local development
     // TODO: remove this once we have a proper way to handle the domain per env
@@ -200,5 +215,5 @@ export const useFilesUploadDropzone = ({
     delayedOpen();
   };
 
-  return {getRootProps, getInputProps, openAllFilesView, openImageFilesView, isDragAccept};
+  return {getRootProps, getInputProps, openAllFilesView, openImageFilesView, handlePastedFile, isDragAccept};
 };
diff --git a/src/script/components/InputBar/InputBar.test.tsx b/src/script/components/InputBar/InputBar.test.tsx
@@ -86,11 +86,13 @@ describe('InputBar', () => {
     propertiesRepository,
     searchRepository,
     storageRepository,
+    isCellsEnabled: false,
     teamState: new TeamState(),
     selfUser: new User('id'),
     onShiftTab: jest.fn(),
     uploadDroppedFiles: jest.fn(),
     uploadImages: jest.fn(),
+    uploadPastedFiles: jest.fn(),
     uploadFiles: jest.fn(),
     onCellImageUpload: jest.fn(),
     onCellAssetUpload: jest.fn(),
diff --git a/src/script/components/InputBar/InputBar.tsx b/src/script/components/InputBar/InputBar.tsx
@@ -84,10 +84,12 @@ interface InputBarProps {
   readonly storageRepository: StorageRepository;
   readonly teamState: TeamState;
   readonly selfUser: User;
+  readonly isCellsEnabled: boolean;
   onShiftTab: () => void;
   uploadDroppedFiles: (droppedFiles: File[]) => void;
   uploadImages: (images: File[]) => void;
   uploadFiles: (files: File[]) => void;
+  uploadPastedFiles: (file: File) => void;
   onCellImageUpload: () => void;
   onCellAssetUpload: () => void;
 }
@@ -104,20 +106,19 @@ export const InputBar = ({
   storageRepository,
   selfUser,
   teamState = container.resolve(TeamState),
+  isCellsEnabled,
   onShiftTab,
   uploadDroppedFiles,
   uploadImages,
   uploadFiles,
+  uploadPastedFiles,
   onCellImageUpload,
   onCellAssetUpload,
 }: InputBarProps) => {
-  const {classifiedDomains, isSelfDeletingMessagesEnabled, isFileSharingSendingEnabled, isCellsEnabled} =
-    useKoSubscribableChildren(teamState, [
-      'classifiedDomains',
-      'isSelfDeletingMessagesEnabled',
-      'isFileSharingSendingEnabled',
-      'isCellsEnabled',
-    ]);
+  const {classifiedDomains, isSelfDeletingMessagesEnabled, isFileSharingSendingEnabled} = useKoSubscribableChildren(
+    teamState,
+    ['classifiedDomains', 'isSelfDeletingMessagesEnabled', 'isFileSharingSendingEnabled'],
+  );
   const {connection, localMessageTimer, messageTimer, hasGlobalMessageTimer, isSelfUserRemoved, is1to1} =
     useKoSubscribableChildren(conversation, [
       'connection',
@@ -126,6 +127,7 @@ export const InputBar = ({
       'hasGlobalMessageTimer',
       'isSelfUserRemoved',
       'is1to1',
+      'cellsState',
     ]);
   const {isOutgoingRequest, isIncomingRequest} = useKoSubscribableChildren(connection!, [
     'isOutgoingRequest',
@@ -197,6 +199,7 @@ export const InputBar = ({
   const fileHandling = useFileHandling({
     uploadDroppedFiles,
     uploadImages,
+    isFileNameKept: isCellsEnabled,
   });
 
   const showMarkdownPreview = useUserPropertyValue<boolean>(
@@ -231,6 +234,11 @@ export const InputBar = ({
     sendPastedFile: fileHandling.sendPastedFile,
   });
 
+  if (fileHandling.pastedFile && !!isCellsEnabled) {
+    uploadPastedFiles(fileHandling.pastedFile);
+    fileHandling.clearPastedFile();
+  }
+
   const ping = usePing({
     conversation,
     messageRepository,
@@ -343,7 +351,7 @@ export const InputBar = ({
             </>
           )}
 
-          {fileHandling.pastedFile && (
+          {fileHandling.pastedFile && !isCellsEnabled && (
             <PastedFileControls
               pastedFile={fileHandling.pastedFile}
               onClear={fileHandling.clearPastedFile}
diff --git a/src/script/components/InputBar/useFileHandling/useFileHandling.ts b/src/script/components/InputBar/useFileHandling/useFileHandling.ts
@@ -28,15 +28,17 @@ import {useFilePaste} from './useFilePaste/useFilePaste';
 interface UseFileHandlingProps {
   uploadDroppedFiles: (files: File[]) => void;
   uploadImages: (images: File[]) => void;
+  isFileNameKept?: boolean;
 }
 
-export const useFileHandling = ({uploadDroppedFiles, uploadImages}: UseFileHandlingProps) => {
+export const useFileHandling = ({uploadDroppedFiles, uploadImages, isFileNameKept}: UseFileHandlingProps) => {
   const [pastedFile, setPastedFile] = useState<File | null>(null);
 
   useFilePaste({
     onFilePasted: file => {
       setPastedFile(file);
     },
+    isFileNameKept,
   });
 
   const clearPastedFile = () => setPastedFile(null);
diff --git a/src/script/components/InputBar/useFileHandling/useFilePaste/useFilePaste.ts b/src/script/components/InputBar/useFileHandling/useFilePaste/useFilePaste.ts
@@ -26,9 +26,10 @@ import {getFileExtension} from 'Util/util';
 
 interface UseFilePasteParams {
   onFilePasted: (file: File) => void;
+  isFileNameKept?: boolean;
 }
 
-export const useFilePaste = ({onFilePasted}: UseFilePasteParams) => {
+export const useFilePaste = ({onFilePasted, isFileNameKept}: UseFilePasteParams) => {
   const processClipboardFiles = useCallback(
     (files: FileList): void => {
       const [pastedFile] = files;
@@ -39,15 +40,17 @@ export const useFilePaste = ({onFilePasted}: UseFilePasteParams) => {
       const {lastModified} = pastedFile;
 
       const date = formatLocale(lastModified || new Date(), 'PP, pp');
-      const fileName = `${t('conversationSendPastedFile', {date})}.${getFileExtension(pastedFile.name)}`;
+      const fileName = isFileNameKept
+        ? pastedFile.name
+        : `${t('conversationSendPastedFile', {date})}.${getFileExtension(pastedFile.name)}`;
 
       const newFile = new File([pastedFile], fileName, {
         type: pastedFile.type,
       });
 
       onFilePasted(newFile);
     },
-    [onFilePasted],
+    [onFilePasted, isFileNameKept],
   );
 
   const handlePasteEvent = useCallback(
diff --git a/src/script/repositories/assets/AssetRepository.test.ts b/src/script/repositories/assets/AssetRepository.test.ts
@@ -145,7 +145,7 @@ describe('AssetRepository', () => {
   it('uploads assets with audit log enabled when specified if required metadata is present', async () => {
     isAuditLogEnabled = true;
     const assetAuditData = {
-      conversationId: {domain: 'domain', id: 'id'},
+      convId: {domain: 'domain', id: 'id'},
       filename: 'filename',
       filetype: 'filetype',
     };
@@ -167,7 +167,7 @@ describe('AssetRepository', () => {
   it('does not upload asset when audit log is enabled and required metadata is missing', async () => {
     isAuditLogEnabled = true;
     const assetAuditData = {
-      conversationId: {domain: 'domain', id: 'id'},
+      convId: {domain: 'domain', id: 'id'},
       filename: 'filename',
       filetype: '',
     };
diff --git a/src/script/repositories/assets/AssetRepository.ts b/src/script/repositories/assets/AssetRepository.ts
@@ -252,10 +252,7 @@ export class AssetRepository {
 
     if (isAuditLogEnabled) {
       const isIncompleteAuditData =
-        !options.auditData ||
-        !options.auditData.conversationId ||
-        !options.auditData.filename ||
-        !options.auditData.filetype;
+        !options.auditData || !options.auditData.convId || !options.auditData.filename || !options.auditData.filetype;
       if (isIncompleteAuditData) {
         this.removeFromUploadQueue(messageId);
         throw new Error('Audit data is incomplete, file cannot be uploaded');
diff --git a/src/script/repositories/conversation/ConversationRepository.ts b/src/script/repositories/conversation/ConversationRepository.ts
diff --git a/src/script/repositories/conversation/MessageRepository.ts b/src/script/repositories/conversation/MessageRepository.ts
diff --git a/yarn.lock b/yarn.lock
