ManagePackageViewModel should not be dependent on DisplayPackageViewModel (#6900)

Author: Scott Bommarito

src/NuGetGallery.Core/NuGetVersionExtensions.cs

@@ -1,7 +1,6 @@
 // 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;
 using System.Text.RegularExpressions;
 using NuGet.Versioning;
 
@@ -20,7 +19,7 @@ public static string Normalize(string version)
             return parsed.ToNormalizedString();
         }
 
-        public static string ToFullStringOrFallback(string version, string fallback = "")
+        public static string ToFullString(string version)
         {
             NuGetVersion nugetVersion;
             if (NuGetVersion.TryParse(version, out nugetVersion))
@@ -29,7 +28,7 @@ public static string ToFullStringOrFallback(string version, string fallback = ""
             }
             else
             {
-                return fallback;
+                return version;
             }
         }
     }

src/NuGetGallery/Scripts/gallery/page-edit-readme.js

@@ -31,15 +31,15 @@
                 }
 
                 var version = _viewModel.Versions[selectedVersion];
-                var cachedReadMe = version.readMe;
+                var cachedReadMe = version.ReadMe;
                 if (cachedReadMe === null) {
-                    var url = version.getReadMe;
+                    var url = version.GetReadMeUrl;
                     $.ajax({
                         url: url,
                         type: 'GET',
                         statusCode: {
                             200: function (data) {
-                                version.readMe = data;
+                                version.ReadMe = data;
                                 _viewModel.Edit = data;
                                 bindData(_viewModel);
                             },
@@ -89,7 +89,7 @@
                     return;
                 }
 
-                var url = _viewModel.Versions[selectedVersion].submit;
+                var url = _viewModel.Versions[selectedVersion].SubmitUrl;
                 $.ajax({
                     url: url,
                     type: 'POST',

src/NuGetGallery/ViewModels/ManagePackageViewModel.cs

@@ -10,7 +10,7 @@
 
 namespace NuGetGallery
 {
-    public class ManagePackageViewModel : DisplayPackageViewModel
+    public class ManagePackageViewModel : ListPackageItemViewModel
     {
         public ManagePackageViewModel(Package package, User currentUser, IReadOnlyList<ReportPackageReason> reasons, UrlHelper url, string readMe)
             : base(package, currentUser)
@@ -32,18 +32,50 @@ public ManagePackageViewModel(Package package, User currentUser, IReadOnlyList<R
 
             IsLocked = package.PackageRegistration.IsLocked;
 
-            var versionSelectPackages = PackageVersions.Where(p => !p.Deleted);
+            var versionSelectPackages = package.PackageRegistration.Packages
+                .Where(p => p.PackageStatusKey == PackageStatus.Available || p.PackageStatusKey == PackageStatus.Validating)
+                .OrderByDescending(p => new NuGetVersion(p.Version))
+                .ToList();
+
+            var versionSelectListItems = new List<SelectListItem>();
+            VersionListedStateDictionary = new Dictionary<string, VersionListedState>();
+            VersionReadMeStateDictionary = new Dictionary<string, VersionReadMeState>();
+            var submitUrlTemplate = url.PackageVersionActionTemplate("Edit");
+            var getReadMeUrlTemplate = url.PackageVersionActionTemplate("GetReadMeMd");
+            string defaultSelectedVersion = null;
+            foreach (var versionSelectPackage in versionSelectPackages)
+            {
+                var text = NuGetVersionFormatter.ToFullString(versionSelectPackage.Version) + (versionSelectPackage.IsLatestSemVer2 ? " (Latest)" : string.Empty);
+                var value = NuGetVersionFormatter.Normalize(versionSelectPackage.Version);
+                versionSelectListItems.Add(new SelectListItem
+                {
+                    Text = text,
+                    Value = value
+                });
+
+                if (versionSelectPackage == package)
+                {
+                    defaultSelectedVersion = value;
+                }
+
+                VersionListedStateDictionary.Add(
+                    value, 
+                    new VersionListedState(versionSelectPackage));
+
+                var model = new TrivialPackageVersionModel(versionSelectPackage);
+                VersionReadMeStateDictionary.Add(
+                    value, 
+                    new VersionReadMeState(
+                        submitUrlTemplate.Resolve(model),
+                        getReadMeUrlTemplate.Resolve(model),
+                        null));
+            }
+
             VersionSelectList = new SelectList(
-                PackageVersions
-                    .Where(p => !p.Deleted && !p.FailedValidation)
-                    .Select(p => new SelectListItem
-                    {
-                        Text = p.FullVersion + (p.LatestVersionSemVer2 ? " (Latest)" : string.Empty),
-                        Value = p.Version
-                    }),
-                "Value",
-                "Text",
-                Version);
+                versionSelectListItems,
+                nameof(SelectListItem.Value),
+                nameof(SelectListItem.Text),
+                defaultSelectedVersion);
 
             // Update edit model with the readme.md data.
             ReadMe = new EditPackageVersionReadMeRequest();
@@ -63,5 +95,35 @@ public ManagePackageViewModel(Package package, User currentUser, IReadOnlyList<R
         public bool IsLocked { get; }
 
         public EditPackageVersionReadMeRequest ReadMe { get; set; }
+
+        public Dictionary<string, VersionListedState> VersionListedStateDictionary { get; set; }
+
+        public Dictionary<string, VersionReadMeState> VersionReadMeStateDictionary { get; set; }
+
+        public class VersionListedState
+        {
+            public VersionListedState(Package package)
+            {
+                Listed = package.Listed;
+                DownloadCount = package.DownloadCount;
+            }
+
+            public bool Listed { get; set; }
+            public int DownloadCount { get; set; }
+        }
+
+        public class VersionReadMeState
+        {
+            public VersionReadMeState(string submitUrl, string getReadMeUrl, string readMe)
+            {
+                SubmitUrl = submitUrl;
+                GetReadMeUrl = getReadMeUrl;
+                ReadMe = readMe;
+            }
+
+            public string SubmitUrl { get; set; }
+            public string GetReadMeUrl { get; set; }
+            public string ReadMe { get; set; }
+        }
     }
 }

src/NuGetGallery/ViewModels/PackageViewModel.cs

@@ -19,7 +19,7 @@ public PackageViewModel(Package package)
         {
             _package = package ?? throw new ArgumentNullException(nameof(package));
 
-            FullVersion = NuGetVersionFormatter.ToFullStringOrFallback(package.Version, fallback: package.Version);
+            FullVersion = NuGetVersionFormatter.ToFullString(package.Version);
             IsSemVer2 = package.SemVerLevelKey == SemVerLevelKey.SemVer2;
 
             Version = String.IsNullOrEmpty(package.NormalizedVersion) ?

src/NuGetGallery/Views/Packages/Manage.cshtml

@@ -59,37 +59,12 @@
         var strings_RemovingSelf = "@Html.Raw(Strings.ManagePackageOwners_RemovingSelf)";
 
         // Set up delete section
-        var versionListedState = @Html.Raw(
-           Json.Encode(
-               Model.VersionSelectList.ToDictionary(
-                   v => v.Value,
-                   v =>
-                   {
-                       var version = Model.PackageVersions.Single(p => p.Version == v.Value);
-                       return new
-                       {
-                           version.Listed,
-                           version.DownloadCount
-                       };
-                   })));
+        var versionListedState = @Html.Raw(Json.Encode(Model.VersionListedStateDictionary));
 
         $(function () {
             // Set up documentation section
-            @{
-                var editTemplate = Url.PackageVersionActionTemplate("Edit");
-                var getReadMeTemplate = Url.PackageVersionActionTemplate("GetReadMeMd");
-            }
-
             var readMeModel = {
-                "Versions": @Html.Raw(Json.Encode(Model.VersionSelectList.ToDictionary(v => v.Value, v => {
-                           var pvmodel = new TrivialPackageVersionModel(Model.Id, v.Value);
-                           return new
-                           {
-                               submit = editTemplate.Resolve(pvmodel),
-                               getReadMe = getReadMeTemplate.Resolve(pvmodel),
-                               readMe = (EditPackageVersionReadMeRequest)null
-                           };
-                       }))),
+                "Versions": @Html.Raw(Json.Encode(Model.VersionReadMeStateDictionary)),
                 "Edit": @Html.Raw(Json.Encode(Model.ReadMe))
             };
 

tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs

@@ -1366,10 +1366,10 @@ public virtual void ReturnsCorrectLatestVersionForMixedSemVer2AndNonSemVer2Packa
                 var packages = InvokeFindPackagesByOwner(currentUser, includeUnlisted: true).ToList();
 
                 var nugetCatalogReaderPackage = packages.Single(p => p.PackageRegistration.Id == "NuGet.CatalogReader");
-                Assert.Equal("1.5.12+git.78e44a8", NuGetVersionFormatter.ToFullStringOrFallback(nugetCatalogReaderPackage.Version, fallback: nugetCatalogReaderPackage.Version));
+                Assert.Equal("1.5.12+git.78e44a8", NuGetVersionFormatter.ToFullString(nugetCatalogReaderPackage.Version));
 
                 var sleetLibPackage = packages.Single(p => p.PackageRegistration.Id == "SleetLib");
-                Assert.Equal("2.2.24+git.f2a0cb6", NuGetVersionFormatter.ToFullStringOrFallback(sleetLibPackage.Version, fallback: sleetLibPackage.Version));
+                Assert.Equal("2.2.24+git.f2a0cb6", NuGetVersionFormatter.ToFullString(sleetLibPackage.Version));
             }
 
             protected FakeEntitiesContext GetMixedVersioningPackagesContext(User currentUser, User packageOwner)