Show VerifyPackage errors correctly in UI (into dev) (#5035)

NuGet · Dec 1, 2017 · 82809a7 · 82809a7
1 parent 46e7cf3
commit 82809a7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -1568,8 +1568,8 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
                 catch (InvalidPackageException ex)
                 {
                     _telemetryService.TraceException(ex);
-
-                    return Json(400, new[] { ex.GetUserSafeMessage() });
+                    
+                    return Json(400, new[] { ex.Message });
                 }
 
                 var pendEdit = false;
@@ -1599,7 +1599,16 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
 
                 if (pendEdit)
                 {
-                    _editPackageService.StartEditPackageRequest(package, formData.Edit, currentUser);
+                    try
+                    {
+                        _editPackageService.StartEditPackageRequest(package, formData.Edit, currentUser);
+                    }
+                    catch (EntityException ex)
+                    {
+                        _telemetryService.TraceException(ex);
+
+                        return Json(400, new[] { ex.Message });
+                    }
                 }
 
                 if (!formData.Listed)

diff --git a/src/NuGetGallery/Scripts/gallery/async-file-upload.js b/src/NuGetGallery/Scripts/gallery/async-file-upload.js
@@ -140,7 +140,8 @@ var AsyncFileUploadManager = new function () {
     }
 
     function cancelUploadAsync(callback, error) {
-        $('#warning-container').addClass("hidden");
+        clearErrors();
+
         $.ajax({
             url: _cancelUrl,
             type: 'POST',
@@ -192,6 +193,8 @@ var AsyncFileUploadManager = new function () {
             return;
         }
 
+        clearErrors()
+
         var failureContainer = $("#validation-failure-container");
         var failureListContainer = document.createElement("div");
         $(failureListContainer).attr("id", "validation-failure-list");
@@ -204,6 +207,10 @@ var AsyncFileUploadManager = new function () {
     function clearErrors() {
         $("#validation-failure-container").addClass("hidden");
         $("#validation-failure-list").remove();
+
+        var warnings = $('#warning-container');
+        warnings.addClass("hidden");
+        warnings.children().remove();
     }
 
     function bindData(model) {
@@ -245,7 +252,7 @@ var AsyncFileUploadManager = new function () {
                 $('#verify-submit-button').attr('disabled', 'disabled');
                 $('#verify-submit-button').attr('value', 'Submitting');
                 $('#verify-submit-button').addClass('.loading');
-                submitVerifyAsync(navigateToPage);
+                submitVerifyAsync(navigateToPage, bindData.bind(this, model));
             });
 
             $('#iconurl-field').on('change', function () {