Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Nov 18, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d44f71b
clear errors and keep form open
Nov 17, 2017
b56225d
show message for generatepackageasync
Nov 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/NuGetGallery/Controllers/PackagesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1557,9 +1557,7 @@ public virtual async Task<JsonResult> VerifyPackage(VerifyPackageRequest formDat
{
_telemetryService.TraceException(ex);

TempData["Message"] = ex.Message;

return Json(400, new[] { ex.GetUserSafeMessage() });
return Json(400, new[] { ex.Message });
}

var pendEdit = false;
Expand Down Expand Up @@ -1589,7 +1587,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)
Expand Down
11 changes: 9 additions & 2 deletions src/NuGetGallery/Scripts/gallery/async-file-upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ var AsyncFileUploadManager = new function () {
}

function cancelUploadAsync(callback, error) {
$('#warning-container').addClass("hidden");
clearErrors();

$.ajax({
url: _cancelUrl,
type: 'POST',
Expand Down Expand Up @@ -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");
Expand All @@ -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) {
Expand Down Expand Up @@ -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 () {
Expand Down