Fix to correctly show binding name in bindings list

Fixes #2145

Author: jeff-phillips-18

app/scripts/directives/serviceBinding.js

@@ -19,11 +19,14 @@
 
   function ServiceBinding() {
     var ctrl = this;
+
     var updateServiceClass = function() {
-      var instanceName = _.get(ctrl.binding, 'spec.instanceRef.name');
-      var instance = _.get(ctrl.serviceInstances, [instanceName]);
-      var serviceClassName = _.get(instance, 'spec.serviceClassName');
-      ctrl.serviceClass = _.get(ctrl.serviceClasses, [serviceClassName]);
+      if (_.get(ctrl.refApiObject, 'kind') !== 'ServiceInstance') {
+        var instanceName = _.get(ctrl.binding, 'spec.instanceRef.name');
+        var instance = _.get(ctrl.serviceInstances, [instanceName]);
+        var serviceClassName = _.get(instance, 'spec.serviceClassName');
+        ctrl.serviceClass = _.get(ctrl.serviceClasses, [serviceClassName]);
+      }
     };
 
     this.$onChanges = function(changes) {

app/views/directives/_service-binding.html

@@ -6,18 +6,13 @@ <h3>
         <div class="component-label">
           Secret
         </div>
-        <span ng-if="$ctrl.serviceClass">
-          <span ng-if="$ctrl.refApiObject.kind !== 'ServiceInstance'">
+        {{$ctrl.binding.metadata.name}}
+        <span ng-if="$ctrl.refApiObject.kind !== 'ServiceInstance'">
+          <small ng-if="$ctrl.serviceClass">
             {{$ctrl.serviceClass.externalMetadata.displayName || $ctrl.serviceClass.metadata.name}}
-          </span>
-          <span ng-if="$ctrl.refApiObject.kind === 'ServiceInstance'">
-            {{$ctrl.binding.spec.secretName}}
-          </span>
+          </small>
+          <small>{{$ctrl.binding.spec.instanceRef.name}}</small>
         </span>
-        <span ng-if="!$ctrl.serviceClass">
-          {{$ctrl.binding.spec.instanceRef.name}}
-        </span>
-        <small ng-if="$ctrl.serviceClass">{{$ctrl.binding.spec.instanceRef.name}}</small>
         <small>created <span am-time-ago="$ctrl.binding.metadata.creationTimestamp"></span></small>
       </h3>
     </div>

dist/scripts/scripts.js

@@ -13168,8 +13168,10 @@ n.imageIDs = r ? [ r ] : t.getImageIDs(n.pods, e.name);
 angular.module("openshiftConsole").component("serviceBinding", {
 controller: [ function() {
 var e = this, t = function() {
+if ("ServiceInstance" !== _.get(e.refApiObject, "kind")) {
 var t = _.get(e.binding, "spec.instanceRef.name"), n = _.get(e.serviceInstances, [ t ]), a = _.get(n, "spec.serviceClassName");
 e.serviceClass = _.get(e.serviceClasses, [ a ]);
+}
 };
 this.$onChanges = function(e) {
 (e.binding || e.serviceInstances || e.serviceClasses) && t();

dist/scripts/templates.js

@@ -5606,18 +5606,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"component-label\">\n" +
     "Secret\n" +
     "</div>\n" +
-    "<span ng-if=\"$ctrl.serviceClass\">\n" +
+    "{{$ctrl.binding.metadata.name}}\n" +
     "<span ng-if=\"$ctrl.refApiObject.kind !== 'ServiceInstance'\">\n" +
+    "<small ng-if=\"$ctrl.serviceClass\">\n" +
     "{{$ctrl.serviceClass.externalMetadata.displayName || $ctrl.serviceClass.metadata.name}}\n" +
+    "</small>\n" +
+    "<small>{{$ctrl.binding.spec.instanceRef.name}}</small>\n" +
     "</span>\n" +
-    "<span ng-if=\"$ctrl.refApiObject.kind === 'ServiceInstance'\">\n" +
-    "{{$ctrl.binding.spec.secretName}}\n" +
-    "</span>\n" +
-    "</span>\n" +
-    "<span ng-if=\"!$ctrl.serviceClass\">\n" +
-    "{{$ctrl.binding.spec.instanceRef.name}}\n" +
-    "</span>\n" +
-    "<small ng-if=\"$ctrl.serviceClass\">{{$ctrl.binding.spec.instanceRef.name}}</small>\n" +
     "<small>created <span am-time-ago=\"$ctrl.binding.metadata.creationTimestamp\"></span></small>\n" +
     "</h3>\n" +
     "</div>\n" +