Skip to content

Commit f89bd6b

Browse files
rhamiltof0x11
rhamilto
authored and
f0x11
committedMar 26, 2018
Making display of errors for service rows consistent with others
Fixes openshift#2108
1 parent 0e92187 commit f89bd6b

File tree

2 files changed

+66
-56
lines changed

2 files changed

+66
-56
lines changed
 

‎app/views/overview/_service-instance-row.html

+46-45
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,60 @@ <h3>
99
<a ng-href="{{row.apiObject | navigateResourceURL}}" ng-bind-html="row.displayName | highlightKeywords : row.state.filterKeywords"></a>
1010
<div ng-bind-html="row.apiObject.metadata.name | highlightKeywords : row.state.filterKeywords" class="list-row-longname"></div>
1111
</h3>
12-
<div class="status-icons">
13-
<notification-icon ng-if="!row.expanded" alerts="row.notifications"></notification-icon>
12+
<div class="status-icons" ng-if="!row.expanded">
13+
<notification-icon alerts="row.notifications"></notification-icon>
14+
<div ng-switch="row.instanceStatus">
15+
<span ng-switch-when="failed"
16+
dynamic-content="{{row.apiObject | serviceInstanceFailedMessage}}"
17+
data-toggle="tooltip"
18+
data-trigger="hover"
19+
class="notification-icon-count">
20+
<span class="pficon pficon-error-circle-o" aria-hidden="true"></span>
21+
<span>Error</span>
22+
</span>
23+
<span ng-switch-when="deleted" class="notification-icon-count">
24+
<span class="pficon pficon-warning-triangle-o" aria-hidden="true"></span>
25+
Marked for Deletion
26+
</span>
27+
<span ng-switch-when="pending" class="notification-icon-count">
28+
<span class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
29+
<span>Pending</span>
30+
</span>
31+
</div>
1432
</div>
1533
</div>
16-
<div class="list-pf-details" ng-if="!row.expanded" ng-switch="row.instanceStatus">
17-
18-
<span ng-switch-when="failed"
19-
dynamic-content="{{row.apiObject | serviceInstanceFailedMessage}}"
20-
data-toggle="tooltip"
21-
data-trigger="hover">
22-
<span class="pficon pficon-error-circle-o" aria-hidden="true"></span>
23-
<span>Error</span>
24-
</span>
25-
<span ng-switch-when="deleted">
26-
<span class="pficon pficon-warning-triangle-o" aria-hidden="true"></span>
27-
Marked for Deletion
34+
<div class="list-pf-details" ng-if="!row.expanded">
35+
<span ng-if="!row.bindings.length
36+
&& row.isBindable
37+
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')"
38+
class="hidden-xs hidden-sm">
39+
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
40+
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
41+
Create Binding
42+
</a>
2843
</span>
29-
<span ng-switch-when="pending">
30-
<span class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
31-
<span>Pending</span>
32-
</span>
33-
<div ng-switch-default>
34-
<div class="hidden-xs hidden-sm">
35-
<span ng-if="!row.bindings.length
36-
&& row.isBindable
37-
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
38-
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
39-
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
40-
<translate>Create Binding</translate>
41-
</a>
44+
<div ng-if="row.bindings.length" class="hidden-xs hidden-sm">
45+
<span class="component-label" translate>Bindings</span>
46+
<p ng-if="firstBinding = row.bindings[0]" class="bindings">
47+
<span ng-if="application = row.state.applicationsByBinding[firstBinding.metadata.name][0]">
48+
{{application.metadata.name}}
4249
</span>
43-
<span ng-if="row.bindings.length" class="component-label" translate>Bindings</span>
44-
<p ng-if="firstBinding = row.bindings[0]" class="bindings">
45-
<span ng-if="application = row.state.applicationsByBinding[firstBinding.metadata.name][0]">
46-
{{application.metadata.name}}
47-
</span>
48-
<span ng-if="!application">
49-
{{firstBinding.spec.secretName}}
50-
</span>
51-
<span ng-if="row.bindings.length > 1">
52-
<translate>and</translate>
53-
<a
54-
ng-if="row.bindings.length > 1"
55-
ng-click="row.toggleExpand($event, true)">
56-
<translate>{{row.bindings.length -1}} other<span ng-if="row.bindings.length > 2">s</span></translate></a>
57-
</span>
58-
</p>
59-
</div>
50+
<span ng-if="!application">
51+
{{firstBinding.spec.secretName}}
52+
</span>
53+
<span ng-if="row.bindings.length > 1">
54+
and
55+
<a
56+
ng-if="row.bindings.length > 1"
57+
ng-click="row.toggleExpand($event, true)">
58+
{{row.bindings.length -1}} other<span ng-if="row.bindings.length > 2">s</span></a>
59+
</span>
60+
</p>
6061
</div>
6162
<div
6263
class="hidden-xs"
6364
ng-if="(!row.instanceStatus || row.instanceStatus === 'ready') && row.apiObject.status.dashboardURL">
64-
<a ng-href="{{row.apiObject.status.dashboardURL}}" target="_blank">
65+
<a ng-href="{{row.apiObject.status.dashboardURL}}" target="_blank" translate>
6566
Console
6667
</a> <i class="fa fa-external-link small" aria-hidden="true"></i>
6768
</div>

