Fixing CustomNode WorkSpace first scenario and trusted bubble behavior (#13197)

jesusalvino · web-flow · commit 07788fb873eb · 2022-08-11T22:29:46.000-07:00
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -218,8 +218,8 @@ public int CurrentWorkspaceIndex
 
                     // Keep DynamoModel.CurrentWorkspace update-to-date
                     int modelIndex = model.Workspaces.IndexOf(currentWorkspaceViewModel.Model);
-                    ExecuteCommand(new DynamoModel.SwitchTabCommand(modelIndex));
-                    (HomeSpaceViewModel as HomeWorkspaceViewModel).UpdateRunStatusMsgBasedOnStates();
+                    ExecuteCommand(new DynamoModel.SwitchTabCommand(modelIndex));                   
+                    (HomeSpaceViewModel as HomeWorkspaceViewModel)?.UpdateRunStatusMsgBasedOnStates();
                 }
             }
         }
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -2507,8 +2507,8 @@ private void FileTrustWarning_Click(object sender, RoutedEventArgs e)
         }
 
         private void DynamoView_Activated(object sender, EventArgs e)
-        {
-            if (fileTrustWarningPopup != null)
+        {            
+            if (fileTrustWarningPopup != null && dynamoViewModel.ViewingHomespace)
             {
                 fileTrustWarningPopup.ManagePopupActivation(true);
             }
diff --git a/src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml.cs b/src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml.cs
@@ -52,9 +52,16 @@ public FileTrustWarning(DynamoView dynamoViewWindow)
 
         private void DynViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == "CurrentSpace" && !dynViewModel.ViewingHomespace)
+            if (e.PropertyName == nameof(DynamoViewModel.CurrentSpace))
             {
-                IsOpen = false;
+                if (dynViewModel.ViewingHomespace)
+                {
+                    ManagePopupActivation(true);
+                }
+                else
+                {
+                    IsOpen = false;
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ public int CurrentWorkspaceIndex`
`218`	`218`
`219`	`219`	`// Keep DynamoModel.CurrentWorkspace update-to-date`
`220`	`220`	`int modelIndex = model.Workspaces.IndexOf(currentWorkspaceViewModel.Model);`
`221`		`- ExecuteCommand(new DynamoModel.SwitchTabCommand(modelIndex));`
`222`		`- (HomeSpaceViewModel as HomeWorkspaceViewModel).UpdateRunStatusMsgBasedOnStates();`
	`221`	`+ ExecuteCommand(new DynamoModel.SwitchTabCommand(modelIndex));`
	`222`	`+ (HomeSpaceViewModel as HomeWorkspaceViewModel)?.UpdateRunStatusMsgBasedOnStates();`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2507,8 +2507,8 @@ private void FileTrustWarning_Click(object sender, RoutedEventArgs e)`
`2507`	`2507`	`}`
`2508`	`2508`
`2509`	`2509`	`private void DynamoView_Activated(object sender, EventArgs e)`
`2510`		`- {`
`2511`		`- if (fileTrustWarningPopup != null)`
	`2510`	`+ {`
	`2511`	`+ if (fileTrustWarningPopup != null && dynamoViewModel.ViewingHomespace)`
`2512`	`2512`	`{`
`2513`	`2513`	`fileTrustWarningPopup.ManagePopupActivation(true);`
`2514`	`2514`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,16 @@ public FileTrustWarning(DynamoView dynamoViewWindow)`
`52`	`52`
`53`	`53`	`private void DynViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`
`54`	`54`	`{`
`55`		`- if (e.PropertyName == "CurrentSpace" && !dynViewModel.ViewingHomespace)`
	`55`	`+ if (e.PropertyName == nameof(DynamoViewModel.CurrentSpace))`
`56`	`56`	`{`
`57`		`- IsOpen = false;`
	`57`	`+ if (dynViewModel.ViewingHomespace)`
	`58`	`+ {`
	`59`	`+ ManagePopupActivation(true);`
	`60`	`+ }`
	`61`	`+ else`
	`62`	`+ {`
	`63`	`+ IsOpen = false;`
	`64`	`+ }`
`58`	`65`	`}`
`59`	`66`	`}`
`60`	`67`