fix(core): add parentId to edit events and update sort events logic

sanity-io · Jan 23, 2025 · 985bfd1 · 985bfd1
1 parent 1197196
commit 985bfd1
Show file tree

Hide file tree

Showing 3 changed files with 433 additions and 11 deletions.
diff --git a/packages/sanity/src/core/store/events/createEventsObservable.ts b/packages/sanity/src/core/store/events/createEventsObservable.ts
@@ -6,6 +6,7 @@ import {type EventsObservableValue} from './getInitialFetchEvents'
 import {type EditDocumentVersionEvent, type UpdateLiveDocumentEvent} from './types'
 import {
   addParentToEvents,
+  sortEvents,
   squashLiveEditEvents,
   updatePublishedEvents,
   updateVersionEvents,
@@ -29,10 +30,7 @@ export function createEventsObservable({
   const documentVariantType = getDocumentVariantType(documentId)
   return combineLatest([releases$, events$, remoteEdits$, expandedEvents$]).pipe(
     map(([releases, {events, nextCursor, loading, error}, remoteEdits, expandedEvents]) => {
-      const eventsWithRemoteEdits = [...remoteEdits, ...events, ...expandedEvents].sort(
-        // Sort by timestamp, newest first
-        (a, b) => Date.parse(b.timestamp) - Date.parse(a.timestamp),
-      )
+      const eventsWithRemoteEdits = sortEvents({remoteEdits, events, expandedEvents})
 
       if (documentVariantType === 'published') {
         return {