Merge pull request #1298 from MarkDeMaria/secrets404

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/secret.js

@@ -39,19 +39,15 @@ angular.module('openshiftConsole')
         $scope.project = project;
         $scope.context = context;
 
-        DataService.get("secrets", $scope.secretName, context).then(
+        DataService.get("secrets", $scope.secretName, context, { errorNotification: false }).then(
           function(secret) {
             $scope.secret = secret;
             $scope.decodedSecretData = SecretsService.decodeSecretData($scope.secret.data);
             $scope.loaded = true;
           },
           function(e) {
             $scope.loaded = true;
-            $scope.alerts["load"] = {
-              type: "error",
-              message: "The secret details could not be loaded.",
-              details: "Reason: " + $filter('getErrorDetails')(e)
-            };
+            $scope.error = e;
           });
     }));
   });

app/views/browse/secret.html

@@ -8,7 +8,11 @@
           <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
           <alerts alerts="alerts"></alerts>
           <div ng-if="!loaded" class="mar-top-xl">Loading...</div>
-          <div ng-if="loaded">
+          <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">
             <h1 class="contains-actions">
               <div class="pull-right dropdown" ng-hide="!('secrets' | canIDoAny)">
                 <button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">

dist/scripts/scripts.js

@@ -6970,15 +6970,13 @@ link:"project/" + a.project + "/browse/secrets"
 title:c.secretName
 } ], d.getAlerts().forEach(function(a) {
 c.alerts[a.name] = a.data;
-}), d.clearAlerts(), f.get(a.project).then(_.spread(function(a, d) {
-c.project = a, c.context = d, e.get("secrets", c.secretName, d).then(function(a) {
+}), d.clearAlerts(), f.get(a.project).then(_.spread(function(a, b) {
+c.project = a, c.context = b, e.get("secrets", c.secretName, b, {
+errorNotification:!1
+}).then(function(a) {
 c.secret = a, c.decodedSecretData = g.decodeSecretData(c.secret.data), c.loaded = !0;
 }, function(a) {
-c.loaded = !0, c.alerts.load = {
-type:"error",
-message:"The secret details could not be loaded.",
-details:"Reason: " + b("getErrorDetails")(a)
-};
+c.loaded = !0, c.error = a;
 });
 }));
 } ]), angular.module("openshiftConsole").controller("CreateSecretController", [ "$filter", "$location", "$routeParams", "$scope", "$window", "AlertMessageService", "ApplicationGenerator", "AuthorizationService", "DataService", "Navigate", "ProjectsService", function(a, b, c, d, e, f, g, h, i, j, k) {

dist/scripts/templates.js

@@ -3844,7 +3844,11 @@ 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\">\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" +
     "<h1 class=\"contains-actions\">\n" +
     "<div class=\"pull-right dropdown\" ng-hide=\"!('secrets' | canIDoAny)\">\n" +
     "<button type=\"button\" class=\"dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs\" data-toggle=\"dropdown\">\n" +