fix(files): simplify recovery UI and restore canceled link carets

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-provider.test.ts

@@ -786,7 +786,7 @@ describe('FileDocProvider', () => {
     provider.destroy()
   })
 
-  it('does not recreate a discarded recovery record during page teardown or destroy', async () => {
+  it('preserves pending recovery through page teardown and destroy', async () => {
     journalStorage.clear()
     const scope = { workspaceId: 'workspace-1', userId: 'user-1' }
     const { socket, fire } = createSocket(true)
@@ -801,15 +801,21 @@ describe('FileDocProvider', () => {
     )
     acceptJoin(fire, doc.clientID, 'doc-1')
     fire('disconnect')
-    doc.getText('default').insert(0, 'discard me')
+    doc.getText('default').insert(0, 'preserve me')
     const journal = new PendingFileDocUpdateJournal({ ...scope, fileId: 'file-1' })
     await vi.waitFor(async () => expect(await journal.load('doc-1')).not.toBeNull())
 
-    await provider.discardPendingChanges()
     ;(provider as unknown as { handlePageHide: () => void }).handlePageHide()
     provider.destroy()
 
-    await expect(journal.load('doc-1')).resolves.toBeNull()
+    const stored = await journal.load('doc-1')
+    expect(stored).not.toBeNull()
+    const recovered = new Y.Doc()
+    Y.applyUpdate(recovered, stored!.recoverySnapshot!)
+    Y.applyUpdate(recovered, stored!.pendingUpdate)
+    expect(recovered.getText('default').toString()).toBe('preserve me')
+    recovered.destroy()
+    doc.destroy()
   })
 
   it('hydrates the complete local draft before reporting a replaced document', async () => {
@@ -890,8 +896,7 @@ describe('FileDocProvider', () => {
       updatedAt: Date.now(),
     })
     const scope = { workspaceId: 'workspace-1', userId: 'user-1' }
-    const discard = vi.spyOn(PendingFileDocUpdateJournal.prototype, 'discard').mockResolvedValue()
-    const { socket, fire } = createSocket(true)
+    const { socket, emit, fire } = createSocket(true)
     const doc = new Y.Doc()
     const provider = new FileDocProvider(
       socket,
@@ -904,12 +909,10 @@ describe('FileDocProvider', () => {
 
     await vi.waitFor(() => expect(provider.joinError).toMatchObject({ code: 'INVALID_UPDATE' }))
     expect(doc.getText('default').toString()).toBe('')
-    await provider.discardPendingChanges()
-    expect(discard).toHaveBeenCalledWith('doc-1')
+    expect(emit.mock.calls.some(([event]) => event === FILE_DOC_EVENTS.UPDATE)).toBe(false)
     provider.destroy()
     doc.destroy()
     load.mockRestore()
-    discard.mockRestore()
   })
 
   it('ignores an obsolete schema rejection when recovery finishes after reconnecting', async () => {

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-provider.ts

@@ -170,8 +170,6 @@ export class FileDocProvider extends ObservableV2<FileDocProviderEvents> {
   private updateFlushInProgress = false
   private recoveryApplied = false
   private recoveryQueued = false
-  private recoveryDocId: string | null = null
-  private pendingChangesDiscarded = false
   private beforeUnloadProtected = false
   private readonly journal: PendingFileDocUpdateJournal | null
   private readonly journalLoad: ReturnType<PendingFileDocUpdateJournal['load']>
@@ -434,18 +432,14 @@ export class FileDocProvider extends ObservableV2<FileDocProviderEvents> {
     }
 
     if (recovered !== null && !this.recoveryApplied) {
-      this.recoveryDocId = recovered.docId
       const validationDoc = new Y.Doc()
       try {
         if (recovered.recoverySnapshot) {
           Y.applyUpdate(validationDoc, recovered.recoverySnapshot)
         }
         Y.applyUpdate(validationDoc, recovered.pendingUpdate)
       } catch {
-        this.failFatally(
-          'The local recovery copy is damaged. Download the current draft before discarding it.',
-          'INVALID_UPDATE'
-        )
+        this.failFatally('The local recovery copy is damaged.', 'INVALID_UPDATE')
         return
       } finally {
         validationDoc.destroy()
@@ -456,10 +450,7 @@ export class FileDocProvider extends ObservableV2<FileDocProviderEvents> {
         }
         Y.applyUpdate(this.doc, recovered.pendingUpdate, RECOVERY_ORIGIN)
       } catch {
-        this.failFatally(
-          'The local recovery copy could not be restored. Download the current draft before discarding it.',
-          'INVALID_UPDATE'
-        )
+        this.failFatally('The local recovery copy could not be restored.', 'INVALID_UPDATE')
         return
       }
       this.recoveryApplied = true
@@ -760,16 +751,13 @@ export class FileDocProvider extends ObservableV2<FileDocProviderEvents> {
         ? Y.mergeUpdates([this.inFlightUpdate.update, update])
         : update
       const saved = await this.journal?.save(docId, journalUpdate, Y.encodeStateAsUpdate(this.doc))
-      if (this.disposed || this.fatal || this.pendingChangesDiscarded) {
-        if (!this.pendingChangesDiscarded) this.queuePendingUpdate(update)
+      if (this.disposed || this.fatal) {
+        this.queuePendingUpdate(update)
         return
       }
       if (saved?.status === 'limit-exceeded') {
         this.queuePendingUpdate(update)
-        this.failFatally(
-          'Local edits exceeded the safe recovery limit; download your draft before reloading',
-          'PENDING_UPDATE_LIMIT'
-        )
+        this.failFatally('Local edits exceeded the safe recovery limit.', 'PENDING_UPDATE_LIMIT')
         return
       }
       const durableUpdate = saved?.pendingUpdate ?? update
@@ -881,7 +869,6 @@ export class FileDocProvider extends ObservableV2<FileDocProviderEvents> {
   }
 
   private persistPendingSnapshot(): Promise<void> | undefined {
-    if (this.pendingChangesDiscarded) return
     const update = this.pendingJournalUpdate()
     const docId = this.docId()
     if (!update || !docId || !this.journal) return
@@ -901,7 +888,6 @@ export class FileDocProvider extends ObservableV2<FileDocProviderEvents> {
     if (typeof window === 'undefined') return
     const shouldProtect =
       !this.disposed &&
-      !this.pendingChangesDiscarded &&
       (this.pendingUpdateBatch.length > 0 ||
         this.inFlightUpdate !== null ||
         this.updateFlushInProgress)
@@ -911,17 +897,6 @@ export class FileDocProvider extends ObservableV2<FileDocProviderEvents> {
     else window.removeEventListener('beforeunload', this.handleBeforeUnload)
   }
 
-  /** Remove the stale recovery record before deliberately loading a replacement document. */
-  discardPendingChanges(): Promise<void> {
-    this.pendingChangesDiscarded = true
-    this.clearUpdateTimers()
-    this.pendingUpdateBatch = []
-    this.inFlightUpdate = null
-    this.updateBeforeUnloadProtection()
-    const docId = this.recoveryDocId ?? this.docId()
-    return docId ? (this.journal?.discard(docId) ?? Promise.resolve()) : Promise.resolve()
-  }
-
   private clearBufferedMessages(): void {
     this.bufferedMessages = []
     this.bufferedMessageBytes = 0

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/pending-update-journal.test.ts

@@ -176,14 +176,14 @@ describe('PendingFileDocUpdateJournal', () => {
     await expect(subject.load()).resolves.toMatchObject({ docId: 'doc-4' })
   })
 
-  it('discards only the selected document identity', async () => {
+  it('clears only the acknowledged document identity', async () => {
     const subject = journal()
     const oldUpdate = updateWith('old')
     const currentUpdate = updateWith('current')
     await subject.save('old-doc', oldUpdate, oldUpdate)
     await subject.save('current-doc', currentUpdate, currentUpdate)
 
-    await subject.discard('old-doc')
+    await subject.clear('old-doc', oldUpdate)
 
     await expect(subject.load('old-doc')).resolves.toBeNull()
     await expect(subject.load('current-doc')).resolves.toMatchObject({ docId: 'current-doc' })

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/pending-update-journal.ts

@@ -178,27 +178,14 @@ export class PendingFileDocUpdateJournal {
     )
   }
 
-  /** Deliberately abandon one recovery identity after the user has preserved its local draft. */
-  discard(docId: string): Promise<void> {
-    return this.enqueue(
-      () =>
-        updateValue<unknown>(this.key, (value) =>
-          record(liveDocuments(value, Date.now()).filter((document) => document.docId !== docId))
-        ),
-      undefined,
-      true
-    )
-  }
-
-  private enqueue<T>(operation: () => Promise<T>, fallback: T, rethrow = false): Promise<T> {
+  private enqueue<T>(operation: () => Promise<T>, fallback: T): Promise<T> {
     const result = this.mutationQueue.then(operation, operation)
     this.mutationQueue = result.then(
       () => undefined,
       () => undefined
     )
     return result.catch((error) => {
       logger.warn('Failed to persist pending file edits', { error })
-      if (rethrow) throw error
       return fallback
     })
   }

apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/editor-lifecycle.test.tsx

@@ -17,10 +17,9 @@ import {
 } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/paste-admission'
 import { LoadedRichMarkdownEditor } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor'
 
-const { collaborationRef, uploadFile, saveBlob } = vi.hoisted(() => ({
+const { collaborationRef, uploadFile } = vi.hoisted(() => ({
   collaborationRef: { current: null as unknown },
   uploadFile: vi.fn(),
-  saveBlob: vi.fn(),
 }))
 
 vi.mock('next/navigation', () => ({
@@ -32,7 +31,6 @@ vi.mock('@/hooks/queries/workspace-files', () => ({
   useUploadWorkspaceFile: () => ({ mutateAsync: uploadFile }),
 }))
 vi.mock('@/hooks/use-add-to-chat', () => ({ useAddToChat: () => vi.fn() }))
-vi.mock('@/lib/uploads/client/download', () => ({ saveBlob }))
 vi.mock('@/hooks/use-file-content-source', () => ({
   useFileContentSource: () => ({ resolveImageSrc: (src: string) => src }),
 }))
@@ -103,7 +101,6 @@ const onChange = vi.fn()
 const onEditSource = vi.fn()
 const onClientAutosaveChange = vi.fn()
 const onSaveShortcut = vi.fn()
-const onDownloadDraft = vi.fn()
 const onSuspendedRender = vi.fn()
 const pendingRender = new Promise<void>(() => {})
 
@@ -122,7 +119,6 @@ function SuspendAfterEditor({ active }: SuspendAfterEditorProps) {
 class FakeFileDocProvider {
   synced = false
   joinError: JoinFileDocError | null = null
-  discardPendingChanges = vi.fn(() => Promise.resolve())
   private readonly listeners = new Map<string, Set<(value: unknown) => void>>()
 
   on(event: string, listener: (value: unknown) => void) {
@@ -182,7 +178,6 @@ async function render(
             onEditSource={onEditSource}
             onClientAutosaveChange={onClientAutosaveChange}
             onSaveShortcut={options.onSaveShortcut ?? onSaveShortcut}
-            onDownloadDraft={onDownloadDraft}
           />
           <SuspendAfterEditor active={options.suspend ?? false} />
         </Suspense>
@@ -261,9 +256,13 @@ describe('loaded rich editor lifecycle', () => {
     expect(editor.isEditable).toBe(true)
     expect(editor.view.dom.getAttribute('aria-readonly')).toBe('false')
     expect(container.textContent).not.toContain('Reconnecting…')
+    expect(container.querySelector('[role="status"]')).toBeNull()
+    expect(container.querySelector('[role="alert"]')).toBeNull()
+    expect(toast.warning).not.toHaveBeenCalled()
+    expect(toast.info).not.toHaveBeenCalled()
   })
 
-  it('keeps a revoked unacknowledged draft visible, read-only, and downloadable', async () => {
+  it('keeps revoked pending edits visible and read-only without draft-management prompts', async () => {
     const provider = new FakeFileDocProvider()
     const doc = new Y.Doc()
     doc.getMap(FILE_DOC_SEED.configMap).set(FILE_DOC_SEED.flag, true)
@@ -294,7 +293,13 @@ describe('loaded rich editor lifecycle', () => {
     expect(editor.view.dom.closest('.hidden')).toBeNull()
     expect(container.textContent).not.toContain('stale opening snapshot')
     expect(container.textContent).not.toContain('Reconnecting…')
-    expect(container.textContent).toContain('Download local draft')
+    expect(container.querySelector('[role="status"]')?.textContent).toBe(
+      'You no longer have edit access to this document.'
+    )
+    expect(container.querySelector('button')).toBeNull()
+    expect(container.querySelector('[role="alert"], [role="dialog"]')).toBeNull()
+    expect(toast.warning).not.toHaveBeenCalled()
+    expect(toast.info).not.toHaveBeenCalled()
   })
 
   it('shows stored content read-only when collaboration fails before the first sync', async () => {
@@ -326,7 +331,7 @@ describe('loaded rich editor lifecycle', () => {
   })
 
   it.each(['DOCUMENT_REPLACED', 'PENDING_UPDATE_LIMIT', 'INVALID_UPDATE'])(
-    'keeps a local draft downloadable before offering a destructive reload for %s',
+    'preserves pending edits with only a passive status for %s',
     async (code) => {
       const provider = new FakeFileDocProvider()
       const doc = new Y.Doc()
@@ -350,21 +355,15 @@ describe('loaded rich editor lifecycle', () => {
         })
       )
 
-      const buttons = [...container.querySelectorAll('button')]
-      const download = buttons.find((button) => button.textContent === 'Download local draft')
-      expect(download).toBeDefined()
-      expect(buttons.some((button) => button.textContent === 'Discard draft')).toBe(true)
-      await act(async () => download?.click())
-      expect(onDownloadDraft).not.toHaveBeenCalled()
-      expect(saveBlob).toHaveBeenCalledOnce()
-      const downloaded = saveBlob.mock.calls[0][0] as Blob
-      const downloadedText = await new Promise<string>((resolve, reject) => {
-        const reader = new FileReader()
-        reader.onload = () => resolve(String(reader.result))
-        reader.onerror = () => reject(reader.error)
-        reader.readAsText(downloaded)
-      })
-      expect(downloadedText).toContain('preserved local change')
+      expect(container.querySelector('[role="status"]')?.textContent).toBe(
+        'Live editing is unavailable.'
+      )
+      expect(container.querySelector('button')).toBeNull()
+      expect(container.querySelector('[role="alert"], [role="dialog"]')).toBeNull()
+      expect(container.textContent).not.toContain('Reconnecting…')
+      expect(toast.warning).not.toHaveBeenCalled()
+      expect(toast.info).not.toHaveBeenCalled()
+      expect(getEditor().isEditable).toBe(false)
       expect(getEditor().getText()).toContain('preserved local change')
     }
   )