Merge pull request #2421 from jhadvig/sec-watcher

Automatic merge from submit-queue.

Add watcher to secrets page

@spadgett PTAL

Author: openshift-merge-robot

app/scripts/controllers/secrets.js

@@ -11,16 +11,20 @@ angular.module('openshiftConsole')
   .controller('SecretsController', function ($routeParams, $scope, DataService, ProjectsService) {
     $scope.projectName = $routeParams.project;
     $scope.secretsByType = {};
+    var watches = [];
 
     ProjectsService
       .get($routeParams.project)
       .then(_.spread(function(project, context) {
         $scope.project = project;
         $scope.context = context;
-
-        DataService.list("secrets", context).then(function(secrets) {
+        watches.push(DataService.watch("secrets", context, function(secrets) {
           $scope.secrets = _.sortBy(secrets.by("metadata.name"), ["type", "metadata.name"]);
-          $scope.loaded = true;
+          $scope.secretsLoaded = true;
+        }));
+
+        $scope.$on('$destroy', function(){
+          DataService.unwatchAll(watches);
         });
     }));
   });

app/views/secrets.html

@@ -18,14 +18,11 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <div ng-if="!loaded" class="mar-top-xl">Loading...</div>
-      <div ng-if="loaded" class="row">
+      <div ng-if="!secretsLoaded" class="mar-top-xl">Loading...</div>
+      <div ng-if="secretsLoaded" class="row">
         <div class="col-md-12">
           <div ng-if="!secrets.length">
-            <p ng-if="!loaded">
-              Loading...
-            </p>
-            <div ng-if="loaded" class="empty-state-message text-center">
+            <div class="empty-state-message text-center">
               <h2>No secrets.</h2>
               <p>
                 No secrets have been added to project {{projectName}}.

dist/scripts/scripts.js

@@ -6442,9 +6442,13 @@ details: t("getErrorDetails")(n)
 s.unwatchAll(f), s.unwatchAll(g);
 });
 } ]), angular.module("openshiftConsole").controller("SecretsController", [ "$routeParams", "$scope", "DataService", "ProjectsService", function(e, t, n, a) {
-t.projectName = e.project, t.secretsByType = {}, a.get(e.project).then(_.spread(function(e, a) {
-t.project = e, t.context = a, n.list("secrets", a).then(function(e) {
-t.secrets = _.sortBy(e.by("metadata.name"), [ "type", "metadata.name" ]), t.loaded = !0;
+t.projectName = e.project, t.secretsByType = {};
+var r = [];
+a.get(e.project).then(_.spread(function(e, a) {
+t.project = e, t.context = a, r.push(n.watch("secrets", a, function(e) {
+t.secrets = _.sortBy(e.by("metadata.name"), [ "type", "metadata.name" ]), t.secretsLoaded = !0;
+})), t.$on("$destroy", function() {
+n.unwatchAll(r);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("SecretController", [ "$routeParams", "$filter", "$scope", "DataService", "ProjectsService", "SecretsService", function(e, t, n, a, r, o) {

dist/scripts/templates.js

@@ -13303,14 +13303,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<div ng-if=\"!loaded\" class=\"mar-top-xl\">Loading...</div>\n" +
-    "<div ng-if=\"loaded\" class=\"row\">\n" +
+    "<div ng-if=\"!secretsLoaded\" class=\"mar-top-xl\">Loading...</div>\n" +
+    "<div ng-if=\"secretsLoaded\" class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
     "<div ng-if=\"!secrets.length\">\n" +
-    "<p ng-if=\"!loaded\">\n" +
-    "Loading...\n" +
-    "</p>\n" +
-    "<div ng-if=\"loaded\" class=\"empty-state-message text-center\">\n" +
+    "<div class=\"empty-state-message text-center\">\n" +
     "<h2>No secrets.</h2>\n" +
     "<p>\n" +
     "No secrets have been added to project {{projectName}}.\n" +