Merge pull request #69 from spadgett/pause-overview-metrics

Merged by openshift-bot
openshift · Jun 17, 2016 · 498b2be · 498b2be
2 parents babd5c1 + c5a461c
commit 498b2be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/views/overview/_service.html b/app/views/overview/_service.html
@@ -89,7 +89,8 @@ <h2>No deployments.</h2>
         <!-- succeeded state -->
         <div column class="deployment-details" ng-if="activeDeploymentByConfig[dcName] && !(deployments | anyDeploymentIsInProgress)">
           <!-- metrics or pod template -->
-          <metrics ng-if="showMetrics" deployment="activeDeploymentByConfig[dcName]" profile="compact" class="overview-metrics"></metrics>
+          <!-- pause metrics updates when the service group is collapsed -->
+          <metrics ng-if="showMetrics && !collapse" deployment="activeDeploymentByConfig[dcName]" profile="compact" class="overview-metrics"></metrics>
           <pod-template ng-if="!showMetrics" pod-template="activeDeploymentByConfig[dcName].spec.template"></pod-template>
           <!-- /metrics or pod template -->
         </div>

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -6766,7 +6766,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "\n" +
     "<div column class=\"deployment-details\" ng-if=\"activeDeploymentByConfig[dcName] && !(deployments | anyDeploymentIsInProgress)\">\n" +
     "\n" +
-    "<metrics ng-if=\"showMetrics\" deployment=\"activeDeploymentByConfig[dcName]\" profile=\"compact\" class=\"overview-metrics\"></metrics>\n" +
+    "\n" +
+    "<metrics ng-if=\"showMetrics && !collapse\" deployment=\"activeDeploymentByConfig[dcName]\" profile=\"compact\" class=\"overview-metrics\"></metrics>\n" +
     "<pod-template ng-if=\"!showMetrics\" pod-template=\"activeDeploymentByConfig[dcName].spec.template\"></pod-template>\n" +
     "\n" +
     "</div>\n" +