Merge pull request #2385 from spadgett/instances-race

Automatic merge from submit-queue.

Wait for service classes and plans to load

Wait for all service classes and plans to load on the overview before
checking bindability and sorting service instances.

Fixes #2384

Requires openshift/origin-web-common#239

origin-web-common 0.0.70 -> 0.0.71

https://github.com/openshift/origin-web-common/releases/tag/v0.0.71

Author: openshift-merge-robot

app/scripts/controllers/overview.js

@@ -3,6 +3,7 @@
 angular.module('openshiftConsole').controller('OverviewController', [
   '$scope',
   '$filter',
+  '$q',
   '$routeParams',
   'AlertMessageService',
   'APIService',
@@ -24,6 +25,7 @@ angular.module('openshiftConsole').controller('OverviewController', [
   'OwnerReferencesService',
   'PodsService',
   'ProjectsService',
+  'PromiseUtils',
   'ResourceAlertsService',
   'RoutesService',
   'ServiceInstancesService',
@@ -32,6 +34,7 @@ angular.module('openshiftConsole').controller('OverviewController', [
 
 function OverviewController($scope,
                             $filter,
+                            $q,
                             $routeParams,
                             AlertMessageService,
                             APIService,
@@ -53,6 +56,7 @@ function OverviewController($scope,
                             OwnerReferencesService,
                             PodsService,
                             ProjectsService,
+                            PromiseUtils,
                             ResourceAlertsService,
                             RoutesService,
                             ServiceInstancesService) {
@@ -1336,46 +1340,69 @@ function OverviewController($scope,
     // The canI check on watch should be temporary until we have a different solution for handling secret parameters
     if (CatalogService.SERVICE_CATALOG_ENABLED && canI(serviceInstancesVersion, 'watch')) {
 
-      // Get the service class for this instance.
+      // Get the service class for this instance. Returns a promise.
       fetchServiceClass = function(instance) {
         var serviceClassName = ServiceInstancesService.getServiceClassNameForInstance(instance);
 
+        var serviceClass = _.get(state, ['serviceClasses', serviceClassName]);
+        if (serviceClass) {
+          return $q.when(serviceClass);
+        }
+
         // Check if we already have the service class or if a request is already in flight.
-        if (!_.has(state, ['serviceClasses', serviceClassName]) && !serviceClassPromises[serviceClassName]) {
+        if (!serviceClassPromises[serviceClassName]) {
           serviceClassPromises[serviceClassName] = DataService.get(serviceClassesVersion, serviceClassName, {}).then(function(serviceClass) {
             state.serviceClasses[serviceClassName] = serviceClass;
+            return serviceClass;
           }).finally(function() {
             delete servicePlanPromises[serviceClassName];
           });
         }
+
+        return serviceClassPromises[serviceClassName];
       };
 
-      // Get the service plan for this instance.
+      // Get the service plan for this instance. Returns a promise.
       fetchServicePlan = function(instance) {
         var servicePlanName = ServiceInstancesService.getServicePlanNameForInstance(instance);
 
         // Check if we already have the service plan or if a request is already in flight.
-        if (!_.has(state, ['servicePlans', servicePlanName]) && !servicePlanPromises[servicePlanName]) {
+        var servicePlan = _.get(state, ['servicePlans', servicePlanName]);
+        if (servicePlan) {
+          return $q.when(servicePlan);
+        }
+
+        if (!servicePlanPromises[servicePlanName]) {
           servicePlanPromises[servicePlanName] = DataService.get(servicePlansVersion, servicePlanName, {}).then(function(servicePlan) {
             state.servicePlans[servicePlanName] = servicePlan;
+            return servicePlan;
           }).finally(function() {
             delete servicePlanPromises[servicePlanName];
           });
         }
+
+        return servicePlanPromises[servicePlanName];
       };
 
       watches.push(DataService.watch(serviceInstancesVersion, context, function(serviceInstances) {
         state.serviceInstances = serviceInstances.by('metadata.name');
+
+        var promises = [];
         _.each(state.serviceInstances, function(instance) {
           var notifications = ResourceAlertsService.getServiceInstanceAlerts(instance);
           setNotifications(instance, notifications);
 
-          fetchServiceClass(instance);
-          fetchServicePlan(instance);
+          promises.push(fetchServiceClass(instance));
+          promises.push(fetchServicePlan(instance));
+        });
+
+        // Wait for all promises to complete before trying to sort the
+        // instances and check bindability.
+        PromiseUtils.waitForAll(promises).finally(function() {
+          sortServiceInstances();
+          updateFilter();
         });
-        sortServiceInstances();
         updateLabelSuggestions(state.serviceInstances);
-        updateFilter();
       }, {poll: limitWatches, pollInterval: DEFAULT_POLL_INTERVAL}));
     }
 

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.70",
+    "origin-web-common": "0.0.71",
     "origin-web-catalog": "0.0.60"
   },
   "devDependencies": {