Address a few PM publish fixes regarding publish process and groups (#16104)

Author: zeusongit

src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs

@@ -2703,6 +2703,7 @@ private void LoadAnnotation(ExtraAnnotationViewInfo annotationViewInfo)
             annotationModel.GUID = annotationGuidValue;
             annotationModel.HeightAdjustment = annotationViewInfo.HeightAdjustment;
             annotationModel.WidthAdjustment = annotationViewInfo.WidthAdjustment;
+            annotationModel.UpdateGroupFrozenStatus();
 
             annotationModel.ModelBaseRequested += annotationModel_GetModelBase;
             annotationModel.Disposed += (_) => annotationModel.ModelBaseRequested -= annotationModel_GetModelBase;

src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs

@@ -1580,15 +1580,26 @@ internal static PublishPackageViewModel FromLocalPackage(DynamoViewModel dynamoV
                 }
             }
 
-            // We need to get the compatibility matrix from the cached package list
-            // in order to show the correct compatibility matrix in the UI.
-            // We are still running the risk of having a higher version of the local package 
-            // leading to a null result for the compatibility matrix.
-            var cachedPackage = dynamoViewModel.PackageManagerClientViewModel.CachedPackageList
-                .FirstOrDefault(x => x.Name == pkg.Name);
-            var version = cachedPackage?.Header.versions
-                .FirstOrDefault(v => v.version.Equals(pkg.VersionName));
-            var compatibility_matrix = version?.compatibility_matrix;
+            // First check if the local package has the compatibility info
+            var compatibility_matrix = pkg.CompatibilityMatrix  ?? pkg.Header?.compatibility_matrix;
+            //If we do not find compatibility info in the local package, we will check the cached packages
+            if (compatibility_matrix == null)
+            {
+                // We need to get the compatibility matrix from the cached package list
+                // in order to show the correct compatibility matrix in the UI.
+                // We are still running the risk of having a higher version of the local package 
+                // leading to a null result for the compatibility matrix, in which case we will not pre-fill the compatibility info..
+                var cachedPackage = dynamoViewModel.PackageManagerClientViewModel.CachedPackageList
+                    .FirstOrDefault(x => x.Name == pkg.Name);
+                var version = cachedPackage?.Header.versions
+                    .FirstOrDefault(v => v.version.Equals(pkg.VersionName));
+                compatibility_matrix = version?.compatibility_matrix?
+                    .Select(entry => new PackageCompatibility(
+                    entry.name,
+                    entry.versions != null ? new List<string>(entry.versions) : null,
+                    entry.min,
+                    entry.max));
+            }
 
             var pkgViewModel = new PublishPackageViewModel(dynamoViewModel)
             {
@@ -1609,13 +1620,7 @@ internal static PublishPackageViewModel FromLocalPackage(DynamoViewModel dynamoV
                 CurrentPackageRootDirectories = new List<string> { pkg.RootDirectory },
                 //default retain folder structure to true when publishing a new version from local.
                 RetainFolderStructureOverride = retainFolderStructure,
-                CompatibilityMatrix = compatibility_matrix?
-                .Select(entry => new PackageCompatibility(
-                    entry.name,
-                    entry.versions != null ? new List<string>(entry.versions) : null,
-                    entry.min,
-                    entry.max))
-                .ToList()
+                CompatibilityMatrix = compatibility_matrix?.ToList(),
             };
 
             // add additional files
@@ -2570,7 +2575,7 @@ internal IEnumerable<string> BuildPackage()
                 Package.RepositoryUrl = RepositoryUrl;
                 Package.CopyrightHolder = string.IsNullOrEmpty(CopyrightHolder) ? dynamoViewModel.Model.AuthenticationManager?.Username : CopyrightHolder;
                 Package.CopyrightYear = string.IsNullOrEmpty(CopyrightYear) ? DateTime.Now.Year.ToString() : copyrightYear;
-                Package.Header.compatibility_matrix = CompatibilityMatrix;  // New - CompatibilityMatrix, Dynamo 3.5
+                Package.SetCompatibility(CompatibilityMatrix); // New - CompatibilityMatrix, Dynamo 3.5
                 Package.Header.release_notes_url = ReleaseNotesUrl; // New - ReleaseNotesUrl, Dynamo 3.5
 
                 AppendPackageContents();

src/DynamoPackages/Package.cs

@@ -216,6 +216,7 @@ internal IEnumerable<Assembly> NodeLibraries
         public ObservableCollection<CustomNodeInfo> LoadedCustomNodes { get; private set; }
         public ObservableCollection<PackageDependency> Dependencies { get; private set; }
         public ObservableCollection<PackageFileInfo> AdditionalFiles { get; private set; }
+        public ObservableCollection<PackageCompatibility> CompatibilityMatrix { get; private set; }
 
         /// <summary>
         ///     A header used to create the package, this data does not reflect runtime
@@ -241,6 +242,7 @@ public Package(string directory, string name, string versionName, string license
             Dependencies = new ObservableCollection<PackageDependency>();
             LoadedCustomNodes = new ObservableCollection<CustomNodeInfo>();
             AdditionalFiles = new ObservableCollection<PackageFileInfo>();
+            CompatibilityMatrix = new ObservableCollection<PackageCompatibility>();
             Header = PackageUploadBuilder.NewRequestBody(this);
         }
 
@@ -278,6 +280,8 @@ public static Package FromJson(string headerPath, ILogger logger)
                     CopyrightYear = body.copyright_year,
                     Header = body
                 };
+
+                pkg.SetCompatibility(body.compatibility_matrix);
 
                 foreach (var dep in body.dependencies)
                     pkg.Dependencies.Add(dep);
@@ -345,6 +349,22 @@ internal void AddAssemblies(IEnumerable<PackageAssembly> assems)
             }
         }
 
+        /// <summary>
+        /// Set the compatibility matrix for the package.
+        /// </summary>
+        /// <param name="cmpList">Package compatibility info</param>
+        internal void SetCompatibility(IEnumerable<PackageCompatibility> cmpList)
+        {
+            // Clear the old compatibility matrix, not checking for an empty list here
+            // as user should be able to remove compatibility as well
+            if (cmpList != null)
+            {
+                CompatibilityMatrix.Clear();
+                CompatibilityMatrix.AddRange(cmpList);
+                Header.compatibility_matrix = cmpList;
+            }
+        }
+
         /// <summary>
         ///     Enumerates all assemblies in the package. This method currently has the side effect that it will
         ///     load all binaries in the package bin folder unless the package is loaded from a special package path

src/DynamoPackages/PackageManagerClient.cs

@@ -150,7 +150,7 @@ internal PackageHeader GetPackageMaintainers(IPackageInfo packageInfo)
             {
                 var nv = new GetMaintainers("dynamo", packageInfo.Name);
                 var pkgResponse = this.client.ExecuteAndDeserializeWithContent<PackageHeader>(nv);
-                return pkgResponse.content;
+                return pkgResponse?.content;
             }, null);
 
             return header;