Merge pull request #8202 from NuGet/dev

[ReleasePrep][2020.09.09]RI of dev to master

Author: lyndaidaii

src/Bootstrap/dist/css/bootstrap-theme.css

@@ -425,3 +425,7 @@ img.reserved-indicator-icon {
   z-index: 99999;
   right: 0;
 }
+
+.sortable {
+	cursor: pointer;
+}

src/Bootstrap/less/theme/base.less

@@ -828,6 +828,10 @@ public HttpStatusCodeResult DisplayPackage()
         [HttpGet]
         public virtual async Task<ActionResult> DisplayPackage(string id, string version)
         {
+            // Attempt to normalize the version but allow version strings that are not actually SemVer strings. For
+            // example, "absoluteLatest" is allowed as the version string as a reference to the absolute latest version
+            // including prerelease versions. In this case, the resulting normalized version will be left as the
+            // original string.
             string normalized = NuGetVersionFormatter.Normalize(version);
             if (!string.Equals(version, normalized))
             {
@@ -890,7 +894,11 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version
                 model.GitHubDependenciesInformation = _contentObjectService.GitHubUsageConfiguration.GetPackageInformation(id);
             }
 
-            if (normalized != null && !string.Equals(package.NormalizedVersion, normalized, StringComparison.OrdinalIgnoreCase))
+            // If the normalized version is actually a SemVer but does not match the resolved package version, show a
+            // warning. It's possible that the normalized version is not a SemVer string (like "absoluteLatest").
+            if (normalized != null
+                && !string.Equals(package.NormalizedVersion, normalized, StringComparison.OrdinalIgnoreCase)
+                && NuGetVersion.TryParse(normalized, out var parsed))
             {
                 model.VersionRequested = normalized;
                 model.VersionRequestedWasNotFound = true;

src/NuGetGallery/Controllers/PackagesController.cs

@@ -12,6 +12,7 @@
 using System.Web.Mvc;
 using NuGet.Services.Entities;
 using NuGet.Services.Messaging.Email;
+using NuGet.Versioning;
 using NuGetGallery.Areas.Admin;
 using NuGetGallery.Areas.Admin.ViewModels;
 using NuGetGallery.Authentication;
@@ -521,16 +522,12 @@ public virtual ActionResult Packages()
             var wasAADLoginOrMultiFactorAuthenticated = User.WasMultiFactorAuthenticated() || User.WasAzureActiveDirectoryAccountUsedForSignin();
 
             var packages = PackageService.FindPackagesByAnyMatchingOwner(currentUser, includeUnlisted: true);
-            var listedPackages = packages
-                .Where(p => p.Listed && p.PackageStatusKey == PackageStatus.Available)
-                .Select(p => _listPackageItemRequiredSignerViewModelFactory.Create(p, currentUser, wasAADLoginOrMultiFactorAuthenticated))
-                .OrderBy(p => p.Id)
-                .ToList();
-            var unlistedPackages = packages
-                .Where(p => !p.Listed || p.PackageStatusKey != PackageStatus.Available)
-                .Select(p => _listPackageItemRequiredSignerViewModelFactory.Create(p, currentUser, wasAADLoginOrMultiFactorAuthenticated))
-                .OrderBy(p => p.Id)
-                .ToList();
+
+            var listedPackages = GetPackages(packages, currentUser, wasAADLoginOrMultiFactorAuthenticated,
+                p => p.Listed && p.PackageStatusKey == PackageStatus.Available);
+            
+            var unlistedPackages = GetPackages(packages, currentUser, wasAADLoginOrMultiFactorAuthenticated,
+                p => !p.Listed || p.PackageStatusKey != PackageStatus.Available);
 
             // find all received ownership requests
             var userReceived = _packageOwnerRequestService.GetPackageOwnershipRequests(newOwner: currentUser);
@@ -567,6 +564,36 @@ public virtual ActionResult Packages()
             return View(model);
         }
 
+        /// <summary>
+        /// Returns all packages based on the predicate, with the VersionSortOrder populated
+        /// </summary>
+        /// <param name="packages"></param>
+        /// <param name="currentUser"></param>
+        /// <param name="wasAADLoginOrMultiFactorAuthenticated"></param>
+        /// <param name="predicate"></param>
+        /// <returns></returns>
+        private List<ListPackageItemRequiredSignerViewModel> GetPackages(
+            IEnumerable<Package> packages,
+            User currentUser,
+            bool wasAADLoginOrMultiFactorAuthenticated,
+            Func<Package, bool> predicate)
+        {
+            var listedPackages = packages
+                .Where(p => predicate(p))
+                .Select(p => _listPackageItemRequiredSignerViewModelFactory.Create(p, currentUser, wasAADLoginOrMultiFactorAuthenticated))
+                .OrderBy(p => NuGetVersion.Parse(p.FullVersion))
+                .ToList();
+
+            for (int i = 0; i < listedPackages.Count; i++)
+            {
+                listedPackages[i].VersionSortOrder = i;
+            }
+
+            listedPackages.Sort((x, y) => string.Compare(x.Id, y.Id, StringComparison.OrdinalIgnoreCase));
+
+            return listedPackages;
+        }
+
         [HttpGet]
         [UIAuthorize]
         public virtual ActionResult Organizations()

src/NuGetGallery/Controllers/UsersController.cs

@@ -38,6 +38,7 @@
             this.CanEdit = packageItem.CanEdit;
             this.CanManageOwners = packageItem.CanManageOwners;
             this.CanDelete = packageItem.CanDelete;
+            this.VersionSortOrder = packageItem.VersionSortOrder;
 
             this.FormattedDownloadCount = ko.pureComputed(function () {
                 return ko.unwrap(this.DownloadCount).toLocaleString();
@@ -355,6 +356,49 @@
             this.RequestsSent = new OwnerRequestsListViewModel(this, initialData.RequestsSent, false, true);
         }
 
+        function setupColumnSorting() {
+            $('.sortable').click(function () {
+
+                var table = $(this).parents('table').eq(0);
+                var rows = table.find('tr:gt(0)').toArray().sort(comparer($(this).index()));
+                this.asc = !this.asc;
+                if (!this.asc) {
+                    rows = rows.reverse();
+                }
+                for (var i = 0; i < rows.length; i++) {
+                    table.append(rows[i]);
+                }
+
+                table.find('.sortable').each(function () {
+                    var currentText = $(this).text();
+                    var newText = currentText.replace(' ▲', '').replace(' ▼', '');
+                    $(this).text(newText);
+                });
+
+                var columnText = $(this).text();
+                $(this).text(columnText + " " + (this.asc ? "▼" : "▲"));
+
+            })
+            function comparer(index) {
+                return function (a, b) {
+                    var valA = getCellValue(a, index), valB = getCellValue(b, index);
+                    return $.isNumeric(valA) && $.isNumeric(valB) ? valB - valA : valA.toString().localeCompare(valB);
+                }
+            }
+            function getCellValue(row, index) {
+                var td = $(row).children('td').eq(index);
+
+                // check for the data-sortby attribute, if found, use that data to sort by
+                var sortby = td.data('sortby');
+
+                if (typeof sortby !== 'undefined') {
+                    return sortby;
+                }
+
+                return td.text();
+            }
+        }
+
         // Immediately load initial expander data
         showInitialPackagesData("#listed-data", initialData.ListedPackages);
         showInitialPackagesData("#unlisted-data", initialData.UnlistedPackages);
@@ -365,6 +409,9 @@
         // Set up the data binding.
         var managePackagesViewModel = new ManagePackagesViewModel(initialData);
         ko.applyBindings(managePackagesViewModel, document.body);
+
+        setupColumnSorting();
+
     });
 
 })();

