DynamoDS · saintentropy · Jun 21, 2021 · Jun 10, 2021 · Jun 10, 2021 · Jun 10, 2021
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -2669,7 +2669,7 @@ private void DisplayXmlDummyNodeWarning()
             OnRequestTaskDialog(null, args);
         }
 
-        enum ButtonId
+        internal enum ButtonId
         {
             Ok = 43420,
             Cancel,

diff --git a/src/DynamoCoreWpf/Properties/AssemblyInfo.cs b/src/DynamoCoreWpf/Properties/AssemblyInfo.cs
@@ -41,4 +41,5 @@
 [assembly: InternalsVisibleTo("DocumentationBrowserViewExtension")]
 [assembly: InternalsVisibleTo("SystemTestServices")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
-[assembly: InternalsVisibleTo("PythonNodeModelsWpf")]
+[assembly: InternalsVisibleTo("PythonNodeModelsWpf")]
+[assembly: InternalsVisibleTo("LintingViewExtension")]
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2399,6 +2399,21 @@ Uninstall the following packages: {0}?</value>
   <data name="ResetCPythonButtonToolTip" xml:space="preserve">
     <value>Resets CPython environment by reloading modules.</value>
   </data>
+  <data name="GraphIssuesOnSave_CancelBtn" xml:space="preserve">
+    <value>Cancel and Show Issues</value>
+  </data>
+  <data name="GraphIssuesOnSave_Description" xml:space="preserve">
+    <value>There are unresolved issues with the graph type. If this graph is designed to be used outside of Dynamo, resolve all issues and save the graph again.</value>
+  </data>
+  <data name="GraphIssuesOnSave_ProceedBtn" xml:space="preserve">
+    <value>Save with Issues</value>
+  </data>
+  <data name="GraphIssuesOnSave_Summary" xml:space="preserve">
+    <value>You are trying to save a graph with unresolved issues</value>
+  </data>
+  <data name="GraphIssuesOnSave_Title" xml:space="preserve">
+    <value>Graph Type Issues found</value>
+  </data>
   <data name="PackagePathsExpanderName" xml:space="preserve">
     <value>Node and Package Paths</value>
   </data>

diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2399,6 +2399,21 @@ Uninstall the following packages: {0}?</value>
   <data name="ResetCPythonButtonToolTip" xml:space="preserve">
     <value>Resets CPython environment by reloading modules.</value>
   </data>
+  <data name="GraphIssuesOnSave_CancelBtn" xml:space="preserve">
+    <value>Cancel and Show Issues</value>
+  </data>
+  <data name="GraphIssuesOnSave_Description" xml:space="preserve">
+    <value>There are unresolved issues with the graph type. If this graph is designed to be used outside of Dynamo, resolve all issues and save the graph again.</value>
+  </data>
+  <data name="GraphIssuesOnSave_ProceedBtn" xml:space="preserve">
+    <value>Save with Issues</value>
+  </data>
+  <data name="GraphIssuesOnSave_Summary" xml:space="preserve">
+    <value>You are trying to save a graph with unresolved issues</value>
+  </data>
+  <data name="GraphIssuesOnSave_Title" xml:space="preserve">
+    <value>Graph Type Issues found</value>
+  </data>
   <data name="PackagePathsExpanderName" xml:space="preserve">
     <value>Node and Package Paths</value>
   </data>

diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -26,6 +26,7 @@
 using Dynamo.Selection;
 using Dynamo.Services;
 using Dynamo.UI;
+using Dynamo.UI.Prompts;
 using Dynamo.Updates;
 using Dynamo.Utilities;
 using Dynamo.Visualization;
@@ -758,6 +759,12 @@ internal void OnNodeViewReady(object nodeView)
             }
         }
 
+        internal event EventHandler RequestOpenLinterView;
+        internal void OnRequestOpenLinterView()
+        {
+            RequestOpenLinterView?.Invoke(this, EventArgs.Empty);
+        }
+
         #region Event handler destroy/create
 
         protected virtual void UnsubscribeAllEvents()
@@ -1535,6 +1542,8 @@ private bool CanOpenRecent(object path)
         /// </summary>
         private void Save(object parameter)
         {
+            if (!ShowWarningDialogOnSaveWithUnresolvedIssues()) return;
+
             if (!String.IsNullOrEmpty(Model.CurrentWorkspace.FileName))
             {
                 // For read-only file, re-direct save to save-as
@@ -1864,12 +1873,16 @@ public void ShowSaveDialogIfNeededAndSaveResult(object parameter)
             if (string.IsNullOrEmpty(vm.Model.CurrentWorkspace.FileName))
             {
                 if (CanShowSaveDialogAndSaveResult(parameter))
+                {
                     ShowSaveDialogAndSaveResult(parameter);
+                }
             }
             else
             {
                 if (CanSave(parameter))
+                {
                     Save(parameter);
+                }
             }
         }
 
@@ -1880,6 +1893,11 @@ internal bool CanShowSaveDialogIfNeededAndSaveResultCommand(object parameter)
 
         public void ShowSaveDialogAndSaveResult(object parameter)
         {
+            if (!ShowWarningDialogOnSaveWithUnresolvedIssues())
+            {
+                return;
+            }
+
             var vm = this;
 
             FileDialog _fileDialog = vm.GetSaveDialog(vm.Model.CurrentWorkspace);
@@ -1903,6 +1921,51 @@ public void ShowSaveDialogAndSaveResult(object parameter)
             }
         }
 
