Convert form alerts to toast notifications for creating, editing and deleting routes

Author: sg00dwin

app/scripts/controllers/createRoute.js

@@ -17,6 +17,7 @@ angular.module('openshiftConsole')
                        AuthorizationService,
                        DataService,
                        Navigate,
+                       NotificationsService,
                        ProjectsService,
                        keyValueEditorUtils) {
     $scope.alerts = {};
@@ -101,15 +102,19 @@ angular.module('openshiftConsole')
 
             DataService.create('routes', null, route, context)
               .then(function() { // Success
+                NotificationsService.addNotification({
+                    type: "success",
+                    message: "Route " + route.metadata.name + " was successfully created."
+                });
                 // Return to the previous page
                 $window.history.back();
               }, function(result) { // Failure
                 $scope.disableInputs = false;
-                $scope.alerts['create-route'] = {
+                NotificationsService.addNotification({
                   type: "error",
                   message: "An error occurred creating the route.",
                   details: $filter('getErrorDetails')(result)
-                };
+                });
               });
           }
         };

app/scripts/controllers/edit/route.js

@@ -17,6 +17,7 @@ angular.module('openshiftConsole')
                        AuthorizationService,
                        DataService,
                        Navigate,
+                       NotificationsService,
                        ProjectsService,
                        RoutesService) {
     $scope.alerts = {};
@@ -162,21 +163,18 @@ angular.module('openshiftConsole')
             var updated = updateRouteFields();
             DataService.update('routes', $scope.routeName, updated, context)
               .then(function() { // Success
-                AlertMessageService.addAlert({
-                  name: $scope.routeName,
-                  data: {
+                NotificationsService.addNotification({
                     type: "success",
                     message: "Route " + $scope.routeName + " was successfully updated."
-                  }
                 });
                 $location.path($scope.routeURL);
               }, function(response) { // Failure
                 $scope.disableInputs = false;
-                $scope.alerts['update-route'] = {
+                NotificationsService.addNotification({
                   type: "error",
                   message: "An error occurred updating route " + $scope.routeName + ".",
                   details: $filter('getErrorDetails')(response)
-                };
+                });
               });
           }
         };

dist/scripts/scripts.js

@@ -7864,7 +7864,7 @@ d.disableInputs = !1, n(o + " could not be updated.", m(a));
 n(o + " could not be loaded.", m(a));
 }) :void j.toErrorPage("You do not have authority to update " + o + ".", "access_denied");
 }));
