update pod watch function, table width; add headers

juanvallejo · juanvallejo · commit 546a661d5db1 · 2016-11-09T14:19:00.000-05:00
diff --git a/app/scripts/controllers/service.js b/app/scripts/controllers/service.js
@@ -16,6 +16,7 @@ angular.module('openshiftConsole')
     $scope.service = null;
     $scope.services = null;
     $scope.alerts = {};
+    $scope.pods = [];
     $scope.renderOptions = $scope.renderOptions || {};
     $scope.renderOptions.hideFilterWidget = true;
     $scope.breadcrumbs = [
@@ -30,9 +31,22 @@ angular.module('openshiftConsole')
 
     var watches = [];
 
+    // receive pods for the current service scope only when the service object is available
+    var getPodsForService = function(service, pods) {
+      $scope.podsForService = {};
+      if (!service || !pods) {
+        return;
+      }
+
+      var ls = new LabelSelector(service.spec.selector);
+      $scope.podsForService = ls.select(pods);
+    };
     var serviceResolved = function(service, action) {
       $scope.loaded = true;
       $scope.service = service;
+
+      getPodsForService(service, $scope.pods);
+
       if (action === "DELETED") {
         $scope.alerts["deleted"] = {
           type: "warning",
@@ -66,42 +80,28 @@ angular.module('openshiftConsole')
         }));
 
         watches.push(DataService.watch("pods", context, function(pods) {
-          var service = $scope.service;
-          if (!service) {
-            DataService
-              .get("services", $routeParams.service, context)
-              .then(function(service) {
-                getPodsForService(service, pods);
-              });
-              return;
-          }
-          getPodsForService(service, pods);
-        }));
-
-        // receive pods for the current service scope only when the service object is available
-        function getPodsForService(service, pods) {
-          $scope.podsForService = [];
-          var ls = new LabelSelector(service.spec.selector);
+          $scope.pods = [];
           angular.forEach(pods.by("metadata.name"), function(pod) {
-            if (ls.matches(pod)) {
-              $scope.podsForService.push(pod);
-            }
+            $scope.pods.push(pod);
           });
-        }
+          getPodsForService($scope.service, $scope.pods);
+        }));
 
         watches.push(DataService.watch("endpoints", context, function(endpoints) {
           $scope.podsWithEndpoints = {};
-          angular.forEach(endpoints.by("metadata.name"), function(endpoint) {
-            if (endpoint.metadata.name === $routeParams.service) {
-              endpoint.subsets.forEach(function(subset) {
-                subset.addresses.forEach(function(address) {
-                  if (address.targetRef !== undefined &&
-                    address.targetRef.kind === "Pod") {
-                    $scope.podsWithEndpoints[address.targetRef.name] = true;
-                  }
-                });
-              });
-            }
+          var svcEndpoint  = endpoints.by("metadata.name");
+          svcEndpoint = svcEndpoint[$routeParams.service];
+
+          if (!svcEndpoint) {
+            return;
+          }
+
+          _.each(svcEndpoint.subsets, function(subset) {
+            _.each(subset.addresses, function(address) {
+              if (_.get(address, "targetRef.kind") === "Pod") {
+                $scope.podsWithEndpoints[address.targetRef.name] = true;
+              }
+            });
           });
         }));
 
diff --git a/app/views/browse/service.html b/app/views/browse/service.html
@@ -69,8 +69,8 @@ <h1>
                         <span ng-repeat="ingress in service.status.loadBalancer.ingress"
                           >{{ingress.ip}}<span ng-if="!$last">, </span></span>
                       </dd>
-                      <dt ng-if="service.spec.externalIPs.length">External IPs:</dt>
-                      <dd ng-if="service.spec.externalIPs.length">
+                      <dt ng-if-start="service.spec.externalIPs.length">External IPs:</dt>
+                      <dd ng-if-end>
                         <span ng-repeat="externalIP in service.spec.externalIPs"
                           >{{externalIP}}<span ng-if="!$last">, </span></span>
                       </dd>
@@ -81,13 +81,8 @@ <h1>
                         </span>
                       </dd>
                     </dl>
-                    <div ng-if="routesForService.length" class="table-responsive small service-table">
-                      <routes-table routes="routesForService" services="services" custom-name-header="routesForService[0].kind"></routes-table>
-                    </div>
-                    <div ng-if="podsForService.length" class="table-responsive small service-table">
-                      <pods-table pods="podsForService" active-pods="podsWithEndpoints" custom-name-header="podsForService[0].kind"></pods-table>
-                    </div>
-                    <div ng-if="service.spec.ports.length" class="table-responsive">
+                    <h3 ng-if-start="service.spec.ports.length">Ports</h3>
+                    <div ng-if-end class="table-responsive">
                       <table class="table table-bordered small service-table">
                         <thead>
                           <tr>
@@ -113,6 +108,14 @@ <h1>
                         </tbody>
                       </table>
                     </div>
+                    <h3 ng-if-start="routesForService.length">Routes</h3>
+                    <div ng-if-end class="table-responsive small">
+                      <routes-table routes="routesForService" services="services" custom-name-header="routesForService[0].kind"></routes-table>
+                    </div>
+                    <h3 ng-if-start="(podsForService | hashSize) > 0">Pods</h3>
+                    <div ng-if-end class="table-responsive small">
+                      <pods-table pods="podsForService" active-pods="podsWithEndpoints" custom-name-header="podsForService[0].kind"></pods-table>
+                    </div>
                     <annotations annotations="service.metadata.annotations"></annotations>
                   </div>
                 </uib-tab>
diff --git a/app/views/directives/pods-table.html b/app/views/directives/pods-table.html
@@ -13,7 +13,7 @@
   </tbody>
   <tbody ng-repeat="pod in pods | orderObjectsByDate : true">
     <tr>
-      <td data-title="Name">
+      <td data-title="{{customNameHeader || 'Name'}}">
         <a href="{{pod | navigateResourceURL}}">{{pod.metadata.name}}</a>
         <span ng-if="!activePods[pod.metadata.name]" data-toggle="popover" data-trigger="hover" data-content="This pod has no endpoints and is not accepting traffic." style="cursor: help; padding-left: 5px;">
           <span class="pficon pficon-warning-triangle-o" aria-hidden="true" data-toggle="tooltip" style="cursor: help;"></span>
diff --git a/app/views/directives/routes-table.html b/app/views/directives/routes-table.html
@@ -13,7 +13,7 @@
 </tbody>
 <tbody ng-repeat="route in routes | orderObjectsByDate : true">
   <tr>
-    <td data-title="Name">
+    <td data-title="{{ customNameHeader || 'Name' }}">
       <a href="{{route | navigateResourceURL}}">{{route.metadata.name}}</a>
       <route-warnings ng-if="route.spec.to.kind !== 'Service' || services"
                       route="route"
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -5979,50 +5979,47 @@ d.unwatchAll(i);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("ServiceController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "$filter", function(a, b, c, d, e) {
-a.projectName = b.project, a.service = null, a.services = null, a.alerts = {}, a.renderOptions = a.renderOptions || {}, a.renderOptions.hideFilterWidget = !0, a.breadcrumbs = [ {
+a.projectName = b.project, a.service = null, a.services = null, a.alerts = {}, a.pods = [], a.renderOptions = a.renderOptions || {}, a.renderOptions.hideFilterWidget = !0, a.breadcrumbs = [ {
 title:"Services",
 link:"project/" + b.project + "/browse/services"
 }, {
 title:b.service
 } ];
 var f = [], g = function(b, c) {
-a.loaded = !0, a.service = b, "DELETED" === c && (a.alerts.deleted = {
+if (a.podsForService = {}, b && c) {
+var d = new LabelSelector(b.spec.selector);
+a.podsForService = d.select(c);
+}
+}, h = function(b, c) {
+a.loaded = !0, a.service = b, g(b, a.pods), "DELETED" === c && (a.alerts.deleted = {
 type:"warning",
 message:"This service has been deleted."
 });
 };
-d.get(b.project).then(_.spread(function(d, h) {
-function i(b, c) {
-a.podsForService = [];
-var d = new LabelSelector(b.spec.selector);
-angular.forEach(c.by("metadata.name"), function(b) {
-d.matches(b) && a.podsForService.push(b);
-});
-}
-a.project = d, a.projectContext = h, c.get("services", b.service, h).then(function(a) {
-g(a), f.push(c.watchObject("services", b.service, h, g));
+d.get(b.project).then(_.spread(function(d, i) {
+a.project = d, a.projectContext = i, c.get("services", b.service, i).then(function(a) {
+h(a), f.push(c.watchObject("services", b.service, i, h));
 }, function(b) {
 a.loaded = !0, a.alerts.load = {
 type:"error",
 message:"The service details could not be loaded.",
 details:"Reason: " + e("getErrorDetails")(b)
 };
-}), f.push(c.watch("services", h, function(b) {
+}), f.push(c.watch("services", i, function(b) {
 a.services = b.by("metadata.name");
-})), f.push(c.watch("pods", h, function(d) {
-var e = a.service;
-return e ? void i(e, d) :void c.get("services", b.service, h).then(function(a) {
-i(a, d);
-});
-})), f.push(c.watch("endpoints", h, function(c) {
-a.podsWithEndpoints = {}, angular.forEach(c.by("metadata.name"), function(c) {
-c.metadata.name === b.service && c.subsets.forEach(function(b) {
-b.addresses.forEach(function(b) {
-void 0 !== b.targetRef && "Pod" === b.targetRef.kind && (a.podsWithEndpoints[b.targetRef.name] = !0);
-});
-});
-});
-})), f.push(c.watch("routes", h, function(c) {
+})), f.push(c.watch("pods", i, function(b) {
+a.pods = [], angular.forEach(b.by("metadata.name"), function(b) {
+a.pods.push(b);
+}), g(a.service, a.pods);
+})), f.push(c.watch("endpoints", i, function(c) {
+a.podsWithEndpoints = {};
+var d = c.by("metadata.name");
+d = d[b.service], d && _.each(d.subsets, function(b) {
+_.each(b.addresses, function(b) {
+"Pod" === _.get(b, "targetRef.kind") && (a.podsWithEndpoints[b.targetRef.name] = !0);
+});
+});
+})), f.push(c.watch("routes", i, function(c) {
 a.routesForService = [], angular.forEach(c.by("metadata.name"), function(c) {
 "Service" === c.spec.to.kind && c.spec.to.name === b.service && a.routesForService.push(c);
 }), Logger.log("routes (subscribe)", a.routesByService);
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -3422,8 +3422,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<dd ng-if=\"service.status.loadBalancer.ingress.length\">\n" +
     "<span ng-repeat=\"ingress in service.status.loadBalancer.ingress\">{{ingress.ip}}<span ng-if=\"!$last\">, </span></span>\n" +
     "</dd>\n" +
-    "<dt ng-if=\"service.spec.externalIPs.length\">External IPs:</dt>\n" +
-    "<dd ng-if=\"service.spec.externalIPs.length\">\n" +
+    "<dt ng-if-start=\"service.spec.externalIPs.length\">External IPs:</dt>\n" +
+    "<dd ng-if-end>\n" +
     "<span ng-repeat=\"externalIP in service.spec.externalIPs\">{{externalIP}}<span ng-if=\"!$last\">, </span></span>\n" +
     "</dd>\n" +
     "<dt ng-if=\"!routesForService.length\">Routes:</dt>\n" +
@@ -3433,13 +3433,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</dd>\n" +
     "</dl>\n" +
-    "<div ng-if=\"routesForService.length\" class=\"table-responsive small service-table\">\n" +
-    "<routes-table routes=\"routesForService\" services=\"services\" custom-name-header=\"routesForService[0].kind\"></routes-table>\n" +
-    "</div>\n" +
-    "<div ng-if=\"podsForService.length\" class=\"table-responsive small service-table\">\n" +
-    "<pods-table pods=\"podsForService\" active-pods=\"podsWithEndpoints\" custom-name-header=\"podsForService[0].kind\"></pods-table>\n" +
-    "</div>\n" +
-    "<div ng-if=\"service.spec.ports.length\" class=\"table-responsive\">\n" +
+    "<h3 ng-if-start=\"service.spec.ports.length\">Ports</h3>\n" +
+    "<div ng-if-end class=\"table-responsive\">\n" +
     "<table class=\"table table-bordered small service-table\">\n" +
     "<thead>\n" +
     "<tr>\n" +
@@ -3465,6 +3460,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</tbody>\n" +
     "</table>\n" +
     "</div>\n" +
+    "<h3 ng-if-start=\"routesForService.length\">Routes</h3>\n" +
+    "<div ng-if-end class=\"table-responsive small\">\n" +
+    "<routes-table routes=\"routesForService\" services=\"services\" custom-name-header=\"routesForService[0].kind\"></routes-table>\n" +
+    "</div>\n" +
+    "<h3 ng-if-start=\"(podsForService | hashSize) > 0\">Pods</h3>\n" +
+    "<div ng-if-end class=\"table-responsive small\">\n" +
+    "<pods-table pods=\"podsForService\" active-pods=\"podsWithEndpoints\" custom-name-header=\"podsForService[0].kind\"></pods-table>\n" +
+    "</div>\n" +
     "<annotations annotations=\"service.metadata.annotations\"></annotations>\n" +
     "</div>\n" +
     "</uib-tab>\n" +
@@ -7208,7 +7211,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</tbody>\n" +
     "<tbody ng-repeat=\"pod in pods | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
-    "<td data-title=\"Name\">\n" +
+    "<td data-title=\"{{customNameHeader || 'Name'}}\">\n" +
     "<a href=\"{{pod | navigateResourceURL}}\">{{pod.metadata.name}}</a>\n" +
     "<span ng-if=\"!activePods[pod.metadata.name]\" data-toggle=\"popover\" data-trigger=\"hover\" data-content=\"This pod has no endpoints and is not accepting traffic.\" style=\"cursor: help; padding-left: 5px\">\n" +
     "<span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\" data-toggle=\"tooltip\" style=\"cursor: help\"></span>\n" +
@@ -7291,7 +7294,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</tbody>\n" +
     "<tbody ng-repeat=\"route in routes | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
-    "<td data-title=\"Name\">\n" +
+    "<td data-title=\"{{ customNameHeader || 'Name' }}\">\n" +
     "<a href=\"{{route | navigateResourceURL}}\">{{route.metadata.name}}</a>\n" +
     "<route-warnings ng-if=\"route.spec.to.kind !== 'Service' || services\" route=\"route\" service=\"services[route.spec.to.name]\">\n" +
     "</route-warnings>\n" +
