Merge ~caleb-ellis/maas:name-in-notification into maas:master

[Caleb Ellis]

Add machine hostname to error notifications in machine list

## Done
- Added machine hostname to error notifications. Note that in some cases where the api returns the hostname already, the name will be mentioned twice.

## Screenshot
https://user-images.githubusercontent.com/25733845/54378083-696bb200-467e-11e9-8a9c-fd17650bc9a3.png

[MAAS Lander (maas-lander)]

UNIT TESTS
-b name-in-notification lp:~caleb-ellis/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b4b6a4104f7f7dd7870bbc94375773adc09be3b4

review: Approve

[Alberto Donato (ack)]

lgtm, +1

review: Approve

[Steve Rydz (steverydz)]

lgtm +1

review: Approve

[Martin Storey (cassiocassio)]

review: Approve

diff --git a/src/maasserver/static/js/angular/directives/machines_table.js b/src/maasserver/static/js/angular/directives/machines_table.js
index e1c0d8d..2d38442 100644
--- a/src/maasserver/static/js/angular/directives/machines_table.js
+++ b/src/maasserver/static/js/angular/directives/machines_table.js
@@ -53,27 +53,6 @@ angular.module('MAAS').directive('maasMachinesTable', [
           21   // testing
         ];
 
-        const actionMap = new Map([
-          ["abort", "abort action in progress"],
-          ["acquire", "acquire machine"],
-          ["check", "check machine's power state"],
-          ["commission", "commission machine"],
-          ["deploy", "deploy machine"],
-          ["exit-rescue-mode", "exit rescue mode"],
-          ["lock", "lock machine"],
-          ["mark-broken", "mark machine as broken"],
-          ["mark-fixed", "mark machine as fixed"],
-          ["off", "power machine off"],
-          ["on", "power machine on"],
-          ["override-failed-testing", "override failed testing"],
-          ["release", "release machine"],
-          ["rescue-mode", "enter rescue mode"],
-          ["set-pool", "set machine's pool"],
-          ["set-zone", "set machine's zone"],
-          ["test", "test machine"],
-          ["unlock", "unlock machine"],
-        ]);
-
         // Scope variables.
         scope.table = {
           column: 'fqdn',
@@ -99,6 +78,55 @@ angular.module('MAAS').directive('maasMachinesTable', [
         ];
         scope.openMenu = "";
 
+        scope.getActionSentence = (action, machine) => {
+          let name = "machine";
+          if (machine && machine.hostname) {
+            name = machine.hostname;
+          }
+          switch (action) {
+            case "abort":
+              return `abort current action of ${name}`;
+            case "acquire":
+              return `acquire ${name}`;
+            case "check":
+              return `check power state of ${name}`;
+            case "commission":
+              return `commission ${name}`;
+            case "deploy":
+              return `deploy ${name}`;
+            case "exit-rescue-mode":
+              return `exit rescue mode of ${name}`;
+            case "lock":
+              return `lock ${name}`;
+            case "mark-broken":
+              return `mark ${name} as broken`;
+            case "mark-fixed":
+              return `mark ${name} as fixed`;
+            case "off":
+              return `power off ${name}`;
+            case "on":
+              return `power on ${name}`;
+            case "override-failed-testing":
+              return `override failed testing of ${name}`;
+            case "release":
+              return `release ${name}`;
+            case "rescue-mode":
+              return `enter rescue mode of ${name}`;
+            case "release":
+              return `release ${name}`;
+            case "set-pool":
+              return `set pool of ${name}`;
+            case "set-zone":
+              return `set zone of ${name}`;
+            case "test":
+              return `test ${name}`;
+            case "unlock":
+              return `unlock ${name}`;
+            default:
+              return "perform action";
+          }
+        };
+
         // Ensures that the checkbox for select all is the correct value.
         scope.updateAllChecked = function() {
           // Not checked when the filtered machines are empty.
@@ -346,7 +374,7 @@ angular.module('MAAS').directive('maasMachinesTable', [
                 machine.powerTransition = undefined;
               },
               error => {
-                scope.createErrorNotification(action, error);
+                scope.createErrorNotification(machine, action, error);
                 machine.action_failed = true;
                 machine.powerTransition = undefined;
               }
@@ -357,7 +385,7 @@ angular.module('MAAS').directive('maasMachinesTable', [
                 machine.action_failed = false;
               },
               error => {
-                scope.createErrorNotification(action, error);
+                scope.createErrorNotification(machine, action, error);
                 machine.action_failed = true;
                 machine.powerTransition = undefined;
               }
@@ -376,7 +404,7 @@ angular.module('MAAS').directive('maasMachinesTable', [
           MachinesManager.performAction(machine, action, extra).then(() => {
             machine.action_failed = false;
           }, error => {
-            scope.createErrorNotification(action, error);
+            scope.createErrorNotification(machine, action, error);
             machine.action_failed = true;
             machine[`${action}-transition`] = undefined;
           });
@@ -404,11 +432,13 @@ angular.module('MAAS').directive('maasMachinesTable', [
 
         scope.closeMenu = () => scope.openMenu = "";
 
-        scope.createErrorNotification = (action, error) => {
+        scope.createErrorNotification = (machine, action, error) => {
           const authUser = UsersManager.getAuthUser();
           if (angular.isObject(authUser)) {
             NotificationsManager.createItem({
-              message: `Unable to ${actionMap.get(action)}: ${error}`,
+              message: `Unable to ${
+                scope.getActionSentence(action, machine)
+              }: ${error}`,
               category: "error",
               user: authUser.id
             });
diff --git a/src/maasserver/static/js/angular/directives/tests/test_machines_table.js b/src/maasserver/static/js/angular/directives/tests/test_machines_table.js
index f0ed447..12b273e 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_machines_table.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_machines_table.js
@@ -39,6 +39,7 @@ describe("maasMachinesTable", function() {
     function makeMachine() {
         var machine = {
             system_id: makeName("system_id"),
+            hostname: makeName("name"),
             $selected: false
         };
         MachinesManager._items.push(machine);
@@ -618,9 +619,9 @@ describe("maasMachinesTable", function() {
             scope.$digest();
             expect(NotificationsManager.createItem)
                 .toHaveBeenCalledWith({
-                    message: (
-                        `Unable to check machine's power state: ${errorMsg}`
-                    ),
+                    message: `Unable to check power state of ${
+                        machine.hostname
+                    }: ${errorMsg}`,
                     category: "error",
                     user: user.id
                 });
@@ -660,7 +661,8 @@ describe("maasMachinesTable", function() {
             scope.$digest();
             expect(NotificationsManager.createItem)
                 .toHaveBeenCalledWith({
-                    message: `Unable to power machine on: ${errorMsg}`,
+                    message:
+                        `Unable to power on ${machine.hostname}: ${errorMsg}`,
                     category: "error",
                     user: user.id
                 });
@@ -759,4 +761,29 @@ describe("maasMachinesTable", function() {
             expect(scope.getStatusActions(machine)).toEqual(["action2"]);
         });
     });
+
+    describe("getActionSentence", () => {
+        it("returns generic sentence if no action param present", () => {
+            const directive = compileDirective();
+            const scope = directive.isolateScope();
+
+            expect(scope.getActionSentence()).toEqual("perform action");
+        });
+
+        it("returns correctly formatted sentence without machine param", () => {
+            const directive = compileDirective();
+            const scope = directive.isolateScope();
+
+            expect(scope.getActionSentence("on")).toEqual("power on machine");
+        });
+
+        it("returns correctly formatted sentence with machine param", () => {
+            const directive = compileDirective();
+            const scope = directive.isolateScope();
+            const machine = makeMachine();
+
+            expect(scope.getActionSentence("on", machine))
+                .toEqual(`power on ${machine.hostname}`);
+        });
+    });
 });