DYN-6511 Pm publish version from mypackages (#14723)

dnenov · web-flow · commit 5d73e141eb0f · 2023-12-15T05:54:59.000-08:00
* publish version from mypackages

- now able to publish new package version from mypacakges

* removed user prompt from tests

- removed OnRequestPackagePublishDialog from tests which were not utilizing it, and rather relying on AddAllFilesAfterSelection (not sure how it was running before)

* Update PackageManagerUITests.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
@@ -113,6 +113,24 @@ public PackageManagerSearchElementViewModel(PackageManagerSearchElement element,
         public PackageManagerSearchElementViewModel(PackageManagerSearchElement element, bool canLogin) : this(element, canLogin, true)
         {}
 
+        /// <summary>
+        /// A property showing if the currently logged-in user owns the package
+        /// </summary>
+        private bool isOwner = false;
+        public bool IsOnwer
+        {
+            get
+            {
+                return isOwner;
+            }
+
+            internal set
+            {   
+                isOwner = value;
+                RaisePropertyChanged(nameof(IsOnwer));
+            }
+        }
+
         private bool canInstall;
         /// <summary>
         /// A Boolean flag reporting whether or not the user can install this SearchElement's package.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -651,8 +651,12 @@ private void PopulateMyPackages()
             var pkgs = PackageManagerClientViewModel.CachedPackageList.Where(x => x.Maintainers != null && x.Maintainers.Contains(name)).ToList();
             foreach(var pkg in pkgs)
             {
-                var p = new PackageManagerSearchElementViewModel(pkg, false);
+                var p = new PackageManagerSearchElementViewModel(pkg,
+                                                                 PackageManagerClientViewModel.AuthenticationManager.HasAuthProvider,
+                                                                 CanInstallPackage(pkg.Name));
                 p.RequestDownload += this.PackageOnExecuted;
+                p.RequestShowFileDialog += this.OnRequestShowFileDialog;
+                p.IsOnwer = true;
 
                 myPackages.Add(p);
             }
@@ -666,6 +670,7 @@ private void ClearMySearchResults()
             foreach (var ele in this.SearchMyResults)
             {
                 ele.RequestDownload -= PackageOnExecuted;
+                ele.RequestShowFileDialog -= OnRequestShowFileDialog;
             }
 
             this.SearchMyResults = null;
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Collections.ObjectModel;
+using System.Linq;
+using Dynamo.PackageManager.ViewModels;
+using Dynamo.UI.Commands;
 using Dynamo.ViewModels;
 using NotificationObject = Dynamo.Core.NotificationObject;
 
@@ -25,7 +28,20 @@ public class PackageManagerViewModel : NotificationObject, IDisposable
         /// <summary>
         /// PublishPackageViewModel containing information about all the published packages
         /// </summary>
-        public PublishPackageViewModel PublishPackageViewModel { get; set; }
+        ///
+        private PublishPackageViewModel publishPackageViewModel;
+        public PublishPackageViewModel PublishPackageViewModel
+        {
+            get { return publishPackageViewModel; }
+            set
+            {
+                if (publishPackageViewModel != value)
+                {
+                    publishPackageViewModel = value;
+                    RaisePropertyChanged(nameof(PublishPackageViewModel));
+                }
+            }
+        }
 
         /// <summary>
         /// Returns all installed packages
@@ -37,6 +53,7 @@ public class PackageManagerViewModel : NotificationObject, IDisposable
         /// </summary>
         public ObservableCollection<PackageFilter> Filters => installedPackagesViewModel.Filters;
 
+        public DelegateCommand PublishNewVersionCommand { get; set; }
 
         //Width of the PackageManagerView the default value is 1076
         public double Width
@@ -90,6 +107,21 @@ public PackageManagerViewModel(DynamoViewModel dynamoViewModel, PackageManagerSe
             {
                 PreferencesViewModel.SelectedPackagePathForInstall = dynamoViewModel.PreferenceSettings.SelectedPackagePathForInstall;
             }
+
+            PublishNewVersionCommand = new DelegateCommand(PublishNewPackageVersionRelayCommand);
+        }
+
+
+        private void PublishNewPackageVersionRelayCommand(object obj)
+        {
+            var searchElement = obj as PackageManagerSearchElementViewModel;
+            if(searchElement != null)
+            {
+                var localPackage = LocalPackages.First(x => x.Model.Name.Equals(searchElement.Name));
+
+                if (localPackage == null) { return; }
+                localPackage.PublishNewPackageVersionCommand.Execute();
+            }
         }
 
         private void LocalPackages_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -1492,6 +1492,10 @@ private void DynamoViewModelRequestPackageManager(PublishPackageViewModel model)
 
                 if (packageManagerWindow.IsLoaded && IsLoaded) packageManagerWindow.Owner = this;
             }
+            if (_pkgVM != null)
+            {
+                _pkgVM.PublishPackageViewModel = model;
+            }
 
             packageManagerWindow.Focus();
             packageManagerWindow.Navigate(Wpf.Properties.Resources.PackageManagerPublishTab);
diff --git a/test/DynamoCoreWpfTests/PackageManager/PackageManagerUITests.cs b/test/DynamoCoreWpfTests/PackageManager/PackageManagerUITests.cs
@@ -1944,8 +1944,6 @@ public void GetAllFilesReturnsEqualsPackageContents()
             var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
             var vm = new PublishPackageViewModel(this.ViewModel);
 
-            ViewModel.OnRequestPackagePublishDialog(vm);
-
             vm.AddAllFilesAfterSelection(allFiles);
 
             int packageContentsCount = 0;
@@ -1969,8 +1967,6 @@ public void AssertGetPreBuildRootItemViewModelReturnsCorrectItem()
             var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
             var vm = new PublishPackageViewModel(this.ViewModel);
 
-            ViewModel.OnRequestPackagePublishDialog(vm);
-
             vm.AddAllFilesAfterSelection(allFiles);
 
             var testPath = Path.Combine(TestDirectory, "core", "docbrowser\\pkgs\\RootPackageFolder\\", "TestPath");
@@ -1994,8 +1990,6 @@ public void AssertGetExistingRootItemViewModelReturnsCorrectItem()
             var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
             var vm = new PublishPackageViewModel(this.ViewModel);
 
-            ViewModel.OnRequestPackagePublishDialog(vm);
-
             vm.AddAllFilesAfterSelection(allFiles);
 
             var testPath = Path.Combine(TestDirectory, "core", "docbrowser\\pkgs\\RootPackageFolder\\", "TestPath");
@@ -2031,8 +2025,6 @@ public void RemoveFilesUpdatesPerviewContentItem()
             var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
             var vm = new PublishPackageViewModel(this.ViewModel);
 
-            ViewModel.OnRequestPackagePublishDialog(vm);
-
             vm.AddAllFilesAfterSelection(allFiles);
 
             // Act
@@ -2056,8 +2048,6 @@ public void RemoveAllChildrenFilesUpdatesContentItem()
             var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
             var vm = new PublishPackageViewModel(this.ViewModel);
 
-            ViewModel.OnRequestPackagePublishDialog(vm);
-
             vm.AddAllFilesAfterSelection(allFiles);
 
             // Act
@@ -2085,8 +2075,6 @@ public void CanRemoveCustomDefinitionDependencyTypes()
             var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
             var vm = new PublishPackageViewModel(this.ViewModel);
 
-            ViewModel.OnRequestPackagePublishDialog(vm);
-
             vm.AddAllFilesAfterSelection(allFiles);
 
             // Act
@@ -2141,8 +2129,6 @@ public void CanRemoveAllDependencyTypes()
             var allFiles = Directory.GetFiles(nodePath, "*", SearchOption.AllDirectories).ToList();
             var vm = new PublishPackageViewModel(this.ViewModel);
 
-            ViewModel.OnRequestPackagePublishDialog(vm);
-
             vm.AddAllFilesAfterSelection(allFiles);
 
             // Act
@@ -2189,8 +2175,6 @@ public void CancelCommandClearsAllData()
             Assert.AreEqual(0, vm.PackageContents.Count);
             Assert.AreEqual(0, vm.PreviewPackageContents.Count);
 
-            ViewModel.OnRequestPackagePublishDialog(vm);
-
             vm.AddAllFilesAfterSelection(allFiles);
 
             // Act
@@ -2217,8 +2201,6 @@ public void AssertPreviewPackageDefaultFolderStructureEqualsPublishLocalPackageR
             //now lets publish this package.
             var newPkgVm = new PublishPackageViewModel(this.ViewModel);
 
-            ViewModel.OnRequestPackagePublishDialog(newPkgVm);
-
             newPkgVm.AddAllFilesAfterSelection(allFiles);
 
             var previewFilesAndFolders = PackageItemRootViewModel.GetFiles(newPkgVm.PreviewPackageContents.ToList());
@@ -2258,9 +2240,6 @@ public void AssertPreviewPackageRetainFolderStructureEqualsPublishLocalPackageRe
             //now lets publish this package.
             var newPkgVm = new PublishPackageViewModel(this.ViewModel);
             newPkgVm.RetainFolderStructureOverride = true;
-
-            ViewModel.OnRequestPackagePublishDialog(newPkgVm);
-
             newPkgVm.AddAllFilesAfterSelection(allFiles);
 
             var previewFilesAndFolders = PackageItemRootViewModel.GetFiles(newPkgVm.PreviewPackageContents.ToList());
@@ -2300,9 +2279,6 @@ public void AssertPublishLocalHandleType()
             //now lets publish this package.
             var newPkgVm = new PublishPackageViewModel(this.ViewModel);
             newPkgVm.RetainFolderStructureOverride = true;
-
-            ViewModel.OnRequestPackagePublishDialog(newPkgVm);
-
             newPkgVm.AddAllFilesAfterSelection(allFiles);
 
             var previewFilesAndFolders = PackageItemRootViewModel.GetFiles(newPkgVm.PreviewPackageContents.ToList());

Original file line number	Diff line number	Diff line change
`@@ -651,8 +651,12 @@ private void PopulateMyPackages()`
`651`	`651`	`var pkgs = PackageManagerClientViewModel.CachedPackageList.Where(x => x.Maintainers != null && x.Maintainers.Contains(name)).ToList();`
`652`	`652`	`foreach(var pkg in pkgs)`
`653`	`653`	`{`
`654`		`- var p = new PackageManagerSearchElementViewModel(pkg, false);`
	`654`	`+ var p = new PackageManagerSearchElementViewModel(pkg,`
	`655`	`+ PackageManagerClientViewModel.AuthenticationManager.HasAuthProvider,`
	`656`	`+ CanInstallPackage(pkg.Name));`
`655`	`657`	`p.RequestDownload += this.PackageOnExecuted;`
	`658`	`+ p.RequestShowFileDialog += this.OnRequestShowFileDialog;`
	`659`	`+ p.IsOnwer = true;`
`656`	`660`
`657`	`661`	`myPackages.Add(p);`
`658`	`662`	`}`
`@@ -666,6 +670,7 @@ private void ClearMySearchResults()`
`666`	`670`	`foreach (var ele in this.SearchMyResults)`
`667`	`671`	`{`
`668`	`672`	`ele.RequestDownload -= PackageOnExecuted;`
	`673`	`+ ele.RequestShowFileDialog -= OnRequestShowFileDialog;`
`669`	`674`	`}`
`670`	`675`
`671`	`676`	`this.SearchMyResults = null;`
Original file line number	Diff line number	Diff line change
`@@ -1492,6 +1492,10 @@ private void DynamoViewModelRequestPackageManager(PublishPackageViewModel model)`
`1492`	`1492`
`1493`	`1493`	`if (packageManagerWindow.IsLoaded && IsLoaded) packageManagerWindow.Owner = this;`
`1494`	`1494`	`}`
	`1495`	`+ if (_pkgVM != null)`
	`1496`	`+ {`
	`1497`	`+ _pkgVM.PublishPackageViewModel = model;`
	`1498`	`+ }`
`1495`	`1499`
`1496`	`1500`	`packageManagerWindow.Focus();`
`1497`	`1501`	`packageManagerWindow.Navigate(Wpf.Properties.Resources.PackageManagerPublishTab);`