src/NuGetGallery/Scripts/gallery/page-manage-packages.js

@@ -25,6 +25,7 @@ public class ListPackageItemViewModel : PackageViewModel
         public string ShortDescription { get; private set; }
         public bool IsDescriptionTruncated { get; set; }
         public bool? IsVerified { get; set; }
+        public int VersionSortOrder { get; set; }
         public string SignatureInformation
         {
             get

src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs

@@ -4,7 +4,6 @@
     ViewBag.Title = "Manage My Package";
     ViewBag.Tab = "Packages";
 }
-
 <section role="main" class="container main-container page-manage-packages">
     @ViewHelpers.AjaxAntiForgeryToken(Html)
 
@@ -113,14 +112,14 @@
                 <thead>
                     <tr class="manage-package-headings">
                         <th class="hidden-xs"><span class="hidden">Package Icon</span></th>
-                        <th>Package ID</th>
-                        <th>Owners</th>
+                        <th class="sortable">Package ID</th>
+                        <th class="sortable">Owners</th>
                     @if (Model.IsCertificatesUIEnabled)
                     {
-                        <th>Signing Owner</th>
+                        <th  class="sortable">Signing Owner</th>
                     }
-                        <th>Downloads</th>
-                        <th>Latest Version</th>
+                        <th  class="sortable">Downloads</th>
+                        <th  class="sortable">Latest Version</th>
                         <th><span class="hidden">Icon</span></th>
                     </tr>
                 </thead>
@@ -166,10 +165,10 @@
                             <!-- /ko -->
                         </td>
                     }
-                        <td class="align-middle text-nowrap">
+                        <td class="align-middle text-nowrap" data-bind="attr: { 'data-sortby': DownloadCount }">
                             <span data-bind="text: FormattedDownloadCount"></span>
                         </td>
-                        <td class="align-middle text-nowrap">
+                        <td class="align-middle text-nowrap" data-bind="attr: { 'data-sortby': VersionSortOrder }">
                             <span data-bind="text: LatestVersion"></span>
                         </td>
                         <td class="text-right align-middle package-controls">
@@ -353,7 +352,8 @@
             CanDelete = p.CanUnlistOrRelist,
             p.CanEditRequiredSigner,
             p.ShowRequiredSigner,
-            p.ShowTextBox
+            p.ShowTextBox,
+            p.VersionSortOrder
         };
     }
 

src/NuGetGallery/Views/Users/Packages.cshtml

@@ -896,6 +896,7 @@ public async Task GivenAnAbsoluteLatestVersionItReturnsTheFirstLatestSemVer2()
                 // The page should select the first package that is IsLatestSemVer2
                 Assert.Equal(latestPackage.NormalizedVersion, model.Version);
                 Assert.True(model.LatestVersionSemVer2);
+                Assert.False(model.VersionRequestedWasNotFound);
 
                 deprecationService.Verify();
             }