From: alfonsomthd <almartin@redhat.com>
Date: Mon, 1 Oct 2018 14:11:46 +0000 (+0200)
Subject: mgr/dashboard: New Landing Page: Milestone 2
X-Git-Tag: v14.0.1~108^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9fa75975a655bdcbf0a714825432ff4fa917c6a7;p=ceph-ci.git

mgr/dashboard: New Landing Page: Milestone 2

Fix: hide 'cluser status' popover when status change to OK.

Fixes: https://tracker.ceph.com/issues/27050

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
index 911dda25a17..650d09e7d64 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
@@ -7,29 +7,36 @@
     <cd-info-card cardTitle="Cluster Status"
                   i18n-cardTitle
                   class="col-sm-6 col-md-4 col-lg-3"
-                  [contentClass]="contentData.health.checks.length > 0 ? 'content-highlight content-row-size-1-5' : 'content-highlight'"
-                  (click)="contentData.health.checks.length > 0 ? healthChecksTarget.toggle() : ''">
-      <ng-template #healthChecks>
-        <p class="logs-link"
-           i18n>
-          &rarr; See <a (click)="viewportScroller.scrollToAnchor('logs')">Logs</a> for more details.
-        </p>
-        <ul>
-          <li *ngFor="let check of contentData.health.checks">
-            <span [ngStyle]="check.severity | healthColor">{{ check.type }}</span>: {{ check.summary.message }}
-          </li>
-        </ul>
-      </ng-template>
-      <div [ngClass]="contentData.health.checks.length > 0 ? 'info-card-content-clickable' : ''"
-           [ngStyle]="contentData.health.status | healthColor"
-           [popover]="contentData.health.checks.length > 0 ? healthChecks : ''"
-           triggers=""
-           #healthChecksTarget="bs-popover"
-           placement="bottom"
-           container="body"
-           containerClass="info-card-popover-cluster-status">
-        {{ contentData.health.status }}
-      </div>
+                  [contentClass]="contentData.health.checks.length > 0 ? 'content-highlight content-row-size-1-5' : 'content-highlight'">
+      <ng-container *ngIf="contentData.health.checks.length > 0">
+        <ng-template #healthChecks>
+          <p class="logs-link"
+             i18n>
+            &rarr; See <a (click)="viewportScroller.scrollToAnchor('logs')">Logs</a> for more details.
+          </p>
+          <ul>
+            <li *ngFor="let check of contentData.health.checks">
+              <span [ngStyle]="check.severity | healthColor">{{ check.type }}</span>: {{ check.summary.message }}
+            </li>
+          </ul>
+        </ng-template>
+        <div class="info-card-content-clickable"
+             [ngStyle]="contentData.health.status | healthColor"
+             [popover]="healthChecks"
+             triggers=""
+             #healthChecksTarget="bs-popover"
+             placement="bottom"
+             container="body"
+             containerClass="info-card-popover-cluster-status"
+             (click)="healthChecksTarget.toggle()">
+          {{ contentData.health.status }}
+        </div>
+      </ng-container>
+      <ng-container *ngIf="contentData.health.checks.length == 0">
+        <div [ngStyle]="contentData.health.status | healthColor">
+          {{ contentData.health.status }}
+        </div>
+      </ng-container>
     </cd-info-card>
 
     <cd-info-card cardTitle="Monitors"