From ef332af17ea62afce19ef83763ac30b356e63289 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 18 May 2022 13:31:09 +0200
Subject: [PATCH] [CST-5535] Fix issue with error notice message on health page
 loading

---
 .../health-page/health-page.component.html    |  2 +-
 src/app/health-page/health-page.component.ts  | 30 ++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 0647620c73..605927dc55 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container" *ngIf="(healthResponseInitialised | async) && (healthInfoResponseInitialised | async)">
   <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
     <ul ngbNav #nav="ngbNav" [activeId]="'health'" class="nav-tabs">
       <li [ngbNavItem]="'health'">
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
index a92e72744b..aa7bd7cba4 100644
--- a/src/app/health-page/health-page.component.ts
+++ b/src/app/health-page/health-page.component.ts
@@ -23,6 +23,16 @@ export class HealthPageComponent implements OnInit {
    */
   healthResponse: BehaviorSubject<HealthResponse> = new BehaviorSubject<HealthResponse>(null);
 
+  /**
+   * Represent if the response from health status endpoint is already retrieved or not
+   */
+  healthResponseInitialised: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * Represent if the response from health info endpoint is already retrieved or not
+   */
+  healthInfoResponseInitialised: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
   constructor(private healthDataService: HealthService) {
   }
 
@@ -31,13 +41,25 @@ export class HealthPageComponent implements OnInit {
    */
   ngOnInit(): void {
     this.healthDataService.getHealth().pipe(take(1)).subscribe({
-      next: (data: any) => { this.healthResponse.next(data.payload); },
-      error: () => { this.healthResponse.next(null); }
+      next: (data: any) => {
+        this.healthResponse.next(data.payload);
+        this.healthResponseInitialised.next(true);
+      },
+      error: () => {
+        this.healthResponse.next(null);
+        this.healthResponseInitialised.next(true);
+      }
     });
 
     this.healthDataService.getInfo().pipe(take(1)).subscribe({
-      next: (data: any) => { this.healthInfoResponse.next(data.payload); },
-      error: () => { this.healthInfoResponse.next(null); }
+      next: (data: any) => {
+        this.healthInfoResponse.next(data.payload);
+        this.healthInfoResponseInitialised.next(true);
+      },
+      error: () => {
+        this.healthInfoResponse.next(null);
+        this.healthInfoResponseInitialised.next(true);
+      }
     });
 
   }