DYN-5709: Pm publish version patch request

src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs

@@ -180,7 +180,7 @@ public PackageViewModel(DynamoViewModel dynamoViewModel, Package model)
             Model = model;
 
             PublishNewPackageVersionCommand = new DelegateCommand(() => ExecuteWithTou(PublishNewPackageVersion), IsOwner);
-            PublishNewPackageCommand = new DelegateCommand(() => ExecuteWithTou(PublishNewPackage), IsOwner);
+            PublishNewPackageCommand = new DelegateCommand(() => ExecuteWithTou(PublishNewPackage), CanPublishNewPackage);
             UninstallCommand = new DelegateCommand(Uninstall, CanUninstall);
             UnmarkForUninstallationCommand = new DelegateCommand(UnmarkForUninstallation, CanUnmarkForUninstallation);
             LoadCommand = new DelegateCommand(Load, CanLoad);
@@ -410,6 +410,25 @@ private bool IsOwner()
             return packageManagerClient.DoesCurrentUserOwnPackage(Model, dynamoModel.AuthenticationManager.Username);
         }
 
+        private bool CanPublishNewPackage()
+        {
+            if (!CanPublish) return false;
+
+            return packageManagerClient.DoesCurrentUserOwnPackage(Model, dynamoModel.AuthenticationManager.Username) ||
+                PackageNotPublishedAndUserIsHolder(Model, dynamoModel.AuthenticationManager.Username);
+        }
+
+
+        // Utility function to assert if a local package can be published
+        // If the current user is the package holder and a package with that name has not been published yet, return true
+        private bool PackageNotPublishedAndUserIsHolder(Package package, string username)
+        {
+            bool userIsHolder = package.CopyrightHolder != null && package.CopyrightHolder.Equals(username);
+            bool packageHasNotBeenPublished = !this.dynamoViewModel.PackageManagerClientViewModel.CachedPackageList.Any(x => x.Name == package.Name);
+
+            return userIsHolder && packageHasNotBeenPublished;
+        }
+
         private bool CanDeprecate()
         {
             var isDeprecated = IsPackageDeprecated(Model.Name);
@@ -438,15 +457,17 @@ private void PublishNewPackageVersion()
             Model.RefreshCustomNodesFromDirectory(dynamoModel.CustomNodeManager, DynamoModel.IsTestMode);
             var vm = PublishPackageViewModel.FromLocalPackage(dynamoViewModel, Model, true);
             vm.IsNewVersion = true;
+            vm.IsPackageInstalled = true;
 
             dynamoViewModel.OnRequestPackagePublishDialog(vm);
         }
 
         private void PublishNewPackage()
         {
             Model.RefreshCustomNodesFromDirectory(dynamoModel.CustomNodeManager, DynamoModel.IsTestMode);
-            var vm = PublishPackageViewModel.FromLocalPackage(dynamoViewModel, Model, false);
+            var vm = PublishPackageViewModel.FromLocalPackage(dynamoViewModel, Model, true);
             vm.IsNewVersion = false;
+            vm.IsPackageInstalled = true;
 
             dynamoViewModel.OnRequestPackagePublishDialog(vm);
         }

src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs

@@ -211,7 +211,25 @@
                 }
             }
         }
-
+
+        /// <summary>
+        /// IsPackageInstalled property </summary>
+        /// <value>
+        /// Shows if the package is already installed </value>
+        private bool _isPackageInstalled = false;
+        public bool IsPackageInstalled
+        {
+            get { return _isPackageInstalled; }
+            set
+            {
+                if (_isPackageInstalled != value)
+                {
+                    _isPackageInstalled = value;
+                    RaisePropertyChanged(nameof(IsPackageInstalled));
+                }
+            }
+        }
+
         /// <summary>
         /// CanEditName property </summary>
         /// <value>
@@ -956,8 +974,8 @@
             customNodeDefinitions = new List<CustomNodeDefinition>();
             SubmitCommand = new DelegateCommand(Submit, CanSubmit);
             PublishLocallyCommand = new DelegateCommand(PublishLocally, CanPublishLocally);
-            ShowAddFileDialogAndAddCommand = new DelegateCommand(ShowAddFileDialogAndAdd, CanShowAddFileDialogAndAdd);
-            SelectDirectoryAndAddFilesRecursivelyCommand = new DelegateCommand(SelectDirectoryAndAddFilesRecursively);
+            ShowAddFileDialogAndAddCommand = new DelegateCommand(ShowAddFileDialogAndAdd, CanAddFiles);
+            SelectDirectoryAndAddFilesRecursivelyCommand = new DelegateCommand(SelectDirectoryAndAddFilesRecursively, CanAddFiles);
             SelectMarkdownDirectoryCommand = new DelegateCommand(SelectMarkdownDirectory);
             ClearMarkdownDirectoryCommand = new DelegateCommand(ClearMarkdownDirectory);
             CancelCommand = new DelegateCommand(Cancel);
