Merge lp:~trapnine/maas/fix-1462078-device-add-message into lp:~maas-committers/maas/trunk

[Jeffrey C Jones]

Display error messages correctly when adding devices.

Display error messages correctly when adding devices.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/maasserver/static/js/angular/controllers/add_device.js'
--- src/maasserver/static/js/angular/controllers/add_device.js	2016-04-22 17:28:15 +0000
+++ src/maasserver/static/js/angular/controllers/add_device.js	2016-06-15 05:50:19 +0000
@@ -237,29 +237,6 @@
             $scope.hide();
         };
 
-        // Convert the Python dict error message to displayed message.
-        $scope.devicePythonDictToErrorMsg = function(pythonError) {
-            var elements = pythonError.match(/'([A-Za-z0-9 \.:_\-]+)'/g);
-            var result = '', msg = '';
-            for (k=0; k < elements.length; ++k) {
-                if (elements.hasOwnProperty(k)) {
-                    switch(elements[k]) {
-                        case "'hostname'":
-                            msg = elements[++k].replace(/'/g,'');
-                            result += msg.replace(/^Node/,'Device') + '  ';
-                            break;
-                        case "'mac_addresses'":
-                            msg = elements[++k].replace(/'/g,'');
-                            result += msg + '  ';
-                            break;
-                        default:
-                            result += elements[k].replace(/'/g,'');
-                    }
-                }
-            }
-            return result;
-        };
-
         // Called when save is clicked.
         $scope.save = function(addAnother) {
             // Do nothing if device in error.
@@ -282,7 +259,8 @@
                     $scope.hide();
                 }
             }, function(error) {
-                $scope.error = $scope.devicePythonDictToErrorMsg(error);
+                $scope.error =
+                    ManagerHelperService.parseValidationError(error);
             });
         };
 

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_add_device.js'
--- src/maasserver/static/js/angular/controllers/tests/test_add_device.js	2016-04-22 17:28:15 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_add_device.js	2016-06-15 05:50:19 +0000
@@ -756,44 +756,10 @@
                 };
                 $scope.save();
                 var errorMsg = makeName("error");
-                var error = "{'hostname': ['" + errorMsg + "']}";
+                var error = '{"hostname": ["' + errorMsg + '"]}';
                 defer.reject(error);
                 $rootScope.$digest();
-                expect($scope.error).toBe(errorMsg + "  ");
+                expect($scope.error).toBe(errorMsg);
             });
     });
-
-    describe("devicePythonDictToErrorMsg", function() {
-        it("converts hostname error for display",
-            function() {
-                var controller = makeController();
-                var errorMsg = makeName("error");
-                var error = "{'hostname': ['Node " + errorMsg + "']}";
-                var expected = "Device " + errorMsg + "  ";
-                expect($scope.devicePythonDictToErrorMsg(
-                        error)).toBe(expected);
-        });
-
-        it("converts mac_addresses error for display",
-                function() {
-                    var controller = makeController();
-                    var errorMsg = makeName("error");
-                    var error = "{'mac_addresses': ['" + errorMsg + "']}";
-                    var expected = errorMsg + "  ";
-                    expect($scope.devicePythonDictToErrorMsg(
-                            error)).toBe(expected);
-        });
-
-        it("converts unknown segments by default",
-                function() {
-                    var controller = makeController();
-                    var errorSegment1 = makeName("error");
-                    var errorSegment2 = makeName("error");
-                    var error = "{'" + errorSegment1 +
-                        "': ['" + errorSegment2 + "']}";
-                    var expected = errorSegment1 + errorSegment2;
-                    expect($scope.devicePythonDictToErrorMsg(
-                            error)).toBe(expected);
-        });
-    });
 });