Merge pull request #3490 from spadgett/deployment-flicker

Merged by openshift-bot

Author: OpenShift Bot

assets/app/scripts/controllers/deployments.js

@@ -11,7 +11,8 @@ angular.module('openshiftConsole')
   .controller('DeploymentsController', function ($scope, DataService, $filter, LabelFilter, Logger, ImageStreamResolver) {
     $scope.deployments = {};
     $scope.unfilteredDeployments = {};
-    $scope.deploymentConfigs = {};
+    // leave undefined so we know when data is loaded
+    $scope.deploymentConfigs = undefined;
     $scope.deploymentsByDeploymentConfig = {};
     $scope.podTemplates = {};
     $scope.imageStreams = {};

assets/app/views/deployments.html

@@ -147,14 +147,24 @@ <h3>
       </div>
 
       <!-- render any deployments whose deployment configs no longer exist -->
-      <div class="tile" ng-repeat="(deploymentConfigName, deployments) in deploymentsByDeploymentConfig" ng-if="!deploymentConfigs[deploymentConfigName]">
+      <div ng-repeat="(deploymentConfigName, deployments) in deploymentsByDeploymentConfig"
+           ng-if="!deploymentConfigs[deploymentConfigName]"
+           class="tile">
         <div>
           <h2 ng-if="deploymentConfigName != ''">
             {{deploymentConfigName}}
-            <span class="pficon-layered" data-toggle="tooltip" data-placement="right" title="This deployment config no longer exists." style="cursor: help;">
+            <!-- don't show a warning if deploymentConfigs is undefined since it means data is still loading -->
+            <!-- render everything else, though, so the page progressively loads -->
+            <span
+                ng-if="deploymentConfigs"
+                class="pficon-layered"
+                data-toggle="tooltip"
+                data-placement="right"
+                title="This deployment config no longer exists."
+                style="cursor: help;">
               <span class="pficon pficon-warning-triangle"></span>
               <span class="pficon pficon-warning-exclamation"></span>
-            </span>            
+            </span>
           </h2>
           <dl class="dl-horizontal left indent">
             <div class="well" ng-repeat="deployment in deployments | orderObjectsByDate : true">

pkg/assets/bindata.go

@@ -14705,7 +14705,7 @@ type:"warning",
 details:"The active filters are hiding all deployments."
 };
 }
-a.deployments = {}, a.unfilteredDeployments = {}, a.deploymentConfigs = {}, a.deploymentsByDeploymentConfig = {}, a.podTemplates = {}, a.imageStreams = {}, a.imagesByDockerReference = {}, a.imageStreamImageRefByDockerReference = {}, a.builds = {}, a.labelSuggestions = {}, a.alerts = a.alerts || {}, a.emptyMessage = "Loading...";
+a.deployments = {}, a.unfilteredDeployments = {}, a.deploymentConfigs = void 0, a.deploymentsByDeploymentConfig = {}, a.podTemplates = {}, a.imageStreams = {}, a.imagesByDockerReference = {}, a.imageStreamImageRefByDockerReference = {}, a.builds = {}, a.labelSuggestions = {}, a.alerts = a.alerts || {}, a.emptyMessage = "Loading...";
 var j = [];
 j.push(b.watch("replicationcontrollers", a, function(b) {
 a.unfilteredDeployments = b.by("metadata.name"), d.addLabelSuggestionsFromResources(a.unfilteredDeployments, a.labelSuggestions), d.setLabelSuggestions(a.labelSuggestions), a.deployments = d.getLabelSelector().select(a.unfilteredDeployments), g(), f.fetchReferencedImageStreamImages(a.podTemplates, a.imagesByDockerReference, a.imageStreamImageRefByDockerReference, a), a.emptyMessage = "No deployments to show", h(), i(), e.log("deployments (subscribe)", a.deployments);
@@ -63063,11 +63063,13 @@ var _views_deployments_html = []byte(`<div ng-controller="ProjectController" cla
 </div>
 </div>
 
-<div class="tile" ng-repeat="(deploymentConfigName, deployments) in deploymentsByDeploymentConfig" ng-if="!deploymentConfigs[deploymentConfigName]">
+<div ng-repeat="(deploymentConfigName, deployments) in deploymentsByDeploymentConfig" ng-if="!deploymentConfigs[deploymentConfigName]" class="tile">
 <div>
 <h2 ng-if="deploymentConfigName != ''">
 {{deploymentConfigName}}
-<span class="pficon-layered" data-toggle="tooltip" data-placement="right" title="This deployment config no longer exists." style="cursor: help">
+
+
+<span ng-if="deploymentConfigs" class="pficon-layered" data-toggle="tooltip" data-placement="right" title="This deployment config no longer exists." style="cursor: help">
 <span class="pficon pficon-warning-triangle"></span>
 <span class="pficon pficon-warning-exclamation"></span>
 </span>