Merge pull request #2408 from rhamilto/issue-2183

Automatic merge from submit-queue.

Correct binding name

Fixes #2183
Requires openshift/origin-web-common#241

<img width="966" alt="screen shot 2017-10-31 at 11 45 50 am" src="https://user-images.githubusercontent.com/895728/32238899-6bba0ebc-be3f-11e7-8e6b-c9499801a3ae.PNG">
<img width="974" alt="screen shot 2017-10-31 at 12 12 59 pm" src="https://user-images.githubusercontent.com/895728/32238900-6bc5156e-be3f-11e7-9de5-65837dbf07c4.PNG">
<img width="920" alt="screen shot 2017-10-31 at 1 18 12 pm" src="https://user-images.githubusercontent.com/895728/32238907-70a1354a-be3f-11e7-8eb4-d893a4ef2212.PNG">

Author: openshift-merge-robot

app/scripts/directives/unbindService.js

@@ -15,7 +15,8 @@
       target: '<',
       bindings: '<',
       applicationsByBinding: '<',
-      onClose: '<'
+      onClose: '<',
+      serviceClass: '<'
     },
     templateUrl: 'views/directives/unbind-service.html'
   });
@@ -87,7 +88,7 @@
       } else {
         formStepLabel = 'Services';
       }
-      ctrl.displayName = serviceInstanceDisplayName(ctrl.target);
+      ctrl.displayName = serviceInstanceDisplayName(ctrl.target, ctrl.serviceClass);
       ctrl.steps = [{
         id: 'deleteForm',
         label: formStepLabel,

app/views/directives/bind-service/delete-binding-result.html

@@ -10,7 +10,7 @@ <h3 class="mar-top-none">
       {{appForBinding.metadata.name}} <small class="text-muted">&ndash; {{ appForBinding.kind | humanizeKind : true}}</small>
     </div>
     <div ng-if="!(ctrl.unboundApps | size)">
-      {{ctrl.selectedBinding.spec.secretName}} <small class="text-muted">&ndash; Secret</small>
+      {{ctrl.selectedBinding.metadata.name}}
     </div>
 
     <!-- Only show the redeploy pods message if previously bound to an app. -->

app/views/directives/bind-service/delete-binding-select-form.html

@@ -14,9 +14,8 @@ <h3 class="mar-top-none">
             ng-repeat="appForBinding in ctrl.appsForBinding(binding.metadata.name)">
             {{appForBinding.metadata.name}} <small class="text-muted">&ndash; {{ appForBinding.kind | humanizeKind : true}}</small>
           </div>
-          <div ng-if="!(ctrl.appsForBinding(binding.metadata.name)  | size)">
-            {{binding.spec.secretName}}
-            <small class="text-muted">&ndash; Secret</small>
+          <div ng-if="!(ctrl.appsForBinding(binding.metadata.name) | size)">
+            {{binding.metadata.name}}
           </div>
           <div>
             <small class="text-muted">Created <span am-time-ago="binding.metadata.creationTimestamp"></span></small>

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

@@ -186,6 +186,7 @@ <h3>
       target="row.overlay.state.target"
       bindings="row.deleteableBindings"
       applications-by-binding="row.state.applicationsByBinding"
-      on-close="row.closeOverlayPanel"></unbind-service>
+      on-close="row.closeOverlayPanel"
+      service-class="row.serviceClass"></unbind-service>
   </div>
 </overlay-panel>

bower.json

@@ -46,7 +46,7 @@
     "angular-moment": "1.0.0",
     "angular-utf8-base64": "0.0.5",
     "file-saver": "1.3.3",
-    "origin-web-common": "0.0.71",
+    "origin-web-common": "0.0.72",
     "origin-web-catalog": "0.0.60"
   },
   "devDependencies": {

dist/scripts/scripts.js

@@ -12985,7 +12985,7 @@ i.nextTitle = "Close", i.wizardComplete = !0, u(), m();
 };
 i.$onInit = function() {
 var e;
-e = "ServiceInstance" === i.target.kind ? s("pod_presets") ? "Applications" : "Bindings" : "Services", i.displayName = c(i.target), i.steps = [ {
+e = "ServiceInstance" === i.target.kind ? s("pod_presets") ? "Applications" : "Bindings" : "Services", i.displayName = c(i.target, i.serviceClass), i.steps = [ {
 id: "deleteForm",
 label: e,
 view: "views/directives/bind-service/delete-binding-select-form.html",
@@ -13011,7 +13011,8 @@ bindings: {
 target: "<",
 bindings: "<",
 applicationsByBinding: "<",
-onClose: "<"
+onClose: "<",
+serviceClass: "<"
 },
 templateUrl: "views/directives/unbind-service.html"
 });

dist/scripts/templates.js

@@ -5925,7 +5925,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "{{appForBinding.metadata.name}} <small class=\"text-muted\">&ndash; {{ appForBinding.kind | humanizeKind : true}}</small>\n" +
     "</div>\n" +
     "<div ng-if=\"!(ctrl.unboundApps | size)\">\n" +
-    "{{ctrl.selectedBinding.spec.secretName}} <small class=\"text-muted\">&ndash; Secret</small>\n" +
+    "{{ctrl.selectedBinding.metadata.name}}\n" +
     "</div>\n" +
     "\n" +
     "<p ng-if=\"ctrl.unboundApps | size\" class=\"mar-top-lg\">\n" +
@@ -5960,9 +5960,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div ng-if=\"ctrl.appsForBinding(binding.metadata.name) | size\" ng-repeat=\"appForBinding in ctrl.appsForBinding(binding.metadata.name)\">\n" +
     "{{appForBinding.metadata.name}} <small class=\"text-muted\">&ndash; {{ appForBinding.kind | humanizeKind : true}}</small>\n" +
     "</div>\n" +
-    "<div ng-if=\"!(ctrl.appsForBinding(binding.metadata.name)  | size)\">\n" +
-    "{{binding.spec.secretName}}\n" +
-    "<small class=\"text-muted\">&ndash; Secret</small>\n" +
+    "<div ng-if=\"!(ctrl.appsForBinding(binding.metadata.name) | size)\">\n" +
+    "{{binding.metadata.name}}\n" +
     "</div>\n" +
     "<div>\n" +
     "<small class=\"text-muted\">Created <span am-time-ago=\"binding.metadata.creationTimestamp\"></span></small>\n" +
@@ -12689,7 +12688,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<bind-service target=\"row.overlay.state.target\" project=\"row.state.project\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
     "</div>\n" +
     "<div ng-if=\"row.overlay.panelName === 'unbindService'\">\n" +
-    "<unbind-service target=\"row.overlay.state.target\" bindings=\"row.deleteableBindings\" applications-by-binding=\"row.state.applicationsByBinding\" on-close=\"row.closeOverlayPanel\"></unbind-service>\n" +
+    "<unbind-service target=\"row.overlay.state.target\" bindings=\"row.deleteableBindings\" applications-by-binding=\"row.state.applicationsByBinding\" on-close=\"row.closeOverlayPanel\" service-class=\"row.serviceClass\"></unbind-service>\n" +
     "</div>\n" +
     "</overlay-panel>"
   );