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

updateQuery of subscribeToMore should be optional #879

Closed
wants to merge 8 commits into from
Closed

updateQuery of subscribeToMore should be optional #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
25b4ac2
updateQuery of subscribeToMore should be optional
Torsten85 Nov 7, 2016
2020244
subscribe doesn't need next function if SubscribeToMoreOptions has no…
Torsten85 Nov 13, 2016
4751813
updateQuery of subscribeToMore should be optional
Torsten85 Nov 7, 2016
6b33e60
subscribe doesn't need next function if SubscribeToMoreOptions has no…
Torsten85 Nov 13, 2016
5a1e32a
Fixed merge conflict
Torsten85 Nov 22, 2016
2f9c2c1
Merge branch 'subscribe-to-more' of github.com:Torsten85/apollo-clien…
Torsten85 Nov 22, 2016
87886c4
[BUGFIX] Turns out 'next' isnt optional after all
Torsten85 Nov 25, 2016
795f3c3
Merge branch 'master' into subscribe-to-more
helfer Nov 28, 2016
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
19 changes: 9 additions & 10 deletions src/core/ObservableQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,14 @@ export class ObservableQuery extends Observable<ApolloQueryResult> {
const reducer = options.updateQuery;

const subscription = observable.subscribe({
next: (data) => {
error: (err) => {
if (options.onError) {
options.onError(err);
} else {
console.error('Unhandled GraphQL subscription errror', err);
}
},
next: reducer ? (data) => {
const mapFn = (previousResult: Object, { variables }: { variables: Object }) => {
return reducer(
previousResult, {
Expand All @@ -240,16 +247,8 @@ export class ObservableQuery extends Observable<ApolloQueryResult> {
);
};
this.updateQuery(mapFn);
},
error: (err) => {
if (options.onError) {
options.onError(err);
} else {
console.error('Unhandled GraphQL subscription errror', err);
}
},
} : () => {}
});

this.subscriptionHandles.push(subscription);

return () => {
Expand Down
2 changes: 1 addition & 1 deletion src/core/watchQueryOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export interface FetchMoreQueryOptions {
export type SubscribeToMoreOptions = {
document: Document;
variables?: { [key: string]: any };
updateQuery: (previousQueryResult: Object, options: {
updateQuery?: (previousQueryResult: Object, options: {
subscriptionData: { data: any },
variables: { [key: string]: any },
}) => Object;
Expand Down