Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sanity): fix race condition introduced by #8120 #8211

Merged
merged 2 commits into from
Jan 8, 2025
Merged

fix(sanity): fix race condition introduced by #8120 #8211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae855bd
fix(sanity): fix race condition regression introduced by #8120
bjoerge Jan 8, 2025
ce0badc
fixup! fix(sanity): fix race condition regression introduced by #8120
bjoerge Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/sanity/src/core/store/_legacy/document/document-pair/checkoutPair.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ export interface Pair {
transactionsPendingEvents$: Observable<PendingMutationsEvent>
published: DocumentVersion
draft: DocumentVersion
_keepalive: Observable<never>
}

function setVersion<T>(version: 'draft' | 'published') {
Expand Down Expand Up @@ -252,8 +251,5 @@ export function checkoutPair(
consistency$: published.consistency$,
remoteSnapshot$: published.remoteSnapshot$.pipe(map(setVersion('published'))),
},
// Use this to keep the mutation pipeline active.
// It won't ever emit any events, but it will prevent the eventsource connection from completing for as long as it is subscribed to
_keepalive: merge(listenerEvents$, commits$).pipe(mergeMap(() => EMPTY)),
}
}
19 changes: 12 additions & 7 deletions packages/sanity/src/core/store/_legacy/document/document-pair/memoizedPair.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {type SanityClient} from '@sanity/client'
import {merge, type Observable, of, ReplaySubject, share, timer} from 'rxjs'
import {EMPTY, merge, Observable, of, ReplaySubject, share, timer} from 'rxjs'
import {mergeMap} from 'rxjs/operators'

import {type PairListenerOptions} from '../getPairListener'
import {type IdPair} from '../types'
Expand All @@ -24,12 +25,16 @@ export const memoizedPair: (
serverActionsEnabled: Observable<boolean>,
pairListenerOptions?: PairListenerOptions,
): Observable<Pair> => {
const pair = checkoutPair(client, idPair, serverActionsEnabled, pairListenerOptions)
return merge(
of(pair),
// makes sure the pair listener is kept alive for as long as there are subscribers
pair._keepalive,
).pipe(
return new Observable<Pair>((subscriber) => {
const pair = checkoutPair(client, idPair, serverActionsEnabled, pairListenerOptions)
return merge(
of(pair),
// merge in draft events and published events to makes sure they receive
// the events they need for as long as the pair is subscribed to
pair.draft.events.pipe(mergeMap(() => EMPTY)),
pair.published.events.pipe(mergeMap(() => EMPTY)),
).subscribe(subscriber)
}).pipe(
share({
connector: () => new ReplaySubject(1),
resetOnComplete: true,
Expand Down
Loading