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.

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(base): wait for all chunked requests to arrive before continuing #4017

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion packages/@sanity/base/src/preview/availability.ts
@@ -1,6 +1,6 @@
/* eslint-disable max-nested-callbacks */
import {combineLatest, defer, from, Observable, of} from 'rxjs'
import {distinctUntilChanged, map, mergeMap, switchMap} from 'rxjs/operators'
import {distinctUntilChanged, map, mergeMap, reduce, switchMap} from 'rxjs/operators'
import shallowEquals from 'shallow-equals'
import {flatten, keyBy} from 'lodash'
import {getDraftId, getPublishedId} from '../util/draftUtils'
Expand Down Expand Up @@ -99,12 +99,23 @@ function chunkDocumentIds(documentIds: string[]): string[][] {
return chunks
}

/**
* Mutative concat
* @param array
* @param chunks
*/
function mutConcat<T>(array: T[], chunks: T[]) {
array.push(...chunks)
return array
}

const fetchDocumentReadability = debounceCollect(function fetchDocumentReadability(
args: string[][]
): Observable<DocumentAvailability[]> {
const uniqueIds = [...new Set(flatten(args))]
return from(chunkDocumentIds(uniqueIds)).pipe(
mergeMap(fetchDocumentReadabilityChunked, 10),
reduce(mutConcat, []),
map((res) => args.map(([id]) => res[uniqueIds.indexOf(id)]))
)
},
Expand Down