fix(core): resolve InitialRenderPendingTasks promise on complete (#49784)

alan-agius4 · AndrewKushnir · commit 2f2ef14f9e6b · 2023-04-11T14:12:38.000-07:00
Current in the `InitialRenderPendingTasks` when the `collection` size is 0 a new promise is created a the status is changed to completed. This causes the promise that is created during the class initialization phase to never be resolved which causes SSR to hang indefinitely. PR Close #49784
diff --git a/packages/core/src/initial_render_pending_tasks.ts b/packages/core/src/initial_render_pending_tasks.ts
@@ -30,12 +30,11 @@ export class InitialRenderPendingTasks implements OnDestroy {
   private promise!: Promise<void>;
 
   get whenAllTasksComplete(): Promise<void> {
-    if (this.collection.size > 0) {
-      return this.promise;
+    if (this.collection.size === 0) {
+      this.complete();
     }
-    return Promise.resolve().then(() => {
-      this.completed = true;
-    });
+
+    return this.promise;
   }
 
   completed = false;
@@ -66,14 +65,17 @@ export class InitialRenderPendingTasks implements OnDestroy {
 
     this.collection.delete(taskId);
     if (this.collection.size === 0) {
-      // We've removed the last task, resolve the promise.
-      this.completed = true;
-      this.resolve();
+      this.complete();
     }
   }
 
   ngOnDestroy() {
-    this.completed = true;
+    this.complete();
     this.collection.clear();
   }
+
+  private complete(): void {
+    this.completed = true;
+    this.resolve();
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,11 @@ export class InitialRenderPendingTasks implements OnDestroy {`
`30`	`30`	`private promise!: Promise<void>;`
`31`	`31`
`32`	`32`	`get whenAllTasksComplete(): Promise<void> {`
`33`		`- if (this.collection.size > 0) {`
`34`		`- return this.promise;`
	`33`	`+ if (this.collection.size === 0) {`
	`34`	`+ this.complete();`
`35`	`35`	`}`
`36`		`- return Promise.resolve().then(() => {`
`37`		`- this.completed = true;`
`38`		`- });`
	`36`	`+`
	`37`	`+ return this.promise;`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`completed = false;`
`@@ -66,14 +65,17 @@ export class InitialRenderPendingTasks implements OnDestroy {`
`66`	`65`
`67`	`66`	`this.collection.delete(taskId);`
`68`	`67`	`if (this.collection.size === 0) {`
`69`		`- // We've removed the last task, resolve the promise.`
`70`		`- this.completed = true;`
`71`		`- this.resolve();`
	`68`	`+ this.complete();`
`72`	`69`	`}`
`73`	`70`	`}`
`74`	`71`
`75`	`72`	`ngOnDestroy() {`
`76`		`- this.completed = true;`
	`73`	`+ this.complete();`
`77`	`74`	`this.collection.clear();`
`78`	`75`	`}`
	`76`	`+`
	`77`	`+ private complete(): void {`
	`78`	`+ this.completed = true;`
	`79`	`+ this.resolve();`
	`80`	`+ }`
`79`	`81`	`}`