Consolidate Edit, Delete, and Manage Owners into a single page (#6805)

Author: Scott Bommarito

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

@@ -7,26 +7,44 @@
     font-size: 15px;
 
     .package-header {
-      .package-title {
-        font-size: 24px;
-        font-weight: 300;
-        line-height: 0.9;
-      }
+      display: flex;
+      justify-content: space-between;
+
+      .package-title-container {
+        white-space: nowrap;
 
-      .reserved-indicator {
-        margin-top: 3px;
-        margin-left: 3px;
-        vertical-align: top;
-        width: 20px;
+        .package-title {
+          font-size: 24px;
+          font-weight: 300;
+          line-height: 0.9;
+        }
+
+        .edit-button {
+          vertical-align: text-bottom;
+          margin-left: 10px;
+        }
+
+        .reserved-indicator {
+          margin-top: 3px;
+          margin-left: 3px;
+          vertical-align: top;
+          width: 20px;
+        }
       }
 
-      .package-by {
-        margin-left: @padding-small-horizontal;
-        color: @text-color;
+      .package-by-container {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
 
-        @media (max-width: @screen-xs-min) {
-          margin-left: 0;
-          display: block;
+        .package-by {
+          margin-left: @padding-small-horizontal;
+          color: @text-color;
+  
+          @media (max-width: @screen-xs-min) {
+            margin-left: 0;
+            display: block;
+          }
         }
       }
     }

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

@@ -1,6 +1,8 @@
 .page-delete-package {
-  h1 {
-    margin-bottom: 0;
+  b {
+    margin-top: 40px;
+    margin-bottom: 15px;
+    display: inline-block;
   }
 
   #show-delete-package {

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

@@ -1,4 +1,8 @@
 .page-edit-package {
+    .readme-tabs {
+        margin-top: 40px;
+    }
+
     .readonly {
         display: none;
     }

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

@@ -1,19 +1,12 @@
 .page-manage-owners {
-  h2 {
-    .ms-Icon {
-      font-size: 0.6em;
-      position: relative;
-      top: -2px;
-    }
-
-    a {
-      color: @text-color;
-      text-decoration: none;
-    }
+  b {
+    margin-top: 40px;
+    margin-bottom: 15px;
+    display: inline-block;
+  }
 
-    a:hover {
-      text-decoration: none;
-    }
+  b:first-of-type {
+    margin-top: 0;
   }
 
   .current-owner {

src/Bootstrap/less/theme/page-manage-owners.less

@@ -98,19 +98,6 @@
     }
 }
 
-@helper AlertPackageEditRecommendation()
-{
-    @AlertWarning(
-    @<text>
-        Editing package metadata is not supported.<br/>
-        <em>
-            To make edits to the package metadata, we recommend uploading a new version of the package created using the updated nuspec.
-            <a href="https://docs.microsoft.com/en-us/nuget/policies/nuget-faq#managing-packages-on-nugetorg" alt="Read more">Read more</a><br />
-        </em>
-    </text>
-        )
-}
-
 @helper AlertPasswordDeprecation()
 {
     @AlertWarning(

src/NuGetGallery/App_Code/ViewHelpers.cshtml

@@ -177,6 +177,14 @@ private static void BundlingPostStart()
                 .Include("~/Scripts/gallery/page-manage-owners.js");
             BundleTable.Bundles.Add(manageOwnersScriptBundle);
 
+            var deletePackageScriptBundle = new ScriptBundle("~/Scripts/gallery/page-delete-package.min.js")
+                .Include("~/Scripts/gallery/page-delete-package.js");
+            BundleTable.Bundles.Add(deletePackageScriptBundle);
+
+            var editReadMeScriptBundle = new ScriptBundle("~/Scripts/gallery/page-edit-readme.min.js")
+                .Include("~/Scripts/gallery/page-edit-readme.js");
+            BundleTable.Bundles.Add(editReadMeScriptBundle);
+
             var aboutScriptBundle = new ScriptBundle("~/Scripts/gallery/page-about.min.js")
                 .Include("~/Scripts/gallery/page-about.js");
             BundleTable.Bundles.Add(aboutScriptBundle);

src/NuGetGallery/App_Start/AppActivator.cs

@@ -602,16 +602,6 @@ public static void RegisterUIRoutes(RouteCollection routes)
                     new { controller = "Packages", action = "ReportAbuse" }),
                 permanent: true).To(packageVersionActionRoute);
 
-            routes.Redirect(
-                r => r.MapRoute(
-                    "PackageActions",
-                    "Package/{action}/{id}/{version}",
-                    new { controller = "Packages", action = "ContactOwners" },
-                    // This next bit looks bad, but it's not. It will never change because
-                    // it's mapping the legacy routes to the new better routes.
-                    new { action = "ContactOwners|ManagePackageOwners" }),
-                permanent: true).To(packageActionRoute);
-
             routes.Redirect(
                 r => r.MapRoute(
                     RouteName.ListPackages,

src/NuGetGallery/App_Start/Routes.cs

@@ -8,7 +8,7 @@
 
 namespace NuGetGallery.Areas.Admin.ViewModels
 {
-    public class ValidatedPackageViewModel
+    public class ValidatedPackageViewModel : IPackageVersionModel
     {
         public ValidatedPackageViewModel(IReadOnlyList<PackageValidationSet> validationSets, PackageDeletedStatus deletedStatus, ValidatingType validatingType)
         {
@@ -23,6 +23,7 @@ public ValidatedPackageViewModel(IReadOnlyList<PackageValidationSet> validationS
 
         public int PackageKey { get; }
         public string Id { get; }
+        public string Version => NormalizedVersion;
         public string NormalizedVersion { get; }
         public PackageDeletedStatus DeletedStatus { get; }
         public IReadOnlyList<PackageValidationSet> ValidationSets { get; }

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

@@ -126,5 +126,5 @@
             ko.applyBindings(new viewModel(), $('#stage').get(0));
         });
     </script>
-    @Scripts.Render("~/Scripts/gallery/page-delete-package.js")
+    @Scripts.Render("~/Scripts/gallery/page-delete-package.min.js")
 }