Fix always loading issue caused by error handling

Changelog.md

@@ -4,15 +4,15 @@
 
 ### Improvements
 
-- Make sure `MockedProvider` is using the proper CJS/ESM bundle, when 
+- Make sure `MockedProvider` is using the proper CJS/ESM bundle, when
   referencing `ApolloProvider`.  <br/>
   [@jure](https://github.com/jure) in [#3029](https://github.com/apollographql/react-apollo/pull/3029).
-- Adjust the `ApolloContext` definition to play a bit more nicely with 
+- Adjust the `ApolloContext` definition to play a bit more nicely with
   `React.createContext` types.  <br/>
   [@JoviDeCroock](https://github.com/JoviDeCroock) in [#3018](https://github.com/apollographql/react-apollo/pull/3018)
-- The result of a mutation is now made available to the wrapped component, 
+- The result of a mutation is now made available to the wrapped component,
   when using the `graphql` HOC.  <br/>
-  [@andycarrell](https://github.com/andycarrell) in [#3008](https://github.com/apollographql/react-apollo/pull/3008) 
+  [@andycarrell](https://github.com/andycarrell) in [#3008](https://github.com/apollographql/react-apollo/pull/3008)
 
 ### Bug Fixes
 
@@ -23,6 +23,11 @@
 - Fix typescript error caused by `query` being mandatory in the `fetchMore`
   signature.  <br/>
   [@HsuTing](https://github.com/HsuTing) in [#3065](https://github.com/apollographql/react-apollo/pull/3065)
+- Fixes an issue that caused the `Query` component to get stuck in an always
+  loading state, caused by receiving an error (meaning subsequent valid
+  responses couldn't be handled). The `Query` component can now handle an
+  error in a response, then continue to handle a valid response afterwards.  <br/>
+  [@hwillson](https://github.com/hwillson) in [#3107](https://github.com/apollographql/react-apollo/pull/3107)
 
 
 ## 2.5.6 (2019-05-22)

src/Query.tsx

@@ -349,14 +349,8 @@ export default class Query<TData = any, TVariables = OperationVariables> extends
         this.updateCurrentData();
       },
       error: error => {
-        if (!this.lastResult) {
-          // We only want to remove the old subscription, and start a new
-          // subscription, when an error was received and we don't have a
-          // previous result stored. This means either no previous result was
-          // received due to problems fetching data, or the previous result
-          // has been forcefully cleared out.
-          this.resubscribeToQuery();
-        }
+        this.resubscribeToQuery();
+
         if (!error.hasOwnProperty('graphQLErrors')) throw error;
         this.updateCurrentData();
       },
@@ -510,6 +504,14 @@ export default class Query<TData = any, TVariables = OperationVariables> extends
       };
     }
 
+    // When the component is done rendering stored query errors, we'll
+    // remove those errors from the `ObservableQuery` query store, so they
+    // aren't re-displayed on subsequent (potentially error free)
+    // requests/responses.
+    setTimeout(() => {
+      this.queryObservable!.resetQueryStoreErrors();
+    });
+
     data.client = this.client;
     return data;
   };