Symbols UI Fixes (#6576)

Author: shishirx34

src/NuGetGallery.Core/Extensions/PackageExtensions.cs

@@ -19,5 +19,16 @@ public static SymbolPackage LatestSymbolPackage(this Package package)
                 .OrderByDescending(sp => sp.Created)
                 .FirstOrDefault();
         }
+
+        /// <summary>
+        /// Returns true if there exists a symbol package which is latest and is in
+        /// available state, false otherwise.
+        /// </summary>
+        public static bool IsLatestSymbolPackageAvailable(this Package package)
+        {
+            var latestSymbolPackage = package.LatestSymbolPackage();
+            return latestSymbolPackage != null
+                && latestSymbolPackage.StatusKey == PackageStatus.Available;
+        }
     }
 }

src/NuGetGallery/Controllers/PackagesController.cs

@@ -237,6 +237,8 @@ private async Task<ActionResult> UploadSymbolsPackageInternal(SubmitPackageReque
 
             var verifyRequest = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration);
             verifyRequest.IsSymbolsPackage = true;
+            verifyRequest.HasExistingAvailableSymbols = packageForUploadingSymbols.IsLatestSymbolPackageAvailable();
+
             model.InProgressUpload = verifyRequest;
 
             return View(model);
@@ -386,7 +388,12 @@ private async Task<JsonResult> UploadSymbolsPackageInternal(PackageArchiveReader
             // Save the uploaded file
             await _uploadFileService.SaveUploadFileAsync(currentUser.Key, uploadStream);
 
-            return await GetVerifyPackageView(currentUser, packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration, isSymbolsPackageUpload: true);
+            return await GetVerifyPackageView(currentUser,
+                packageMetadata,
+                accountsAllowedOnBehalfOf,
+                existingPackageRegistration,
+                isSymbolsPackageUpload: true,
+                hasExistingSymbolsPackageAvailable: packageForUploadingSymbols.IsLatestSymbolPackageAvailable());
         }
 
         private async Task<JsonResult> UploadPackageInternal(PackageArchiveReader packageArchiveReader, Stream uploadStream, NuspecReader nuspec, PackageMetadata packageMetadata)