@@ -1364,7 +1382,7 @@
         {
             if (e.PropertyName == "PackageContents")
             {
-                CanSubmit();
+               CanSubmit();
                SubmitCommand.RaiseCanExecuteChanged();
                PublishLocallyCommand.RaiseCanExecuteChanged();
             }
@@ -1493,6 +1511,7 @@
         /// <summary>
         /// The method is used to create a PublishPackageViewModel from a Package object.
         /// If retainFolderStructure is set to true, the folder structure of the package will be retained. Else, the default folder structure will be imposed.
+        /// Investigating if both options (publish and publish new version) should not use 'retainFolderStructure' with disabled package files and folders editing
         /// </summary>
         /// <param name="dynamoViewModel"></param>
         /// <param name="pkg">The package to be loaded</param>
@@ -2117,9 +2136,9 @@
             }
         }
 
-        private bool CanShowAddFileDialogAndAdd()
+        private bool CanAddFiles()
         {
-            return true;
+            return !IsPackageInstalled;
         }
 
         internal void AddFile(string filename)
@@ -2267,7 +2286,15 @@
             {
                 // begin submission
                 var pmExtension = dynamoViewModel.Model.GetPackageManagerExtension();
-                var handle = pmExtension.PackageManagerClient.PublishAsync(Package, RetainFolderStructureOverride ? updatedFiles : contentFiles, MarkdownFiles, IsNewVersion, CurrentPackageRootDirectories, RetainFolderStructureOverride);
+                PackageUploadHandle handle;
+                if (IsPackageInstalled)
+                {
+                    handle = pmExtension.PackageManagerClient.PublishInstalledPackageAsync(Package, IsNewVersion);
+                }
+                else
+                {
+                    handle = pmExtension.PackageManagerClient.PublishAsync(Package, RetainFolderStructureOverride ? updatedFiles : contentFiles, MarkdownFiles, IsNewVersion, CurrentPackageRootDirectories, RetainFolderStructureOverride);
+                }
 
                 // start upload
                 Uploading = true;
@@ -2601,10 +2628,12 @@
         }
 
         /// <summary>
-        /// Delegate used to publish the element locally </summary>
+        /// Delegate used to publish the element locally
+        /// If the package is already installed (and therefore loaded), we shouldn't be able to publish it locally again?
+        /// </summary>
         private bool CanPublishLocally()
         {
-            return CheckPackageValidity();
+            return !IsPackageInstalled && CheckPackageValidity();
         }
 
         private bool CheckPackageValidity()

src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs

@@ -1517,7 +1517,7 @@ private void DynamoViewModelRequestPackageManager(PublishPackageViewModel model)
                     WindowStartupLocation = WindowStartupLocation.CenterOwner
                 };
 
-                // setting the owner to the packageManagerWindow will centralize promts originating from the Package Manager
+                // setting the owner to the packageManagerWindow will centralize prompts originating from the Package Manager
                 dynamoViewModel.Owner = packageManagerWindow;
 
                 packageManagerWindow.Closed += HandlePackageManagerWindowClosed;

src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageSelectPage.xaml

@@ -427,6 +427,11 @@
                                         Property="Fill"
                                         Value="#6AC0E7" />
                                 </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter TargetName="Folder"
+                                        Property="Fill"
+                                        Value="Gray" />
+                                </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
                     </Button.Template>
@@ -465,6 +470,11 @@
                                         Property="Fill"
                                         Value="#6AC0E7" />
                                 </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter TargetName="Folder"
+                                        Property="Fill"
+                                        Value="Gray" />
+                                </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
                     </Button.Template>
@@ -475,6 +485,7 @@
             <local:CustomBrowserControl x:Name="customBrowserControl"
                                     Grid.Column="0" Grid.Row="1"
                                     Loaded="customBrowserControl_Loaded"
+                                    DisableRemove="{Binding IsPackageInstalled}"
                                     Root="{Binding PackageContents, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" />
 
             <!--Files-->
@@ -487,6 +498,7 @@
                   CanUserSortColumns="True"
                   VerticalScrollBarVisibility="Disabled"
                   ItemsSource="{Binding RootContents, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                  IsEnabled="{Binding IsPackageInstalled, Converter={StaticResource BooleanNegationConverter}}"
                   Style="{StaticResource DataGrid}">
                 <DataGrid.RowStyle>
                     <Style TargetType="DataGridRow" BasedOn="{StaticResource DataGridRowStyle}">
