Skip to content

Trigger another request if the variables or query change #36

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

Merged
jackdclark merged 2 commits into from
Feb 20, 2019
Merged

Trigger another request if the variables or query change #36

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
ecf9fe0
failing regression tests for #35
jackdclark Feb 20, 2019
e19a35f
remove data & error check in useQuery useEffect request
jackdclark Feb 20, 2019
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: 1 addition & 3 deletions src/useQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ module.exports = function useQuery(query, opts = {}) {
}

React.useEffect(() => {
if (!state.data && !state.error) {
queryReq();
}
queryReq();
}, [query, JSON.stringify(opts.variables)]);

return {
Expand Down
56 changes: 44 additions & 12 deletions test/unit/useQuery.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,6 @@ describe('useQuery', () => {
expect(mockQueryReq).toHaveBeenCalledTimes(1);
});

it('does not send the same query on mount if data is already present', () => {
mockState.data = { some: 'data' };
testHook(() => useQuery(TEST_QUERY), { wrapper: Wrapper });
expect(mockQueryReq).not.toHaveBeenCalled();
});

it('does not send the query on mount if there is an error', () => {
mockState.error = true;
testHook(() => useQuery(TEST_QUERY), { wrapper: Wrapper });
expect(mockQueryReq).not.toHaveBeenCalled();
});

it('adds query to ssrPromises when in ssrMode if no data & no error', () => {
mockClient.ssrMode = true;
mockQueryReq.mockResolvedValueOnce('data');
Expand Down Expand Up @@ -135,6 +123,28 @@ describe('useQuery', () => {
expect(mockQueryReq).toHaveBeenCalledTimes(2);
});

it('sends the query again if the variables change, even if there was previously data', () => {
let options = { variables: { limit: 2 } };
const { rerender } = testHook(() => useQuery(TEST_QUERY, options), {
wrapper: Wrapper
});
mockState.data = { some: 'data' };
options.variables.limit = 3;
rerender();
expect(mockQueryReq).toHaveBeenCalledTimes(2);
});

it('sends the query again if the variables change, even if there was previously an error', () => {
let options = { variables: { limit: 2 } };
const { rerender } = testHook(() => useQuery(TEST_QUERY, options), {
wrapper: Wrapper
});
mockState.error = true;
options.variables.limit = 3;
rerender();
expect(mockQueryReq).toHaveBeenCalledTimes(2);
});

it('sends another query if the query changes', () => {
let query = TEST_QUERY;
const { rerender } = testHook(() => useQuery(query), {
Expand All @@ -144,4 +154,26 @@ describe('useQuery', () => {
rerender();
expect(mockQueryReq).toHaveBeenCalledTimes(2);
});

it('sends the query again if the query changes, even if there was previously data', () => {
let query = TEST_QUERY;
const { rerender } = testHook(() => useQuery(query), {
wrapper: Wrapper
});
mockState.data = { some: 'data' };
query = ANOTHER_TEST_QUERY;
rerender();
expect(mockQueryReq).toHaveBeenCalledTimes(2);
});

it('sends the query again if the query changes, even if there was previously an error', () => {
let query = TEST_QUERY;
const { rerender } = testHook(() => useQuery(query), {
wrapper: Wrapper
});
mockState.error = true;
query = ANOTHER_TEST_QUERY;
rerender();
expect(mockQueryReq).toHaveBeenCalledTimes(2);
});
});