Handling the Custom Nodes and Trusted Location message (#13138)

jesusalvino · web-flow · commit d4e50f138438 · 2022-08-04T20:30:53.000-07:00
* Handling the Custom Nodes and Trusted Location message

* take HomeSpaceViewModel instead of element from Workspaces

* trust info enhancement between two workspaces

* Refactoring the trust behavior info between 2 workspaces

* Refactoring the Eventing between the Trust UI messages and the Workspaces

* Cleaning spacing and removing unncessary code

* Checking the DynamoViewModel.ViewingHomespace instead of casting it

* unsubscribing for consistency

* Spacing and Tabbing

* Checking property name instead of string value
diff --git a/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/HomeWorkspaceViewModel.cs
@@ -128,10 +128,18 @@ public HomeWorkspaceViewModel(HomeWorkspaceModel model, DynamoViewModel dynamoVi
             hwm.SetNodeDeltaState +=hwm_SetNodeDeltaState;
 
             dynamoViewModel.Model.ShutdownStarted += Model_ShutdownStarted;
-
+            dynamoViewModel.PropertyChanged += DynamoViewModel_PropertyChanged;
             SetupFooterNotificationItems();
         }
 
+        private void DynamoViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(DynamoViewModel.CurrentSpace) && !(sender as DynamoViewModel).ViewingHomespace)
+            {
+                ClearWarning();
+            }
+        }
+
         /// <summary>
         /// Setup the initial collection of FooterNotificationItems
         /// </summary>
@@ -496,6 +504,7 @@ public override void Dispose()
             RunSettingsViewModel.Dispose();
             RunSettingsViewModel = null;
             DynamoViewModel.Model.ShutdownStarted -= Model_ShutdownStarted;
+            DynamoViewModel.Model.PropertyChanged -= DynamoViewModel_PropertyChanged;
         }
     }
 
diff --git a/src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml.cs b/src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml.cs
@@ -47,6 +47,15 @@ public FileTrustWarning(DynamoView dynamoViewWindow)
             SetUpPopup();
 
             HomeWorkspaceModel.WorkspaceClosed += CloseWarningPopup;
+            dynViewModel.PropertyChanged += DynViewModel_PropertyChanged;
+        }
+
+        private void DynViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "CurrentSpace" && !dynViewModel.ViewingHomespace)
+            {
+                IsOpen = false;
+            }
         }
 
         private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -170,6 +179,7 @@ internal void CleanPopup()
             }
 
             HomeWorkspaceModel.WorkspaceClosed -= CloseWarningPopup;
+            dynViewModel.PropertyChanged -= DynViewModel_PropertyChanged;
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,15 @@ public FileTrustWarning(DynamoView dynamoViewWindow)`
`47`	`47`	`SetUpPopup();`
`48`	`48`
`49`	`49`	`HomeWorkspaceModel.WorkspaceClosed += CloseWarningPopup;`
	`50`	`+ dynViewModel.PropertyChanged += DynViewModel_PropertyChanged;`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ private void DynViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`
	`54`	`+ {`
	`55`	`+ if (e.PropertyName == "CurrentSpace" && !dynViewModel.ViewingHomespace)`
	`56`	`+ {`
	`57`	`+ IsOpen = false;`
	`58`	`+ }`
`50`	`59`	`}`
`51`	`60`
`52`	`61`	`private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`
`@@ -170,6 +179,7 @@ internal void CleanPopup()`
`170`	`179`	`}`
`171`	`180`
`172`	`181`	`HomeWorkspaceModel.WorkspaceClosed -= CloseWarningPopup;`
	`182`	`+ dynViewModel.PropertyChanged -= DynViewModel_PropertyChanged;`
`173`	`183`	`}`
`174`	`184`
`175`	`185`	`/// <summary>`