From f9ff578c6b5831b0d4729f00bdc8319a9276e226 Mon Sep 17 00:00:00 2001
From: Anthony LC <anthony.le-courric@mail.numerique.gouv.fr>
Date: Wed, 5 Nov 2025 11:42:13 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A5=85(frontend)=20improve=20error=20hand?=
 =?UTF-8?q?ling=20during=20upload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Catch and log errors when replacing blocks during
file upload.
---
 .../custom-blocks/UploadLoaderBlock.tsx       | 58 +++++++++++--------
 .../docs/doc-editor/hook/useUploadFile.tsx    | 37 +++++++-----
 2 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-blocks/UploadLoaderBlock.tsx b/src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-blocks/UploadLoaderBlock.tsx
index 3842cb42..3e30224b 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-blocks/UploadLoaderBlock.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-blocks/UploadLoaderBlock.tsx
@@ -70,35 +70,43 @@ const UploadLoaderBlockComponent = ({
     loopCheckDocMediaStatus(url)
       .then((response) => {
         // Replace the loading block with the resource block (image, audio, video, pdf ...)
-        editor.replaceBlocks(
-          [block.id],
-          [
-            {
-              type: block.props.blockUploadType,
-              props: {
-                url: `${mediaUrl}${response.file}`,
-                showPreview: block.props.blockUploadShowPreview,
-                name: block.props.blockUploadName,
-                caption: '',
-                backgroundColor: 'default',
-                textAlignment: 'left',
-              },
-            } as never,
-          ],
-        );
+        try {
+          editor.replaceBlocks(
+            [block.id],
+            [
+              {
+                type: block.props.blockUploadType,
+                props: {
+                  url: `${mediaUrl}${response.file}`,
+                  showPreview: block.props.blockUploadShowPreview,
+                  name: block.props.blockUploadName,
+                  caption: '',
+                  backgroundColor: 'default',
+                  textAlignment: 'left',
+                },
+              } as never,
+            ],
+          );
+        } catch {
+          /* During collaboration, another user might have updated the block */
+        }
       })
       .catch((error) => {
         console.error('Error analyzing file:', error);
 
-        editor.updateBlock(block.id, {
-          type: 'uploadLoader',
-          props: {
-            type: 'warning',
-            information: t(
-              'The antivirus has detected an anomaly in your file.',
-            ),
-          },
-        });
+        try {
+          editor.updateBlock(block.id, {
+            type: 'uploadLoader',
+            props: {
+              type: 'warning',
+              information: t(
+                'The antivirus has detected an anomaly in your file.',
+              ),
+            },
+          });
+        } catch {
+          /* During collaboration, another user might have updated the block */
+        }
       });
   }, [block, editor, mediaUrl]);
 
diff --git a/src/frontend/apps/impress/src/features/docs/doc-editor/hook/useUploadFile.tsx b/src/frontend/apps/impress/src/features/docs/doc-editor/hook/useUploadFile.tsx
index 6cab7272..d3451ed0 100644
--- a/src/frontend/apps/impress/src/features/docs/doc-editor/hook/useUploadFile.tsx
+++ b/src/frontend/apps/impress/src/features/docs/doc-editor/hook/useUploadFile.tsx
@@ -1,3 +1,4 @@
+import { captureException } from '@sentry/nextjs';
 import { useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -70,22 +71,28 @@ export const useUploadStatus = (editor: DocsBlockNoteEditor) => {
       const timeoutId = setTimeout(() => {
         // Replace the resource block by a uploadLoader block
         // to show analyzing status
-        editor.replaceBlocks(
-          [blockChanges.block.id],
-          [
-            {
-              type: 'uploadLoader',
-              props: {
-                information: t('Analyzing file...'),
-                type: 'loading',
-                blockUploadName,
-                blockUploadType,
-                blockUploadUrl,
-                blockUploadShowPreview,
+        try {
+          editor.replaceBlocks(
+            [blockChanges.block.id],
+            [
+              {
+                type: 'uploadLoader',
+                props: {
+                  information: t('Analyzing file...'),
+                  type: 'loading',
+                  blockUploadName,
+                  blockUploadType,
+                  blockUploadUrl,
+                  blockUploadShowPreview,
+                },
               },
-            },
-          ],
-        );
+            ],
+          );
+        } catch (error) {
+          captureException(error, {
+            extra: { info: 'Error replacing block for upload loader' },
+          });
+        }
       }, 250);
 
       return () => {