+        private bool ShowWarningDialogOnSaveWithUnresolvedIssues()
+        {
+            if (Model.LinterManager is null || 
+                Model.LinterManager.RuleEvaluationResults.Count <= 0)
+            {
+                return true;
+            }
+
+            string imageUri = "/DynamoCoreWpf;component/UI/Images/task_dialog_future_file.png";
+            var args = new TaskDialogEventArgs(
+                new Uri(imageUri, UriKind.Relative), 
+                WpfResources.GraphIssuesOnSave_Title,
+                WpfResources.GraphIssuesOnSave_Summary, 
+                WpfResources.GraphIssuesOnSave_Description);
+
+            args.AddRightAlignedButton((int)DynamoModel.ButtonId.Proceed, WpfResources.GraphIssuesOnSave_ProceedBtn);
+            args.AddRightAlignedButton((int)DynamoModel.ButtonId.Cancel, WpfResources.GraphIssuesOnSave_CancelBtn);
+
+            var dialog = new GenericTaskDialog(args);
+
+            if (DynamoModel.IsTestMode)
+            {
+                dialog.Show();
+                if (dialog.IsActive)
+                {
+                    var saveWarningArgs = new SaveWarningOnUnresolvedIssuesArgs(dialog);
+                    OnSaveWarningOnUnresolvedIssuesShows(saveWarningArgs);
+                }
+                return false;
+            }
+
+            dialog.ShowDialog();
+
+            // If cancel ('x' in top right corner) is pressed the ClickedButtonId on the 
+            // GenericTaskDialog is 0
+            if (args.ClickedButtonId == (int)DynamoModel.ButtonId.Cancel ||
+                args.ClickedButtonId == 0)
+            {
+                OnRequestOpenLinterView();
+                return false;
+            }
+
+            return true;
+        }
+
         internal bool CanShowSaveDialogAndSaveResult(object parameter)
         {
             return true;

diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEventArgs.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEventArgs.cs
@@ -10,6 +10,7 @@
 using Dynamo.Graph.Notes;
 using Dynamo.Graph.Workspaces;
 using Dynamo.PackageManager;
+using Dynamo.UI.Prompts;
 
 namespace Dynamo.ViewModels
 {
@@ -337,4 +338,18 @@ private static string GetInputNames(NodeModel node)
             return string.Join(",", inputNames);
         }
     }
+
+    /// <summary>
+    /// Provides information about the task dialog used when saving a graph while there are unresolved linter issues in the graph.
+    /// This is meant to be used only for unit tests to verify that the dialog has been showed.
+    /// </summary>
+    internal class SaveWarningOnUnresolvedIssuesArgs : EventArgs
+    {
+        internal GenericTaskDialog TaskDialog;
+
+        internal SaveWarningOnUnresolvedIssuesArgs(GenericTaskDialog taskDialog)
+        {
+            TaskDialog = taskDialog;
+        }
+    }
 }
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
@@ -162,5 +162,17 @@ internal void OnRequestReturnFocusToView()
             if (RequestReturnFocusToView != null)
                 RequestReturnFocusToView();
         }
+
+        /// <summary>
+        /// Event used to verify that the correct dialog is being showed when saving a graph with unresolved linter issues.
+        /// This is only meant to be used for unit testing purposes.
+        /// As the GenericTaskDialog is not owned by the DynamoWindow we need another way to verify that it shows up
+        /// when doing unit tests.
+        /// </summary>
+        internal event Action<SaveWarningOnUnresolvedIssuesArgs> SaveWarningOnUnresolvedIssuesShows;
+        internal void OnSaveWarningOnUnresolvedIssuesShows(SaveWarningOnUnresolvedIssuesArgs e)
+        {
+            SaveWarningOnUnresolvedIssuesShows?.Invoke(e);
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
@@ -20,6 +20,7 @@
 using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
 using Dynamo.Selection;
+using Dynamo.UI.Prompts;
 using Dynamo.Utilities;
 using Dynamo.Wpf.ViewModels;
 using Dynamo.Wpf.ViewModels.Core;
@@ -556,7 +557,9 @@ internal void Save(string filePath, bool isBackup = false, EngineController engi
             try
             {
                 if (!isBackup)
+                {
                     Model.OnSaving(saveContext);
+                }
 
                 //set the name before serializing model.
                 this.Model.setNameBasedOnFileName(filePath, isBackup);

diff --git a/src/LintingViewExtension/LintingViewExtension.cs b/src/LintingViewExtension/LintingViewExtension.cs
@@ -39,6 +39,8 @@ public override void Loaded(ViewLoadedParams viewLoadedParams)
             this.linterViewModel = new LinterViewModel(linterManager, viewLoadedParamsReference);
             this.linterView = new LinterView() { DataContext = linterViewModel };
 
+            (viewLoadedParams.DynamoWindow.DataContext as DynamoViewModel).RequestOpenLinterView += OnRequestOpenLinterView;
+
             // Add a button to Dynamo View menu to manually show the window
             this.linterMenuItem = new MenuItem { Header = Resources.MenuItemText, IsCheckable = true };
             this.linterMenuItem.Checked += MenuItemCheckHandler;
@@ -48,6 +50,12 @@ public override void Loaded(ViewLoadedParams viewLoadedParams)
             this.linterManager.PropertyChanged += OnLinterManagerPropertyChange;
         }
 
+        private void OnRequestOpenLinterView(object sender, System.EventArgs e)
+        {
+            if (linterMenuItem.IsChecked) return;
+            linterMenuItem.IsChecked = true;
+        }
+
         public override void Shutdown()
         {
             // Do nothing for now