@@ -495,14 +502,22 @@ await _packageDeleteService.HardDeletePackagesAsync(
 
             await _uploadFileService.SaveUploadFileAsync(currentUser.Key, uploadStream);
 
-            return await GetVerifyPackageView(currentUser, packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration, isSymbolsPackageUpload: false);
+            var hasExistingSymbolsPackageAvailable = existingPackage != null && existingPackage.IsLatestSymbolPackageAvailable();
+
+            return await GetVerifyPackageView(currentUser,
+                packageMetadata,
+                accountsAllowedOnBehalfOf,
+                existingPackageRegistration,
+                isSymbolsPackageUpload: false,
+                hasExistingSymbolsPackageAvailable: hasExistingSymbolsPackageAvailable);
         }
 
         private async Task<JsonResult> GetVerifyPackageView(User currentUser,
             PackageMetadata packageMetadata,
             IEnumerable<User> accountsAllowedOnBehalfOf,
             PackageRegistration existingPackageRegistration,
-            bool isSymbolsPackageUpload)
+            bool isSymbolsPackageUpload,
+            bool hasExistingSymbolsPackageAvailable)
         {
             IReadOnlyList<string> warnings = new List<string>();
             using (Stream uploadedFile = await _uploadFileService.GetUploadFileAsync(currentUser.Key))
@@ -546,8 +561,8 @@ private async Task<JsonResult> GetVerifyPackageView(User currentUser,
 
             var model = new VerifyPackageRequest(packageMetadata, accountsAllowedOnBehalfOf, existingPackageRegistration);
             model.IsSymbolsPackage = isSymbolsPackageUpload;
+            model.HasExistingAvailableSymbols = hasExistingSymbolsPackageAvailable;
             model.Warnings.AddRange(warnings);
-
             return Json(model);
         }
 

src/NuGetGallery/RequestModels/VerifyPackageRequest.cs

@@ -117,6 +117,7 @@ public VerifyPackageRequest(PackageMetadata packageMetadata, IEnumerable<User> p
         public string Tags { get; set; }
         public string Title { get; set; }
         public bool IsSymbolsPackage { get; set; }
+        public bool HasExistingAvailableSymbols { get; set; }
 
         public List<string> Warnings { get; set; } = new List<string>();
 

src/NuGetGallery/Scripts/gallery/async-file-upload.js

@@ -84,7 +84,7 @@
         };
 
         function resetFileSelectFeedback() {
-            $('#file-select-feedback').attr('value', 'Browse or Drop files to select a package or symbols package...');
+            $('#file-select-feedback').attr('value', 'Browse or Drop files to select a package (.nupkg) or symbols package (.snupkg)...');
         }
 
         function prepareUploadFormData() {
@@ -232,6 +232,7 @@
         function clearErrors() {
             $("#validation-failure-container").addClass("hidden");
             $("#validation-failure-list").remove();
+            $('#symbols-replace-warning-container').addClass('hidden');
 
             var warnings = $('#warning-container');
             warnings.addClass("hidden");
@@ -271,6 +272,12 @@
                     cancelUploadAsync();
                 });
 
+                if (model.IsSymbolsPackage && model.HasExistingAvailableSymbols) {
+                    $('#symbols-replace-warning-container').removeClass('hidden');
+                } else {
+                    $('#symbols-replace-warning-container').addClass('hidden');
+                }
+
                 $('#verify-submit-button').on('click', function () {
                     $('#verify-cancel-button').attr('disabled', 'disabled');
                     $('#verify-submit-button').attr('disabled', 'disabled');

src/NuGetGallery/Views/Packages/DeleteSymbols.cshtml

@@ -61,16 +61,15 @@
                 </div>
 
                 <h2>
-                    <a href="#" role="button" data-toggle="collapse" data-target="#delete-package"
-                       aria-expanded="false" aria-controls="delete-package" id="show-delete-package">
-                        <i class="ms-Icon ms-Icon--ChevronRight" aria-hidden="true"></i>
+                    <a href="#" role="button" data-toggle="collapse" data-target="#delete-package" aria-expanded="true" aria-controls="delete-package" id="show-delete-package">
+                        <i class="ms-Icon ms-Icon--ChevronDown" aria-hidden="true"></i>
                         <span>Delete Symbols Package Version</span>
                     </a>
                 </h2>
-                <div class="list-unstyled panel-collapse collapse" id="delete-package">
+                <div class="list-unstyled panel-collapse collapse in" id="delete-package">
                     @ViewHelpers.AlertDanger(
                         @<text>
-                            <strong>Deleting this symbols package will remove all the symbols from the symbol server and make them unavailable.</strong><br />
+                            <strong>Deleting this symbols package will remove all symbols in this package from the symbol server and make them unavailable.</strong><br />
                         </text>)
 
                     @using (Html.BeginForm("DeleteSymbolsPackage", "Packages", FormMethod.Post, new { id = "delete-symbols-form" }))

src/NuGetGallery/Views/Packages/UploadPackage.cshtml

@@ -3,8 +3,8 @@
     ViewBag.Title = "Upload Package";
     ViewBag.Tab = "Upload";
     var placeholder = Model.IsSymbolsUploadEnabled
-        ? "Browse or Drop files to select a package or symbols package..."
-        : "Browse or Drop files to select a package";
+        ? "Browse or Drop files to select a package (.nupkg) or symbols package (.snupkg)..."
+        : "Browse or Drop files to select a package (.nupkg)";
     var acceptExtensions = Model.IsSymbolsUploadEnabled
         ? ".nupkg,.snupkg"
         : ".nupkg";
@@ -58,6 +58,11 @@
                 </div>
             }
 
+                <div id="symbols-replace-warning-container" class="hidden">
+                    @ViewHelpers.AlertWarning(@<text>There is an existing symbols package (.snupkg) for the below package ID and version. 
+                        Submitting this request will replace the previously uploaded symbols package as well as the corresponding symbol files from the symbol server.</text>)
+                </div>
+
             @Html.Partial("_VerifyForm")
         </div>
     </div>

src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml

@@ -121,6 +121,7 @@
             </div>
             <!-- /ko -->
 
+            <!-- ko ifnot: $data.IsSymbolsPackage -->
             <div class="verify-package-field">
                 <label class="verify-package-field-heading">Title</label>
                 <div data-bind="template: { name: 'display-data-or-default', data: { DisplayText: $data.Title }}"></div>
@@ -136,7 +137,6 @@
                 <div data-bind="template: { name: 'display-data-or-default', data: { DisplayText: $data.Summary }}"></div>
             </div>
 
-            <!-- ko ifnot: $data.IsSymbolsPackage -->
             <div class="verify-package-field">
                 <div class="verify-package-field-heading"><label>Release Notes</label> (for this version)</div>
                 <div data-bind="template: { name: 'display-data-or-default', data: { DisplayText: $data.ReleaseNotes }}"></div>