Merge pull request #1271 from spadgett/admitted-route-links

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/filters/resources.js

@@ -366,7 +366,7 @@ angular.module('openshiftConsole')
   })
   .filter('isWebRoute', function(routeHostFilter) {
     return function(route){
-       return !!routeHostFilter(route) &&
+       return !!routeHostFilter(route, true) &&
               _.get(route, 'spec.wildcardPolicy') !== 'Subdomain';
     };
   })
@@ -1273,7 +1273,7 @@ angular.module('openshiftConsole')
     };
   })
   .filter('routeHost', function() {
-    return function (route) {
+    return function (route, onlyAdmitted) {
       if (!_.get(route, 'status.ingress')) {
         return _.get(route, 'spec.host');
       }
@@ -1289,7 +1289,11 @@ angular.module('openshiftConsole')
         }
       });
 
-      return oldestAdmittedIngress ? oldestAdmittedIngress.host : route.spec.host;
+      if (oldestAdmittedIngress) {
+        return oldestAdmittedIngress.host;
+      }
+
+      return onlyAdmitted ? null : route.spec.host;
     };
   })
   .filter('isRequestCalculated', function(LimitRangesService) {

dist/scripts/scripts.js

@@ -14325,7 +14325,7 @@ namespace:e
 };
 } ]).filter("isWebRoute", [ "routeHostFilter", function(a) {
 return function(b) {
-return !!a(b) && "Subdomain" !== _.get(b, "spec.wildcardPolicy");
+return !!a(b, !0) && "Subdomain" !== _.get(b, "spec.wildcardPolicy");
 };
 } ]).filter("routeWebURL", [ "routeHostFilter", function(a) {
 return function(b, c, d) {
@@ -14833,16 +14833,16 @@ type:b
 }) :null;
 };
 }).filter("routeHost", function() {
-return function(a) {
+return function(a, b) {
 if (!_.get(a, "status.ingress")) return _.get(a, "spec.host");
 if (!a.status.ingress) return a.spec.host;
-var b = null;
+var c = null;
 return angular.forEach(a.status.ingress, function(a) {
 _.some(a.conditions, {
 type:"Admitted",
 status:"True"
-}) && (!b || b.lastTransitionTime > a.lastTransitionTime) && (b = a);
-}), b ? b.host :a.spec.host;
+}) && (!c || c.lastTransitionTime > a.lastTransitionTime) && (c = a);
+}), c ? c.host :b ? null :a.spec.host;
 };
 }).filter("isRequestCalculated", [ "LimitRangesService", function(a) {
 return function(b, c) {