Better handling of version list when short version list is displayed. (#10697)

agr · web-flow · commit 08de4c1086a2 · 2026-02-10T14:49:29.000-08:00
* Partial view for a version list.
* Making sure Latest semver2 versions make it to the short version list.
* Method and routes to load full version list.
* Ordering by Key instead of Created. The order should largely be the same , but less DB resource spent.
diff --git a/src/GitHubVulnerabilities2Db/Gallery/ThrowingTelemetryService.cs b/src/GitHubVulnerabilities2Db/Gallery/ThrowingTelemetryService.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -408,5 +408,10 @@ public void TrackDownloadJsonTotalPackageIds(int totalPackageIds) {
         public void TrackDownloadJsonTotalPackageVersions(int totalPackageVersions) {
             throw new NotImplementedException();
         }
+
+        public void TrackFullVersionListLoadRequest()
+        {
+            throw new NotImplementedException();
+        }
     }
-}
+}
diff --git a/src/NuGetGallery.Services/PackageManagement/IPackageService.cs b/src/NuGetGallery.Services/PackageManagement/IPackageService.cs
@@ -66,7 +66,7 @@ IReadOnlyCollection<Package> FindPackagesById(
         /// <param name="includeSupportedFrameworks"></param>
         /// <param name="maxCount"></param>
         /// <returns></returns>
-        IReadOnlyCollection<Package> FindLatestVersionsById(
+        LatestPackageVersionsResult FindLatestVersionsById(
             string id,
             string includeVersion,
             bool includePackageRegistration,
diff --git a/src/NuGetGallery.Services/PackageManagement/LatestPackageVersionsResult.cs b/src/NuGetGallery.Services/PackageManagement/LatestPackageVersionsResult.cs
@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using NuGet.Services.Entities;
+
+namespace NuGetGallery
+{
+    public class LatestPackageVersionsResult
+    {
+        public IReadOnlyCollection<Package> Packages { get; set; }
+        public bool HasMoreResults { get; set; }
+    }
+}
diff --git a/src/NuGetGallery.Services/PackageManagement/PackageFilter.cs b/src/NuGetGallery.Services/PackageManagement/PackageFilter.cs
@@ -46,7 +46,7 @@ public Package GetFiltered(IReadOnlyCollection<Package> packages, PackageFilterC
             
             // The package still wasn't found so let's just get the latest version. This applies when 
             // no version is specified, or when the version asked for (in context.Version) wasn't found
-            result =  result ?? _packageService.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, allowPrerelease: true);
+            result = result ?? _packageService.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, allowPrerelease: true);
             
             return result;
         }
diff --git a/src/NuGetGallery.Services/PackageManagement/PackageService.cs b/src/NuGetGallery.Services/PackageManagement/PackageService.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Data.Entity;
 using System.IO;
 using System.Linq;
@@ -274,7 +275,7 @@ public IReadOnlyCollection<Package> FindPackagesById(
             return packages.ToList();
         }
 
-        public IReadOnlyCollection<Package> FindLatestVersionsById(
+        public LatestPackageVersionsResult FindLatestVersionsById(
             string id,
             string includeVersion,
             bool includePackageRegistration,
@@ -301,10 +302,24 @@ public IReadOnlyCollection<Package> FindLatestVersionsById(
                 includeDeprecations: includeDeprecations,
                 includeDeprecationRelationships: false,
                 includeSupportedFrameworks: includeSupportedFrameworks)
-                .OrderByDescending(p => p.Created)
-                .Take(maxCount)
+                .OrderByDescending(p => p.IsLatestSemVer2 || p.IsLatestStableSemVer2)
+                    .ThenByDescending(p => p.Key)
+                .Take(maxCount + 1)
                 .ToList();
 
+            bool moreAvailable = packages.Count > maxCount;
+
+            if (moreAvailable)
+            {
+                // if we have list longer than requested, trim it, making sure we don't trim includeVersion if it happens to be last
+                var removeAt = packages.Count - 1;
+                if (!string.IsNullOrWhiteSpace(includeVersion) && packages[removeAt].NormalizedVersion == includeVersion)
+                {
+                    --removeAt;
+                }
+                packages.RemoveAt(removeAt);
+            }
+
             if (!string.IsNullOrWhiteSpace(includeVersion) && !packages.Any(p => p.NormalizedVersion == includeVersion))
             {
                 var requiredPackage = GetPackagesByIdQueryable(
@@ -329,7 +344,7 @@ public IReadOnlyCollection<Package> FindLatestVersionsById(
                 }
             }
 
-            return packages;
+            return new LatestPackageVersionsResult { Packages = packages, HasMoreResults = moreAvailable };
         }
 
         public virtual Package FindPackageByIdAndVersion(
diff --git a/src/NuGetGallery.Services/Telemetry/ITelemetryService.cs b/src/NuGetGallery.Services/Telemetry/ITelemetryService.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -432,5 +432,7 @@ void TrackABTestEvaluated(
 
         IDisposable TrackSyncSqlConnectionCreationDuration();
         IDisposable TrackAsyncSqlConnectionCreationDuration();
+
+        void TrackFullVersionListLoadRequest();
     }
-}
+}
diff --git a/src/NuGetGallery.Services/Telemetry/TelemetryService.cs b/src/NuGetGallery.Services/Telemetry/TelemetryService.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -97,6 +97,7 @@ public static class Events
             public const string InstanceUptime = "InstanceUptimeInDays";
             public const string ApiRequest = "ApiRequest";
             public const string CreateSqlConnectionDurationMs = "CreateSqlConnectionDurationMs";
+            public const string FullVersionListRequest = "FullVersionListRequest";
         }
 
         private readonly IDiagnosticsSource _diagnosticsSource;
@@ -1164,6 +1165,11 @@ public IDisposable TrackSyncSqlConnectionCreationDuration()
         public IDisposable TrackAsyncSqlConnectionCreationDuration()
             => TrackSqlConnectionCreationDuration(Async);
 
+        public void TrackFullVersionListLoadRequest()
+        {
+            TrackMetric(Events.FullVersionListRequest, 1, _ => { });
+        }
+
         private IDisposable TrackSqlConnectionCreationDuration(string kind)
         {
             return new DurationTracker(duration => 
@@ -1189,4 +1195,4 @@ private string BuildArrayProperty(IEnumerable<string> list)
             return JsonConvert.SerializeObject(list);
         }
     }
-}
+}
diff --git a/src/NuGetGallery/App_Start/Routes.cs b/src/NuGetGallery/App_Start/Routes.cs
@@ -253,6 +253,24 @@ public static void RegisterUIRoutes(RouteCollection routes, bool adminPanelEnabl
                     action = nameof(PackagesController.AtomFeed)
                 });
 
