Fix Server Overview deployments flashing and showing count up on refresh

hawkular · Jan 13, 2016 · 05ba744 · 05ba744
1 parent 764ad72
commit 05ba744
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/html/directives/overview/status-overview.html b/console/src/main/scripts/plugins/metrics/html/directives/overview/status-overview.html
@@ -28,21 +28,28 @@ <h2 class="card-pf-title">Status Overview</h2>
       </div>
       <div class="col-sm-6 hk-dashboard-block">
         <div class="hk-data-info">
-          <div class="hk-data" ng-if="overviewInfo.deployments">{{overviewInfo.deployments.length}}</div>
+          <div class="hk-data" ng-show="overviewInfo.deployments">{{overviewInfo.deployments.length}}</div>
           <div class="hk-info">
             <p class="card-pf-aggregate-status-notifications">
               <span class="card-pf-aggregate-status-notification">
                 <i class="fa fa-times-circle-o" tooltip-trigger tooltip="Failed"></i>
-                <span ng-if="overviewInfo.deployments">{{vm.filterByState(overviewInfo.deployments, 'failed').length}}</span>
+                <span ng-show="overviewInfo.deployments">
+                  {{ (overviewInfo.deployments | filter:{state:'failed'}).length }}
+                </span>
               </span>
               <span class="card-pf-aggregate-status-notification">
                 <i class="fa fa-square" tooltip-trigger tooltip="Stopped"></i>
-                <span ng-if="overviewInfo.deployments">{{vm.filterByState(overviewInfo.deployments, 'down').length}}</span>
+                <span ng-show="overviewInfo.deployments">
+                  {{ (overviewInfo.deployments | filter:{state:'down'}).length }}
+                </span>
               </span>
               <span class="card-pf-aggregate-status-notification">
                 <i class="fa fa-check-circle-o" tooltip-trigger tooltip="OK"></i>
-                <span ng-if="overviewInfo.deployments">{{vm.filterByState(overviewInfo.deployments, 'up').length}}</span>
+                <span ng-show="overviewInfo.deployments">
+                  {{ (overviewInfo.deployments | filter:{state:'up'}).length }}
+                </span>
               </span>
+              <!--{{ overviewInfo.deployments }}-->
             </p>
           </div>
         </div>

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerOverviewDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerOverviewDetails.ts
@@ -152,7 +152,7 @@ module HawkularMetrics {
 
     private getOverviewInfo() {
       let promises = [];
-      let resourceData = {};
+      let resourceData: any = {};
 
       this.HawkularInventory.ResourceOfTypeUnderFeed.query({
         feedId: this.$routeParams.feedId,
@@ -173,7 +173,10 @@ module HawkularMetrics {
             }
           }).$promise);
         });
-        resourceData['deployments'] = aResourceList;
+        this.$q.all(promises).then(() => {
+          resourceData.deployments = aResourceList;
+          this.overviewInfo = resourceData;
+        });
       });
 
       //Web session data
@@ -206,9 +209,6 @@ module HawkularMetrics {
           }
         })
       );
-      this.$q.all(promises).then((result) => {
-        this.overviewInfo = resourceData;
-      });
     }
 
     private getActiveWebSession() {