sorted and pre-selected instances

Author: jwforres

app/scripts/constants.js

@@ -89,8 +89,8 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
   ],
 
   ENABLE_TECH_PREVIEW_FEATURE: {
-    service_catalog_landing_page: true,
-    pod_presets: true
+    service_catalog_landing_page: false,
+    pod_presets: false
   },
 
   SAMPLE_PIPELINE_TEMPLATE: {

app/scripts/directives/bindService.js

@@ -34,12 +34,46 @@ function BindService($filter,
 
   ctrl.$onInit = function() {
     // TODO: handle not having any service instances, or handle path where coming into binding from svc instance
-    // TODO: need serviceInstances as an array first
-    // ctrl.serviceToBind = _.get(_.head(ctrl.serviceInstances), 'metadata.name');
-
     ctrl.gotoStep(ctrl.steps[0]);
   };
 
+  var statusCondition = $filter('statusCondition');
+  ctrl.$onChanges = function(changes) {
+    if (changes.serviceInstances && !ctrl.serviceToBind) {
+      var newestReady;
+      var newestNotReady;
+      _.each(ctrl.serviceInstances, function(instance) {
+        var ready = _.get(statusCondition(instance, 'Ready'), 'status', 'False') === 'True';
+        if (ready && (!newestReady || instance.metadata.creationTimestamp > newestReady.metadata.creationTimestamp)) {
+          newestReady = instance;
+        }
+        if (!ready && (!newestNotReady || instance.metadata.creationTimestamp > newestNotReady.metadata.creationTimestamp)) {
+          newestNotReady = instance;
+        }
+      });
+      ctrl.serviceToBind = _.get(newestReady, 'metadata.name') || _.get(newestNotReady, 'metadata.name');
+    }
+
+    // wait till both service instances and service classes are available so that the sort is stable and items dont jump around
+    if (changes.serviceInstances && ctrl.serviceClasses || changes.serviceClasses && ctrl.serviceInstances) {
+      var instances = _.toArray(ctrl.serviceInstances);
+      instances.sort(function(left, right) {
+        var leftName = _.get(ctrl.serviceClasses, [left.spec.serviceClassName, 'osbMetadata', 'displayName']) || left.spec.serviceClassName;
+        var rightName = _.get(ctrl.serviceClasses, [left.spec.serviceClassName, 'osbMetadata', 'displayName']) || right.spec.serviceClassName;
+
+        // Fall back to sorting by `metadata.name` if the display names are the
+        // same so that the sort is stable.
+        if (leftName === rightName) {
+          leftName = _.get(left, 'metadata.name', '');
+          rightName = _.get(right, 'metadata.name', '');
+        }
+
+        return leftName.localeCompare(rightName);
+      });
+      ctrl.orderedServiceInstances = instances;
+    }
+  };
+
   var gotoStepID = function(id) {
     var step = _.find(ctrl.steps, { id: id });
     ctrl.gotoStep(step);

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

@@ -4,7 +4,7 @@ <h3 class="mar-top-none">Select a service to bind to <strong>{{ctrl.target.metad
 for your application to use the service.
 <form name="serviceSelection" class="mar-bottom-lg">
   <fieldset ng-disabled="ctrl.isDisabled">
-    <div class="radio" ng-repeat="serviceInstance in ctrl.serviceInstances">
+    <div class="radio" ng-repeat="serviceInstance in ctrl.orderedServiceInstances">
       <label>
         <input type="radio" ng-model="ctrl.serviceToBind" value="{{serviceInstance.metadata.name}}">
         {{ctrl.serviceClasses[serviceInstance.spec.serviceClassName].osbMetadata.displayName || serviceInstance.spec.serviceClassName}}