Merge pull request #8125 from NuGet/dev

[ReleasePrep][2020.07.23] RI dev to master

Author: agr

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

@@ -3,28 +3,91 @@
     margin-bottom: 33px;
   }
 
-  .row-heading {
-    .cell-heading {
-      h1 {
-        .break-word;
-      }
+  .no-padding {
+    padding: 0 !important;
+  }
+
+  .no-margin {
+    margin: 0 !important;
+  }
+
+  .btn-command {
+    margin-top: 33px;
+    margin-bottom: 33px;
+    width: 90px;
+    height: 45px;
+    background-color: transparent;
+    border: none;
+  }
+
+  @media (max-width: @screen-md) {
+    .btn-command {
+      text-align: left;
+      margin-top: 0px;
+      margin-bottom: 5px;
     }
+  }
 
-    @media (min-width: @screen-md-min) {
-      display: table;
-      width: 100%;
+  .prerel-filter {
+    white-space: nowrap;
+  }
 
-      .cell-heading {
-        text-align: left;
-        display: table-cell;
-      }
+  @media (min-width: @screen-md) {
+    .prerel-filter {
+      display: inline-block;
+      margin-top: 54px;
+    }
+  }
+
+  .btn-command:hover {
+    background-color: #f4f4f4;
+  }
+
+  .advanced-search-panel {
+    background-color: @alert-info-bg;
+    border-color: @alert-info-border;
+    margin-right: 0px;
+    margin-left: 0;
+    margin-bottom: 15px;
 
-      .cell-controls {
-        margin-top: 42px;
-        display: table-cell;
-        text-align: right;
+    fieldset {
+      margin: 20px;
+
+      label {
+        margin-left: 3px;
+        font-weight: 400;
+        font-size: small;
         white-space: nowrap;
       }
+
+      input {
+        margin-right: 3px;
+        position: relative;
+        top: 2px;
+      }
+    }
+
+    legend {
+      margin-bottom: 5px;
+      font-weight: 500;
+      font-size: medium;
+      white-space: nowrap;
+    }
+
+    .btn {
+      margin-left: 20px;
+      margin-bottom: 10px;
+    }
+
+    .warning-panel {
+      margin-left: 10px;
+      margin-right: 10px;
+    }
+  }
+
+  @media (min-width: @screen-sm) {
+    .text-align-right {
+      text-align: right;
     }
   }
-}
+}

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

@@ -21,7 +21,7 @@ public string CreateSecurityAdvisoriesQuery(DateTimeOffset? updatedSince = null,
       cursor
       node {
         databaseId
-        ghsaId
+        permalink
         severity
         updatedAt
         " + CreateVulnerabilitiesConnectionQuery() + @"
@@ -33,7 +33,7 @@ public string CreateSecurityAdvisoriesQuery(DateTimeOffset? updatedSince = null,
         public string CreateSecurityAdvisoryQuery(SecurityAdvisory advisory)
             => @"
 {
-  securityAdvisory(ghsaId: " + advisory.GhsaId + @") {
+  securityAdvisory(databaseId: " + advisory.DatabaseId + @") {
     severity
     updatedAt
     identifiers {

src/GitHubVulnerabilities2Db/Collector/AdvisoryQueryBuilder.cs

@@ -61,7 +61,6 @@
     <Compile Include="GraphQL\SecurityAdvisory.cs" />
     <Compile Include="GraphQL\QueryResponse.cs" />
     <Compile Include="GraphQL\QueryService.cs" />
-    <Compile Include="GraphQL\SecurityAdvisoryExtensions.cs" />
     <Compile Include="GraphQL\SecurityVulnerability.cs" />
     <Compile Include="Ingest\AdvisoryIngestor.cs" />
     <Compile Include="Ingest\GitHubVersionRangeParser.cs" />

src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj

@@ -11,12 +11,7 @@ namespace GitHubVulnerabilities2Db.GraphQL
     public class SecurityAdvisory : INode
     {
         public int DatabaseId { get; set; }
-
-        /// <summary>
-        /// The GitHub SecurityAdvisory ID in the format 'GHSA-xxxx-xxxx-xxxx'.
-        /// </summary>
-        public string GhsaId { get; set; }
-
+        public string Permalink { get; set; }
         public string Severity { get; set; }
         public DateTimeOffset UpdatedAt { get; set; }
         public DateTimeOffset? WithdrawnAt { get; set; }

src/GitHubVulnerabilities2Db/GraphQL/SecurityAdvisory.cs

@@ -41,7 +41,7 @@ private Tuple<PackageVulnerability, bool> FromAdvisory(SecurityAdvisory advisory
             {
                 GitHubDatabaseKey = advisory.DatabaseId,
                 Severity = (PackageVulnerabilitySeverity)Enum.Parse(typeof(PackageVulnerabilitySeverity), advisory.Severity, ignoreCase: true),
-                AdvisoryUrl = advisory.GetPermalink()
+                AdvisoryUrl = advisory.Permalink
             };
 
             foreach (var securityVulnerability in advisory.Vulnerabilities?.Edges?.Select(e => e.Node) ?? Enumerable.Empty<SecurityVulnerability>())

src/GitHubVulnerabilities2Db/GraphQL/SecurityAdvisoryExtensions.cs

@@ -0,0 +1,21 @@
+// 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 NuGet.Services.Entities
+{
+    /// <summary>
+    /// Specifies the type of the readme file used in the package
+    /// </summary>
+    public enum EmbeddedReadmeFileType
+    {
+        /// <summary>
+        /// Indicates that the package has no embedded readme file.
+        /// </summary>
+        Absent = 0,
+
+        /// <summary>
+        /// Indicates that the embedded readme file is markdown.
+        /// </summary>
+        Markdown = 1,
+    }
+}

src/GitHubVulnerabilities2Db/Ingest/AdvisoryIngestor.cs

@@ -48,6 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AccountDelete.cs" />
+    <Compile Include="EmbeddedReadmeFileType.cs" />
     <Compile Include="CredentialRevocationSource.cs" />
     <Compile Include="Certificate.cs" />
     <Compile Include="Constants.cs" />

src/NuGet.Services.Entities/EmbeddedReadmeFileType.cs

@@ -285,5 +285,7 @@ public bool HasReadMe
         /// A flag that indicates that the package metadata had an embedded icon specified.
         /// </summary>
         public bool HasEmbeddedIcon { get; set; }
+
+        public EmbeddedReadmeFileType EmbeddedReadmeType { get; set; }
     }
 }