Merge pull request #36074 from overleaf/mj-reload-after-failed-catch-up

[web] Reload after failed intermittent-connection catchup

GitOrigin-RevId: c9a6315ecb6ebe957ad85c05ebc84bb8165881ab

services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx

@@ -606,6 +606,7 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
             editorContent: editorContent || '',
             baseContent: backupRecord.snapshot,
             docName: document.docName,
+            reloadAfterClose: true,
           })
           OfflineDocBackup.remove(projectId, document.doc_id)
         } else {
@@ -644,13 +645,14 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
 
   useEffect(() => {
     const handleUnableToSync = ({
-      detail: [{ editorContent, baseContent, docName }],
+      detail: [{ editorContent, baseContent, docName, reloadAfterClose }],
     }: CustomEvent<IdeEvents['ide:unableToSyncOfflineChanges']>) => {
       showUnableToSyncModal({
         baseContent,
         targetContent: editorContent,
         docName,
         rootFolderId: fileTreeDataRef.current?._id,
+        reloadAfterClose,
       })
     }
 

services/web/frontend/js/features/ide-react/context/modals-context.tsx

@@ -32,7 +32,11 @@ type ModalsContextValue = {
   showUnableToSyncModal: (
     data: Pick<
       UnableToSyncModalProps,
-      'baseContent' | 'targetContent' | 'docName' | 'rootFolderId'
+      | 'baseContent'
+      | 'targetContent'
+      | 'docName'
+      | 'rootFolderId'
+      | 'reloadAfterClose'
     >
   ) => void
 }
@@ -64,13 +68,18 @@ export const ModalsContextProvider: FC<React.PropsWithChildren> = ({
   const [unableToSyncModalData, setUnableToSyncModalData] = useState<
     Pick<
       UnableToSyncModalProps,
-      'baseContent' | 'targetContent' | 'docName' | 'rootFolderId'
+      | 'baseContent'
+      | 'targetContent'
+      | 'docName'
+      | 'rootFolderId'
+      | 'reloadAfterClose'
     >
   >({
     baseContent: '',
     targetContent: '',
     docName: null,
     rootFolderId: undefined,
+    reloadAfterClose: undefined,
   })
 
   const handleHideGenericModal = useCallback(() => {
@@ -122,7 +131,11 @@ export const ModalsContextProvider: FC<React.PropsWithChildren> = ({
     (
       data: Pick<
         UnableToSyncModalProps,
-        'baseContent' | 'targetContent' | 'docName' | 'rootFolderId'
+        | 'baseContent'
+        | 'targetContent'
+        | 'docName'
+        | 'rootFolderId'
+        | 'reloadAfterClose'
       >
     ) => {
       setUnableToSyncModalData(data)