Skip to content

Commit b770865

Browse files
author
OpenShift Bot
authored
Merge pull request openshift#567 from spadgett/overview-deployment-log-link
Merged by openshift-bot
2 parents d7045ad + 5019d49 commit b770865

File tree

4 files changed

+32
-27
lines changed

4 files changed

+32
-27
lines changed

‎app/scripts/directives/overview/dc.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ angular.module('openshiftConsole')
1111
link: function($scope) {
1212
var orderByDate = $filter('orderObjectsByDate');
1313
var deploymentIsInProgress = $filter('deploymentIsInProgress');
14-
var anyDeploymentInProgress = $filter('anyDeploymentIsInProgress');
1514

1615
$scope.$watch('deploymentConfigs', function(deploymentConfigs) {
1716
$scope.deploymentConfig = _.get(deploymentConfigs, $scope.dcName);
@@ -20,11 +19,11 @@ angular.module('openshiftConsole')
2019
$scope.$watch('deployments', function(deployments) {
2120
$scope.orderedDeployments = orderByDate(deployments, true);
2221
$scope.activeDeployment = _.get($scope, ['scalableDeploymentByConfig', $scope.dcName]);
23-
$scope.anyDeploymentInProgress = anyDeploymentInProgress(deployments);
22+
$scope.inProgressDeployment = _.find($scope.orderedDeployments, deploymentIsInProgress);
2423
});
2524

2625
$scope.cancelDeployment = function() {
27-
var deployment = _.find($scope.orderedDeployments, deploymentIsInProgress);
26+
var deployment = $scope.inProgressDeployment;
2827
if (!deployment) {
2928
return;
3029
}

‎app/views/overview/_dc.html

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
1-
<div class="deployment-tile" ng-class="{ 'deployment-in-progress': anyDeploymentInProgress }">
1+
<div class="deployment-tile" ng-class="{ 'deployment-in-progress': inProgressDeployment }">
22
<ng-include src="'views/overview/_service-header.html'"></ng-include>
33
<div class="deployment-header">
44
<div class="rc-header">
55
<div>
66
Deployment
77
<a ng-href="{{deploymentConfig | navigateResourceURL}}">{{dcName}}</a>
8-
<small class="overview-timestamp" ng-if="activeDeployment && !anyDeploymentInProgress">
8+
<small class="overview-timestamp" ng-if="activeDeployment && !inProgressDeployment">
99
<span class="hidden-xs">&ndash;</span>
1010
<relative-timestamp timestamp="activeDeployment.metadata.creationTimestamp"></relative-timestamp>
1111
</small>
1212
</div>
1313
<div>
1414
<image-names
15-
ng-if="activeDeployment && !anyDeploymentInProgress && showMetrics"
15+
ng-if="activeDeployment && !inProgressDeployment && showMetrics"
1616
pod-template="activeDeployment.spec.template">
1717
</image-names>
18-
<span ng-if="anyDeploymentInProgress" class="small">
18+
<span ng-if="inProgressDeployment" class="small">
1919
{{deploymentConfig.spec.strategy.type}} <ellipsis-pulser color="dark" size="sm" display="inline" msg="deployment in progress"></ellipsis-pulser>
20-
<a href="" ng-click="cancelDeployment()" role="button">Cancel</a>
20+
<span ng-if="'deploymentconfigs/log' | canI : 'get'" class="deployment-log-link">
21+
<a ng-href="{{inProgressDeployment | navigateResourceURL}}?tab=logs">View Log</a>
22+
<span ng-if="'replicationcontrollers' | canI: 'update'" class="action-divider">|</span>
23+
</span>
24+
<span ng-if="'replicationcontrollers' | canI : 'update'" class="deployment-log-link">
25+
<a href="" ng-click="cancelDeployment()" role="button">Cancel</a>
26+
</span>
2127
</span>
2228
</div>
2329
</div>
@@ -47,23 +53,20 @@
4753
<!-- /all visible deployments -->
4854

4955
<!-- deployment in progress (connecting arrow) -->
50-
<div column class="overview-donut-connector" ng-class="{'contains-deployment-status-msg':deployments.length === 1}" ng-if="anyDeploymentInProgress">
56+
<div column class="overview-donut-connector" ng-class="{'contains-deployment-status-msg':deployments.length === 1}" ng-if="inProgressDeployment">
5157
<div ng-if="deployments.length > 1" class="deployment-connector-arrow">
5258

5359
</div>
5460
<div ng-if="deployments.length === 1" class="deployment-status-msg">
5561
<status-icon status="deployments[0] | deploymentStatus" class="mar-right-xs"></status-icon>
5662
Deployment&nbsp;#{{deployments[0] | annotation : 'deploymentVersion'}}
5763
{{deployments[0] | deploymentStatus | lowercase}}
58-
<div ng-if="'deploymentconfigs/log' | canI : 'get'" class="deployment-log-link">
59-
<a ng-href="{{deployments[0] | navigateResourceURL}}?tab=logs">View Log</a>
60-
</div>
6164
</div>
6265
</div>
6366
<!-- /deployment in progress (connecting arrow) -->
6467

6568
<!-- cancelled/failed state -->
66-
<div column class="overview-unsuccessful-state" ng-if="!activeDeployment && !anyDeploymentInProgress" ng-switch="deployments[0] | deploymentStatus">
69+
<div column class="overview-unsuccessful-state" ng-if="!activeDeployment && !inProgressDeployment" ng-switch="deployments[0] | deploymentStatus">
6770
<div ng-switch-when="Cancelled">
6871
<span class="deployment-status-msg">
6972
<i class="fa fa-ban" aria-hidden="true"></i>
@@ -84,7 +87,7 @@
8487
<!-- /cancelled/failed state -->
8588

8689
<!-- succeeded state -->
87-
<div column class="deployment-details" ng-if="activeDeployment && !anyDeploymentInProgress">
90+
<div column class="deployment-details" ng-if="activeDeployment && !inProgressDeployment">
8891
<!-- metrics or pod template -->
8992
<!-- pause metrics updates when the service group is collapsed -->
9093
<deployment-metrics

‎dist/scripts/scripts.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -9742,13 +9742,13 @@ restrict:"E",
97429742
scope:!0,
97439743
templateUrl:"views/overview/_dc.html",
97449744
link:function(d) {
9745-
var e = a("orderObjectsByDate"), f = a("deploymentIsInProgress"), g = a("anyDeploymentIsInProgress");
9745+
var e = a("orderObjectsByDate"), f = a("deploymentIsInProgress");
97469746
d.$watch("deploymentConfigs", function(a) {
97479747
d.deploymentConfig = _.get(a, d.dcName);
97489748
}), d.$watch("deployments", function(a) {
9749-
d.orderedDeployments = e(a, !0), d.activeDeployment = _.get(d, [ "scalableDeploymentByConfig", d.dcName ]), d.anyDeploymentInProgress = g(a);
9749+
d.orderedDeployments = e(a, !0), d.activeDeployment = _.get(d, [ "scalableDeploymentByConfig", d.dcName ]), d.inProgressDeployment = _.find(d.orderedDeployments, f);
97509750
}), d.cancelDeployment = function() {
9751-
var a = _.find(d.orderedDeployments, f);
9751+
var a = d.inProgressDeployment;
97529752
if (a) {
97539753
var e = a.metadata.name, g = b.open({
97549754
animation:!0,

‎dist/scripts/templates.js

+13-10
Original file line numberDiff line numberDiff line change
@@ -8049,25 +8049,31 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
80498049

80508050

80518051
$templateCache.put('views/overview/_dc.html',
8052-
"<div class=\"deployment-tile\" ng-class=\"{ 'deployment-in-progress': anyDeploymentInProgress }\">\n" +
8052+
"<div class=\"deployment-tile\" ng-class=\"{ 'deployment-in-progress': inProgressDeployment }\">\n" +
80538053
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
80548054
"<div class=\"deployment-header\">\n" +
80558055
"<div class=\"rc-header\">\n" +
80568056
"<div>\n" +
80578057
"Deployment\n" +
80588058
"<a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{dcName}}</a>\n" +
8059-
"<small class=\"overview-timestamp\" ng-if=\"activeDeployment && !anyDeploymentInProgress\">\n" +
8059+
"<small class=\"overview-timestamp\" ng-if=\"activeDeployment && !inProgressDeployment\">\n" +
80608060
"<span class=\"hidden-xs\">&ndash;</span>\n" +
80618061
"<relative-timestamp timestamp=\"activeDeployment.metadata.creationTimestamp\"></relative-timestamp>\n" +
80628062
"</small>\n" +
80638063
"</div>\n" +
80648064
"<div>\n" +
8065-
"<image-names ng-if=\"activeDeployment && !anyDeploymentInProgress && showMetrics\" pod-template=\"activeDeployment.spec.template\">\n" +
8065+
"<image-names ng-if=\"activeDeployment && !inProgressDeployment && showMetrics\" pod-template=\"activeDeployment.spec.template\">\n" +
80668066
"</image-names>\n" +
8067-
"<span ng-if=\"anyDeploymentInProgress\" class=\"small\">\n" +
8067+
"<span ng-if=\"inProgressDeployment\" class=\"small\">\n" +
80688068
"{{deploymentConfig.spec.strategy.type}} <ellipsis-pulser color=\"dark\" size=\"sm\" display=\"inline\" msg=\"deployment in progress\"></ellipsis-pulser>\n" +
8069+
"<span ng-if=\"'deploymentconfigs/log' | canI : 'get'\" class=\"deployment-log-link\">\n" +
8070+
"<a ng-href=\"{{inProgressDeployment | navigateResourceURL}}?tab=logs\">View Log</a>\n" +
8071+
"<span ng-if=\"'replicationcontrollers' | canI: 'update'\" class=\"action-divider\">|</span>\n" +
8072+
"</span>\n" +
8073+
"<span ng-if=\"'replicationcontrollers' | canI : 'update'\" class=\"deployment-log-link\">\n" +
80698074
"<a href=\"\" ng-click=\"cancelDeployment()\" role=\"button\">Cancel</a>\n" +
80708075
"</span>\n" +
8076+
"</span>\n" +
80718077
"</div>\n" +
80728078
"</div>\n" +
80738079
"<div column flex class=\"shield\" ng-if=\"activeDeployment\" ng-class=\"{ 'shield-lg': (activeDeployment | annotation: 'deploymentVersion').length > 3 }\">\n" +
@@ -8084,20 +8090,17 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
80848090
"</div>\n" +
80858091
"\n" +
80868092
"\n" +
8087-
"<div column class=\"overview-donut-connector\" ng-class=\"{'contains-deployment-status-msg':deployments.length === 1}\" ng-if=\"anyDeploymentInProgress\">\n" +
8093+
"<div column class=\"overview-donut-connector\" ng-class=\"{'contains-deployment-status-msg':deployments.length === 1}\" ng-if=\"inProgressDeployment\">\n" +
80888094
"<div ng-if=\"deployments.length > 1\" class=\"deployment-connector-arrow\">\n" +
80898095
"</div>\n" +
80908096
"<div ng-if=\"deployments.length === 1\" class=\"deployment-status-msg\">\n" +
80918097
"<status-icon status=\"deployments[0] | deploymentStatus\" class=\"mar-right-xs\"></status-icon>\n" +
80928098
"Deployment&nbsp;#{{deployments[0] | annotation : 'deploymentVersion'}} {{deployments[0] | deploymentStatus | lowercase}}\n" +
8093-
"<div ng-if=\"'deploymentconfigs/log' | canI : 'get'\" class=\"deployment-log-link\">\n" +
8094-
"<a ng-href=\"{{deployments[0] | navigateResourceURL}}?tab=logs\">View Log</a>\n" +
8095-
"</div>\n" +
80968099
"</div>\n" +
80978100
"</div>\n" +
80988101
"\n" +
80998102
"\n" +
8100-
"<div column class=\"overview-unsuccessful-state\" ng-if=\"!activeDeployment && !anyDeploymentInProgress\" ng-switch=\"deployments[0] | deploymentStatus\">\n" +
8103+
"<div column class=\"overview-unsuccessful-state\" ng-if=\"!activeDeployment && !inProgressDeployment\" ng-switch=\"deployments[0] | deploymentStatus\">\n" +
81018104
"<div ng-switch-when=\"Cancelled\">\n" +
81028105
"<span class=\"deployment-status-msg\">\n" +
81038106
"<i class=\"fa fa-ban\" aria-hidden=\"true\"></i>\n" +
@@ -8117,7 +8120,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
81178120
"</div>\n" +
81188121
"\n" +
81198122
"\n" +
8120-
"<div column class=\"deployment-details\" ng-if=\"activeDeployment && !anyDeploymentInProgress\">\n" +
8123+
"<div column class=\"deployment-details\" ng-if=\"activeDeployment && !inProgressDeployment\">\n" +
81218124
"\n" +
81228125
"\n" +
81238126
"<deployment-metrics ng-if=\"showMetrics && !collapse\" pods=\"podsByDeployment[activeDeployment.metadata.name]\" containers=\"activeDeployment.spec.template.spec.containers\" compact class=\"overview-metrics\">\n" +

0 commit comments

Comments
 (0)