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 useQueryWithStore outputs incorrect loaded field when enabled is false #6262

Merged
merged 1 commit into from
May 10, 2021
Merged

Fix useQueryWithStore outputs incorrect loaded field when enabled is false #6262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 45 additions & 4 deletions packages/ra-core/src/dataProvider/useQueryWithStore.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ describe('useQueryWithStore', () => {
expect(callArgs.error).toBeNull();
expect(callArgs.total).toBeNull();

await new Promise(resolve => setImmediate(resolve)); // wait for useEffect
callArgs = callback.mock.calls[1][0];
expect(callArgs.loading).toEqual(false);
expect(callArgs.loaded).toEqual(false);

callback.mockClear();
rerender(
<DataProviderContext.Provider value={dataProvider}>
<UseQueryWithStore
Expand All @@ -64,16 +70,43 @@ describe('useQueryWithStore', () => {
</DataProviderContext.Provider>,
{ admin: { resources: { posts: { data: {} } } } }
);
await new Promise(resolve => setImmediate(resolve)); // dataProvider Promise returns result on next tick
callArgs = callback.mock.calls[2][0];
callArgs = callback.mock.calls[0][0];
expect(callArgs.data).toBeUndefined();
expect(callArgs.loading).toEqual(false);
expect(callArgs.loaded).toEqual(false);
expect(callArgs.error).toBeNull();
expect(callArgs.total).toBeNull();

callback.mockClear();
await new Promise(resolve => setImmediate(resolve)); // wait for useEffect
callArgs = callback.mock.calls[0][0];
expect(callArgs.data).toBeUndefined();
expect(callArgs.loading).toEqual(true);
expect(callArgs.loaded).toEqual(false);
expect(callArgs.error).toBeNull();
expect(callArgs.total).toBeNull();

await new Promise(resolve => setImmediate(resolve)); // dataProvider Promise returns result on next tick
callArgs = callback.mock.calls[4][0];
callArgs = callback.mock.calls[1][0];
expect(callArgs.data).toEqual({
id: 1,
title: 'titleFromDataProvider',
});
expect(callArgs.loading).toEqual(false);
expect(callArgs.loaded).toEqual(true);
expect(callArgs.error).toBeNull();
expect(callArgs.total).toBeNull();

callback.mockClear();
rerender(
<DataProviderContext.Provider value={dataProvider}>
<UseQueryWithStore
callback={callback}
options={{ enabled: false }}
/>
</DataProviderContext.Provider>,
{ admin: { resources: { posts: { data: {} } } } }
);
callArgs = callback.mock.calls[0][0];
expect(callArgs.data).toEqual({
id: 1,
title: 'titleFromDataProvider',
Expand All @@ -82,6 +115,14 @@ describe('useQueryWithStore', () => {
expect(callArgs.loaded).toEqual(true);
expect(callArgs.error).toBeNull();
expect(callArgs.total).toBeNull();

callback.mockClear();
await new Promise(resolve => setImmediate(resolve)); // wait for useEffect
callArgs = callback.mock.calls[0][0];
expect(callArgs.loading).toEqual(false);
expect(callArgs.loaded).toEqual(false);
expect(callArgs.error).toBeNull();
expect(callArgs.total).toBeNull();
});

it('should return data from dataProvider', async () => {
Expand Down
7 changes: 4 additions & 3 deletions packages/ra-core/src/dataProvider/useQueryWithStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export const useQueryWithStore = <State extends ReduxState = ReduxState>(
total,
error: null,
loading: options?.enabled === false ? false : true,
loaded: isDataLoaded(data),
loaded: options?.enabled === false ? false : isDataLoaded(data),
refetch,
});

Expand All @@ -158,7 +158,7 @@ export const useQueryWithStore = <State extends ReduxState = ReduxState>(
total,
error: null,
loading: options?.enabled === false ? false : true,
loaded: isDataLoaded(data),
loaded: options?.enabled === false ? false : isDataLoaded(data),
refetch,
});
} else if (!isEqual(state.data, data) || state.total !== total) {
Expand Down Expand Up @@ -217,7 +217,8 @@ export const useQueryWithStore = <State extends ReduxState = ReduxState>(
resolve({
error: null,
loading: false,
loaded: true,
loaded:
options?.enabled === false ? false : true,
});
})
.catch(error => {
Expand Down