‎dist/scripts/templates.js

+20-11
Original file line numberDiff line numberDiff line change
@@ -13275,26 +13275,27 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1327513275
"<a ng-href=\"{{row.apiObject | navigateResourceURL}}\" ng-bind-html=\"row.displayName | highlightKeywords : row.state.filterKeywords\"></a>\n" +
1327613276
"<div ng-bind-html=\"row.apiObject.metadata.name | highlightKeywords : row.state.filterKeywords\" class=\"list-row-longname\"></div>\n" +
1327713277
"</h3>\n" +
13278-
"<div class=\"status-icons\">\n" +
13279-
"<notification-icon ng-if=\"!row.expanded\" alerts=\"row.notifications\"></notification-icon>\n" +
13280-
"</div>\n" +
13281-
"</div>\n" +
13282-
"<div class=\"list-pf-details\" ng-if=\"!row.expanded\" ng-switch=\"row.instanceStatus\">\n" +
13283-
"<span ng-switch-when=\"failed\" dynamic-content=\"{{row.apiObject | serviceInstanceFailedMessage}}\" data-toggle=\"tooltip\" data-trigger=\"hover\">\n" +
13278+
"<div class=\"status-icons\" ng-if=\"!row.expanded\">\n" +
13279+
"<notification-icon alerts=\"row.notifications\"></notification-icon>\n" +
13280+
"<div ng-switch=\"row.instanceStatus\">\n" +
13281+
"<span ng-switch-when=\"failed\" dynamic-content=\"{{row.apiObject | serviceInstanceFailedMessage}}\" data-toggle=\"tooltip\" data-trigger=\"hover\" class=\"notification-icon-count\">\n" +
1328413282
"<span class=\"pficon pficon-error-circle-o\" aria-hidden=\"true\"></span>\n" +
1328513283
"<span>Error</span>\n" +
1328613284
"</span>\n" +
13287-
"<span ng-switch-when=\"deleted\">\n" +
13285+
"<span ng-switch-when=\"deleted\" class=\"notification-icon-count\">\n" +
1328813286
"<span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
1328913287
"Marked for Deletion\n" +
1329013288
"</span>\n" +
13291-
"<span ng-switch-when=\"pending\">\n" +
13289+
"<span ng-switch-when=\"pending\" class=\"notification-icon-count\">\n" +
1329213290
"<span class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
1329313291
"<span>Pending</span>\n" +
1329413292
"</span>\n" +
13295-
"<div ng-switch-default>\n" +
13296-
"<div class=\"hidden-xs hidden-sm\">\n" +
13293+
"</div>\n" +
13294+
"</div>\n" +
13295+
"</div>\n" +
13296+
"<div class=\"list-pf-details\" ng-if=\"!row.expanded\">\n" +
1329713297
"<span ng-if=\"!row.bindings.length\n" +
13298+
<<<<<<< 5d3e04a4959fad9c6c052058599b414e9e1b9021
1329813299
" && row.isBindable\n" +
1329913300
<<<<<<< 3afdb5cdc2e1c6f17bcd15c48f0429db3bb4800a
1330013301
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
@@ -13304,13 +13305,22 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1330413305
=======
1330513306
" && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
1330613307
>>>>>>> Adopt new service catalog resource names
13308+
=======
13309+
" && row.isBindable\n" +
13310+
" && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\" class=\"hidden-xs hidden-sm\">\n" +
13311+
>>>>>>> Making display of errors for service rows consistent with others
1330713312
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">\n" +
1330813313
"<span class=\"pficon pficon-add-circle-o\" aria-hidden=\"true\"></span>\n" +
1330913314
"Create Binding\n" +
1331013315
"</a>\n" +
1331113316
>>>>>>> Add bindings list to resource pages
1331213317
"</span>\n" +
13318+
<<<<<<< 5d3e04a4959fad9c6c052058599b414e9e1b9021
1331313319
"<span ng-if=\"row.bindings.length\" class=\"component-label\" translate>Bindings</span>\n" +
13320+
=======
13321+
"<div ng-if=\"row.bindings.length\" class=\"hidden-xs hidden-sm\">\n" +
13322+
"<span class=\"component-label\">Bindings</span>\n" +
13323+
>>>>>>> Making display of errors for service rows consistent with others
1331413324
"<p ng-if=\"firstBinding = row.bindings[0]\" class=\"bindings\">\n" +
1331513325
"<span ng-if=\"application = row.state.applicationsByBinding[firstBinding.metadata.name][0]\">\n" +
1331613326
"{{application.metadata.name}}\n" +
@@ -13325,7 +13335,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1332513335
"</span>\n" +
1332613336
"</p>\n" +
1332713337
"</div>\n" +
13328-
"</div>\n" +
1332913338
"<div class=\"hidden-xs\" ng-if=\"(!row.instanceStatus || row.instanceStatus === 'ready') && row.apiObject.status.dashboardURL\">\n" +
1333013339
"<a ng-href=\"{{row.apiObject.status.dashboardURL}}\" target=\"_blank\">\n" +
1333113340
"Console\n" +

0 commit comments

Comments
 (0)
Please sign in to comment.