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

Improve processing of options.nextFetchPolicy #8465

Merged
merged 11 commits into from
Jul 9, 2021
Merged

Improve processing of options.nextFetchPolicy #8465

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
add15f5
Avoid deleting options.nextFetchPolicy after applying it.
benjamn Jul 6, 2021
143e2ea
Specify which ObservableQuery operations run independently.
benjamn Jul 6, 2021
231ffbd
Reset options.fetchPolicy in ObservableQuery#setVariables.
benjamn Jul 6, 2021
1ab0161
Improve ObservableQuery nextFetchPolicy test.
benjamn Jul 6, 2021
1dcc2e8
Avoid specifying options.nextFetchPolicy for refetch operations.
benjamn Jul 6, 2021
4bd46ed
Avoid calling applyNextFetchPolicy in prepareObservableQueryOptions.
benjamn Jun 29, 2021
bdac212
Improve type for QueryData["previous"]["observableQueryOptions"].
benjamn Jul 7, 2021
83703c2
Reliably reset fetchPolicy to original value when variables change.
benjamn Jul 7, 2021
5d47432
Test that fetchPolicy is reset when variables change.
benjamn Jul 8, 2021
89126b6
Keep ObservableQuery initialFetchPolicy member private for now.
benjamn Jul 9, 2021
8a98eb9
Mention PR #8465 in CHANGELOG.md, as a "potentially disruptive" change.
benjamn Jul 9, 2021
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
Prev Previous commit
Next Next commit
Improve type for QueryData["previous"]["observableQueryOptions"].
  • Loading branch information
@benjamn
benjamn committed Jul 9, 2021
commit bdac212592472dd040d6e7a902d052de26793ce7
9 changes: 6 additions & 3 deletions src/react/data/QueryData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ import {
} from '../types/types';
import { OperationData } from './OperationData';

type ObservableQueryOptions<TData, TVars> =
ReturnType<QueryData<TData, TVars>["prepareObservableQueryOptions"]>;

export class QueryData<TData, TVariables> extends OperationData<
QueryDataOptions<TData, TVariables>
> {
Expand All @@ -39,7 +42,7 @@ export class QueryData<TData, TVariables> extends OperationData<
private previous: {
client?: ApolloClient<object>;
query?: DocumentNode | TypedDocumentNode<TData, TVariables>;
observableQueryOptions?: {};
observableQueryOptions?: ObservableQueryOptions<TData, TVariables>;
result?: QueryResult<TData, TVariables>;
loading?: boolean;
options?: QueryDataOptions<TData, TVariables>;
Expand Down Expand Up @@ -222,7 +225,7 @@ export class QueryData<TData, TVariables> extends OperationData<

this.previous.observableQueryOptions = {
...observableQueryOptions,
children: null
children: void 0,
};
this.currentObservable = this.refreshClient().client.watchQuery({
...observableQueryOptions
Expand All @@ -246,7 +249,7 @@ export class QueryData<TData, TVariables> extends OperationData<

const newObservableQueryOptions = {
...this.prepareObservableQueryOptions(),
children: null
children: void 0,
};

if (this.getOptions().skip) {
Expand Down