+            routes.MapRoute(
+                RouteName.PackageVersionTableById,
+                "packages/{id}/versiontable",
+                new
+                {
+                    controller = "Packages",
+                    action = nameof(PackagesController.GetAllPackageVersionsById)
+                });
+
+            routes.MapRoute(
+                RouteName.PackageVersionTableByIdVersion,
+                "packages/{id}/{version}/versiontable",
+                new
+                {
+                    controller = "Packages",
+                    action = nameof(PackagesController.GetAllPackageVersions)
+                });
+
             routes.MapRoute(
                 RouteName.PackageEnableLicenseReport,
                 "packages/{id}/{version}/EnableLicenseReport",
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -928,14 +928,19 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version
 
             IReadOnlyCollection<Package> allVersions;
 
+            bool hasMoreVersions = false;
+
             if (_featureFlagService.IsReducedVersionListsEnabled())
             {
-                allVersions = _packageService.FindLatestVersionsById(id,
+                LatestPackageVersionsResult latestVersions = _packageService.FindLatestVersionsById(id,
                     includeVersion: normalized,
                     includePackageRegistration: true,
                     includeDeprecations: true,
                     includeSupportedFrameworks: true,
                     maxCount: 20);
+
+                allVersions = latestVersions.Packages;
+                hasMoreVersions = latestVersions.HasMoreResults;
             }
             else
             {
@@ -1008,6 +1013,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version
             model.IsMarkdigMdSyntaxHighlightEnabled = _featureFlagService.IsMarkdigMdSyntaxHighlightEnabled();
             model.IsMcpServerPackageDisplayEnabled = _featureFlagService.IsMcpServerPackageDisplayEnabled();
             model.CanDisplayReadmeWarning = canDisplayReadmeWarning;
+            model.HasMoreVersions = hasMoreVersions;
 
             if (model.IsComputeTargetFrameworkEnabled || model.IsDisplayTargetFrameworkEnabled)
             {
@@ -2422,6 +2428,73 @@ public virtual Task<ActionResult> RejectPendingOwnershipRequest(string id, strin
             return HandleOwnershipRequest(id, username, token, redirect: false, accept: false);
         }
 
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public ActionResult GetAllPackageVersionsById(string id)
+        {
+            return GetAllPackageVersions(id, version: null);
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public ActionResult GetAllPackageVersions(string id, string version)
+        {
+            if (!_featureFlagService.IsReducedVersionListsEnabled())
+            {
+                return HttpNotFound();
+            }
+
+            if (string.IsNullOrWhiteSpace(id))
+            {
+                return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
+            }
+
+            _telemetryService.TrackFullVersionListLoadRequest();
+
+            string normalized = NuGetVersionFormatter.Normalize(version);
+
+            IReadOnlyCollection<Package> allVersions = _packageService.FindPackagesById(id,
+                includePackageRegistration: true,
+                includeDeprecations: true,
+                includeSupportedFrameworks: true);
+
+            var filterContext = new PackageFilterContext(RouteData?.Route, version);
+            var package = _packageFilter.GetFiltered(allVersions, filterContext);
+
+            // Validating packages should be hidden to everyone but the owners and admins.
+            var currentUser = GetCurrentUser();
+            if (package == null
+                || ((package.PackageStatusKey == PackageStatus.Validating
+                     || package.PackageStatusKey == PackageStatus.FailedValidation)
+                    && ActionsRequiringPermissions.DisplayPrivatePackageMetadata.CheckPermissionsOnBehalfOfAnyAccount(currentUser, package) != PermissionsCheckResult.Allowed))
+            {
+                return HttpNotFound();
+            }
+
+            var isPackageDeprecationEnabled = _featureFlagService.IsManageDeprecationEnabled(currentUser, allVersions);
+            var packageKeyToDeprecation = isPackageDeprecationEnabled
+                ? _deprecationService.GetDeprecationsById(id)
+                    .GroupBy(d => d.PackageKey)
+                    .ToDictionary(g => g.Key, g => g.First())
+                : null;
+
+            var isPackageVulnerabilitiesEnabled = _featureFlagService.IsDisplayVulnerabilitiesEnabled();
+            var packageKeyToVulnerabilities = isPackageVulnerabilitiesEnabled
+                ? _vulnerabilitiesService.GetVulnerabilitiesById(id)
+                : null;
+
+            var model = _displayPackageViewModelFactory.Create(
+                package,
+                allVersions,
+                currentUser,
+                packageKeyToDeprecation,
+                packageKeyToVulnerabilities,
+                packageRenames: null, // not used in this view
+                readmeResult: null);  // not used in this view
+
+            return PartialView("_DisplayPackageVersionTable", model);
+        }
+
         private async Task<ActionResult> HandleOwnershipRequest(
             string id,
             string username,
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
@@ -2327,6 +2327,9 @@
   <ItemGroup>
     <Content Include="Views\Users\TrustedPublishing.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Packages\_DisplayPackageVersionTable.cshtml" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/src/NuGetGallery/RouteName.cs b/src/NuGetGallery/RouteName.cs
@@ -35,6 +35,8 @@ public static class RouteName
         public const string DisplayReleasePackage = "package-release-route";
         public const string DisplayPrereleasePackage = "package-prerelease-route";
         public const string DisplayPackageFeed = "package-route-feed";
+        public const string PackageVersionTableById = "package-version-table-by-id";
+        public const string PackageVersionTableByIdVersion = "package-version-table-by-id-version";
         public const string DownloadPackage = "DownloadPackage";
         public const string DownloadSymbolsPackage = "DownloadSymbolsPackage";
         public const string DownloadNuGetExe = "DownloadNuGetExe";
diff --git a/src/NuGetGallery/Scripts/gallery/page-display-package.js b/src/NuGetGallery/Scripts/gallery/page-display-package.js
@@ -335,6 +335,42 @@ $(function () {
         });
     }
 
+    $("#load-more-versions").on('click', function(event) {
+        const target = event.currentTarget;
+        if (target.getAttribute("aria-disabled") === "true") {
+            event.preventDefault();
+            event.stopPropagation();
+            return;
+        }
+        const token = $("#AntiForgeryForm input[name=__RequestVerificationToken]").val();
+        const url = target.dataset.url;
+        const container = target.parentElement;
+        const failed = container.querySelector("#loading-more-error");
+        target.setAttribute("aria-disabled", "true");
+        target.setAttribute("aria-busy", "true");
+        target.innerHTML = "Loading..."
+        $.ajax({
+            url: url,
+            type: 'POST',
+            data: {
+                __RequestVerificationToken: token
+            },
+            success: function(response) {
+                $("#version-history table").html(response);
+                container.classList.add("hide");
+                const currentVersionLink = document.querySelector(".version-history .bg-brand-info a");
+                if (currentVersionLink) {
+                    currentVersionLink.focus();
+                }
+                applyVersionFilters();
+            },
+            error: function() {
+                target.classList.add("hide");
+                failed.classList.remove("hide");
+            }
+        });
+    });
+
     $(".reserved-indicator").each(window.nuget.setPopovers);
     $(".framework-badge-asset").each(window.nuget.setPopovers);
     $(".package-warning-icon").each(window.nuget.setPopovers);
diff --git a/src/NuGetGallery/UrlHelperExtensions.cs b/src/NuGetGallery/UrlHelperExtensions.cs
@@ -293,6 +293,31 @@ public static string Package(
             return version == null ? EnsureTrailingSlash(result) : result;
         }
 
+        public static string VersionTable(this UrlHelper url, string id, string version, bool relativeUrl = true)
+        {
+            if (string.IsNullOrWhiteSpace(version))
+            {
+                return GetRouteLink(
+                    url,
+                    RouteName.PackageVersionTableById,
+                    relativeUrl,
+                    routeValues: new RouteValueDictionary
+                    {
+                        { "id", id }
+                    });
+            }
+
+            return GetRouteLink(
+                url,
+                RouteName.PackageVersionTableByIdVersion,
+                relativeUrl,
+                routeValues: new RouteValueDictionary
+                {
+                    { "id", id },
+                    { "version", version }
+                });
+        }
+
         public static string Package(
             this UrlHelper url,
             Package package,
diff --git a/src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs b/src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs
@@ -53,6 +53,7 @@ public class DisplayPackageViewModel : ListPackageItemViewModel
         public bool HasEmbeddedReadmeFile { get; set; }
         public PackageDependents PackageDependents { get; set; }
         public McpServerEntryTemplateResult VsCodeMcpServerEntryTemplate { get; set; }
+        public bool HasMoreVersions { get; set; }
 
         public const int NumberOfDaysToBlockIndexing = 90;
 
diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
diff --git a/src/NuGetGallery/Views/Packages/_DisplayPackageVersionTable.cshtml b/src/NuGetGallery/Views/Packages/_DisplayPackageVersionTable.cshtml
diff --git a/src/VerifyMicrosoftPackage/Fakes/FakeTelemetryService.cs b/src/VerifyMicrosoftPackage/Fakes/FakeTelemetryService.cs
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public Package GetFiltered(IReadOnlyCollection<Package> packages, PackageFilterC`
`46`	`46`
`47`	`47`	`// The package still wasn't found so let's just get the latest version. This applies when`
`48`	`48`	`// no version is specified, or when the version asked for (in context.Version) wasn't found`
`49`		`- result = result ?? _packageService.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, allowPrerelease: true);`
	`49`	`+ result = result ?? _packageService.FilterLatestPackage(packages, SemVerLevelKey.SemVer2, allowPrerelease: true);`
`50`	`50`
`51`	`51`	`return result;`
`52`	`52`	`}`