fix: draftId correct set in timeline for version docs

sanity-io · Aug 29, 2024 · 5cff65b · 5cff65b
1 parent 7a9c9f5
commit 5cff65b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/sanity/src/core/store/_legacy/history/history/Timeline.ts b/packages/sanity/src/core/store/_legacy/history/history/Timeline.ts
@@ -1,6 +1,7 @@
 import {type Diff} from '@sanity/diff'
 import {type TransactionLogEventWithEffects} from '@sanity/types'
 import {applyPatch, incremental} from 'mendoza'
+import {isVersionId} from 'sanity'
 
 import {type Annotation, type Chunk} from '../../../../field'
 import {chunkFromTransaction, mergeChunk} from './chunker'
@@ -60,7 +61,7 @@ export class Timeline {
 
   constructor(opts: TimelineOptions) {
     this.publishedId = opts.publishedId
-    this.draftId = `drafts.${opts.publishedId}`
+    this.draftId = isVersionId(opts.publishedId) ? opts.publishedId : `drafts.${opts.publishedId}`
 
     if (opts.enableTrace) {
       this._trace = []

diff --git a/packages/sanity/src/core/store/_legacy/history/useTimelineStore.ts b/packages/sanity/src/core/store/_legacy/history/useTimelineStore.ts
@@ -18,7 +18,6 @@ import {
   type Chunk,
   DRAFTS_FOLDER,
   getVersionId,
-  isVersionId,
   remoteSnapshots,
   type RemoteSnapshotVersionEvent,
   type SelectionState,
@@ -119,8 +118,7 @@ export function useTimelineStore({
     () =>
       historyStore.getTimelineController({
         client,
-        documentId:
-          isVersionId(documentId) && version ? getVersionId(documentId, version) : documentId,
+        documentId: version ? getVersionId(documentId, version) : documentId,
         documentType,
       }),
     [client, documentId, documentType, historyStore, version],