Update bind types for clarity

Depends on openshift/origin-web-common#90

app/scripts/directives/bindService.js

@@ -71,7 +71,7 @@ function BindService($scope,
                                         .concat(replicaSets)
                                         .concat(statefulSets);
       ctrl.applications = _.sortByAll(apiObjects, ['metadata.name', 'kind']);
-      ctrl.shouldBindToApp = ctrl.applications.length ? "true" : "false";
+      ctrl.bindType = ctrl.applications.length ? "application" : "secret-only";
     }
   };
 
@@ -133,7 +133,7 @@ function BindService($scope,
 
     // TODO is it ever realistically possible for target to not be defined at this point
     if (ctrl.target.kind === 'Instance') {
-      ctrl.shouldBindToApp = "false";
+      ctrl.bindType = "secret-only";
       ctrl.appToBind = null;
       ctrl.serviceToBind = ctrl.target.metadata.name;
       // Load all the "application" types
@@ -168,6 +168,8 @@ function BindService($scope,
       });
     }
     else {
+      ctrl.bindType = 'application';
+      ctrl.appToBind = ctrl.target;
       DataService.list({
         group: 'servicecatalog.k8s.io',
         resource: 'instances'
@@ -195,13 +197,13 @@ function BindService($scope,
 
   ctrl.bindService = function() {
     var svcToBind = ctrl.target.kind === 'Instance' ? ctrl.target : ctrl.serviceInstances[ctrl.serviceToBind];
-    var appToBind = ctrl.target.kind !== 'Instance' ? ctrl.target : ctrl.appToBind;
+    var application = ctrl.bindType === 'application' ? _.get(ctrl.appToBind, 'metadata.name') : undefined;
 
     var context = {
       namespace: _.get(svcToBind, 'metadata.namespace')
     };
 
-    BindingService.bindService(context, _.get(svcToBind, 'metadata.name'), _.get(appToBind, 'metadata.name')).then(function(binding){
+    BindingService.bindService(context, _.get(svcToBind, 'metadata.name'), application).then(function(binding){
       ctrl.binding = binding;
       ctrl.error = null;
 

app/views/directives/bind-service/bind-service-form.html

@@ -12,8 +12,7 @@
                      service-class-name="ctrl.serviceClassName"
                      form-name="ctrl.selectionForm"
                      applications="ctrl.applications"
-                     app-to-bind="ctrl.appToBind"
-                     should-bind-to-app="ctrl.shouldBindToApp"
-                     group-by-kind="ctrl.groupByKind">
+                     bind-type="ctrl.bindType"
+                     app-to-bind="ctrl.appToBind">
   </bind-service-form>
 </div>

app/views/directives/bind-service/results.html

@@ -1,6 +1,7 @@
 <bind-results error="ctrl.error"
               binding="ctrl.binding"
               service-to-bind="ctrl.serviceToBind"
+              bind-type="{{ctrl.bindType}}"
               application-to-bind="ctrl.appToBind.metadata.name"
               generated-secret-name="ctrl.generatedSecretName"
               show-pod-presets="'pod_presets' | enableTechPreviewFeature"

dist/scripts/scripts.js

@@ -540,7 +540,7 @@ return c === d && (c = _.get(a, "metadata.name", ""), d = _.get(b, "metadata.nam
 }, p = function() {
 if (g && h && i && j && k) {
 var a = g.concat(h).concat(i).concat(j).concat(k);
-l.applications = _.sortByAll(a, [ "metadata.name", "kind" ]), l.shouldBindToApp = l.applications.length ? "true" :"false";
+l.applications = _.sortByAll(a, [ "metadata.name", "kind" ]), l.bindType = l.applications.length ? "application" :"secret-only";
 }
 }, q = function() {
 l.nextTitle = "Bind", e = a.$watch("ctrl.selectionForm.$valid", function(a) {
@@ -573,7 +573,7 @@ group:"servicecatalog.k8s.io",
 resource:"serviceclasses"
 }, {}).then(function(a) {
 l.serviceClasses = a.by("metadata.name"), "Instance" === l.target.kind && (l.serviceClass = l.serviceClasses[l.target.spec.serviceClassName], l.serviceClassName = l.target.spec.serviceClassName), o();
-}), "Instance" === l.target.kind ? (l.shouldBindToApp = "false", l.appToBind = null, l.serviceToBind = l.target.metadata.name, c.list("deploymentconfigs", d).then(function(a) {
+}), "Instance" === l.target.kind ? (l.bindType = "secret-only", l.appToBind = null, l.serviceToBind = l.target.metadata.name, c.list("deploymentconfigs", d).then(function(a) {
 g = _.toArray(a.by("metadata.name")), p();
 }), c.list("replicationcontrollers", d).then(function(a) {
 i = _.reject(a.by("metadata.name"), b("hasDeploymentConfig")), p();
@@ -592,7 +592,7 @@ group:"apps",
 resource:"statefulsets"
 }, d).then(function(a) {
 k = _.toArray(a.by("metadata.name")), p();
-})) :(c.list({
+})) :(l.bindType = "application", l.appToBind = l.target, c.list({
 group:"servicecatalog.k8s.io",
 resource:"instances"
 }, d).then(function(a) {
@@ -601,10 +601,10 @@ l.serviceInstances = a.by("metadata.name"), l.serviceToBind || n(), o();
 }, l.$onDestroy = function() {
 e && (e(), e = void 0), f && c.unwatch(f);
 }, l.bindService = function() {
-var a = "Instance" === l.target.kind ? l.target :l.serviceInstances[l.serviceToBind], b = "Instance" !== l.target.kind ? l.target :l.appToBind, e = {
+var a = "Instance" === l.target.kind ? l.target :l.serviceInstances[l.serviceToBind], b = "application" === l.bindType ? _.get(l.appToBind, "metadata.name") :void 0, e = {
 namespace:_.get(a, "metadata.namespace")
 };
-d.bindService(e, _.get(a, "metadata.name"), _.get(b, "metadata.name")).then(function(a) {
+d.bindService(e, _.get(a, "metadata.name"), b).then(function(a) {
 l.binding = a, l.error = null, f = c.watchObject(d.bindingResource, _.get(l.binding, "metadata.name"), e, function(a) {
 l.binding = a;
 });

dist/scripts/templates.js

@@ -5802,14 +5802,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</bind-application-form>\n" +
     "</div>\n" +
     "<div ng-if=\"ctrl.target.kind === 'Instance'\">\n" +
-    "<bind-service-form selected-project=\"ctrl.project\" service-class=\"ctrl.serviceClass\" service-class-name=\"ctrl.serviceClassName\" form-name=\"ctrl.selectionForm\" applications=\"ctrl.applications\" app-to-bind=\"ctrl.appToBind\" should-bind-to-app=\"ctrl.shouldBindToApp\" group-by-kind=\"ctrl.groupByKind\">\n" +
+    "<bind-service-form selected-project=\"ctrl.project\" service-class=\"ctrl.serviceClass\" service-class-name=\"ctrl.serviceClassName\" form-name=\"ctrl.selectionForm\" applications=\"ctrl.applications\" bind-type=\"ctrl.bindType\" app-to-bind=\"ctrl.appToBind\">\n" +
     "</bind-service-form>\n" +
     "</div>"
   );
 
 
   $templateCache.put('views/directives/bind-service/results.html',
-    "<bind-results error=\"ctrl.error\" binding=\"ctrl.binding\" service-to-bind=\"ctrl.serviceToBind\" application-to-bind=\"ctrl.appToBind.metadata.name\" generated-secret-name=\"ctrl.generatedSecretName\" show-pod-presets=\"'pod_presets' | enableTechPreviewFeature\" secret-href=\"ctrl.generatedSecretName | navigateResourceURL : 'Secret' : ctrl.target.metadata.namespace\">\n" +
+    "<bind-results error=\"ctrl.error\" binding=\"ctrl.binding\" service-to-bind=\"ctrl.serviceToBind\" bind-type=\"{{ctrl.bindType}}\" application-to-bind=\"ctrl.appToBind.metadata.name\" generated-secret-name=\"ctrl.generatedSecretName\" show-pod-presets=\"'pod_presets' | enableTechPreviewFeature\" secret-href=\"ctrl.generatedSecretName | navigateResourceURL : 'Secret' : ctrl.target.metadata.namespace\">\n" +
     "</bind-results>"
   );