DYN-8630:asterisk replace, upload canceled

src/DynamoCoreWpf/PublicAPI.Unshipped.txt

@@ -1102,6 +1102,7 @@ Dynamo.PackageManager.PublishPackageViewModel.SiteUrl.get -> string
 Dynamo.PackageManager.PublishPackageViewModel.SiteUrl.set -> void
 Dynamo.PackageManager.PublishPackageViewModel.SubmitCommand.get -> Prism.Commands.DelegateCommand
 Dynamo.PackageManager.PublishPackageViewModel.ToggleMoreCommand.get -> Prism.Commands.DelegateCommand
+Dynamo.PackageManager.PublishPackageViewModel.UploadCancelled -> System.Action
 Dynamo.PackageManager.PublishPackageViewModel.UploadHandle.get -> Dynamo.PackageManager.PackageUploadHandle
 Dynamo.PackageManager.PublishPackageViewModel.UploadHandle.set -> void
 Dynamo.PackageManager.PublishPackageViewModel.Uploading.get -> bool

src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs

@@ -986,6 +986,11 @@ public bool HasChanges
         /// </summary>
         private bool IsPublishFromLocalPackage = false;
 
+        /// <summary>
+        /// Notifies the view model that the user has cancelled the upload
+        /// </summary>
+        public event Action UploadCancelled;
+
         #endregion
 
         internal PublishPackageViewModel()
@@ -2348,6 +2353,8 @@ private void Submit()
             MessageBoxResult response = DynamoModel.IsTestMode ? MessageBoxResult.OK : MessageBoxService.Show(Owner, Resources.PrePackagePublishMessage, Resources.PrePackagePublishTitle, MessageBoxButton.OKCancel, MessageBoxImage.Information);
             if (response == MessageBoxResult.Cancel)
             {
+                // Notify the front-end that the user has cancelled the upload
+                UploadCancelled?.Invoke();
                 return;
             }
 

src/DynamoCoreWpf/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml.cs

@@ -155,6 +155,7 @@ private void OnDataContextChanged(object sender, DependencyPropertyChangedEventA
             {
                 previousViewModel.PropertyChanged -= PublishPackageViewModel_PropertyChanged;
                 previousViewModel.PublishSuccess -= PublishPackageViewModel_PublishSuccess;
+                previousViewModel.UploadCancelled -= OnUploadCancelled;
             }
 
             // Cast and assign the new DataContext
@@ -170,9 +171,10 @@ private void OnDataContextChanged(object sender, DependencyPropertyChangedEventA
             {
                 publishPackageViewModel.PropertyChanged += PublishPackageViewModel_PropertyChanged;
                 publishPackageViewModel.PublishSuccess += PublishPackageViewModel_PublishSuccess;
+                previousViewModel.UploadCancelled += OnUploadCancelled;
 
                 // Only send updates if the application has been loaded
-                if(_applicationLoaded) UpdateFromBackEnd();
+                if (_applicationLoaded) UpdateFromBackEnd();
             }
         }
 
@@ -558,6 +560,14 @@ private async void SendResetProgress()
             }
         }
 
+        private async void SendUploadCancel()
+        {
+            if (dynWebView?.CoreWebView2 != null)
+            {
+                await dynWebView.CoreWebView2.ExecuteScriptAsync($"window.receiveUploadCancel();");
+            }
+        }
+
         private async void SendDialogResult(string msg)
         {
             var payload = new { result = msg };
@@ -729,6 +739,15 @@ internal void UpdateCompatibilityMatrix(string jsonPayload)
                 );
                 if (compatibilityMatrix == null) return;
 
+                // Replace any 'x' in the max field with '*'
+                foreach (var item in compatibilityMatrix)
+                {
+                    if (!string.IsNullOrWhiteSpace(item.max))
+                    {
+                        item.max = item.max.Replace("x", "*");
+                    }
+                }
+
                 publishPackageViewModel.CompatibilityMatrix = compatibilityMatrix;
 
                 LogMessage("Compatibility matrix updated successfully.");
@@ -836,6 +855,15 @@ internal void ShowDialog(string title, string message)
             }
         }
 
+        /// <summary>
+        ///  Notify the front-end that the upload was cancelled
+        /// </summary>
+        /// <exception cref="NotImplementedException"></exception>
+        private void OnUploadCancelled()
+        {
+           SendUploadCancel();
+        }
+
         #endregion
 
         #region Utility
@@ -1041,6 +1069,7 @@ protected virtual void Dispose(bool disposing)
                     {
                         this.publishPackageViewModel.PropertyChanged -= PublishPackageViewModel_PropertyChanged;
                         this.publishPackageViewModel.PublishSuccess -= PublishPackageViewModel_PublishSuccess;
+                        this.previousViewModel.UploadCancelled -= OnUploadCancelled;
                     }
 
                     if (this.dynWebView != null && this.dynWebView.CoreWebView2 != null)
@@ -1052,6 +1081,7 @@ protected virtual void Dispose(bool disposing)
                 _disposed = true;
             }
         }
+
         #endregion
     }