Disable UI scaling for in progress deployment

Author: spadgett

assets/app/scripts/controllers/deploymentConfig.js

@@ -64,7 +64,6 @@ angular.module('openshiftConsole')
     AlertMessageService.clearAlerts();
 
     var watches = [];
-    var hashSize = $filter('hashSize');
 
     ProjectsService
       .get($routeParams.project)
@@ -104,6 +103,8 @@ angular.module('openshiftConsole')
 
 
             watches.push(DataService.watch("replicationcontrollers", context, function(deployments, action, deployment) {
+              var deploymentConfigName = $routeParams.deploymentconfig;
+
               // TODO we should add this back in and show the pod template on this page
               // extractPodTemplates();
               // ImageStreamResolver.fetchReferencedImageStreamImages($scope.podTemplates, $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, $scope);
@@ -118,7 +119,6 @@ angular.module('openshiftConsole')
                 $scope.deploymentConfigDeploymentsInProgress = DeploymentsService.associateRunningDeploymentToDeploymentConfig(deploymentsByDeploymentConfig);
               } else if (DeploymentsService.deploymentBelongsToConfig(deployment, $routeParams.deploymentconfig)) {
                 var deploymentName = deployment.metadata.name;
-                var deploymentConfigName = $routeParams.deploymentconfig;
                 switch (action) {
                   case 'ADDED':
                   case 'MODIFIED':
@@ -142,6 +142,8 @@ angular.module('openshiftConsole')
               }
 
               $scope.deployments = LabelFilter.getLabelSelector().select($scope.unfilteredDeployments);
+              $scope.deploymentInProgress = !!_.size($scope.deploymentConfigDeploymentsInProgress[deploymentConfigName]);
+
               updateFilterWarning();
               LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredDeployments, $scope.labelSuggestions);
               LabelFilter.setLabelSuggestions($scope.labelSuggestions);
@@ -184,8 +186,6 @@ angular.module('openshiftConsole')
           updateHPAWarnings();
         });
 
-
-
         watches.push(DataService.watch("imagestreams", context, function(imageStreams) {
           $scope.imageStreams = imageStreams.by("metadata.name");
           ImageStreamResolver.buildDockerRefMapForImageStreams($scope.imageStreams, $scope.imageStreamImageRefByDockerReference);
@@ -239,8 +239,7 @@ angular.module('openshiftConsole')
             return false;
           }
 
-          if ($scope.deploymentConfigDeploymentsInProgress &&
-              hashSize($scope.deploymentConfigDeploymentsInProgress[$scope.deploymentConfig.metadata.name]) > 0) {
+          if ($scope.deploymentInProgress) {
             return false;
           }
 

assets/app/scripts/services/deployments.js

@@ -246,9 +246,15 @@ angular.module("openshiftConsole")
 
       // Iterate over the list to find the most recent active deployment.
       var activeDeployment = null;
-      angular.forEach(deployments, function(deployment) {
-        // An "active" deployment must be in progress or complete.
-        if (!isInProgress(deployment) && annotation(deployment, 'deploymentStatus') !== 'Complete') {
+      _.each(deployments, function(deployment) {
+        if (isInProgress(deployment)) {
+          // If any deployment is in progress, there is no current active deployment (disable scaling).
+          // Break out of the loop and return null.
+          activeDeployment = null;
+          return false;
+        }
+
+        if (annotation(deployment, 'deploymentStatus') !== 'Complete') {
           return;
         }
 

assets/app/views/browse/deployment-config.html

@@ -101,7 +101,7 @@ <h3>Configuration</h3>
                             <dt>Replicas:</dt>
                             <dd>
                               <replicas spec="deploymentConfig.spec.replicas"
-                                        disable-scaling="autoscalers.length"
+                                        disable-scaling="autoscalers.length || deploymentInProgress"
                                         scale-fn="scale(replicas)"></replicas>
                               <span ng-if="autoscalers.length">(autoscaled)</span>
                             </dd>