Merge pull request #2867 from jhadvig/BZ1550797

Automatic merge from submit-queue. Bug 1550797 - Should remove 'loading..' when browser non-existent image Also fixed case when imageStream tag is missing/non-existing. @spadgett PTAL
openshift · Mar 2, 2018 · e3f6278 · e3f6278
2 parents fb518ae + b256cc0
commit e3f6278
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/app/scripts/controllers/image.js b/app/scripts/controllers/image.js
@@ -101,6 +101,7 @@ angular.module('openshiftConsole')
         DataService
           .get(imageStreamsVersion, $routeParams.imagestream, context, { errorNotification: false })
           .then(function(imageStream) {
+            $scope.loaded = true;
             imageStreamResolved(imageStream, context);
             watches.push(DataService.watchObject(imageStreamsVersion, $routeParams.imagestream, context, function(imageStream, action) {
               imageStreamResolved(imageStream, context, action);

diff --git a/app/views/browse/image.html b/app/views/browse/image.html
@@ -3,7 +3,7 @@
     <div class="container-fluid">
       <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
       <alerts alerts="alerts"></alerts>
-      <div ng-if="!imageStream" class="mar-top-xl">Loading...</div>
+      <div ng-if="!loaded" class="mar-top-xl">Loading...</div>
       <div ng-if="imageStream">
         <h1>
           {{imageStream.metadata.name}}:{{tagName}}
@@ -13,7 +13,7 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content" persist-tab-state>
     <div class="container-fluid">
-      <div ng-if="imageStream && !image">Loading...</div>
+      <div ng-if="!loaded">Loading...</div>
       <div class="row" ng-if="image">
         <div class="col-md-12">
           <registry-image-pull settings="settings" names="[ imageStream.metadata.name + ':' + tagName ]">

diff --git a/app/views/browse/imagestream.html b/app/views/browse/imagestream.html
@@ -3,7 +3,7 @@
     <div class="container-fluid">
       <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
       <alerts alerts="alerts"></alerts>
-      <div ng-if="!imageStream" class="mar-top-xl">Loading...</div>
+      <div ng-if="!loaded" class="mar-top-xl">Loading...</div>
       <div ng-if="imageStream">
         <h1 class="contains-actions">
           <div class="pull-right dropdown" ng-hide="!('imageStreams' | canIDoAny)">

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -5759,7 +5759,7 @@ s.get(n.project).then(_.spread(function(r, o) {
 t.project = r, a.get(u, n.imagestream, o, {
 errorNotification: !1
 }).then(function(e) {
-p(e, o), d.push(a.watchObject(u, n.imagestream, o, function(e, t) {
+t.loaded = !0, p(e, o), d.push(a.watchObject(u, n.imagestream, o, function(e, t) {
 p(e, o, t);
 }));
 }, function(n) {

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -2807,7 +2807,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\n" +
     "<breadcrumbs breadcrumbs=\"breadcrumbs\"></breadcrumbs>\n" +
     "<alerts alerts=\"alerts\"></alerts>\n" +
-    "<div ng-if=\"!imageStream\" class=\"mar-top-xl\">Loading...</div>\n" +
+    "<div ng-if=\"!loaded\" class=\"mar-top-xl\">Loading...</div>\n" +
     "<div ng-if=\"imageStream\">\n" +
     "<h1>\n" +
     "{{imageStream.metadata.name}}:{{tagName}}\n" +
@@ -2817,7 +2817,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\" persist-tab-state>\n" +
     "<div class=\"container-fluid\">\n" +
-    "<div ng-if=\"imageStream && !image\">Loading...</div>\n" +
+    "<div ng-if=\"!loaded\">Loading...</div>\n" +
     "<div class=\"row\" ng-if=\"image\">\n" +
     "<div class=\"col-md-12\">\n" +
     "<registry-image-pull settings=\"settings\" names=\"[ imageStream.metadata.name + ':' + tagName ]\">\n" +
@@ -2856,7 +2856,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\n" +
     "<breadcrumbs breadcrumbs=\"breadcrumbs\"></breadcrumbs>\n" +
     "<alerts alerts=\"alerts\"></alerts>\n" +
-    "<div ng-if=\"!imageStream\" class=\"mar-top-xl\">Loading...</div>\n" +
+    "<div ng-if=\"!loaded\" class=\"mar-top-xl\">Loading...</div>\n" +
     "<div ng-if=\"imageStream\">\n" +
     "<h1 class=\"contains-actions\">\n" +
     "<div class=\"pull-right dropdown\" ng-hide=\"!('imageStreams' | canIDoAny)\">\n" +