Skip to content

Commit e724d33

Browse files
author
OpenShift Bot
authored
Merge pull request #2019 from spadgett/show-details-when-provisioning
Merged by openshift-bot
2 parents 38eb4eb + c173e5d commit e724d33

File tree

2 files changed

+52
-71
lines changed

2 files changed

+52
-71
lines changed

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

+50-68
Original file line numberDiff line numberDiff line change
@@ -95,24 +95,6 @@ <h3>
9595
<div class="list-pf-container">
9696
<div class="expanded-section">
9797
<alerts alerts="row.notifications"></alerts>
98-
<!--
99-
TODO: follow-on PR
100-
<div class="expanded-section">
101-
<div class="section-title">
102-
Configuration Details
103-
</div>
104-
<div class="row" ng-repeat="item in [{
105-
name: 'password',
106-
value: '*****'
107-
}, {
108-
name: 'lorem ipsum',
109-
value: 'dolor sit amet'
110-
}]">
111-
<div class="col-sm-5">{{item.name}}</div>
112-
<div class="col-sm-7">{{item.value}}</div>
113-
</div>
114-
</div>
115-
-->
11698
<div ng-switch="row.instanceStatus">
11799
<div ng-switch-when="deleted" class="row">
118100
<div class="col-sm-12">
@@ -143,61 +125,61 @@ <h3>
143125
</div>
144126
</div>
145127
</div>
146-
<div ng-switch-default>
147-
<div class="row">
148-
<div class="col-sm-12" ng-if="row.description">
149-
<p class="pre-wrap" ng-bind-html="row.description | linky"></p>
150-
</div>
151-
</div>
152-
<div class="section-title" ng-if="row.isBindable || row.bindings">
153-
Bindings
128+
</div>
129+
<div>
130+
<div class="row">
131+
<div class="col-sm-12" ng-if="row.description">
132+
<p class="pre-wrap" ng-bind-html="row.description | linky"></p>
154133
</div>
155-
<div class="row overview-bindings" ng-repeat="(name, binding) in row.bindings">
156-
<div class="col-sm-5 col-md-6">
157-
<div ng-if="!(row.state.applicationsByBinding[binding.metadata.name] | size)">
158-
<h3>
159-
<div class="component-label">
160-
Secret
161-
</div>
162-
<a ng-if="('secrets' | canI : 'get')"
163-
ng-href="{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}">
164-
{{binding.spec.secretName}}
165-
</a>
166-
<span ng-if="!('secrets' | canI : 'get')">
167-
{{binding.spec.secretName}}
168-
</span>
169-
</h3>
170-
</div>
171-
<div ng-repeat="target in row.state.applicationsByBinding[binding.metadata.name] track by (target | uid)">
172-
<h3>
173-
<div class="component-label">
174-
{{target.kind | humanizeKind : true}}
175-
</div>
176-
<a ng-href="{{target | navigateResourceURL}}">{{target.metadata.name}}</a>
177-
</h3>
178-
</div>
134+
</div>
135+
<div class="section-title" ng-if="row.isBindable || row.bindings">
136+
Bindings
137+
</div>
138+
<div class="row overview-bindings" ng-repeat="(name, binding) in row.bindings">
139+
<div class="col-sm-5 col-md-6">
140+
<div ng-if="!(row.state.applicationsByBinding[binding.metadata.name] | size)">
141+
<h3>
142+
<div class="component-label">
143+
Secret
144+
</div>
145+
<a ng-if="('secrets' | canI : 'get')"
146+
ng-href="{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}">
147+
{{binding.spec.secretName}}
148+
</a>
149+
<span ng-if="!('secrets' | canI : 'get')">
150+
{{binding.spec.secretName}}
151+
</span>
152+
</h3>
179153
</div>
180-
<div class="col-sm-7 col-md-6 overview-bindings">
181-
<span ng-if="binding.metadata.deletionTimestamp">
182-
<status-icon status="'Pending'"></status-icon> Deleting
183-
</span>
184-
<span ng-if="!(binding | isBindingReady) && !binding.metadata.deletionTimestamp">
185-
<status-icon status="'Pending'"></status-icon> Pending
186-
</span>
154+
<div ng-repeat="target in row.state.applicationsByBinding[binding.metadata.name] track by (target | uid)">
155+
<h3>
156+
<div class="component-label">
157+
{{target.kind | humanizeKind : true}}
158+
</div>
159+
<a ng-href="{{target | navigateResourceURL}}">{{target.metadata.name}}</a>
160+
</h3>
187161
</div>
188162
</div>
189-
<div class="row" ng-if="row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
190-
<div class="col-sm-12">
191-
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
192-
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
193-
Create Binding
194-
</a>
195-
</div>
163+
<div class="col-sm-7 col-md-6 overview-bindings">
164+
<span ng-if="binding.metadata.deletionTimestamp">
165+
<status-icon status="'Pending'"></status-icon> Deleting
166+
</span>
167+
<span ng-if="!(binding | isBindingReady) && !binding.metadata.deletionTimestamp">
168+
<status-icon status="'Pending'"></status-icon> Pending
169+
</span>
196170
</div>
197-
<div class="row" ng-if="!row.bindings.length && (!row.isBindable || !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'))">
198-
<div class="col-sm-12">
199-
<em>No bindings</em>
200-
</div>
171+
</div>
172+
<div class="row" ng-if="row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
173+
<div class="col-sm-12">
174+
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
175+
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
176+
Create Binding
177+
</a>
178+
</div>
179+
</div>
180+
<div class="row" ng-if="!row.bindings.length && (!row.isBindable || !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'))">
181+
<div class="col-sm-12">
182+
<em>No bindings</em>
201183
</div>
202184
</div>
203185
</div>

‎dist/scripts/templates.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -12164,7 +12164,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1216412164
"<div class=\"list-pf-container\">\n" +
1216512165
"<div class=\"expanded-section\">\n" +
1216612166
"<alerts alerts=\"row.notifications\"></alerts>\n" +
12167-
"\n" +
1216812167
"<div ng-switch=\"row.instanceStatus\">\n" +
1216912168
"<div ng-switch-when=\"deleted\" class=\"row\">\n" +
1217012169
"<div class=\"col-sm-12\">\n" +
@@ -12195,7 +12194,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1219512194
"</div>\n" +
1219612195
"</div>\n" +
1219712196
"</div>\n" +
12198-
"<div ng-switch-default>\n" +
12197+
"</div>\n" +
12198+
"<div>\n" +
1219912199
"<div class=\"row\">\n" +
1220012200
"<div class=\"col-sm-12\" ng-if=\"row.description\">\n" +
1220112201
"<p class=\"pre-wrap\" ng-bind-html=\"row.description | linky\"></p>\n" +
@@ -12255,7 +12255,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1225512255
"</div>\n" +
1225612256
"</div>\n" +
1225712257
"</div>\n" +
12258-
"</div>\n" +
1225912258
"<overlay-panel single-column=\"true\" show-panel=\"row.overlay.panelVisible\" show-close=\"true\" handle-close=\"row.closeOverlayPanel\">\n" +
1226012259
"<div ng-if=\"row.overlay.panelName === 'bindService'\">\n" +
1226112260
"<bind-service target=\"row.overlay.state.target\" project=\"row.state.project\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +

0 commit comments

Comments
 (0)