Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,46 @@ describe('injectQueries', () => {
expect(rendered.getByText('status2: success, data2: 2')).toBeInTheDocument()
})

it('should reflect query list changes after subscriber results exist', async () => {
const key = queryKey()

@Component({
template: `
<div>
count: {{ result().length }}, data:
{{ dataText() }}
</div>
`,
})
class Page {
readonly ids = signal([1])
readonly result = injectQueries(() => ({
queries: this.ids().map((id) => ({
queryKey: [...key, id],
queryFn: () => sleep(10).then(() => id),
})),
}))

dataText() {
return this.result()
.map((query) => query.data() ?? 'none')
.join(',')
}
}

const rendered = await render(Page)

await vi.advanceTimersByTimeAsync(11)
rendered.fixture.detectChanges()

expect(rendered.getByText('count: 1, data: 1')).toBeInTheDocument()

rendered.fixture.componentInstance.ids.set([])
rendered.fixture.detectChanges()

expect(rendered.getByText('count: 0, data:')).toBeInTheDocument()
})

describe('isRestoring', () => {
it('should not fetch for the duration of the restoring period when isRestoring is true', async () => {
const key1 = queryKey()
Expand Down
14 changes: 8 additions & 6 deletions packages/angular-query-experimental/src/inject-queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,17 @@ export function injectQueries<
),
)

const resultFromSubscriberSignal = signal<TCombinedResult | null>(null)

// Do not notify on updates because of changes in the options because
// these changes should already be reflected in the optimistic result.
effect(() => {
observerSignal().setQueries(
defaultedQueries(),
optionsSignal() as QueriesObserverOptions<TCombinedResult>,
)
const observer = observerSignal()
const defaulted = defaultedQueries()
const options = optionsSignal() as QueriesObserverOptions<TCombinedResult>

resultFromSubscriberSignal.set(null)
observer.setQueries(defaulted, options)
})

const optimisticCombinedResultSignal = computed(() => {
Expand All @@ -289,8 +293,6 @@ export function injectQueries<
return getCombinedResult(trackResult())
})

const resultFromSubscriberSignal = signal<TCombinedResult | null>(null)

effect(() => {
const observer = observerSignal()
const [_optimisticResult, getCombinedResult] = optimisticResultSignal()
Expand Down