fix(http): delay accessing pendingTasks.whenAllTasksComplete (#49784)

alan-agius4 · AndrewKushnir · commit 15c91a53ae2c · 2023-04-11T14:12:38.000-07:00
Accessing `pendingTasks.whenAllTasksComplete` too early causes the `InitialRenderPendingTasks` to return a resolved promise too early. This commit changes the way we access `whenAllTasksComplete` to only happen when the application is stabilized. PR Close #49784
diff --git a/packages/common/http/src/transfer_cache.ts b/packages/common/http/src/transfer_cache.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {APP_BOOTSTRAP_LISTENER, ApplicationRef, inject, InjectionToken, makeStateKey, Provider, StateKey, TransferState, ɵENABLED_SSR_FEATURES as ENABLED_SSR_FEATURES, ɵInitialRenderPendingTasks as InitialRenderPendingTasks} from '@angular/core';
+import {APP_INITIALIZER, ApplicationRef, inject, InjectionToken, makeStateKey, Provider, StateKey, TransferState, ɵENABLED_SSR_FEATURES as ENABLED_SSR_FEATURES, ɵInitialRenderPendingTasks as InitialRenderPendingTasks} from '@angular/core';
 import {Observable, of} from 'rxjs';
 import {first, tap} from 'rxjs/operators';
 
@@ -160,7 +160,7 @@ export function withHttpTransferCache(): Provider[] {
       deps: [TransferState, CACHE_STATE]
     },
     {
-      provide: APP_BOOTSTRAP_LISTENER,
+      provide: APP_INITIALIZER,
       multi: true,
       useFactory: () => {
         const appRef = inject(ApplicationRef);
@@ -169,9 +169,7 @@ export function withHttpTransferCache(): Provider[] {
 
         return () => {
           const isStablePromise = appRef.isStable.pipe(first((isStable) => isStable)).toPromise();
-          const pendingTasksPromise = pendingTasks.whenAllTasksComplete;
-
-          Promise.allSettled([isStablePromise, pendingTasksPromise]).then(() => {
+          isStablePromise.then(() => pendingTasks.whenAllTasksComplete).then(() => {
             cacheState.isCacheActive = false;
           });
         };