@@ -599,9 +611,9 @@
                           Height="15"
                           VerticalAlignment="Center"
                           Margin="0 5"
-                          IsEnabled="True"
                           IsChecked="{Binding Path=RetainFolderStructureOverride, Mode=TwoWay}"
                           IsTabStop="False"
+                          IsEnabled="{Binding IsPackageInstalled, Converter={StaticResource BooleanNegationConverter}}"
                           Style="{StaticResource EllipseToggleButton1}" />
                 <TextBlock Text="{x:Static p:Resources.PublishPackageRetainFolderStructureToggleButtonText}"
                        Style="{StaticResource LabelStyle}"

src/DynamoPackages/PackageDirectoryBuilder.cs

@@ -12,10 +12,10 @@ public interface IPackageDirectoryBuilder
     {
         IDirectoryInfo BuildDirectory(Package packages, string packagesDirectory, IEnumerable<string> files, IEnumerable<string> markdownfiles);
         IDirectoryInfo BuildRetainDirectory(Package package, string packagesDirectory, IEnumerable<string> roots, IEnumerable<IEnumerable<string>> contentFiles, IEnumerable<string> markdownFiles);
+        IDirectoryInfo BuildPackageHeader(Package package, string packagesDirectory);
 
         [Obsolete]
         IDirectoryInfo BuildRetainDirectory(Package package, string packagesDirectory, IEnumerable<IEnumerable<string>> contentFiles, IEnumerable<string> markdownFiles);
-
     }
 
     /// <summary>
@@ -125,6 +125,23 @@ public IDirectoryInfo BuildRetainDirectory(Package package, string packagesDirec
             return rootDir;
         }
 
