DYN-6547: toggle depreciate revised (#15383)

DynamoDS · Jul 11, 2024 · aba9359 · aba9359
1 parent 424c87e
commit aba9359
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs
@@ -22,6 +22,7 @@ public class PackageViewModel : NotificationObject
         private readonly DynamoViewModel dynamoViewModel;
         private readonly PackageManagerClient packageManagerClient;
         private readonly DynamoModel dynamoModel;
+        private readonly PackageManagerClientViewModel packageManagerClientViewModel;
 
         public Package Model { get; private set; }
 
@@ -172,6 +173,7 @@ public PackageViewModel(DynamoViewModel dynamoViewModel, Package model)
         {
             this.dynamoViewModel = dynamoViewModel;
             this.dynamoModel = dynamoViewModel.Model;
+            this.packageManagerClientViewModel = dynamoViewModel.PackageManagerClientViewModel;
 
             var pmExtension = dynamoModel.GetPackageManagerExtension();
             this.packageManagerClient = pmExtension.PackageManagerClient;
@@ -410,10 +412,9 @@ private bool IsOwner()
 
         private bool CanDeprecate()
         {
-            var packageInfo = new PackageInfo(Model.Name, Version.Parse(Model.VersionName));
-            var packageHeader = this.packageManagerClient.GetPackageHeader(packageInfo);
+            var isDeprecated = IsPackageDeprecated(Model.Name);
 
-            return IsOwner() && !packageHeader.deprecated;
+            return IsOwner() && !isDeprecated;
         }
 
         private void Undeprecate()
@@ -427,10 +428,9 @@ private void Undeprecate()
 
         private bool CanUndeprecate()
         {
-            var packageInfo = new PackageInfo(Model.Name, Version.Parse(Model.VersionName));
-            var packageHeader = this.packageManagerClient.GetPackageHeader(packageInfo);
+            var isDeprecated = IsPackageDeprecated(Model.Name);
 
-            return IsOwner() && packageHeader.deprecated;
+            return IsOwner() && isDeprecated;
         }
 
         private void PublishNewPackageVersion()
@@ -465,5 +465,19 @@ private void ExecuteWithTou(Action acceptanceCallback)
 
             termsOfUseCheck.Execute(false);
         }
+
+        private PackageManagerSearchElement GetPackageVersionInformationFromCached(string packageName)
+        {
+            var package = this.packageManagerClientViewModel.CachedPackageList.FirstOrDefault(x => x.Name == packageName);
+
+            return package;
+        }
+
+        private bool IsPackageDeprecated(string packageName)
+        {
+            var package = GetPackageVersionInformationFromCached(packageName);
+
+            return package != null ? package.IsDeprecated : false;
+        }
     }
 }
diff --git a/src/DynamoPackages/PackageManagerClient.cs b/src/DynamoPackages/PackageManagerClient.cs
@@ -123,11 +123,11 @@ void CleanPackagesWithWrongVersions(List<PackageHeader> packages)
         }
 
         /// <summary>
-        /// Get the package Header which contains all the relevant information to the Package
+        /// Gets maintainers for a specific package
         /// </summary>
         /// <param name="packageInfo"></param>
         /// <returns></returns>
-        internal PackageHeader GetPackageHeader(IPackageInfo packageInfo)
+        internal PackageHeader GetPackageMaintainers(IPackageInfo packageInfo)
         {
             var header = FailFunc.TryExecute(() =>
             {
@@ -314,7 +314,7 @@ internal bool DoesCurrentUserOwnPackage(Package package,string username)
                 return value;
             }
             var pkg = new PackageInfo(package.Name, new Version(package.VersionName));
-            var mnt = GetPackageHeader(pkg);
+            var mnt = GetPackageMaintainers(pkg);
             value = (mnt != null) && (mnt.maintainers.Any(maintainer => maintainer.username.Equals(username)));
             this.packageMaintainers[package.Name] = value;
             return value;