Avoid loading:true results for warm cache reads when possible.

Fixes #6659 and #6686.
apollographql · Jul 27, 2020 · 5fe8fee · 5fe8fee
1 parent 8be3800
commit 5fe8fee
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/src/core/ObservableQuery.ts b/src/core/ObservableQuery.ts
@@ -138,7 +138,7 @@ export class ObservableQuery<
       return result;
     }
 
-    const { fetchPolicy } = this.options;
+    const { fetchPolicy = 'cache-first' } = this.options;
     if (fetchPolicy === 'no-cache' ||
         fetchPolicy === 'network-only') {
       result.partial = false;
@@ -159,6 +159,16 @@ export class ObservableQuery<
         diff.complete ||
         this.options.returnPartialData
       ) ? diff.result : void 0;
+      // If the cache diff is complete, and we're using a FetchPolicy that
+      // terminates after a complete cache read, we can assume the next
+      // result we receive will have NetworkStatus.ready and !loading.
+      if (diff.complete &&
+          result.networkStatus === NetworkStatus.loading &&
+          (fetchPolicy === 'cache-first' ||
+           fetchPolicy === 'cache-only')) {
+        result.networkStatus = NetworkStatus.ready;
+        result.loading = false;
+      }
     }
 
     this.updateLastResult(result);

diff --git a/src/core/__tests__/ObservableQuery.ts b/src/core/__tests__/ObservableQuery.ts
@@ -1396,8 +1396,8 @@ describe('ObservableQuery', () => {
         });
         expect(stripSymbols(observable.getCurrentResult())).toEqual({
           data: dataOne,
-          loading: true,
-          networkStatus: NetworkStatus.loading,
+          loading: false,
+          networkStatus: NetworkStatus.ready,
           partial: false,
         });
       }).then(resolve, reject);

diff --git a/src/react/components/__tests__/client/Query.test.tsx b/src/react/components/__tests__/client/Query.test.tsx
@@ -1674,9 +1674,6 @@ describe('Query component', () => {
               });
               break;
             case 4:
-              expect(props.loading).toBeTruthy();
-              break;
-            case 5:
               // Good result should be received without any errors.
               expect(props.error).toBeFalsy();
               expect(props.data.allPeople).toBeTruthy();
@@ -1698,7 +1695,7 @@ describe('Query component', () => {
         </Query>
       );
 
-      return wait(() => expect(count).toBe(6)).then(resolve, reject);
+      return wait(() => expect(count).toBe(5)).then(resolve, reject);
     }
   );
 

diff --git a/src/react/hoc/__tests__/mutations/recycled-queries.test.tsx b/src/react/hoc/__tests__/mutations/recycled-queries.test.tsx
@@ -162,9 +162,6 @@ describe('graphql(mutation) update queries', () => {
               });
               break;
             case 3:
-              expect(this.props.data!.loading).toBeTruthy();
-              break;
-            case 4:
               expect(stripSymbols(this.props.data!.todo_list)).toEqual({
                 id: '123',
                 title: 'how to apollo',
@@ -228,15 +225,14 @@ describe('graphql(mutation) update queries', () => {
               expect(todoUpdateQueryCount).toBe(2);
               expect(queryMountCount).toBe(2);
               expect(queryUnmountCount).toBe(2);
-              expect(queryRenderCount).toBe(5);
             }, 5);
           }, 5);
         }, 5);
       }, 6);
     }, 5);
 
     return wait(() => {
-      expect(queryRenderCount).toBe(5);
+      expect(queryRenderCount).toBe(4);
     });
   });
 
@@ -359,12 +355,6 @@ describe('graphql(mutation) update queries', () => {
               );
               break;
             case 3:
-              expect(this.props.data!.loading).toBeTruthy();
-              expect(stripSymbols(this.props.data!.todo_list)).toEqual(
-                updatedData.todo_list
-              );
-              break;
-            case 4:
               expect(this.props.data!.loading).toBeFalsy();
               expect(stripSymbols(this.props.data!.todo_list)).toEqual(
                 updatedData.todo_list
@@ -405,7 +395,7 @@ describe('graphql(mutation) update queries', () => {
     });
 
     return wait(() => {
-      expect(queryRenderCount).toBe(5);
+      expect(queryRenderCount).toBe(4);
     });
   });
 });
diff --git a/src/react/hoc/__tests__/queries/observableQuery.test.tsx b/src/react/hoc/__tests__/queries/observableQuery.test.tsx
@@ -321,9 +321,6 @@ describe('[queries] observableQuery', () => {
               expect(stripSymbols(allPeople)).toEqual(data.allPeople);
               break;
             case 3:
-              expect(loading).toBe(true);
-              break;
-            case 4:
               expect(loading).toBe(false);
               expect(stripSymbols(allPeople)).toEqual(data.allPeople);
               break;