Merge pull request #1657 from spadgett/hpa-toasts

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/edit/autoscaler.js

@@ -20,6 +20,7 @@ angular.module('openshiftConsole')
                         HPAService,
                         MetricsService,
                         Navigate,
+                        NotificationsService,
                         ProjectsService,
                         keyValueEditorUtils) {
     if (!$routeParams.kind || !$routeParams.name) {
@@ -62,16 +63,19 @@ angular.module('openshiftConsole')
       $scope.metricsWarning = !available;
     });
 
-    $scope.alerts = {};
-
     var getErrorDetails = $filter('getErrorDetails');
 
-    var displayError = function(errorMessage, result) {
-      $scope.alerts['autoscaling'] = {
-        type: "error",
-        message: errorMessage,
-        details: getErrorDetails(result)
-      };
+    var navigateBack = function() {
+      $window.history.back();
+    };
+
+    var hideErrorNotifications = function() {
+      NotificationsService.hideNotification('edit-hpa-error');
+    };
+
+    $scope.cancel = function() {
+      hideErrorNotifications();
+      navigateBack();
     };
 
     ProjectsService
@@ -88,6 +92,7 @@ angular.module('openshiftConsole')
 
         var createHPA = function() {
           $scope.disableInputs = true;
+          hideErrorNotifications();
           var hpa = {
             apiVersion: "autoscaling/v1",
             kind: "HorizontalPodAutoscaler",
@@ -112,12 +117,21 @@ angular.module('openshiftConsole')
             resource: 'horizontalpodautoscalers',
             group: 'autoscaling'
           }, null, hpa, context)
-            .then(function() { // Success
-              // Return to the previous page
-              $window.history.back();
+            .then(function(hpa) { // Success
+              NotificationsService.addNotification({
+                type: 'success',
+                message: 'Horizontal pod autoscaler ' + hpa.metadata.name + ' successfully created.'
+              });
+
+              navigateBack();
             }, function(result) { // Failure
               $scope.disableInputs = false;
-              displayError('An error occurred creating the horizontal pod autoscaler.', result);
+              NotificationsService.addNotification({
+                id: 'edit-hpa-error',
+                type: 'error',
+                message: 'An error occurred creating the horizontal pod autoscaler.',
+                details: getErrorDetails(result)
+              });
             });
         };
 
@@ -134,12 +148,21 @@ angular.module('openshiftConsole')
             resource: 'horizontalpodautoscalers',
             group: 'autoscaling'
           }, hpa.metadata.name, hpa, context)
-            .then(function() { // Success
-              // Return to the previous page
-              $window.history.back();
+            .then(function(hpa) { // Success
+              NotificationsService.addNotification({
+                type: 'success',
+                message: 'Horizontal pod autoscaler ' + hpa.metadata.name + ' successfully updated.'
+              });
+
+              navigateBack();
             }, function(result) { // Failure
               $scope.disableInputs = false;
-              displayError('An error occurred updating horizontal pod autoscaler "' + hpa.metadata.name + '".', result);
+              NotificationsService.addNotification({
+                id: 'edit-hpa-error',
+                type: 'error',
+                message: 'An error occurred creating the horizontal pod autoscaler.',
+                details: getErrorDetails(result)
+              });
             });
         };
 

app/views/edit/autoscaler.html

@@ -12,7 +12,6 @@
             <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
             <div class="row">
               <div class="col-md-12">
-                <alerts alerts="alerts"></alerts>
                 <div ng-if="!targetKind || !targetName || !project" class="mar-top-md">
                   Loading...
                 </div>
@@ -67,7 +66,7 @@ <h1>
                           ng-disabled="form.$invalid || form.$pristine">
                         Save
                       </button>
-                      <a href="" class="btn btn-default btn-lg" back>Cancel</a>
+                      <a href="" ng-click="cancel()" class="btn btn-default btn-lg" role="button">Cancel</a>
                     </div>
                   </fieldset>
                 </form>

dist/scripts/scripts.js

@@ -7213,37 +7213,37 @@ A(), f.history.back();
 }, a.$on("$destroy", function() {
 i.unwatchAll(s);
 });
