Merge pull request #9804 from NuGet/dev

 [ReleasePrep][2024.02.14]RI of dev into main

Author: v-ponkumar

src/AccountDeleter/EmptyFeatureFlagService.cs

@@ -315,5 +315,10 @@ public bool IsDisplayTfmBadgesEnabled(User user)
         {
             throw new NotImplementedException();
         }
+
+        public bool IsAdvancedFrameworkFilteringEnabled(User user)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

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

@@ -10,6 +10,15 @@
 .framework-badges {
   .framework;
   margin-bottom: 14px;
+
+  a {
+    display: inline-block;
+
+    &:hover,
+    &:focus {
+      text-decoration: none;
+    }
+  }
 }
 
 .framework-badge {

src/Bootstrap/less/theme/common-supported-frameworks.less

@@ -109,6 +109,7 @@
       border: none;
       outline: none;
       float: right;
+      margin-right: -3px;
     }
 
     .active, .collapsible:hover {
@@ -130,6 +131,85 @@
         list-style: none;
       }
     }
+
+    .computed-frameworks-option {
+      margin-top: 3px;
+      margin-right: -2px;
+
+      label {
+        margin-left: 0px;
+      }
+
+      #computed-frameworks-checkbox {
+        float: right;
+      }
+    }
+
+    .framework-filter-mode-option {
+      align-items: center;
+      display: flex;
+      justify-content: space-between;
+      margin-top: 2px;
+      margin-bottom: 6px;
+      margin-right: -2px;
+
+      p {
+        margin: 0px;
+        float: left;
+        font-size: small;
+      }
+
+      i {
+        vertical-align: middle;
+      }
+
+      .toggle-switch-control {
+        float: right;
+        margin-right: -2px;
+      }
+
+      input {
+        opacity: 0;
+        width: 0px;
+        margin: 0px;
+      }
+
+      input:focus + label {
+        outline: 1px solid #000;
+        outline-offset: -1px;
+      }
+
+      label {
+        cursor: pointer;
+        float: left;
+        width: 35px;
+        padding: 4px 7px;
+        margin: 0px;
+        text-align: center;
+        vertical-align: middle;
+        color: #555;
+        font-size: x-small;
+        background-color: #d9d9d9;
+        border: 1px solid #767676;
+      }
+
+      input:checked + label {
+        color: #fff;
+        font-weight: bolder;
+        background-color: rgb(51, 122, 183);
+        border: 1px solid rgb(51, 122, 183);
+      }
+
+      label[for="all-selector"] {
+        border-top-left-radius: 2px;
+        border-bottom-left-radius: 2px;
+      }
+
+      label[for="any-selector"] {
+        border-top-right-radius: 2px;
+        border-bottom-right-radius: 2px;
+      }
+    }
   }
 
   @media (min-width: @screen-sm) {

src/Bootstrap/less/theme/page-list-packages.less

@@ -314,5 +314,10 @@ public bool IsDisplayTfmBadgesEnabled(User user)
         {
             throw new NotImplementedException();
         }
+
+        public bool IsAdvancedFrameworkFilteringEnabled(User user)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs

@@ -8,6 +8,6 @@ namespace NuGetGallery.Frameworks
 {
     public interface IPackageFrameworkCompatibilityFactory
     {
-        PackageFrameworkCompatibility Create(ICollection<PackageFramework> packageFrameworks, string packageId, bool includeComputedBadges = false);
+        PackageFrameworkCompatibility Create(ICollection<PackageFramework> packageFrameworks, string packageId, string packageVersion, bool includeComputedBadges = false);
     }
 }

src/NuGetGallery.Core/Frameworks/IPackageFrameworkCompatibilityFactory.cs

@@ -16,6 +16,7 @@ namespace NuGetGallery.Frameworks
     public class PackageFrameworkCompatibilityBadges
     {
         public string PackageId { get; set; }
+        public string PackageVersion { get; set; }
         public PackageFrameworkCompatibilityData Net { get; set; }
         public PackageFrameworkCompatibilityData NetCore { get; set; }
         public PackageFrameworkCompatibilityData NetStandard { get; set; }

src/NuGetGallery.Core/Frameworks/PackageFrameworkCompatibilityBadges.cs

@@ -22,7 +22,7 @@ public class PackageFrameworkCompatibilityFactory : IPackageFrameworkCompatibili
         private readonly NuGetFrameworkSorter Sorter = new NuGetFrameworkSorter();
         private readonly int NetStartingMajorVersion = 5;
 
-        public PackageFrameworkCompatibility Create(ICollection<PackageFramework> packageFrameworks, string packageId, bool includeComputedBadges = false)
+        public PackageFrameworkCompatibility Create(ICollection<PackageFramework> packageFrameworks, string packageId, string packageVersion, bool includeComputedBadges = false)
         {
             if (packageFrameworks == null)
             {
@@ -35,7 +35,7 @@ public PackageFrameworkCompatibility Create(ICollection<PackageFramework> packag
                 .ToHashSet();
 
             var table = CreateFrameworkCompatibilityTable(filteredPackageFrameworks);
-            var badges = CreateFrameworkCompatibilityBadges(table, packageId, includeComputedBadges);
+            var badges = CreateFrameworkCompatibilityBadges(table, packageId, packageVersion, includeComputedBadges);
 
             return new PackageFrameworkCompatibility
             {
@@ -147,7 +147,11 @@ private void AddOrderedKey(Dictionary<string, SortedSet<PackageFrameworkCompatib
             }
         }
 
-        private PackageFrameworkCompatibilityBadges CreateFrameworkCompatibilityBadges(IReadOnlyDictionary<string, IReadOnlyCollection<PackageFrameworkCompatibilityData>> table, string packageId, bool includeComputed = false)
+        private PackageFrameworkCompatibilityBadges CreateFrameworkCompatibilityBadges(
+            IReadOnlyDictionary<string, IReadOnlyCollection<PackageFrameworkCompatibilityData>> table,
+            string packageId,
+            string packageVersion,
+            bool includeComputed = false)
         {
             var net = GetBadgeFramework(table, FrameworkProductNames.Net, includeComputed);
             var netCore = GetBadgeFramework(table, FrameworkProductNames.NetCore, includeComputed);
@@ -157,6 +161,7 @@ private PackageFrameworkCompatibilityBadges CreateFrameworkCompatibilityBadges(I
             return new PackageFrameworkCompatibilityBadges
             {
                 PackageId = packageId,
+                PackageVersion = packageVersion,
                 Net = net,
                 NetCore = netCore,
                 NetStandard = netStandard,

src/NuGetGallery.Core/Frameworks/PackageFrameworkCompatibilityFactory.cs

@@ -61,6 +61,7 @@ public class FeatureFlagService : IFeatureFlagService
         private const string NuGetAccountPasswordLoginFeatureName = GalleryPrefix + "NuGetAccountPasswordLogin";
         private const string FrameworkFilteringFeatureName = GalleryPrefix + "FrameworkFiltering";
         private const string DisplayTfmBadgesFeatureName = GalleryPrefix + "DisplayTfmBadges";
+        private const string AdvancedFrameworkFilteringFeatureName = GalleryPrefix + "AdvancedFrameworkFiltering";
 
         private const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllNonHijacked";
         private const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllCountNonHijacked";
@@ -409,5 +410,10 @@ public bool IsDisplayTfmBadgesEnabled(User user)
         {
             return _client.IsEnabled(DisplayTfmBadgesFeatureName, user, defaultValue: false);
         }
+
+        public bool IsAdvancedFrameworkFilteringEnabled(User user)
+        {
+            return _client.IsEnabled(AdvancedFrameworkFilteringFeatureName, user, defaultValue: false);
+        }
     }
 }

src/NuGetGallery.Services/Configuration/FeatureFlagService.cs

@@ -332,5 +332,10 @@ public interface IFeatureFlagService
         /// Whether or not to display TFM badges in search results
         /// </summary>
         bool IsDisplayTfmBadgesEnabled(User user);
+
+        /// <summary>
+        /// Whether or not to allow filtering by frameworks on NuGet.org search
+        /// </summary>
+        bool IsAdvancedFrameworkFilteringEnabled(User user);
     }
 }