Skip to content

Commit

Permalink
Still show instance details when provision in progress
Browse files Browse the repository at this point in the history 
Show the description and other instance details on the overview even if
it's not yet ready.
  • Loading branch information
@spadgett
spadgett committed Sep 6, 2017
1 parent 73c7420 commit c173e5d
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 71 deletions.
118 changes: 50 additions & 68 deletions app/views/overview/_service-instance-row.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,24 +95,6 @@ <h3>
<div class="list-pf-container">
<div class="expanded-section">
<alerts alerts="row.notifications"></alerts>
<!--
TODO: follow-on PR
<div class="expanded-section">
<div class="section-title">
Configuration Details
</div>
<div class="row" ng-repeat="item in [{
name: 'password',
value: '*****'
}, {
name: 'lorem ipsum',
value: 'dolor sit amet'
}]">
<div class="col-sm-5">{{item.name}}</div>
<div class="col-sm-7">{{item.value}}</div>
</div>
</div>
-->
<div ng-switch="row.instanceStatus">
<div ng-switch-when="deleted" class="row">
<div class="col-sm-12">
Expand Down Expand Up @@ -143,61 +125,61 @@ <h3>
</div>
</div>
</div>
<div ng-switch-default>
<div class="row">
<div class="col-sm-12" ng-if="row.description">
<p class="pre-wrap" ng-bind-html="row.description | linky"></p>
</div>
</div>
<div class="section-title" ng-if="row.isBindable || row.bindings">
Bindings
</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>
<div class="row overview-bindings" ng-repeat="(name, binding) in row.bindings">
<div class="col-sm-5 col-md-6">
<div ng-if="!(row.state.applicationsByBinding[binding.metadata.name] | size)">
<h3>
<div class="component-label">
Secret
</div>
<a ng-if="('secrets' | canI : 'get')"
ng-href="{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}">
{{binding.spec.secretName}}
</a>
<span ng-if="!('secrets' | canI : 'get')">
{{binding.spec.secretName}}
</span>
</h3>
</div>
<div ng-repeat="target in row.state.applicationsByBinding[binding.metadata.name] track by (target | uid)">
<h3>
<div class="component-label">
{{target.kind | humanizeKind : true}}
</div>
<a ng-href="{{target | navigateResourceURL}}">{{target.metadata.name}}</a>
</h3>
</div>
</div>
<div class="section-title" ng-if="row.isBindable || row.bindings">
Bindings
</div>
<div class="row overview-bindings" ng-repeat="(name, binding) in row.bindings">
<div class="col-sm-5 col-md-6">
<div ng-if="!(row.state.applicationsByBinding[binding.metadata.name] | size)">
<h3>
<div class="component-label">
Secret
</div>
<a ng-if="('secrets' | canI : 'get')"
ng-href="{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}">
{{binding.spec.secretName}}
</a>
<span ng-if="!('secrets' | canI : 'get')">
{{binding.spec.secretName}}
</span>
</h3>
</div>
<div class="col-sm-7 col-md-6 overview-bindings">
<span ng-if="binding.metadata.deletionTimestamp">
<status-icon status="'Pending'"></status-icon> Deleting
</span>
<span ng-if="!(binding | isBindingReady) && !binding.metadata.deletionTimestamp">
<status-icon status="'Pending'"></status-icon> Pending
</span>
<div ng-repeat="target in row.state.applicationsByBinding[binding.metadata.name] track by (target | uid)">
<h3>
<div class="component-label">
{{target.kind | humanizeKind : true}}
</div>
<a ng-href="{{target | navigateResourceURL}}">{{target.metadata.name}}</a>
</h3>
</div>
</div>
<div class="row" ng-if="row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<div class="col-sm-12">
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
Create Binding
</a>
</div>
<div class="col-sm-7 col-md-6 overview-bindings">
<span ng-if="binding.metadata.deletionTimestamp">
<status-icon status="'Pending'"></status-icon> Deleting
</span>
<span ng-if="!(binding | isBindingReady) && !binding.metadata.deletionTimestamp">
<status-icon status="'Pending'"></status-icon> Pending
</span>
</div>
<div class="row" ng-if="!row.bindings.length && (!row.isBindable || !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'))">
<div class="col-sm-12">
<em>No bindings</em>
</div>
</div>
<div class="row" ng-if="row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<div class="col-sm-12">
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
Create Binding
</a>
</div>
</div>
<div class="row" ng-if="!row.bindings.length && (!row.isBindable || !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'))">
<div class="col-sm-12">
<em>No bindings</em>
</div>
</div>
</div>
Expand Down
5 changes: 2 additions & 3 deletions dist/scripts/templates.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12166,7 +12166,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"list-pf-container\">\n" +
"<div class=\"expanded-section\">\n" +
"<alerts alerts=\"row.notifications\"></alerts>\n" +
"\n" +
"<div ng-switch=\"row.instanceStatus\">\n" +
"<div ng-switch-when=\"deleted\" class=\"row\">\n" +
"<div class=\"col-sm-12\">\n" +
Expand Down Expand Up @@ -12197,7 +12196,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"</div>\n" +
"</div>\n" +
"<div ng-switch-default>\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" +
Expand Down Expand Up @@ -12257,7 +12257,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"<overlay-panel single-column=\"true\" show-panel=\"row.overlay.panelVisible\" show-close=\"true\" handle-close=\"row.closeOverlayPanel\">\n" +
"<div ng-if=\"row.overlay.panelName === 'bindService'\">\n" +
"<bind-service target=\"row.overlay.state.target\" project=\"row.state.project\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
Expand Down

0 comments on commit c173e5d

Please sign in to comment.