Skip to content

Commit 2892ee1

Browse files
Do not show binding parameters on the overview page
1 parent b2c1cf1 commit 2892ee1

File tree

9 files changed

+28
-47
lines changed

9 files changed

+28
-47
lines changed

app/scripts/directives/serviceInstanceBindings.js

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ angular.module('openshiftConsole').component('serviceInstanceBindings', {
99
],
1010
controllerAs: '$ctrl',
1111
bindings: {
12+
isOverview: '<?',
1213
showHeader: '<?',
1314
project: '<',
1415
bindings: '<',

app/styles/_components.less

+9-14
Original file line numberDiff line numberDiff line change
@@ -200,35 +200,30 @@ code.command {
200200
margin-left: 20px;
201201
}
202202
.service-binding-parameters {
203-
margin-left: 20px;
204-
> a {
205-
border-left: 1px solid @color-pf-black-300;
206-
padding: 0 10px;
203+
margin-top: 5px;
207204

208-
&:first-of-type {
209-
border-left: 0;
210-
}
205+
> form {
206+
margin-top: 5px;
211207
}
212-
.parameters-heading {
213-
color: @color-pf-black-500;
214-
text-transform: uppercase;
215-
}
216-
.parameter-title {
217-
font-weight: 700;
218-
text-align: right;
208+
.hide-show-link {
209+
font-size: @font-size-base;
210+
margin-left: 5px;
219211
}
220212
}
221213

222214
.service-binding-actions {
223215
font-size: 13px;
224216
font-weight: 400;
217+
margin-top: 5px;
218+
225219
> a {
226220
border-left: 1px solid @color-pf-black-300;
227221
padding: 0 10px;
228222

229223
&:first-of-type {
230224
border-left: 0;
231225
padding-left: 0;
226+
padding-right: 5px;
232227
}
233228
}
234229
}

app/styles/_core.less

-13
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,6 @@
100100
.config-parameters-form {
101101
margin-top: 5px;
102102

103-
.control-label {
104-
padding-right: 0;
105-
word-break: break-word;
106-
}
107-
108-
form {
109-
margin-top: 10px;
110-
}
111-
112-
.form-group {
113-
margin-bottom: 0;
114-
}
115-
116103
.hide-show-link {
117104
font-size: @font-size-base;
118105
margin-left: 5px;

app/views/directives/_service-binding.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ <h3>
4848
View Secret
4949
</a>
5050
</div>
51-
<div class="service-binding-parameters" ng-if="$ctrl.bindParameterSchema.properties">
52-
<span class="parameters-heading">Parameters</span>
53-
<a href="" ng-click="$ctrl.toggleShowParameterValues()" role="button">
51+
<div class="service-binding-parameters" ng-if="!$ctrl.isOverview && $ctrl.bindParameterSchema.properties">
52+
<span class="component-label">Parameters</span>
53+
<a href="" class="hide-show-link" ng-click="$ctrl.toggleShowParameterValues()" role="button">
5454
{{$ctrl.showParameterValues ? 'Hide Values' : 'Reveal Values'}}
5555
</a>
5656
<form name="ctrl.parametersForm">

app/views/directives/service-instance-bindings.html

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<h3 ng-if="$ctrl.showHeader">Bindings</h3>
33
<service-binding
44
ng-repeat="binding in $ctrl.bindings track by (binding | uid)"
5+
is-overview="$ctrl.isOverview"
56
namespace="binding.metadata.namespace"
67
binding="binding"
78
ref-api-object="$ctrl.serviceInstance">

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

+1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ <h3>
152152
<div ng-if="row.isBindable || (row.bindings | size)">
153153
<div class="section-title">Bindings</div>
154154
<service-instance-bindings
155+
is-overview="true"
155156
project="row.state.project"
156157
bindings="row.bindings"
157158
service-instance="row.apiObject"

dist/scripts/scripts.js

+1
Original file line numberDiff line numberDiff line change
@@ -10450,6 +10450,7 @@ templateUrl: "views/directives/resource-service-bindings.html"
1045010450
controller: [ "$filter", "APIService", "BindingService", ServiceInstanceBindings ],
1045110451
controllerAs: "$ctrl",
1045210452
bindings: {
10453+
isOverview: "<?",
1045310454
showHeader: "<?",
1045410455
project: "<",
1045510456
bindings: "<",

dist/scripts/templates.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -5679,9 +5679,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
56795679
"View Secret\n" +
56805680
"</a>\n" +
56815681
"</div>\n" +
5682-
"<div class=\"service-binding-parameters\" ng-if=\"$ctrl.bindParameterSchema.properties\">\n" +
5683-
"<span class=\"parameters-heading\">Parameters</span>\n" +
5684-
"<a href=\"\" ng-click=\"$ctrl.toggleShowParameterValues()\" role=\"button\">\n" +
5682+
"<div class=\"service-binding-parameters\" ng-if=\"!$ctrl.isOverview && $ctrl.bindParameterSchema.properties\">\n" +
5683+
"<span class=\"component-label\">Parameters</span>\n" +
5684+
"<a href=\"\" class=\"hide-show-link\" ng-click=\"$ctrl.toggleShowParameterValues()\" role=\"button\">\n" +
56855685
"{{$ctrl.showParameterValues ? 'Hide Values' : 'Reveal Values'}}\n" +
56865686
"</a>\n" +
56875687
"<form name=\"ctrl.parametersForm\">\n" +
@@ -9227,7 +9227,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
92279227
$templateCache.put('views/directives/service-instance-bindings.html',
92289228
"<div ng-if=\"$ctrl.bindable || ($ctrl.bindings | size)\">\n" +
92299229
"<h3 ng-if=\"$ctrl.showHeader\">Bindings</h3>\n" +
9230-
"<service-binding ng-repeat=\"binding in $ctrl.bindings track by (binding | uid)\" namespace=\"binding.metadata.namespace\" binding=\"binding\" ref-api-object=\"$ctrl.serviceInstance\">\n" +
9230+
"<service-binding ng-repeat=\"binding in $ctrl.bindings track by (binding | uid)\" is-overview=\"$ctrl.isOverview\" namespace=\"binding.metadata.namespace\" binding=\"binding\" ref-api-object=\"$ctrl.serviceInstance\">\n" +
92319231
"</service-binding>\n" +
92329232
"<div ng-if=\"$ctrl.bindable\">\n" +
92339233
"<a href=\"\" ng-click=\"$ctrl.createBinding()\" role=\"button\">\n" +
@@ -12642,7 +12642,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1264212642
"</div>\n" +
1264312643
"<div ng-if=\"row.isBindable || (row.bindings | size)\">\n" +
1264412644
"<div class=\"section-title\">Bindings</div>\n" +
12645-
"<service-instance-bindings project=\"row.state.project\" bindings=\"row.bindings\" service-instance=\"row.apiObject\" service-class=\"row.serviceClass\" service-plan=\"row.servicePlan\">\n" +
12645+
"<service-instance-bindings is-overview=\"true\" project=\"row.state.project\" bindings=\"row.bindings\" service-instance=\"row.apiObject\" service-class=\"row.serviceClass\" service-plan=\"row.servicePlan\">\n" +
1264612646
"</service-instance-bindings>\n" +
1264712647
"</div>\n" +
1264812648
"</div>\n" +

dist/styles/main.css

+7-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)