From 95e1ae4e7894d0edf4a06872a12e49afb3a9296f Mon Sep 17 00:00:00 2001 From: Robb Hamilton Date: Mon, 5 Dec 2016 15:53:23 -0500 Subject: [PATCH] If there is only 1 pod, navigate directly to it from the donut --- app/scripts/directives/deploymentDonut.js | 7 +++++-- app/scripts/services/navigate.js | 5 +++++ dist/scripts/scripts.js | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/scripts/directives/deploymentDonut.js b/app/scripts/directives/deploymentDonut.js index f99220ddbe..8f4e58f182 100644 --- a/app/scripts/directives/deploymentDonut.js +++ b/app/scripts/directives/deploymentDonut.js @@ -105,9 +105,12 @@ angular.module('openshiftConsole') $scope.viewPodsForDeployment = function(deployment) { if (hashSizeFilter($scope.pods) === 0) { return; + } else if (hashSizeFilter($scope.pods) === 1) { + // there should only be 1 pod, so navigate to it + Navigate.toResourceURL(_.sample($scope.pods)); + } else { + Navigate.toPodsForDeployment(deployment); } - - Navigate.toPodsForDeployment(deployment); }; $scope.scaleUp = function() { diff --git a/app/scripts/services/navigate.js b/app/scripts/services/navigate.js index 4ae35bcab6..624e82ee80 100644 --- a/app/scripts/services/navigate.js +++ b/app/scripts/services/navigate.js @@ -233,6 +233,11 @@ angular.module("openshiftConsole") return url.toString(); }, + // Navigate to the URL of the resource + toResourceURL: function (resource) { + $location.url(this.resourceURL(resource)); + }, + // Returns the build config URL for a build or the deployment config URL for a deployment. configURLForResource: function(resource, /* optional */ action) { var bc, dc, diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index 327c591010..618bcdb0d8 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -2252,6 +2252,9 @@ group:n.group } return i.toString(); }, +toResourceURL:function(b) { +a.url(this.resourceURL(b)); +}, configURLForResource:function(a, b) { var c, d, e = _.get(a, "kind"), f = _.get(a, "metadata.namespace"); if (!e || !f) return null; @@ -11907,7 +11910,7 @@ return e.scale(a, b.desiredReplicas).then(_.noop, m); } }, p = _.debounce(o, 650); b.viewPodsForDeployment = function(a) { -0 !== j(b.pods) && i.toPodsForDeployment(a); +0 !== j(b.pods) && (1 === j(b.pods) ? i.toResourceURL(_.sample(b.pods)) :i.toPodsForDeployment(a)); }, b.scaleUp = function() { b.scalable && (b.desiredReplicas = b.getDesiredReplicas(), b.desiredReplicas++, p(), c = !0); }, b.scaleDown = function() {