Update Run Status Message to Run Blocked during File Trust Warning (#12953)

QilongTang · web-flow · commit d1477f35d035 · 2022-06-03T08:38:07.000-04:00
* Update Run Status Message to Run Blocked

* Clean up

* Update

* update

* Add null check
diff --git a/src/DynamoCore/Graph/Workspaces/HomeWorkspaceModel.cs b/src/DynamoCore/Graph/Workspaces/HomeWorkspaceModel.cs
@@ -654,7 +654,6 @@ private void PulseMakerRunStarted()
         /// <param name="markNodesAsDirty">Set this parameter to true to force 
         ///     reset of the execution substrait. Note that setting this parameter 
         ///     to true will have a negative performance impact.</param>
-        /// <param name="forceAutomaticWithoutRun">This parameter, if true, will prohibit the graph from executing when RunMode is set to Automatic</param>
         internal void ResetEngine(EngineController controller, bool markNodesAsDirty = false)
         {
             if (EngineController != null)
@@ -674,7 +673,7 @@ internal void ResetEngine(EngineController controller, bool markNodesAsDirty = f
                 MarkNodesAsModifiedAndRequestRun(Nodes);
             }
 
-            if (RunSettings.RunEnabled && RunSettings.RunType == RunType.Automatic && RunSettings.ForceAutomaticWithoutRun == false)
+            if (RunSettings.RunEnabled && RunSettings.RunType == RunType.Automatic && !RunSettings.ForceAutomaticWithoutRun)
                 Run();
         }
 
diff --git a/src/DynamoCore/Models/RunSettings.cs b/src/DynamoCore/Models/RunSettings.cs
@@ -20,8 +20,10 @@ public class RunSettings : NotificationObject
         private RunType runType;
         private bool runEnabled;
         private bool runTypesEnabled;
-        private bool runTypesComboBoxToolTipIsEnabled;
 
+        /// <summary>
+        /// Boolean indicates if Dynamo should block run even when mode is Automatic.
+        /// </summary>
         internal bool ForceAutomaticWithoutRun { get; set; } = false;
 
         /// <summary>
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
@@ -3199,4 +3199,8 @@ To install the latest version of a package, click Install. \n
   <data name="MessagePackageTargetOtherHosts" xml:space="preserve">
     <value>The package or one of its dependencies targets a different environment, such as Revit, Civil 3D, Advance Steel, Alias or FormIt. This can cause instability and unexpected problems. Do you want to continue?</value>
   </data>
+  <data name="RunBlockedMessage" xml:space="preserve">
+    <value>Run blocked.</value>
+    <comment>Run status message for case where graph run blocked due to unresolved security warning.</comment>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3186,4 +3186,8 @@ To install the latest version of a package, click Install. \n
   <data name="MessagePackageTargetOtherHosts" xml:space="preserve">
     <value>The package or one of its dependencies targets a different environment, such as Revit, Civil 3D, Advance Steel, Alias or FormIt. This can cause instability and unexpected problems. Do you want to continue?</value>
   </data>
+  <data name="RunBlockedMessage" xml:space="preserve">
+    <value>Run blocked.</value>
+    <comment>Run status message for case where graph run blocked due to unresolved security warning.</comment>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -1605,17 +1605,13 @@ private void Open(object parameters)
                 }
 
                 var directoryName = Path.GetDirectoryName(filePath);
-                //Checks if the file that is being opened is in the trusted list.
-                bool bShowFileTrustWarning = false;
-                if(!PreferenceSettings.TrustedLocations.Contains(directoryName) && DynamoModel.IsTestMode == false)
-                {
-                    HomeSpace.RunSettings.ForceAutomaticWithoutRun = true;
-                    bShowFileTrustWarning = true;
-                }
                 ExecuteCommand(new DynamoModel.OpenFileCommand(filePath, forceManualMode));
-
-                if (FileTrustViewModel != null && bShowFileTrustWarning == true)
+                if (!PreferenceSettings.TrustedLocations.Contains(directoryName) 
+                    && (currentWorkspaceViewModel?.IsHomeSpace ?? false)
+                    && DynamoModel.IsTestMode == false
+                    && FileTrustViewModel != null)
                 {
+                    HomeSpace.RunSettings.ForceAutomaticWithoutRun = true;
                     FileTrustViewModel.DynFileDirectoryName = directoryName;
                     FileTrustViewModel.ShowWarningPopup = true;
                 }
diff --git a/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs
@@ -265,6 +265,12 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)
         /// </summary>
         internal void UpdateRunStatusMsgBasedOnStates()
         {
+            if ((bool)((Model as HomeWorkspaceModel)?.RunSettings.ForceAutomaticWithoutRun))
+            {
+                SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunBlockedMessage);
+                return;
+            }
+
             if (!HasWarnings && !HasErrors)
             {
                 if (Model.ScaleFactorChanged)

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,6 @@ private void PulseMakerRunStarted()`
`654`	`654`	`/// <param name="markNodesAsDirty">Set this parameter to true to force`
`655`	`655`	`/// reset of the execution substrait. Note that setting this parameter`
`656`	`656`	`/// to true will have a negative performance impact.</param>`
`657`		`- /// <param name="forceAutomaticWithoutRun">This parameter, if true, will prohibit the graph from executing when RunMode is set to Automatic</param>`
`658`	`657`	`internal void ResetEngine(EngineController controller, bool markNodesAsDirty = false)`
`659`	`658`	`{`
`660`	`659`	`if (EngineController != null)`
`@@ -674,7 +673,7 @@ internal void ResetEngine(EngineController controller, bool markNodesAsDirty = f`
`674`	`673`	`MarkNodesAsModifiedAndRequestRun(Nodes);`
`675`	`674`	`}`
`676`	`675`
`677`		`- if (RunSettings.RunEnabled && RunSettings.RunType == RunType.Automatic && RunSettings.ForceAutomaticWithoutRun == false)`
	`676`	`+ if (RunSettings.RunEnabled && RunSettings.RunType == RunType.Automatic && !RunSettings.ForceAutomaticWithoutRun)`
`678`	`677`	`Run();`
`679`	`678`	`}`
`680`	`679`
Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,12 @@ void hwm_EvaluationCompleted(object sender, EvaluationCompletedEventArgs e)`
`265`	`265`	`/// </summary>`
`266`	`266`	`internal void UpdateRunStatusMsgBasedOnStates()`
`267`	`267`	`{`
	`268`	`+ if ((bool)((Model as HomeWorkspaceModel)?.RunSettings.ForceAutomaticWithoutRun))`
	`269`	`+ {`
	`270`	`+ SetCurrentWarning(NotificationLevel.Moderate, Properties.Resources.RunBlockedMessage);`
	`271`	`+ return;`
	`272`	`+ }`
	`273`	`+`
`268`	`274`	`if (!HasWarnings && !HasErrors)`
`269`	`275`	`{`
`270`	`276`	`if (Model.ScaleFactorChanged)`