Simplify fetchMore cleanup logic.

apollographql · Apr 9, 2019 · 6d5078b · 6d5078b
1 parent 9c57833
commit 6d5078b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,9 @@
 - Avoid updating (and later invalidating) cache watches when `fetchPolicy` is `'no-cache'`. <br/>
   [@bradleyayers](https://github.com/bradleyayers) in [PR #4573](https://github.com/apollographql/apollo-client/pull/4573), part of [issue #3452](https://github.com/apollographql/apollo-client/issues/3452)
 
+- Remove temporary `queryId` after `fetchMore` completes. <br/>
+  [@doomsower](https://github.com/doomsower) in [#4440](https://github.com/apollographql/apollo-client/pull/4440)
+
 ### Apollo Cache In-Memory
 
 - Support `new InMemoryCache({ freezeResults: true })` to help enforce immutability. <br/>

diff --git a/packages/apollo-client/src/core/ObservableQuery.ts b/packages/apollo-client/src/core/ObservableQuery.ts
@@ -343,12 +343,10 @@ export class ObservableQuery<
     );
 
     let combinedOptions: any;
-    let qid: string;
+    const qid = this.queryManager.generateQueryId();
 
     return Promise.resolve()
       .then(() => {
-        qid = this.queryManager.generateQueryId();
-
         if (fetchMoreOptions.query) {
           // fetch a new query
           combinedOptions = fetchMoreOptions;
@@ -381,9 +379,14 @@ export class ObservableQuery<
             variables: combinedOptions.variables,
           }),
         );
+
         this.queryManager.stopQuery(qid);
 
         return fetchMoreResult as ApolloQueryResult<TData>;
+
+      }, error => {
+        this.queryManager.stopQuery(qid);
+        throw error;
       });
   }