Skip to content

Commit

Permalink
Overview instance row improvements
Browse files Browse the repository at this point in the history 
* Show documentation URL
* Show support URL
* Add a delete action to failed deployment alerts
* Truncate long text in alert messages
  • Loading branch information
@spadgett
spadgett committed Sep 26, 2017
1 parent c6db605 commit 2bd951f
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 26 deletions.
7 changes: 1 addition & 6 deletions app/scripts/directives/overview/serviceInstanceRow.js
View file
Expand Up @@ -32,11 +32,6 @@

var serviceInstanceDisplayName = $filter('serviceInstanceDisplayName');

var getDescription = function() {
var serviceClassName = row.apiObject.spec.serviceClassName;
return _.get(row, ['state','serviceClasses', serviceClassName, 'description']);
};

var updateInstanceStatus = function() {
if (_.get(row.apiObject, 'metadata.deletionTimestamp')) {
row.instanceStatus = 'deleted';
Expand All @@ -55,7 +50,7 @@
row.notifications = ListRowUtils.getNotifications(row.apiObject, row.state);
row.displayName = serviceInstanceDisplayName(row.apiObject, row.state.serviceClasses);
row.isBindable = BindingService.isServiceBindable(row.apiObject, row.state.serviceClasses);
row.description = getDescription();
row.serviceClass = _.get(row, ['state', 'serviceClasses', row.apiObject.spec.serviceClassName]);
};

row.$onChanges = function(changes) {
Expand Down
8 changes: 8 additions & 0 deletions app/styles/_overview.less
View file
Expand Up @@ -445,6 +445,14 @@
font-size: 10px;
}
}
.list-pf-expansion .learn-more-link {
display: block;
font-size: @font-size-base;
@media (min-width: @screen-sm-min) {
display: inline;
margin-right: 10px;
}
}
}
@media (min-width: @screen-md-min) {
.status-icons {
Expand Down
24 changes: 17 additions & 7 deletions app/views/overview/_service-instance-row.html
View file
Expand Up @@ -63,8 +63,8 @@ <h3>
class="hidden-xs"
ng-if="(!row.instanceStatus || row.instanceStatus === 'ready') && row.apiObject.status.dashboardURL">
<a ng-href="{{row.apiObject.status.dashboardURL}}" target="_blank">
Console
</a> <i class="fa fa-external-link small" aria-hidden="true"></i>
Console <i class="fa fa-external-link" aria-hidden="true"></i>
</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -112,7 +112,13 @@ <h3>
<div class="alert word-break alert-danger">
<span class="pficon pficon-error-circle-o" aria-hidden="true"></span>
<span class="sr-only">error</span>
<span class="strong">{{row.apiObject | serviceInstanceFailedMessage}}</span>
<span class="strong">The service failed.</span>
<span class="mar-right-md">
<truncate-long-text content="row.apiObject | serviceInstanceFailedMessage" limit="265"></truncate-long-text>
</span>
<span ng-if="{resource: 'serviceinstances', group: 'servicecatalog.k8s.io'} | canI : 'delete'" class="nowrap">
<a href="" ng-click="row.deprovision()">Delete This Service</a>
</span>
</div>
</div>
</div>
Expand All @@ -121,16 +127,20 @@ <h3>
<div class="alert word-break alert-info">
<span class="pficon pficon-info" aria-hidden="true"></span>
<span class="sr-only">info</span>
<span>The service is not yet ready.</span>
<span>{{row.pendingMessage}}</span>
<span class="strong">The service is not yet ready.</span>
<truncate-long-text content="row.pendingMessage" limit="265"></truncate-long-text>
</div>
</div>
</div>
</div>
<div>
<div class="row">
<div class="col-sm-12" ng-if="row.description">
<p class="pre-wrap" ng-bind-html="row.description | linky"></p>
<div class="col-sm-12" ng-if="row.serviceClass.description">
<p class="pre-wrap" ng-bind-html="row.serviceClass.description | linky"></p>
<div ng-if="row.serviceClass.externalMetadata.documentationUrl || row.serviceClass.externalMetadata.supportUrl">
<a ng-if="row.serviceClass.externalMetadata.documentationUrl" ng-href="{{row.serviceClass.externalMetadata.documentationUrl}}" target="_blank" class="learn-more-link">View Documentation <i class="fa fa-external-link" aria-hidden="true"></i></a>
<a ng-if="row.serviceClass.externalMetadata.supportUrl" ng-href="{{row.serviceClass.externalMetadata.supportUrl}}" target="_blank" class="learn-more-link">Get Support <i class="fa fa-external-link" aria-hidden="true"></i></a>
</div>
</div>
</div>
<overview-service-bindings
Expand Down
5 changes: 1 addition & 4 deletions dist/scripts/scripts.js
View file
Expand Up @@ -13570,13 +13570,10 @@ controller: [ "$filter", "AuthorizationService", "BindingService", "ListRowUtils
var o = this, i = e("isBindingFailed"), s = e("isBindingReady");
_.extend(o, a.ui);
var c = e("serviceInstanceDisplayName"), l = function() {
var e = o.apiObject.spec.serviceClassName;
return _.get(o, [ "state", "serviceClasses", e, "description" ]);
}, u = function() {
_.get(o.apiObject, "metadata.deletionTimestamp") ? o.instanceStatus = "deleted" : i(o.apiObject) ? o.instanceStatus = "failed" : s(o.apiObject) ? o.instanceStatus = "ready" : o.instanceStatus = "pending";
};
o.$doCheck = function() {
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();
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 ]);
}, o.$onChanges = function(e) {
e.bindings && (o.deleteableBindings = _.reject(o.bindings, "metadata.deletionTimestamp"));
}, o.getSecretForBinding = function(e) {
Expand Down
24 changes: 17 additions & 7 deletions dist/scripts/templates.js
View file
Expand Up @@ -12362,8 +12362,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"<div class=\"hidden-xs\" ng-if=\"(!row.instanceStatus || row.instanceStatus === 'ready') && row.apiObject.status.dashboardURL\">\n" +
"<a ng-href=\"{{row.apiObject.status.dashboardURL}}\" target=\"_blank\">\n" +
"Console\n" +
"</a> <i class=\"fa fa-external-link small\" aria-hidden=\"true\"></i>\n" +
"Console <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i>\n" +
"</a>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -12406,7 +12406,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"alert word-break alert-danger\">\n" +
"<span class=\"pficon pficon-error-circle-o\" aria-hidden=\"true\"></span>\n" +
"<span class=\"sr-only\">error</span>\n" +
"<span class=\"strong\">{{row.apiObject | serviceInstanceFailedMessage}}</span>\n" +
"<span class=\"strong\">The service failed.</span>\n" +
"<span class=\"mar-right-md\">\n" +
"<truncate-long-text content=\"row.apiObject | serviceInstanceFailedMessage\" limit=\"265\"></truncate-long-text>\n" +
"</span>\n" +
"<span ng-if=\"{resource: 'serviceinstances', group: 'servicecatalog.k8s.io'} | canI : 'delete'\" class=\"nowrap\">\n" +
"<a href=\"\" ng-click=\"row.deprovision()\">Delete This Service</a>\n" +
"</span>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand All @@ -12415,16 +12421,20 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"alert word-break alert-info\">\n" +
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
"<span class=\"sr-only\">info</span>\n" +
"<span>The service is not yet ready.</span>\n" +
"<span>{{row.pendingMessage}}</span>\n" +
"<span class=\"strong\">The service is not yet ready.</span>\n" +
"<truncate-long-text content=\"row.pendingMessage\" limit=\"265\"></truncate-long-text>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"<div>\n" +
"<div class=\"row\">\n" +
"<div class=\"col-sm-12\" ng-if=\"row.description\">\n" +
"<p class=\"pre-wrap\" ng-bind-html=\"row.description | linky\"></p>\n" +
"<div class=\"col-sm-12\" ng-if=\"row.serviceClass.description\">\n" +
"<p class=\"pre-wrap\" ng-bind-html=\"row.serviceClass.description | linky\"></p>\n" +
"<div ng-if=\"row.serviceClass.externalMetadata.documentationUrl || row.serviceClass.externalMetadata.supportUrl\">\n" +
"<a ng-if=\"row.serviceClass.externalMetadata.documentationUrl\" ng-href=\"{{row.serviceClass.externalMetadata.documentationUrl}}\" target=\"_blank\" class=\"learn-more-link\">View Documentation <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +
"<a ng-if=\"row.serviceClass.externalMetadata.supportUrl\" ng-href=\"{{row.serviceClass.externalMetadata.supportUrl}}\" target=\"_blank\" class=\"learn-more-link\">Get Support <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"<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" +
Expand Down
6 changes: 4 additions & 2 deletions dist/styles/main.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2bd951f

Please sign in to comment.