Mark deprecated versions in Display Package page's version history (#6973)

Author: Scott Bommarito

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

@@ -7,6 +7,10 @@
     margin-bottom: 0;
   }
 
+  tr {
+    border-bottom: 1px solid lightgray;
+  }
+
   .package-title {
     margin-bottom: 24px;
 
@@ -67,14 +71,15 @@
   .package-details-main {
     .break-word;
 
-    .signature-info-cell {
+    .package-icon-cell {
       cursor: default;
-      max-width: 1em;
       padding-left: 0;
       padding-right: 0;
+      text-align: right;
 
-      .signature-info {
+      .package-icon {
         padding-left: 6px;
+        padding-right: 6px;
       }
     }
   }

src/Bootstrap/less/theme/page-display-package.less

@@ -193,6 +193,7 @@
     <Compile Include="Services\IFileMetadataService.cs" />
     <Compile Include="Services\IRevalidationStateService.cs" />
     <Compile Include="Services\ISimpleCloudBlob.cs" />
+    <Compile Include="Services\PackageDeprecationFieldsToInclude.cs" />
     <Compile Include="Services\SymbolPackageFileServiceMetadata.cs" />
     <Compile Include="Services\PackageFileServiceMetadata.cs" />
     <Compile Include="Services\RevalidationState.cs" />

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -285,7 +285,9 @@ public virtual async Task UpdatePackageSigningCertificateAsync(string packageId,
             }
         }
 
-        protected IQueryable<Package> GetPackagesByIdQueryable(string id, bool withDeprecations = false)
+        protected IQueryable<Package> GetPackagesByIdQueryable(
+            string id, 
+            PackageDeprecationFieldsToInclude deprecationFields = PackageDeprecationFieldsToInclude.None)
         {
             var packages = _packageRepository
                 .GetAll()
@@ -295,7 +297,12 @@ protected IQueryable<Package> GetPackagesByIdQueryable(string id, bool withDepre
                 .Include(p => p.SymbolPackages)
                 .Where(p => p.PackageRegistration.Id == id);
 
-            if (withDeprecations)
+            if (deprecationFields == PackageDeprecationFieldsToInclude.Deprecation)
+            {
+                packages = packages
+                    .Include(p => p.Deprecations);
+            }
+            else if (deprecationFields == PackageDeprecationFieldsToInclude.DeprecationAndRelationships)
             {
                 packages = packages
                     .Include(p => p.Deprecations.Select(d => d.AlternatePackage.PackageRegistration))

src/NuGetGallery.Core/Services/CorePackageService.cs

@@ -0,0 +1,12 @@
+// 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.
+
+namespace NuGetGallery
+{
+    public enum PackageDeprecationFieldsToInclude
+    {
+        None,
+        Deprecation,
+        DeprecationAndRelationships
+    }
+}

src/NuGetGallery.Core/Services/PackageDeprecationFieldsToInclude.cs

@@ -145,7 +145,7 @@ public virtual async Task<JsonResult> Deprecate(
                 return DeprecateErrorResponse(HttpStatusCode.BadRequest, Strings.DeprecatePackage_InvalidCvss);
             }
 
-            var packages = _packageService.FindPackagesById(id, withDeprecations: true);
+            var packages = _packageService.FindPackagesById(id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships);
             var registration = packages.FirstOrDefault()?.PackageRegistration;
             if (registration == null)
             {

src/NuGetGallery/Controllers/ManageDeprecationJsonApiController.cs

@@ -710,7 +710,7 @@ public virtual async Task<ActionResult> DisplayPackage(string id, string version
 
             Package package = null;
             // Load all packages with the ID.
-            var packages = _packageService.FindPackagesById(id);
+            var packages = _packageService.FindPackagesById(id, PackageDeprecationFieldsToInclude.Deprecation);
             if (version != null)
             {
                 if (version.Equals(GalleryConstants.AbsoluteLatestUrlString, StringComparison.InvariantCultureIgnoreCase))
@@ -1456,7 +1456,8 @@ public virtual async Task<ActionResult> Manage(string id, string version = null)
             Package package = null;
 
             // Load all versions of the package.
-            var packages = _packageService.FindPackagesById(id, withDeprecations: true);
+            var packages = _packageService.FindPackagesById(
+                id, PackageDeprecationFieldsToInclude.DeprecationAndRelationships);
             if (version != null)
             {
                 // Try to find the exact version if it was specified.

src/NuGetGallery/Controllers/PackagesController.cs

@@ -19,9 +19,11 @@ public interface IPackageService : ICorePackageService
     {
         /// <summary>
         /// Returns all packages with an <see cref="Package.Id"/> of <paramref name="id"/>.
-        /// Includes deprecation entities if <paramref name="withDeprecations"/> is true.
+        /// Includes deprecation fields based on <paramref name="deprecationFields"/>.
         /// </summary>
-        IReadOnlyCollection<Package> FindPackagesById(string id, bool withDeprecations = false);
+        IReadOnlyCollection<Package> FindPackagesById(
+            string id, 
+            PackageDeprecationFieldsToInclude deprecationFields = PackageDeprecationFieldsToInclude.None);
 
         /// <summary>
         /// Gets the package with the given ID and version when exists;

src/NuGetGallery/Services/IPackageService.cs

@@ -135,9 +135,11 @@ public override PackageRegistration FindPackageRegistrationById(string packageId
                 .SingleOrDefault(pr => pr.Id == packageId);
         }
 
-        public virtual IReadOnlyCollection<Package> FindPackagesById(string id, bool withDeprecations = false)
+        public virtual IReadOnlyCollection<Package> FindPackagesById(
+            string id, 
+            PackageDeprecationFieldsToInclude deprecationFields = PackageDeprecationFieldsToInclude.None)
         {
-            return GetPackagesByIdQueryable(id, withDeprecations).ToList();
+            return GetPackagesByIdQueryable(id, deprecationFields).ToList();
         }
 
         public virtual Package FindPackageByIdAndVersion(

src/NuGetGallery/Services/PackageService.cs

@@ -49,8 +49,6 @@ public DisplayPackageViewModel(Package package, User currentUser, PackageDepreca
 
             if (deprecation != null)
             {
-                DeprecationStatus = deprecation.Status;
-
                 CveIds = deprecation.Cves?.Select(c => c.CveId).ToList();
                 CweIds = deprecation.Cwes?.Select(c => c.CweId).ToList();
 
@@ -123,6 +121,9 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed
                     LicenseNames = licenseNames.Split(',').Select(l => l.Trim());
                 }
             }
+
+            DeprecationStatus = package.Deprecations.SingleOrDefault()?.Status 
+                ?? PackageDeprecationStatus.NotDeprecated;
         }
 
         public bool ValidatingTooLong { get; set; }