-} ]), angular.module("openshiftConsole").controller("EditAutoscalerController", [ "$scope", "$filter", "$routeParams", "$window", "APIService", "AuthorizationService", "BreadcrumbsService", "DataService", "HPAService", "MetricsService", "Navigate", "ProjectsService", "keyValueEditorUtils", function(a, b, c, d, e, f, g, h, i, j, k, l, m) {
+} ]), angular.module("openshiftConsole").controller("EditAutoscalerController", [ "$scope", "$filter", "$routeParams", "$window", "APIService", "AuthorizationService", "BreadcrumbsService", "DataService", "HPAService", "MetricsService", "Navigate", "NotificationsService", "ProjectsService", "keyValueEditorUtils", function(a, b, c, d, e, f, g, h, i, j, k, l, m, n) {
 if (!c.kind || !c.name) return void k.toErrorPage("Kind or name parameter missing.");
-var n = [ "Deployment", "DeploymentConfig", "HorizontalPodAutoscaler", "ReplicaSet", "ReplicationController" ];
-if (!_.includes(n, c.kind)) return void k.toErrorPage("Autoscaling not supported for kind " + c.kind + ".");
+var o = [ "Deployment", "DeploymentConfig", "HorizontalPodAutoscaler", "ReplicaSet", "ReplicationController" ];
+if (!_.includes(o, c.kind)) return void k.toErrorPage("Autoscaling not supported for kind " + c.kind + ".");
 a.kind = c.kind, a.name = c.name, "HorizontalPodAutoscaler" === c.kind ? a.disableInputs = !0 :(a.targetKind = c.kind, a.targetName = c.name), a.autoscaling = {
 name:a.name
 }, a.labels = [], j.isAvailable().then(function(b) {
 a.metricsWarning = !b;
-}), a.alerts = {};
-var o = b("getErrorDetails"), p = function(b, c) {
-a.alerts.autoscaling = {
-type:"error",
-message:b,
-details:o(c)
-};
+});
+var p = b("getErrorDetails"), q = function() {
+d.history.back();
+}, r = function() {
+l.hideNotification("edit-hpa-error");
 };
-l.get(c.project).then(_.spread(function(b, j) {
+a.cancel = function() {
+r(), q();
+}, m.get(c.project).then(_.spread(function(b, d) {
 a.project = b;
-var l = "HorizontalPodAutoscaler" === c.kind ? "update" :"create";
+var j = "HorizontalPodAutoscaler" === c.kind ? "update" :"create";
 if (!f.canI({
 resource:"horizontalpodautoscalers",
 group:"autoscaling"
-}, l, c.project)) return void k.toErrorPage("You do not have authority to " + l + " horizontal pod autoscalers in project " + c.project + ".", "access_denied");
-var n = function() {
-a.disableInputs = !0;
+}, j, c.project)) return void k.toErrorPage("You do not have authority to " + j + " horizontal pod autoscalers in project " + c.project + ".", "access_denied");
+var m = function() {
+a.disableInputs = !0, r();
 var b = {
 apiVersion:"autoscaling/v1",
 kind:"HorizontalPodAutoscaler",
 metadata:{
 name:a.autoscaling.name,
-labels:m.mapEntries(m.compactEntries(a.labels))
+labels:n.mapEntries(n.compactEntries(a.labels))
 },
 spec:{
 scaleTargetRef:{
@@ -7260,40 +7260,56 @@ targetCPUUtilizationPercentage:a.autoscaling.targetCPU || a.autoscaling.defaultT
 h.create({
 resource:"horizontalpodautoscalers",
 group:"autoscaling"
-}, null, b, j).then(function() {
-d.history.back();
+}, null, b, d).then(function(a) {
+l.addNotification({
+type:"success",
+message:"Horizontal pod autoscaler " + a.metadata.name + " successfully created."
+}), q();
 }, function(b) {
-a.disableInputs = !1, p("An error occurred creating the horizontal pod autoscaler.", b);
+a.disableInputs = !1, l.addNotification({
+id:"edit-hpa-error",
+type:"error",
+message:"An error occurred creating the horizontal pod autoscaler.",
+details:p(b)
+});
 });
 }, o = function(b) {
-a.disableInputs = !0, b = angular.copy(b), b.metadata.labels = m.mapEntries(m.compactEntries(a.labels)), b.spec.minReplicas = a.autoscaling.minReplicas, b.spec.maxReplicas = a.autoscaling.maxReplicas, b.spec.targetCPUUtilizationPercentage = a.autoscaling.targetCPU || a.autoscaling.defaultTargetCPU || null, h.update({
+a.disableInputs = !0, b = angular.copy(b), b.metadata.labels = n.mapEntries(n.compactEntries(a.labels)), b.spec.minReplicas = a.autoscaling.minReplicas, b.spec.maxReplicas = a.autoscaling.maxReplicas, b.spec.targetCPUUtilizationPercentage = a.autoscaling.targetCPU || a.autoscaling.defaultTargetCPU || null, h.update({
 resource:"horizontalpodautoscalers",
 group:"autoscaling"
-}, b.metadata.name, b, j).then(function() {
-d.history.back();
-}, function(c) {
-a.disableInputs = !1, p('An error occurred updating horizontal pod autoscaler "' + b.metadata.name + '".', c);
+}, b.metadata.name, b, d).then(function(a) {
+l.addNotification({
+type:"success",
+message:"Horizontal pod autoscaler " + a.metadata.name + " successfully updated."
+}), q();
+}, function(b) {
+a.disableInputs = !1, l.addNotification({
+id:"edit-hpa-error",
+type:"error",
+message:"An error occurred creating the horizontal pod autoscaler.",
+details:p(b)
 });
-}, q = {};
-q = "HorizontalPodAutoscaler" === c.kind ? {
+});
+}, s = {};
+s = "HorizontalPodAutoscaler" === c.kind ? {
 resource:"horizontalpodautoscalers",
 group:"autoscaling",
 version:"v1"
 } :{
 resource:e.kindToResource(c.kind),
 group:c.group
-}, h.get(q, c.name, j).then(function(d) {
-if (a.labels = _.map(_.get(d, "metadata.labels", {}), function(a, b) {
+}, h.get(s, c.name, d).then(function(e) {
+if (a.labels = _.map(_.get(e, "metadata.labels", {}), function(a, b) {
 return {
 name:b,
 value:a
 };
-}), "HorizontalPodAutoscaler" === c.kind) a.targetKind = _.get(d, "spec.scaleTargetRef.kind"), a.targetName = _.get(d, "spec.scaleTargetRef.name"), _.assign(a.autoscaling, {
-minReplicas:_.get(d, "spec.minReplicas"),
-maxReplicas:_.get(d, "spec.maxReplicas"),
-targetCPU:_.get(d, "spec.targetCPUUtilizationPercentage")
+}), "HorizontalPodAutoscaler" === c.kind) a.targetKind = _.get(e, "spec.scaleTargetRef.kind"), a.targetName = _.get(e, "spec.scaleTargetRef.name"), _.assign(a.autoscaling, {
+minReplicas:_.get(e, "spec.minReplicas"),
+maxReplicas:_.get(e, "spec.maxReplicas"),
+targetCPU:_.get(e, "spec.targetCPUUtilizationPercentage")
 }), a.disableInputs = !1, a.save = function() {
-o(d);
+o(e);
 }, a.breadcrumbs = g.getBreadcrumbs({
 name:a.targetName,
 kind:a.targetKind,
@@ -7303,17 +7319,17 @@ subpage:"Autoscale",
 includeProject:!0
 }); else {
 a.breadcrumbs = g.getBreadcrumbs({
-object:d,
+object:e,
 project:b,
 subpage:"Autoscale",
 includeProject:!0
-}), a.save = n;
-var e = {}, f = function() {
-var c = _.get(d, "spec.template.spec.containers", []);
-a.showCPURequestWarning = !i.hasCPURequest(c, e, b);
+}), a.save = m;
+var f = {}, j = function() {
+var c = _.get(e, "spec.template.spec.containers", []);
+a.showCPURequestWarning = !i.hasCPURequest(c, f, b);
 };
-h.list("limitranges", j).then(function(a) {
-e = a.by("metadata.name"), f();
+h.list("limitranges", d).then(function(a) {
+f = a.by("metadata.name"), j();
 });
 }
 });

dist/scripts/templates.js

@@ -8778,7 +8778,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<breadcrumbs breadcrumbs=\"breadcrumbs\"></breadcrumbs>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div ng-if=\"!targetKind || !targetName || !project\" class=\"mar-top-md\">\n" +
     "Loading...\n" +
     "</div>\n" +
@@ -8817,7 +8816,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<button type=\"submit\" class=\"btn btn-primary btn-lg\" ng-disabled=\"form.$invalid || form.$pristine\">\n" +
     "Save\n" +
     "</button>\n" +
-    "<a href=\"\" class=\"btn btn-default btn-lg\" back>Cancel</a>\n" +
+    "<a href=\"\" ng-click=\"cancel()\" class=\"btn btn-default btn-lg\" role=\"button\">Cancel</a>\n" +
     "</div>\n" +
     "</fieldset>\n" +
     "</form>\n" +