Merge pull request #9109 from NuGet/dev

[ReleasePrep][2022.04.27]RI of dev into main

Author: ryuyu

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

@@ -90,4 +90,16 @@
 p.frameworktableinfo-text {
   .frameworktableinfo-text;
   margin-top: 10px;
+}
+
+@media (-ms-high-contrast: active), (forced-colors: active) {
+  .framework-badge-asset {
+    font-weight: bold;
+    border: 2px solid @badge-dark;
+    padding: 0px 8px;
+  }
+
+  .frameworktableinfo-asset-icon {
+    border: 2px solid @badge-dark;
+  }
 }

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

@@ -1365,6 +1365,9 @@ public virtual ActionResult ReportAbuse(string id, string version)
                 PackageId = id,
                 PackageVersion = package.Version,
                 CopySender = true,
+                IsPackageListed = package.Listed,
+                IsOwnerLocked = package.User?.IsLocked ?? false,
+                IsPackageLocked = package.PackageRegistration.IsLocked,
             };
 
             if (Request.IsAuthenticated)
@@ -1418,6 +1421,9 @@ public virtual async Task<ActionResult> ReportMyPackage(string id, string versio
                 PackageVersion = package.Version,
                 CopySender = true,
                 AllowDelete = allowDelete,
+                IsPackageListed = package.Listed,
+                IsPackageLocked = package.PackageRegistration.IsLocked,
+                IsOwnerLocked = package.User?.IsLocked ?? false
             };
 
             return View(model);

src/NuGetGallery/Controllers/PackagesController.cs

@@ -68,7 +68,12 @@ private static bool CanPerformAction(User currentUser, Package package, ActionRe
 
         private static BasicUserViewModel GetBasicUserViewModel(User user)
         {
-            return new BasicUserViewModel { Username = user.Username, EmailAddress = user.EmailAddress, IsOrganization = user is Organization };
+            return new BasicUserViewModel { 
+                Username = user.Username, 
+                EmailAddress = user.EmailAddress, 
+                IsOrganization = user is Organization,
+                IsLocked = user.IsLocked
+            };
         }
     }
 }

src/NuGetGallery/Helpers/ViewModelExtensions/ListPackageItemViewModelFactory.cs

@@ -47,6 +47,7 @@ public PackageViewModel Setup(PackageViewModel viewModel, Package package)
             viewModel.DevelopmentDependency = package.DevelopmentDependency;
             viewModel.LastUpdated = package.Published;
             viewModel.Listed = package.Listed;
+            viewModel.Locked = package.PackageRegistration.IsLocked;
             viewModel.DownloadCount = package.DownloadCount;
             viewModel.Prerelease = package.IsPrerelease;
             viewModel.FailedValidation = package.PackageStatusKey == PackageStatus.FailedValidation;

src/NuGetGallery/Helpers/ViewModelExtensions/PackageViewModelFactory.cs

@@ -305,7 +305,7 @@
             if (e) {
                 e.stopPropagation();
                 e.preventDefault();
-            }            
+            }
             return false;
         }
 
@@ -377,12 +377,10 @@
     nuget.addAjaxAntiForgeryToken = function (data) {
         var $tokenKey = "__RequestVerificationToken";
         var $field = $("#AntiForgeryForm input[name=__RequestVerificationToken]");
-        if (data instanceof FormData)
-        {
+        if (data instanceof FormData) {
             data.append($tokenKey, $field.val());
         }
-        else
-        {
+        else {
             data["__RequestVerificationToken"] = $field.val();
         }
         return data;
@@ -464,14 +462,14 @@
 
     nuget.setPopovers = function () {
         var popoverElement = $(this);
-        popoverElement.popover({ trigger: 'hover focus' });
-        popoverElement.click(function () {
-            popoverElement.popover('show');
-            setTimeout(function () {
-                    popoverElement.popover('hide');
-                },
-                2000);
-        });
+        var popoverElementDom = popoverElement.get(0);
+        var originalLabel = popoverElementDom.ariaLabel;
+        var popoverHideTimeMS = 2000;
+        var popoverFadeTimeMS = 200;
+
+        popoverElement.popover({ trigger: 'hover' });
+        popoverElement.click(popoverShowAndHide);
+        popoverElement.focus(popoverShowAndHide);
         popoverElement.keyup(function (event) {
             // normalize keycode for browser compatibility
             var code = event.which || event.keyCode || event.charCode;
@@ -481,6 +479,25 @@
                 popoverElement.popover('hide');
             }
         });
+
+        function popoverShowAndHide() {
+            popoverElement.popover('show');
+
+            // Windows Narrator does not announce popovers' content. See: https://github.com/twbs/bootstrap/issues/18618
+            // We can force Narrator to announce the popover's content by "flashing" the element's ARIA label.
+            popoverElementDom.ariaLabel = "";
+
+            setTimeout(function () {
+                popoverElement.popover('hide');
+
+                // We need to restore the element's original ARIA label.
+                // Wait 0.15 seconds for the popover to fade away first.
+                // Otherwise, the screen reader will re-announce the popover's content.
+                setTimeout(function () {
+                    popoverElementDom.ariaLabel = originalLabel;
+                }, popoverFadeTimeMS);
+            }, popoverHideTimeMS);
+        }
     };
 
     window.nuget = nuget;

src/NuGetGallery/Scripts/gallery/common.js

@@ -8,5 +8,6 @@ public class BasicUserViewModel
         public string EmailAddress { get; set; }
         public string Username { get; set; }
         public bool IsOrganization { get; set; }
+        public bool IsLocked { get; set; }
     }
 }

src/NuGetGallery/ViewModels/BasicUserViewModel.cs

@@ -47,7 +47,7 @@ public class DisplayPackageViewModel : ListPackageItemViewModel
         public bool HasEmbeddedReadmeFile { get; set; }
         public PackageDependents PackageDependents { get; set; }
 
-        public const int NumberOfDaysToBlockIndexing = 21;
+        public const int NumberOfDaysToBlockIndexing = 90;
 
         public bool HasNewerPrerelease
         {
@@ -156,6 +156,14 @@ public bool BlockSearchEngineIndexing
             }
         }
 
+        public bool ShowDetailsAndLinks
+        {
+            get
+            {
+                return Listed || !Locked || !Owners.Any(x => x.IsLocked); 
+            }
+        }
+
         public enum RepositoryKind
         {
             Unknown,

src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs

@@ -19,6 +19,7 @@ public class PackageViewModel : IPackageVersionModel
         public bool VersionRequestedWasNotFound { get; set; }
         public int DownloadCount { get; set; }
         public bool Listed { get; set; }
+        public bool Locked { get; set; }
         public bool FailedValidation { get; set; }
         public bool Available { get; set; }
         public bool Validating { get; set; }

src/NuGetGallery/ViewModels/PackageViewModel.cs

@@ -27,5 +27,13 @@ public class ReportAbuseViewModel : ReportViewModel
         [StringLength(4000)]
         [Display(Name = "Details")]
         public string Message { get; set; }
+
+        public bool ShowReportAbuseForm
+        {
+            get
+            {
+                return IsPackageListed || !IsPackageLocked || !IsOwnerLocked;
+            }
+        }
     }
 }