Merge pull request #2326 from jeff-phillips-18/parameters

Automatic merge from submit-queue.

Do not show binding parameters on the overview page

See #2323

Author: openshift-merge-robot

Diff for: app/scripts/directives/serviceInstanceBindings.js

@@ -9,6 +9,7 @@ angular.module('openshiftConsole').component('serviceInstanceBindings', {
   ],
   controllerAs: '$ctrl',
   bindings: {
+    isOverview: '<?',
     showHeader: '<?',
     project: '<',
     bindings: '<',

Diff for: app/styles/_components.less

@@ -200,35 +200,30 @@ code.command {
   margin-left: 20px;
 }
 .service-binding-parameters {
-  margin-left: 20px;
-  > a {
-    border-left: 1px solid @color-pf-black-300;
-    padding: 0 10px;
+  margin-top: 5px;
 
-    &:first-of-type {
-      border-left: 0;
-    }
+  > form {
+    margin-top: 5px;
   }
-  .parameters-heading {
-    color: @color-pf-black-500;
-    text-transform: uppercase;
-  }
-  .parameter-title {
-    font-weight: 700;
-    text-align: right;
+  .hide-show-link {
+    font-size: @font-size-base;
+    margin-left: 5px;
   }
 }
 
 .service-binding-actions {
   font-size: 13px;
   font-weight: 400;
+  margin-top: 5px;
+
   > a {
     border-left: 1px solid @color-pf-black-300;
     padding: 0 10px;
 
     &:first-of-type {
       border-left: 0;
       padding-left: 0;
+      padding-right: 5px;
     }
   }
 }

Diff for: app/styles/_core.less

@@ -100,19 +100,6 @@
   .config-parameters-form {
     margin-top: 5px;
 
-    .control-label {
-      padding-right: 0;
-      word-break: break-word;
-    }
-
-    form {
-      margin-top: 10px;
-    }
-
-    .form-group {
-      margin-bottom: 0;
-    }
-
     .hide-show-link {
       font-size: @font-size-base;
       margin-left: 5px;

Diff for: app/views/directives/_service-binding.html

@@ -48,9 +48,9 @@ <h3>
       View Secret
     </a>
   </div>
-  <div class="service-binding-parameters" ng-if="$ctrl.bindParameterSchema.properties">
-    <span class="parameters-heading">Parameters</span>
-    <a href="" ng-click="$ctrl.toggleShowParameterValues()" role="button">
+  <div class="service-binding-parameters" ng-if="!$ctrl.isOverview && $ctrl.bindParameterSchema.properties">
+    <span class="component-label">Parameters</span>
+    <a href="" class="hide-show-link" ng-click="$ctrl.toggleShowParameterValues()" role="button">
       {{$ctrl.showParameterValues ? 'Hide Values' : 'Reveal Values'}}
     </a>
     <form name="ctrl.parametersForm">

Diff for: app/views/directives/service-instance-bindings.html

@@ -2,6 +2,7 @@
   <h3 ng-if="$ctrl.showHeader">Bindings</h3>
   <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">

Diff for: app/views/overview/_service-instance-row.html

@@ -151,6 +151,7 @@ <h3>
           <div ng-if="row.isBindable || (row.bindings | size)">
             <div class="section-title">Bindings</div>
             <service-instance-bindings
+              is-overview="true"
               project="row.state.project"
               bindings="row.bindings"
               service-instance="row.apiObject"

Diff for: dist/scripts/scripts.js

@@ -10450,6 +10450,7 @@ templateUrl: "views/directives/resource-service-bindings.html"
 controller: [ "$filter", "APIService", "BindingService", ServiceInstanceBindings ],
 controllerAs: "$ctrl",
 bindings: {
+isOverview: "<?",
 showHeader: "<?",
 project: "<",
 bindings: "<",

Diff for: dist/scripts/templates.js

@@ -5679,9 +5679,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "View Secret\n" +
     "</a>\n" +
     "</div>\n" +
-    "<div class=\"service-binding-parameters\" ng-if=\"$ctrl.bindParameterSchema.properties\">\n" +
-    "<span class=\"parameters-heading\">Parameters</span>\n" +
-    "<a href=\"\" ng-click=\"$ctrl.toggleShowParameterValues()\" role=\"button\">\n" +
+    "<div class=\"service-binding-parameters\" ng-if=\"!$ctrl.isOverview && $ctrl.bindParameterSchema.properties\">\n" +
+    "<span class=\"component-label\">Parameters</span>\n" +
+    "<a href=\"\" class=\"hide-show-link\" ng-click=\"$ctrl.toggleShowParameterValues()\" role=\"button\">\n" +
     "{{$ctrl.showParameterValues ? 'Hide Values' : 'Reveal Values'}}\n" +
     "</a>\n" +
     "<form name=\"ctrl.parametersForm\">\n" +
@@ -9227,7 +9227,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
   $templateCache.put('views/directives/service-instance-bindings.html',
     "<div ng-if=\"$ctrl.bindable || ($ctrl.bindings | size)\">\n" +
     "<h3 ng-if=\"$ctrl.showHeader\">Bindings</h3>\n" +
-    "<service-binding ng-repeat=\"binding in $ctrl.bindings track by (binding | uid)\" namespace=\"binding.metadata.namespace\" binding=\"binding\" ref-api-object=\"$ctrl.serviceInstance\">\n" +
+    "<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" +
     "</service-binding>\n" +
     "<div ng-if=\"$ctrl.bindable\">\n" +
     "<a href=\"\" ng-click=\"$ctrl.createBinding()\" role=\"button\">\n" +
@@ -12642,7 +12642,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div ng-if=\"row.isBindable || (row.bindings | size)\">\n" +
     "<div class=\"section-title\">Bindings</div>\n" +
-    "<service-instance-bindings project=\"row.state.project\" bindings=\"row.bindings\" service-instance=\"row.apiObject\" service-class=\"row.serviceClass\" service-plan=\"row.servicePlan\">\n" +
+    "<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" +
     "</service-instance-bindings>\n" +
     "</div>\n" +
     "</div>\n" +