Merge pull request #2436 from jhadvig/secret-watcher

Automatic merge from submit-queue.

Add watcher to secrets browse page

This is a follow up of #2421

@spadgett PTAL

Author: openshift-merge-robot

app/scripts/controllers/secret.js

@@ -8,7 +8,12 @@
  * Controller of the openshiftConsole
  */
 angular.module('openshiftConsole')
-  .controller('SecretController', function ($routeParams, $filter, $scope, DataService, ProjectsService, SecretsService) {
+  .controller('SecretController', function ($routeParams,
+                                            $filter,
+                                            $scope,
+                                            DataService,
+                                            ProjectsService,
+                                            SecretsService) {
     $scope.projectName = $routeParams.project;
     $scope.secretName = $routeParams.secret;
     $scope.view = {
@@ -27,6 +32,20 @@ angular.module('openshiftConsole')
       }
     ];
 
+    var watches = [];
+
+    var secretResolved = function(secret, action) {
+      $scope.secret = secret;
+      if (action === "DELETED") {
+        $scope.alerts["deleted"] = {
+          type: "warning",
+          message: "This secret has been deleted."
+        };
+        return;
+      }
+      $scope.decodedSecretData = SecretsService.decodeSecretData($scope.secret.data);
+    };
+
     $scope.addToApplicationVisible = false;
 
     $scope.addToApplication = function() {
@@ -48,13 +67,21 @@ angular.module('openshiftConsole')
 
         DataService.get("secrets", $scope.secretName, context, { errorNotification: false }).then(
           function(secret) {
-            $scope.secret = secret;
-            $scope.decodedSecretData = SecretsService.decodeSecretData($scope.secret.data);
             $scope.loaded = true;
+            secretResolved(secret);
+            watches.push(DataService.watchObject("secrets", $scope.secretName, context, secretResolved));
           },
           function(e) {
             $scope.loaded = true;
-            $scope.error = e;
+            $scope.alerts["load"] = {
+              type: "error",
+              message: "The secret details could not be loaded.",
+              details: $filter('getErrorDetails')(e)
+            };
           });
+
+        $scope.$on('$destroy', function(){
+          DataService.unwatchAll(watches);
+        });
     }));
   });

app/views/browse/secret.html

@@ -4,11 +4,7 @@
       <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
       <alerts alerts="alerts"></alerts>
       <div ng-if="!loaded" class="mar-top-xl">Loading...</div>
-      <div ng-if="loaded && error" class="empty-state-message text-center">
-        <h2>The secret details could not be loaded.</h2>
-        <p>{{error | getErrorDetails}}</p>
-      </div>
-      <div ng-if="loaded && !error">
+      <div ng-if="secret">
         <h1 class="contains-actions">
           <div class="pull-right dropdown">
             <!--

dist/scripts/scripts.js

@@ -6459,17 +6459,30 @@ title: "Secrets",
 link: "project/" + e.project + "/browse/secrets"
 }, {
 title: n.secretName
-} ], n.addToApplicationVisible = !1, n.addToApplication = function() {
+} ];
+var i = [], s = function(e, t) {
+n.secret = e, "DELETED" !== t ? n.decodedSecretData = o.decodeSecretData(n.secret.data) : n.alerts.deleted = {
+type: "warning",
+message: "This secret has been deleted."
+};
+};
+n.addToApplicationVisible = !1, n.addToApplication = function() {
 n.secret.data && (n.addToApplicationVisible = !0);
 }, n.closeAddToApplication = function() {
 n.addToApplicationVisible = !1;
-}, r.get(e.project).then(_.spread(function(e, t) {
-n.project = e, n.context = t, a.get("secrets", n.secretName, t, {
+}, r.get(e.project).then(_.spread(function(e, r) {
+n.project = e, n.context = r, a.get("secrets", n.secretName, r, {
 errorNotification: !1
 }).then(function(e) {
-n.secret = e, n.decodedSecretData = o.decodeSecretData(n.secret.data), n.loaded = !0;
+n.loaded = !0, s(e), i.push(a.watchObject("secrets", n.secretName, r, s));
 }, function(e) {
-n.loaded = !0, n.error = e;
+n.loaded = !0, n.alerts.load = {
+type: "error",
+message: "The secret details could not be loaded.",
+details: t("getErrorDetails")(e)
+};
+}), n.$on("$destroy", function() {
+a.unwatchAll(i);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("CreateSecretController", [ "$filter", "$location", "$routeParams", "$scope", "$window", "ApplicationGenerator", "AuthorizationService", "DataService", "Navigate", "ProjectsService", function(e, t, n, a, r, o, i, s, c, l) {

dist/scripts/templates.js

@@ -3568,11 +3568,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<breadcrumbs breadcrumbs=\"breadcrumbs\"></breadcrumbs>\n" +
     "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div ng-if=\"!loaded\" class=\"mar-top-xl\">Loading...</div>\n" +
-    "<div ng-if=\"loaded && error\" class=\"empty-state-message text-center\">\n" +
-    "<h2>The secret details could not be loaded.</h2>\n" +
-    "<p>{{error | getErrorDetails}}</p>\n" +
-    "</div>\n" +
-    "<div ng-if=\"loaded && !error\">\n" +
+    "<div ng-if=\"secret\">\n" +
     "<h1 class=\"contains-actions\">\n" +
     "<div class=\"pull-right dropdown\">\n" +
     "\n" +