Merge pull request #9064 from NuGet/dev

Merge branch 'dev' into main

Author: joelverhagen

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

@@ -426,6 +426,11 @@ img.reserved-indicator-icon {
 	cursor: pointer;
 }
 
+.form-group label.required::after {
+  color: red;
+  content: " *";
+}
+
 // Workaround. See https://github.com/NuGet/NuGetGallery/issues/8264
 @media (max-width: 767.9px) {
     .hidden-xs {

src/Bootstrap/less/theme/base.less

@@ -370,23 +370,18 @@
 
     .tab-content {
       .tab-pane {
-        > div {
-          display: table;
-          height: 1px;
-        }
-
+        
         .install-script-row {
-          display: table-row;
+          display: flex;
           height: 100%;
+          width: 100%;
 
           .install-script {
-            display: table-cell;
             background-color: @panel-footer-bg;
             font-family: @font-family-monospace;
             font-size: 1em;
             color: #fff;
-            width: 100%;
-            max-width: 1px;
+            width: calc(100% - 40px);
             line-height: 1.5;
             white-space: pre-wrap;
             // Add a border with the same color as the background to support visual callout
@@ -396,16 +391,13 @@
             border-width: 1px 0 1px 1px;
             vertical-align: middle;
             word-break: break-word;
+            margin: 0px;
           }
 
-          .copy-button {
-            height: 100%;
-
-            button {
+          .copy-button button {
               height: 100%;
               min-height: 42px;
               line-height: 1.5;
-            }
           }
         }
 

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

@@ -41,7 +41,7 @@
 
   .circuit-board {
     margin-top: 20px;
-    width: 768px;
+    width: 900px;
     height: 396px;
     position: relative;
     margin: 0 auto;
@@ -52,6 +52,8 @@
     .circuit-board-label {
       position: absolute;
       height: 75px;
+      padding-left: 25px;
+      padding-right: 25px;
       background-color: #fff;
       color: @text-color;
       box-shadow: 0 0 3px black;
@@ -62,35 +64,32 @@
     }
 
     .circuit-board-pd {
-      left: 377px;
+      left: 443px;
       top: 10px;
       float: left;
-      width: 230px;
 
       &.triangle:after {
         left: 20px;
       }
     }
 
     .circuit-board-pv {
-      left: 0;
+      right: 675px;
       top: 63px;
       float: left;
-      width: 144px;
 
       &.triangle:after {
-        right: 30px;
+        right: 45px;
       }
     }
 
     .circuit-board-up {
-      right: 0;
-      top: 87px;
+      left: 675px;
+      top: 105px;
       float: right;
-      width: 144px;
 
       &.triangle:after {
-        left: 30px;
+        left: 45px;
       }
     }
   }

src/Bootstrap/less/theme/page-home.less

@@ -72,4 +72,8 @@
             margin-bottom: none;
         }
     }
+
+    .statistics-report-title {
+        overflow-wrap: break-word;
+    }
 }

src/Bootstrap/less/theme/page-statistics-per-package.less

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Data.Entity;
 using System.Linq;
 using System.Web.Mvc;
 using System.Threading.Tasks;
@@ -13,19 +14,23 @@ namespace NuGetGallery.Areas.Admin.Controllers
 {
     public class ReservedNamespaceController : AdminControllerBase
     {
-        private IReservedNamespaceService _reservedNamespaceService;
+        private readonly IReservedNamespaceService _reservedNamespaceService;
+        private readonly IEntityRepository<PackageRegistration> _packageRegistrations;
 
         protected ReservedNamespaceController() { }
 
-        public ReservedNamespaceController(IReservedNamespaceService reservedNamespaceService)
+        public ReservedNamespaceController(
+            IReservedNamespaceService reservedNamespaceService,
+            IEntityRepository<PackageRegistration> packageRegistrations)
         {
             _reservedNamespaceService = reservedNamespaceService ?? throw new ArgumentNullException(nameof(reservedNamespaceService));
+            _packageRegistrations = packageRegistrations ?? throw new ArgumentNullException(nameof(packageRegistrations));
         }
 
         [HttpGet]
         public ActionResult Index()
         {
-            return View();
+            return View(new ReservedNamespaceViewModel());
         }
 
         [HttpGet]
@@ -49,6 +54,37 @@ public JsonResult SearchPrefix(string query)
             return Json(results, JsonRequestBehavior.AllowGet);
         }
 
+        [HttpGet]
+        public ActionResult FindNamespacesByPrefix(string prefix)
+        {
+            var namespaces = _reservedNamespaceService
+                .FindAllReservedNamespacesForPrefix(prefix, getExactMatches: false)
+                .OrderBy(x => x.Value)
+                .ThenBy(x => x.IsPrefix)
+                .ToList();
+            var model = new ReservedNamespaceViewModel { ReservedNamespacesQuery = prefix, ReservedNamespaces = namespaces };
+            return View(nameof(Index), model);
+        }
+
+        [HttpGet]
+        public ActionResult FindPackagesByPrefix(string prefix)
+        {
+            if (string.IsNullOrWhiteSpace(prefix))
+            {
+                return RedirectToAction(nameof(Index));
+            }
+
+            var packageRegistrations = _packageRegistrations
+                .GetAll()
+                .Include(x => x.Owners)
+                .Include(x => x.ReservedNamespaces)
+                .Where(x => x.Id.StartsWith(prefix))
+                .OrderBy(x => x.Id)
+                .ToList();
+            var model = new ReservedNamespaceViewModel { PackageRegistrationsQuery = prefix, PackageRegistrations = packageRegistrations };
+            return View(nameof(Index), model);
+        }
+
         [HttpPost]
         [ValidateAntiForgeryToken]
         public async Task<JsonResult> AddNamespace(ReservedNamespace newNamespace)

src/NuGetGallery/Areas/Admin/Controllers/ReservedNamespaceController.cs

@@ -1,13 +1,16 @@
 // 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.Areas.Admin.ViewModels
 {
     public sealed class ReservedNamespaceViewModel
     {
-        /// <summary>
-        /// Prefix search query.
-        /// </summary>
-        public string PrefixSearchQuery { get; set; }
+        public string ReservedNamespacesQuery { get; set; }
+        public IReadOnlyList<ReservedNamespace> ReservedNamespaces { get; set; }
+        public string PackageRegistrationsQuery { get; set; }
+        public IReadOnlyList<PackageRegistration> PackageRegistrations { get; set; }
     }
 }

src/NuGetGallery/Areas/Admin/ViewModels/ReservedNamespaceViewModel.cs

@@ -21,7 +21,7 @@
     @using (Html.BeginForm("Revoke", "ApiKeys", new { area = "Admin" }, FormMethod.Post))
     {
         @Html.AntiForgeryToken()
-        <table class="table break-word" style="display: none" data-bind="visible: verifiedResults().length > 0">
+        <table class="table break-word" style="display: none" data-bind="visible: verifiedResults().length > 0" aria-label="API Keys">
             <thead>
                 <tr>
                     <th class="col-sm-1">

src/NuGetGallery/Areas/Admin/Views/ApiKeys/Index.cshtml

@@ -18,7 +18,7 @@
 
     @using (Html.BeginForm("Delete", "Packages", new { area = "" }, FormMethod.Post, new { id = "delete-form" }))
     {
-        <table class="table" id="searchResults" style="display: none" data-bind="visible: searchResults().length > 0">
+        <table class="table" id="searchResults" style="display: none" data-bind="visible: searchResults().length > 0" aria-label="Search results">
             <thead>
                 <tr>
                     <th><input type="checkbox" data-bind="click: toggleSelectAll, checked: selectAllState" /></th>

src/NuGetGallery/Areas/Admin/Views/Delete/Index.cshtml

@@ -36,7 +36,7 @@
             @<text>Features</text>,
             @<text><p>View and edit features.</p></text>,
             @<text>
-                <table class="table">
+                <table class="table" aria-label="Features">
                     <tr>
                         <th>Name</th>
                         <th>Current Status</th>
@@ -61,7 +61,7 @@
             @<text>Flights</text>,
             @<text><p>View and edit flights.</p></text>,
             @<text>
-                <table class="table">
+                <table class="table" aria-label="Flights">
                     <tr>
                         <th>Name</th>
                         <th>All</th>