-} ]), angular.module("openshiftConsole").controller("EditRouteController", [ "$filter", "$location", "$routeParams", "$scope", "AlertMessageService", "AuthorizationService", "DataService", "Navigate", "ProjectsService", "RoutesService", function(a, b, c, d, e, f, g, h, i, j) {
+} ]), angular.module("openshiftConsole").controller("EditRouteController", [ "$filter", "$location", "$routeParams", "$scope", "AlertMessageService", "AuthorizationService", "DataService", "Navigate", "NotificationsService", "ProjectsService", "RoutesService", function(a, b, c, d, e, f, g, h, i, j, k) {
 d.alerts = {}, d.renderOptions = {
 hideFilterWidget:!0
 }, d.projectName = c.project, d.routeName = c.route, d.loading = !0, d.routeURL = h.resourceURL(d.routeName, "Route", d.projectName), d.breadcrumbs = [ {
@@ -7878,20 +7878,20 @@ title:d.routeName,
 link:d.routeURL
 }, {
 title:"Edit"
-} ], i.get(c.project).then(_.spread(function(i, k) {
-if (d.project = i, d.breadcrumbs[0].title = a("displayName")(i), !f.canI("routes", "update", c.project)) return void h.toErrorPage("You do not have authority to update route " + c.routeName + ".", "access_denied");
+} ], j.get(c.project).then(_.spread(function(e, j) {
+if (d.project = e, d.breadcrumbs[0].title = a("displayName")(e), !f.canI("routes", "update", c.project)) return void h.toErrorPage("You do not have authority to update route " + c.routeName + ".", "access_denied");
 var l, m = a("orderByDisplayName");
-g.get("routes", d.routeName, k).then(function(a) {
+g.get("routes", d.routeName, j).then(function(a) {
 l = angular.copy(a);
 var b = _.get(l, "spec.host"), c = "Subdomain" === _.get(l, "spec.wildcardPolicy");
-c && (b = "*." + j.getSubdomain(l)), d.routing = {
+c && (b = "*." + k.getSubdomain(l)), d.routing = {
 service:_.get(l, "spec.to.name"),
 host:b,
 wildcardPolicy:_.get(l, "spec.wildcardPolicy"),
 path:_.get(l, "spec.path"),
 targetPort:_.get(l, "spec.port.targetPort"),
 tls:angular.copy(_.get(l, "spec.tls"))
-}, g.list("services", k).then(function(a) {
+}, g.list("services", j).then(function(a) {
 var b = a.by("metadata.name"), c = _.get(l, "spec.to", {});
 d.loading = !1, d.services = m(b), d.routing.to = {
 service:b[c.name],
@@ -7926,20 +7926,17 @@ d.updateRoute = function() {
 if (d.form.$valid) {
 d.disableInputs = !0;
 var c = n();
-g.update("routes", d.routeName, c, k).then(function() {
-e.addAlert({
-name:d.routeName,
-data:{
+g.update("routes", d.routeName, c, j).then(function() {
+i.addNotification({
 type:"success",
 message:"Route " + d.routeName + " was successfully updated."
-}
 }), b.path(d.routeURL);
 }, function(b) {
-d.disableInputs = !1, d.alerts["update-route"] = {
+d.disableInputs = !1, i.addNotification({
 type:"error",
 message:"An error occurred updating route " + d.routeName + ".",
 details:a("getErrorDetails")(b)
-};
+});
 });
 }
 };
@@ -8690,7 +8687,7 @@ details:c("getErrorDetails")(b)
 }
 });
 }));
-} ]), angular.module("openshiftConsole").controller("CreateRouteController", [ "$filter", "$routeParams", "$scope", "$window", "ApplicationGenerator", "AuthorizationService", "DataService", "Navigate", "ProjectsService", "keyValueEditorUtils", function(a, b, c, d, e, f, g, h, i, j) {
+} ]), angular.module("openshiftConsole").controller("CreateRouteController", [ "$filter", "$routeParams", "$scope", "$window", "ApplicationGenerator", "AuthorizationService", "DataService", "Navigate", "NotificationsService", "ProjectsService", "keyValueEditorUtils", function(a, b, c, d, e, f, g, h, i, j, k) {
 c.alerts = {}, c.renderOptions = {
 hideFilterWidget:!0
 }, c.projectName = b.project, c.serviceName = b.service, c.labels = [], c.routing = {
@@ -8703,15 +8700,15 @@ title:"Routes",
 link:"project/" + c.projectName + "/browse/routes"
 }, {
 title:"Create Route"
-} ], i.get(b.project).then(_.spread(function(i, k) {
-if (c.project = i, c.breadcrumbs[0].title = a("displayName")(i), !f.canI("routes", "create", b.project)) return void h.toErrorPage("You do not have authority to create routes in project " + b.project + ".", "access_denied");
-var l = a("orderByDisplayName");
-g.list("services", k).then(function(a) {
-c.services = l(a.by("metadata.name")), c.routing.to = {}, c.routing.to.service = _.find(c.services, function(a) {
+} ], j.get(b.project).then(_.spread(function(j, l) {
+if (c.project = j, c.breadcrumbs[0].title = a("displayName")(j), !f.canI("routes", "create", b.project)) return void h.toErrorPage("You do not have authority to create routes in project " + b.project + ".", "access_denied");
+var m = a("orderByDisplayName");
+g.list("services", l).then(function(a) {
+c.services = m(a.by("metadata.name")), c.routing.to = {}, c.routing.to.service = _.find(c.services, function(a) {
 return !c.serviceName || a.metadata.name === c.serviceName;
 });
 }), c.copyServiceLabels = function() {
-var a = _.get(c, "routing.to.service.metadata.labels", {}), b = j.mapEntries(j.compactEntries(c.labels)), d = _.assign(b, a);
+var a = _.get(c, "routing.to.service.metadata.labels", {}), b = k.mapEntries(k.compactEntries(c.labels)), d = _.assign(b, a);
 c.labels = _.map(d, function(a, b) {
 return {
 name:b,
@@ -8721,21 +8718,24 @@ value:a
 }, c.createRoute = function() {
 if (c.createRouteForm.$valid) {
 c.disableInputs = !0;
-var b = c.routing.to.service.metadata.name, f = j.mapEntries(j.compactEntries(c.labels)), h = e.createRoute(c.routing, b, f), i = _.get(c, "routing.alternateServices", []);
-_.isEmpty(i) || (h.spec.to.weight = _.get(c, "routing.to.weight"), h.spec.alternateBackends = _.map(i, function(a) {
+var b = c.routing.to.service.metadata.name, f = k.mapEntries(k.compactEntries(c.labels)), h = e.createRoute(c.routing, b, f), j = _.get(c, "routing.alternateServices", []);
+_.isEmpty(j) || (h.spec.to.weight = _.get(c, "routing.to.weight"), h.spec.alternateBackends = _.map(j, function(a) {
 return {
 kind:"Service",
 name:_.get(a, "service.metadata.name"),
 weight:a.weight
 };
-})), g.create("routes", null, h, k).then(function() {
-d.history.back();
+})), g.create("routes", null, h, l).then(function() {
+i.addNotification({
+type:"success",
+message:"Route " + h.metadata.name + " was successfully created."
+}), d.history.back();
 }, function(b) {
-c.disableInputs = !1, c.alerts["create-route"] = {
+c.disableInputs = !1, i.addNotification({
 type:"error",
 message:"An error occurred creating the route.",
 details:a("getErrorDetails")(b)
-};
+});
 });
 }
 };