+        /// <summary>
+        /// Builds package header in the provided package directory
+        /// </summary>
+        /// <param name="package">The already installed package</param>
+        /// <param name="packagesDirectory">The package installation folder</param>
+        /// <returns></returns>
+        public IDirectoryInfo BuildPackageHeader(Package package, string packagesDirectory)
+        {
+            var rootPath = Path.Combine(packagesDirectory, package.Name);
+            var rootDir = fileSystem.TryCreateDirectory(rootPath);
+            package.RootDirectory = rootDir.FullName;
+
+            WritePackageHeader(package, rootDir);
+
+            return rootDir;
+        }
+
         public static void PreBuildDirectory(string packageName, string packagesDirectory,
             out string rootDir, out string dyfDir, out string binDir, out string extraDir, out string docDir)
         {

src/DynamoPackages/PackageManagerClient.cs

@@ -251,6 +251,62 @@ internal PackageUploadHandle PublishAsync(Package package, object files, IEnumer
             return packageUploadHandle;
         }
 
+
+        internal PackageUploadHandle PublishInstalledPackageAsync(Package package, bool isNewVersion)
+        {
+            var packageUploadHandle = new PackageUploadHandle(PackageUploadBuilder.NewRequestBody(package));
+
+            Task.Factory.StartNew(() =>
+            {
+                Publish(package, isNewVersion, packageUploadHandle);
+            });
+
+            return packageUploadHandle;
+        }
+
+        internal void Publish(Package package, bool isNewVersion, PackageUploadHandle packageUploadHandle)
+        {
+            try
+            {
+                ResponseBody ret = null;
+                if (isNewVersion)
+                {
+                    var pkg = uploadBuilder.InstalledPackageVersionUpload(package, packageUploadDirectory, packageUploadHandle);
+                    packageUploadHandle.UploadState = PackageUploadHandle.State.Uploading;
+                    ret = this.client.ExecuteAndDeserialize(pkg);
+                }
+                else
+                {
+                    var pkg = uploadBuilder.InstalledPackageUpload(package, packageUploadDirectory, packageUploadHandle);
+                    packageUploadHandle.UploadState = PackageUploadHandle.State.Uploading;
+                    ret = this.client.ExecuteAndDeserialize(pkg);
+                }
+                if (ret == null)
+                {
+                    packageUploadHandle.Error("Failed to submit.  Try again later.");
+                    return;
+                }
+
+                if (ret != null && !ret.success)
+                {
+                    packageUploadHandle.Error(ret.message);
+                    return;
+                }
+                packageUploadHandle.Done(null);
+            }
+            catch (Exception ex)
+            {
+                if (ex is IOException || ex is UnauthorizedAccessException)
+                {
+                    packageUploadHandle.Error(DynamoPackages.Properties.Resources.CannotRemovePackageAssemblyTitle + ": " + DynamoPackages.Properties.Resources.CannotRemovePackageAssemblyMessage + "(" + ex.Message + ")");
+                }
+                else
+                {
+                    packageUploadHandle.Error(ex.GetType() + ": " + ex.Message);
+                }
+            }
+        }
+
         internal void Publish(Package package, object files, IEnumerable<string> markdownFiles, bool isNewVersion, PackageUploadHandle packageUploadHandle, IEnumerable<string> roots, bool retainFolderStructure = false)
         {
             try

src/DynamoPackages/PackageUploadBuilder.cs

@@ -15,11 +15,15 @@ PackageUpload NewPackageUpload(Package package, string packagesDirectory, IEnume
         PackageUpload NewPackageRetainUpload(Package package, string packagesDirectory, IEnumerable<string> roots, IEnumerable<IEnumerable<string>> files, IEnumerable<string> markdownFiles,
             PackageUploadHandle handle);
 
-        PackageVersionUpload NewPackageVersionUpload(Package package, string packagesDirectory,
-            IEnumerable<string> files, IEnumerable<string> markdownFiles, PackageUploadHandle handle);
+        PackageVersionUpload NewPackageVersionUpload(Package package, string packagesDirectory, IEnumerable<string> files, IEnumerable<string> markdownFiles,
+            PackageUploadHandle handle);
+
+        PackageVersionUpload NewPackageVersionRetainUpload(Package package, string packagesDirectory, IEnumerable<string> roots, IEnumerable<IEnumerable<string>> files, IEnumerable<string> markdownFiles,
+            PackageUploadHandle handle);
 
-        PackageVersionUpload NewPackageVersionRetainUpload(Package package, string packagesDirectory, IEnumerable<string> roots,
-            IEnumerable<IEnumerable<string>> files, IEnumerable<string> markdownFiles, PackageUploadHandle handle);
+        PackageUpload InstalledPackageUpload(Package package, string packagesDirectory, PackageUploadHandle handle);
+
+        PackageVersionUpload InstalledPackageVersionUpload(Package package, string packagesDirectory, PackageUploadHandle handle);
     }
 
     internal class PackageUploadBuilder : IPackageUploadBuilder
@@ -188,6 +192,40 @@ public PackageVersionUpload NewPackageVersionRetainUpload(Package package, strin
             return new PackageVersionUpload(NewRequestBody(package), BuildAndZip(package, packagesDirectory, files, markdownFiles, handle).Name);
         }
 
+        /// <summary>
+        /// Publishes an installed package
+        /// </summary>
+        /// <param name="package"></param>
+        /// <param name="packagesDirectory"></param>
+        /// <param name="handle"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        public PackageUpload InstalledPackageUpload(Package package, string packagesDirectory, PackageUploadHandle handle)
+        {
+            if (package == null) throw new ArgumentNullException("package");
+            if (packagesDirectory == null) throw new ArgumentNullException("packagesDirectory");
+            if (handle == null) throw new ArgumentNullException("handle");
+
+            return new PackageUpload(NewRequestBody(package), BuildAndZip(package, packagesDirectory, handle).Name);
+        }
+
+
+        /// <summary>
+        /// Publishes a new version of an installed package
+        /// </summary>
+        /// <param name="package"></param>
+        /// <param name="packagesDirectory"></param>
+        /// <param name="handle"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        public PackageVersionUpload InstalledPackageVersionUpload(Package package, string packagesDirectory, PackageUploadHandle handle)
+        {
+            if (package == null) throw new ArgumentNullException("package");
+            if (packagesDirectory == null) throw new ArgumentNullException("packagesDirectory");
+            if (handle == null) throw new ArgumentNullException("handle");
+
+            return new PackageVersionUpload(NewRequestBody(package), BuildAndZip(package, packagesDirectory, handle).Name);
+        }
         #endregion
 
         #region Private Class Methods
@@ -226,6 +264,17 @@ private IFileInfo BuildAndZip(Package package, string packagesDirectory, IEnumer
             return Zip(dir);
         }
 
+        private IFileInfo BuildAndZip(Package package, string packagesDirectory, PackageUploadHandle handle)
+        {
+            handle.UploadState = PackageUploadHandle.State.Copying;
+
+            var dir = builder.BuildPackageHeader(package, packagesDirectory);
+
+            handle.UploadState = PackageUploadHandle.State.Compressing;
+
+            return Zip(dir);
+        }
+
 
         private IFileInfo Zip(IDirectoryInfo directory)
         {