Merge pull request #9362 from NuGet/dev

[ReleasePrep][2023.01.26]RI of dev into main

Author: agr

src/AccountDeleter/EmptyFeatureFlagService.cs

@@ -295,5 +295,9 @@ public bool IsDisplayUploadWarningV2Enabled(User user)
         {
             throw new NotImplementedException();
         }
+
+        public bool IsFrameworkFilteringEnabled(User user) {
+            throw new NotImplementedException();
+        }
     }
 }

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

@@ -1,6 +1,6 @@
 /*!
  * Bootstrap v3.4.1 (https://getbootstrap.com/)
- * Copyright 2011-2022 Twitter, Inc.
+ * Copyright 2011-2023 Twitter, Inc.
  * Licensed under the MIT license
  */
 

src/Bootstrap/dist/js/bootstrap.js

@@ -11,17 +11,23 @@
     margin: 0 !important;
   }
 
-  .btn-command {
+  .btn-filter {
     margin-top: 33px;
     margin-bottom: 33px;
     width: 90px;
     height: 45px;
+    font-weight: 500;
+    font-size: medium;
     background-color: transparent;
     border: none;
   }
 
+  .btn-filter:hover {
+    background-color: #f4f4f4;
+  }
+
   @media (max-width: @screen-md) {
-    .btn-command {
+    .btn-filter {
       text-align: left;
       margin-top: 0px;
       margin-bottom: 5px;
@@ -30,6 +36,7 @@
 
   .prerel-filter {
     white-space: nowrap;
+    float: right;
   }
 
   @media (min-width: @screen-md) {
@@ -39,16 +46,30 @@
     }
   }
 
-  .btn-command:hover {
-    background-color: #f4f4f4;
+  .sortby {
+    margin-top: 47px;
+
+    label {
+      font-weight: 500;
+      font-size: large;
+    }
+
+    select {
+      float: right;
+    }
+  }
+
+  .framework-filter-info-icon {
+    margin-bottom: -6px;
+    overflow: hidden;
   }
 
   .advanced-search-panel {
     background-color: @alert-info-bg;
     border-color: @alert-info-border;
     margin-right: 0px;
     margin-left: 0;
-    margin-bottom: 15px;
+    margin-top: 30px;
 
     fieldset {
       margin: 20px;
@@ -79,13 +100,47 @@
       margin-bottom: 10px;
     }
 
+    .reset-btn {
+      padding-left: 0px;
+    }
+
     .warning-panel {
       margin-left: 10px;
       margin-right: 10px;
     }
 
     #reset-advanced-search {
       color: darken(@link-color, 10%);
+      margin-left: 0px;
+      margin-right: 20px;
+    }
+
+    .collapsible {
+      color: rgb(73, 73, 73);
+      background-color: @alert-info-bg;
+      padding-top: 0px;
+      padding-bottom: 0px;
+      border: none;
+      outline: none;
+      float: right;
+    }
+
+    .active, .collapsible:hover {
+      color: rgb(90, 135, 220);
+    }
+
+    .collapsible:focus {
+      outline: solid;
+    }
+
+    .tfmTab {
+      max-height: 0;
+      overflow: hidden;
+      transition: max-height 0.1s ease-out;
+
+      ul {
+        list-style: none;
+      }
     }
   }
 

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

@@ -294,5 +294,9 @@ public bool IsNuGetAccountPasswordLoginEnabled()
         {
             throw new NotImplementedException();
         }
+
+        public bool IsFrameworkFilteringEnabled(User user) {
+            throw new NotImplementedException();
+        }
     }
 }

src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs

@@ -400,5 +400,13 @@ public IDisposable TrackAsyncSqlConnectionCreationDuration()
         {
             throw new NotImplementedException();
         }
+
+        public void TrackDownloadJsonTotalPackageIds(int totalPackageIds) {
+            throw new NotImplementedException();
+        }
+
+        public void TrackDownloadJsonTotalPackageVersions(int totalPackageVersions) {
+            throw new NotImplementedException();
+        }
     }
 }

src/GitHubVulnerabilities2Db/Gallery/ThrowingTelemetryService.cs

@@ -0,0 +1,77 @@
+using NuGet.Frameworks;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NuGetGallery.Frameworks
+{
+    public static class FrameworkFilterHelper
+    {
+
+        /// <summary>
+        /// Each Framework Filter Group represents one of the four Framework generations
+        /// represented in the Search Filters.
+        /// </summary>
+        public class FrameworkFilterGroup
+        {
+            public FrameworkFilterGroup(
+                string shortName,
+                string displayName,
+                List<string> tfms) {
+                ShortName = shortName;
+                DisplayName = displayName;
+                Tfms = tfms;
+            }
+
+            public string ShortName { get; set; }
+            public string DisplayName { get; set; }
+            public List<string> Tfms { get; set; }
+        }
+
+        public static readonly Dictionary<string, FrameworkFilterGroup> FrameworkFilters = new Dictionary<string, FrameworkFilterGroup>()
+        {
+            { 
+                AssetFrameworkHelper.FrameworkGenerationIdentifiers.Net,
+                new FrameworkFilterGroup(
+                    AssetFrameworkHelper.FrameworkGenerationIdentifiers.Net,
+                    AssetFrameworkHelper.FrameworkGenerationDisplayNames.Net,
+                    SupportedFrameworks.TfmFilters.NetTfms
+                        .Select(f => f.GetShortFolderName())
+                        .ToList()
+                )
+            },
+            {   
+                AssetFrameworkHelper.FrameworkGenerationIdentifiers.NetCoreApp,
+                new FrameworkFilterGroup(
+                    AssetFrameworkHelper.FrameworkGenerationIdentifiers.NetCoreApp,
+                    AssetFrameworkHelper.FrameworkGenerationDisplayNames.NetCoreApp,
+                    SupportedFrameworks.TfmFilters.NetCoreAppTfms
+                        .Select(f => f.GetShortFolderName())
+                        .ToList()
+                )
+            },
+            { 
+                AssetFrameworkHelper.FrameworkGenerationIdentifiers.NetStandard,
+                new FrameworkFilterGroup(
+                    AssetFrameworkHelper.FrameworkGenerationIdentifiers.NetStandard,
+                    AssetFrameworkHelper.FrameworkGenerationDisplayNames.NetStandard,
+                    SupportedFrameworks.TfmFilters.NetStandardTfms
+                        .Select(f => f.GetShortFolderName())
+                        .ToList()
+                )
+            },
+            { 
+                AssetFrameworkHelper.FrameworkGenerationIdentifiers.NetFramework,
+                new FrameworkFilterGroup(
+                    AssetFrameworkHelper.FrameworkGenerationIdentifiers.NetFramework,
+                    AssetFrameworkHelper.FrameworkGenerationDisplayNames.NetFramework,
+                    SupportedFrameworks.TfmFilters.NetFrameworkTfms
+                        .Select(f => f.GetShortFolderName())
+                        .ToList()
+                )
+            }
+        };
+    }
+}