Skip to content

Commit 43e8d6a

Browse files
spadgettspadgett
committed
Overview instance row improvements
* Show documentation URL * Show support URL * Add a delete action to failed deployment alerts * Truncate long text in alert messages
1 parent c6db605 commit 43e8d6a

File tree

6 files changed

+41
-24
lines changed

6 files changed

+41
-24
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232

3333
var serviceInstanceDisplayName = $filter('serviceInstanceDisplayName');
3434

35-
var getDescription = function() {
36-
var serviceClassName = row.apiObject.spec.serviceClassName;
37-
return _.get(row, ['state','serviceClasses', serviceClassName, 'description']);
38-
};
39-
4035
var updateInstanceStatus = function() {
4136
if (_.get(row.apiObject, 'metadata.deletionTimestamp')) {
4237
row.instanceStatus = 'deleted';
@@ -55,7 +50,7 @@
5550
row.notifications = ListRowUtils.getNotifications(row.apiObject, row.state);
5651
row.displayName = serviceInstanceDisplayName(row.apiObject, row.state.serviceClasses);
5752
row.isBindable = BindingService.isServiceBindable(row.apiObject, row.state.serviceClasses);
58-
row.description = getDescription();
53+
row.serviceClass = _.get(row, ['state', 'serviceClasses', row.apiObject.spec.serviceClassName]);
5954
};
6055

6156
row.$onChanges = function(changes) {

‎app/styles/_overview.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,10 @@
445445
font-size: 10px;
446446
}
447447
}
448+
.list-pf-expansion .learn-more-inline {
449+
margin-left: 0;
450+
margin-right: 5px;
451+
}
448452
}
449453
@media (min-width: @screen-md-min) {
450454
.status-icons {

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

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ <h3>
6363
class="hidden-xs"
6464
ng-if="(!row.instanceStatus || row.instanceStatus === 'ready') && row.apiObject.status.dashboardURL">
6565
<a ng-href="{{row.apiObject.status.dashboardURL}}" target="_blank">
66-
Console
67-
</a> <i class="fa fa-external-link small" aria-hidden="true"></i>
66+
Console <i class="fa fa-external-link" aria-hidden="true"></i>
67+
</a>
6868
</div>
6969
</div>
7070
</div>
@@ -112,7 +112,13 @@ <h3>
112112
<div class="alert word-break alert-danger">
113113
<span class="pficon pficon-error-circle-o" aria-hidden="true"></span>
114114
<span class="sr-only">error</span>
115-
<span class="strong">{{row.apiObject | serviceInstanceFailedMessage}}</span>
115+
<span class="strong">The service failed.</span>
116+
<span class="mar-right-md">
117+
<truncate-long-text content="row.apiObject | serviceInstanceFailedMessage" limit="265"></truncate-long-text>
118+
</span>
119+
<span ng-if="{resource: 'serviceinstances', group: 'servicecatalog.k8s.io'} | canI : 'delete'" class="nowrap">
120+
<a href="" ng-click="row.deprovision()">Delete This Service</a>
121+
</span>
116122
</div>
117123
</div>
118124
</div>
@@ -121,16 +127,20 @@ <h3>
121127
<div class="alert word-break alert-info">
122128
<span class="pficon pficon-info" aria-hidden="true"></span>
123129
<span class="sr-only">info</span>
124-
<span>The service is not yet ready.</span>
125-
<span>{{row.pendingMessage}}</span>
130+
<span class="strong">The service is not yet ready.</span>
131+
<truncate-long-text content="row.pendingMessage" limit="265"></truncate-long-text>
126132
</div>
127133
</div>
128134
</div>
129135
</div>
130136
<div>
131137
<div class="row">
132-
<div class="col-sm-12" ng-if="row.description">
133-
<p class="pre-wrap" ng-bind-html="row.description | linky"></p>
138+
<div class="col-sm-12" ng-if="row.serviceClass.description">
139+
<p class="pre-wrap" ng-bind-html="row.serviceClass.description | linky"></p>
140+
<div ng-if="row.serviceClass.externalMetadata.documentationUrl || row.serviceClass.externalMetadata.supportUrl">
141+
<a ng-if="row.serviceClass.externalMetadata.documentationUrl" ng-href="{{row.serviceClass.externalMetadata.documentationUrl}}" target="_blank" class="learn-more-inline">View Documentation <i class="fa fa-external-link" aria-hidden="true"></i></a>
142+
<a ng-if="row.serviceClass.externalMetadata.supportUrl" ng-href="{{row.serviceClass.externalMetadata.supportUrl}}" target="_blank" class="learn-more-inline">Get Support <i class="fa fa-external-link" aria-hidden="true"></i></a>
143+
</div>
134144
</div>
135145
</div>
136146
<overview-service-bindings

‎dist/scripts/scripts.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13570,13 +13570,10 @@ controller: [ "$filter", "AuthorizationService", "BindingService", "ListRowUtils
1357013570
var o = this, i = e("isBindingFailed"), s = e("isBindingReady");
1357113571
_.extend(o, a.ui);
1357213572
var c = e("serviceInstanceDisplayName"), l = function() {
13573-
var e = o.apiObject.spec.serviceClassName;
13574-
return _.get(o, [ "state", "serviceClasses", e, "description" ]);
13575-
}, u = function() {
1357613573
_.get(o.apiObject, "metadata.deletionTimestamp") ? o.instanceStatus = "deleted" : i(o.apiObject) ? o.instanceStatus = "failed" : s(o.apiObject) ? o.instanceStatus = "ready" : o.instanceStatus = "pending";
1357713574
};
1357813575
o.$doCheck = function() {
13579-
u(), o.notifications = a.getNotifications(o.apiObject, o.state), o.displayName = c(o.apiObject, o.state.serviceClasses), o.isBindable = n.isServiceBindable(o.apiObject, o.state.serviceClasses), o.description = l();
13576+
l(), o.notifications = a.getNotifications(o.apiObject, o.state), o.displayName = c(o.apiObject, o.state.serviceClasses), o.isBindable = n.isServiceBindable(o.apiObject, o.state.serviceClasses), o.serviceClass = _.get(o, [ "state", "serviceClasses", o.apiObject.spec.serviceClassName ]);
1358013577
}, o.$onChanges = function(e) {
1358113578
e.bindings && (o.deleteableBindings = _.reject(o.bindings, "metadata.deletionTimestamp"));
1358213579
}, o.getSecretForBinding = function(e) {

‎dist/scripts/templates.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12362,8 +12362,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1236212362
"</div>\n" +
1236312363
"<div class=\"hidden-xs\" ng-if=\"(!row.instanceStatus || row.instanceStatus === 'ready') && row.apiObject.status.dashboardURL\">\n" +
1236412364
"<a ng-href=\"{{row.apiObject.status.dashboardURL}}\" target=\"_blank\">\n" +
12365-
"Console\n" +
12366-
"</a> <i class=\"fa fa-external-link small\" aria-hidden=\"true\"></i>\n" +
12365+
"Console <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i>\n" +
12366+
"</a>\n" +
1236712367
"</div>\n" +
1236812368
"</div>\n" +
1236912369
"</div>\n" +
@@ -12406,7 +12406,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1240612406
"<div class=\"alert word-break alert-danger\">\n" +
1240712407
"<span class=\"pficon pficon-error-circle-o\" aria-hidden=\"true\"></span>\n" +
1240812408
"<span class=\"sr-only\">error</span>\n" +
12409-
"<span class=\"strong\">{{row.apiObject | serviceInstanceFailedMessage}}</span>\n" +
12409+
"<span class=\"strong\">The service failed.</span>\n" +
12410+
"<span class=\"mar-right-md\">\n" +
12411+
"<truncate-long-text content=\"row.apiObject | serviceInstanceFailedMessage\" limit=\"265\"></truncate-long-text>\n" +
12412+
"</span>\n" +
12413+
"<span ng-if=\"{resource: 'serviceinstances', group: 'servicecatalog.k8s.io'} | canI : 'delete'\" class=\"nowrap\">\n" +
12414+
"<a href=\"\" ng-click=\"row.deprovision()\">Delete This Service</a>\n" +
12415+
"</span>\n" +
1241012416
"</div>\n" +
1241112417
"</div>\n" +
1241212418
"</div>\n" +
@@ -12415,16 +12421,20 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1241512421
"<div class=\"alert word-break alert-info\">\n" +
1241612422
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
1241712423
"<span class=\"sr-only\">info</span>\n" +
12418-
"<span>The service is not yet ready.</span>\n" +
12419-
"<span>{{row.pendingMessage}}</span>\n" +
12424+
"<span class=\"strong\">The service is not yet ready.</span>\n" +
12425+
"<truncate-long-text content=\"row.pendingMessage\" limit=\"265\"></truncate-long-text>\n" +
1242012426
"</div>\n" +
1242112427
"</div>\n" +
1242212428
"</div>\n" +
1242312429
"</div>\n" +
1242412430
"<div>\n" +
1242512431
"<div class=\"row\">\n" +
12426-
"<div class=\"col-sm-12\" ng-if=\"row.description\">\n" +
12427-
"<p class=\"pre-wrap\" ng-bind-html=\"row.description | linky\"></p>\n" +
12432+
"<div class=\"col-sm-12\" ng-if=\"row.serviceClass.description\">\n" +
12433+
"<p class=\"pre-wrap\" ng-bind-html=\"row.serviceClass.description | linky\"></p>\n" +
12434+
"<div ng-if=\"row.serviceClass.externalMetadata.documentationUrl || row.serviceClass.externalMetadata.supportUrl\">\n" +
12435+
"<a ng-if=\"row.serviceClass.externalMetadata.documentationUrl\" ng-href=\"{{row.serviceClass.externalMetadata.documentationUrl}}\" target=\"_blank\" class=\"learn-more-inline\">View Documentation <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +
12436+
"<a ng-if=\"row.serviceClass.externalMetadata.supportUrl\" ng-href=\"{{row.serviceClass.externalMetadata.supportUrl}}\" target=\"_blank\" class=\"learn-more-inline\">Get Support <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +
12437+
"</div>\n" +
1242812438
"</div>\n" +
1242912439
"</div>\n" +
1243012440
"<overview-service-bindings ng-if=\"row.isBindable || row.bindings\" section-title=\"Bindings\" ref-api-object=\"row.apiObject\" namespace=\"row.apiObject.metadata.namespace\" bindings=\"row.bindings\" bindable-service-instances=\"row.state.bindableServiceInstances\" service-classes=\"row.state.serviceClasses\" create-binding=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">\n" +

‎dist/styles/main.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)