Replace Application.Current with HostAnalyticsInfo.HostName check (#14574)

zeusongit · QilongTang · web-flow · commit c5df6f9ab3ef · 2023-11-27T11:22:32.000-05:00
* Fix PostDiff job

* replace application.current

* tests

* refactor after Bogdans PR

---------

Co-authored-by: Aaron (Qilong) &lt;173288704@qq.com&gt;
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -537,7 +537,7 @@ public interface IStartConfiguration
             bool NoNetworkMode => false;
 
             /// <summary>
-            /// Configuration object that contains host information like Host name, version and session id.
+            /// Configuration object that contains host information like Host name, parent id and session id.
             /// </summary>
             HostAnalyticsInfo HostAnalyticsInfo { get; set; }
         }
diff --git a/src/DynamoCoreWpf/Controls/InPortContextMenu.xaml.cs b/src/DynamoCoreWpf/Controls/InPortContextMenu.xaml.cs
@@ -1,6 +1,7 @@
-﻿using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
+using Dynamo.Models;
 using Dynamo.ViewModels;
 
 namespace Dynamo.UI.Controls
@@ -15,8 +16,10 @@ public partial class InPortContextMenu : UserControl
         public InPortContextMenu()
         {
             InitializeComponent();
-
-            if (Application.Current != null) Application.Current.Deactivated += CurrentApplicationDeactivated;
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
+            {
+                Application.Current.Deactivated += CurrentApplicationDeactivated;
+            }
             Unloaded += InPortContextMenuControl_Unloaded;
         }
 
@@ -27,7 +30,7 @@ public InPortContextMenu()
         /// <param name="e"></param>
         private void InPortContextMenuControl_Unloaded(object sender, RoutedEventArgs e)
         {
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
             }
diff --git a/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs b/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs
@@ -8,6 +8,7 @@
 using System.Windows.Input;
 using System.Windows.Threading;
 using Dynamo.Logging;
+using Dynamo.Models;
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.ViewModels;
@@ -31,7 +32,7 @@ public SearchViewModel ViewModel
         public InCanvasSearchControl()
         {
             InitializeComponent();
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated += CurrentApplicationDeactivated;
                 Application.Current.MainWindow.Closing += InCanvasSearchControl_Unloaded;
@@ -40,7 +41,7 @@ public InCanvasSearchControl()
 
         private void InCanvasSearchControl_Unloaded(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
                 Application.Current.MainWindow.Closing -= InCanvasSearchControl_Unloaded;
diff --git a/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs b/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs
@@ -42,10 +42,10 @@ public partial class NodeAutoCompleteSearchControl : IDisposable
         public NodeAutoCompleteSearchControl()
         {
             InitializeComponent();
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated += CurrentApplicationDeactivated;
-                if (Application.Current.MainWindow != null)
+                if (Application.Current?.MainWindow != null)
                 {
                     Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;
                 }
@@ -55,10 +55,10 @@ public NodeAutoCompleteSearchControl()
 
         private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
-                if (Application.Current.MainWindow != null)
+                if (Application.Current?.MainWindow != null)
                 {
                     Application.Current.MainWindow.Closing -= NodeAutoCompleteSearchControl_Unloaded;
                 }
diff --git a/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml.cs b/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using Dynamo.Models;
 using Dynamo.ViewModels;
 
 namespace Dynamo.UI.Controls
@@ -19,7 +20,10 @@ public OutPortContextMenu()
         {
             InitializeComponent();
 
-            if (Application.Current != null) Application.Current.Deactivated += CurrentApplicationDeactivated;
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
+            {
+                Application.Current.Deactivated += CurrentApplicationDeactivated;
+            }
             Unloaded += OutPortContextMenuControl_Unloaded;
         }
 
@@ -30,7 +34,7 @@ public OutPortContextMenu()
         /// <param name="e"></param>
         private void OutPortContextMenuControl_Unloaded(object sender, RoutedEventArgs e)
         {
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
             }
diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs
@@ -105,15 +105,14 @@ public void ToggleIsAnalyticsReportingApproved(object parameter)
         private void ShowUsageReportingPrompt(Window ownerWindow)
         {
             // If an owner window is not supplied, then we will fallback onto 
-            // using the application's main window. In native host application
-            // scenario (e.g. Revit), the "Application.Current" will be "null".
+            // using the application's main window.
             // The owner window is important so that usage report window always 
             // get shown on top of the owner window, otherwise it is possible 
             // for usage report window to show up in the background (behind all
             // other full screen windows), and Dynamo main window will appear 
             // to be frozen because control cannot return to it.
             // 
-            if (ownerWindow == null && (null != Application.Current))
+            if (ownerWindow == null && string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
                 ownerWindow = Application.Current.MainWindow;
 
             var usageReportingPrompt = new UsageReportingAgreementPrompt(resourceProvider, dynamoViewModel)
diff --git a/src/DynamoCoreWpf/ViewModels/RunSettingsViewModel.cs b/src/DynamoCoreWpf/ViewModels/RunSettingsViewModel.cs
@@ -314,9 +314,9 @@ void NotifyOfGraphRunChanged()
             RaisePropertyChanged(nameof(RunButtonEnabled));
             RaisePropertyChanged(nameof(RunButtonToolTip));
 
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName))
             {
-                Application.Current.Dispatcher.Invoke(new Action(() =>
+                Application.Current?.Dispatcher.Invoke(new Action(() =>
                 {
                     dynamoViewModel.ShowOpenDialogAndOpenResultCommand.RaiseCanExecuteChanged();
                     dynamoViewModel.NewHomeWorkspaceCommand.RaiseCanExecuteChanged();
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -256,7 +256,7 @@ public DynamoView(DynamoViewModel dynamoViewModel)
             {
                 fileTrustWarningPopup = new FileTrustWarning(this);
             }
-            if (!DynamoModel.IsTestMode && Application.Current != null)
+            if (!DynamoModel.IsTestMode && string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.MainWindow = this;
             }
@@ -1372,9 +1372,10 @@ private void DynamoView_Loaded(object sender, EventArgs e)
 
             TrackStartupAnalytics();
 
-            // In native host scenario (e.g. Revit), the "Application.Current" will be "null". Therefore, the InCanvasSearchControl.OnRequestShowInCanvasSearch
-            // will not work. Instead, we have to check if the Owner Window (DynamoView) is deactivated or not.  
-            if (Application.Current == null)
+            // In native host scenario (e.g. Revit), the InCanvasSearchControl.OnRequestShowInCanvasSearch
+            // will not work. Instead, we have to check if the Owner Window (DynamoView) is deactivated or not.
+
+            if (!string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName))
             {
                 this.Deactivated += (s, args) => { HidePopupWhenWindowDeactivated(null); };
             }

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ public interface IStartConfiguration`
`537`	`537`	`bool NoNetworkMode => false;`
`538`	`538`
`539`	`539`	`/// <summary>`
`540`		`- /// Configuration object that contains host information like Host name, version and session id.`
	`540`	`+ /// Configuration object that contains host information like Host name, parent id and session id.`
`541`	`541`	`/// </summary>`
`542`	`542`	`HostAnalyticsInfo HostAnalyticsInfo { get; set; }`
`543`	`543`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Windows;`
`3`	`3`	`using System.Windows.Controls;`
	`4`	`+using Dynamo.Models;`
`4`	`5`	`using Dynamo.ViewModels;`
`5`	`6`
`6`	`7`	`namespace Dynamo.UI.Controls`
`@@ -15,8 +16,10 @@ public partial class InPortContextMenu : UserControl`
`15`	`16`	`public InPortContextMenu()`
`16`	`17`	`{`
`17`	`18`	`InitializeComponent();`
`18`		`-`
`19`		`- if (Application.Current != null) Application.Current.Deactivated += CurrentApplicationDeactivated;`
	`19`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
	`20`	`+ {`
	`21`	`+ Application.Current.Deactivated += CurrentApplicationDeactivated;`
	`22`	`+ }`
`20`	`23`	`Unloaded += InPortContextMenuControl_Unloaded;`
`21`	`24`	`}`
`22`	`25`
`@@ -27,7 +30,7 @@ public InPortContextMenu()`
`27`	`30`	`/// <param name="e"></param>`
`28`	`31`	`private void InPortContextMenuControl_Unloaded(object sender, RoutedEventArgs e)`
`29`	`32`	`{`
`30`		`- if (Application.Current != null)`
	`33`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`31`	`34`	`{`
`32`	`35`	`Application.Current.Deactivated -= CurrentApplicationDeactivated;`
`33`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using System.Windows.Input;`
`9`	`9`	`using System.Windows.Threading;`
`10`	`10`	`using Dynamo.Logging;`
	`11`	`+using Dynamo.Models;`
`11`	`12`	`using Dynamo.Utilities;`
`12`	`13`	`using Dynamo.ViewModels;`
`13`	`14`	`using Dynamo.Wpf.ViewModels;`
`@@ -31,7 +32,7 @@ public SearchViewModel ViewModel`
`31`	`32`	`public InCanvasSearchControl()`
`32`	`33`	`{`
`33`	`34`	`InitializeComponent();`
`34`		`- if (Application.Current != null)`
	`35`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`35`	`36`	`{`
`36`	`37`	`Application.Current.Deactivated += CurrentApplicationDeactivated;`
`37`	`38`	`Application.Current.MainWindow.Closing += InCanvasSearchControl_Unloaded;`
`@@ -40,7 +41,7 @@ public InCanvasSearchControl()`
`40`	`41`
`41`	`42`	`private void InCanvasSearchControl_Unloaded(object sender, System.ComponentModel.CancelEventArgs e)`
`42`	`43`	`{`
`43`		`- if (Application.Current != null)`
	`44`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`44`	`45`	`{`
`45`	`46`	`Application.Current.Deactivated -= CurrentApplicationDeactivated;`
`46`	`47`	`Application.Current.MainWindow.Closing -= InCanvasSearchControl_Unloaded;`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,10 @@ public partial class NodeAutoCompleteSearchControl : IDisposable`
`42`	`42`	`public NodeAutoCompleteSearchControl()`
`43`	`43`	`{`
`44`	`44`	`InitializeComponent();`
`45`		`- if (Application.Current != null)`
	`45`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`46`	`46`	`{`
`47`	`47`	`Application.Current.Deactivated += CurrentApplicationDeactivated;`
`48`		`- if (Application.Current.MainWindow != null)`
	`48`	`+ if (Application.Current?.MainWindow != null)`
`49`	`49`	`{`
`50`	`50`	`Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;`
`51`	`51`	`}`
`@@ -55,10 +55,10 @@ public NodeAutoCompleteSearchControl()`
`55`	`55`
`56`	`56`	`private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.ComponentModel.CancelEventArgs e)`
`57`	`57`	`{`
`58`		`- if (Application.Current != null)`
	`58`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`59`	`59`	`{`
`60`	`60`	`Application.Current.Deactivated -= CurrentApplicationDeactivated;`
`61`		`- if (Application.Current.MainWindow != null)`
	`61`	`+ if (Application.Current?.MainWindow != null)`
`62`	`62`	`{`
`63`	`63`	`Application.Current.MainWindow.Closing -= NodeAutoCompleteSearchControl_Unloaded;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Windows;`
`3`	`3`	`using System.Windows.Controls;`
	`4`	`+using Dynamo.Models;`
`4`	`5`	`using Dynamo.ViewModels;`
`5`	`6`
`6`	`7`	`namespace Dynamo.UI.Controls`
`@@ -19,7 +20,10 @@ public OutPortContextMenu()`
`19`	`20`	`{`
`20`	`21`	`InitializeComponent();`
`21`	`22`
`22`		`- if (Application.Current != null) Application.Current.Deactivated += CurrentApplicationDeactivated;`
	`23`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
	`24`	`+ {`
	`25`	`+ Application.Current.Deactivated += CurrentApplicationDeactivated;`
	`26`	`+ }`
`23`	`27`	`Unloaded += OutPortContextMenuControl_Unloaded;`
`24`	`28`	`}`
`25`	`29`
`@@ -30,7 +34,7 @@ public OutPortContextMenu()`
`30`	`34`	`/// <param name="e"></param>`
`31`	`35`	`private void OutPortContextMenuControl_Unloaded(object sender, RoutedEventArgs e)`
`32`	`36`	`{`
`33`		`- if (Application.Current != null)`
	`37`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`34`	`38`	`{`
`35`	`39`	`Application.Current.Deactivated -= CurrentApplicationDeactivated;`
`36`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -314,9 +314,9 @@ void NotifyOfGraphRunChanged()`
`314`	`314`	`RaisePropertyChanged(nameof(RunButtonEnabled));`
`315`	`315`	`RaisePropertyChanged(nameof(RunButtonToolTip));`
`316`	`316`
`317`		`- if (Application.Current != null)`
	`317`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName))`
`318`	`318`	`{`
`319`		`- Application.Current.Dispatcher.Invoke(new Action(() =>`
	`319`	`+ Application.Current?.Dispatcher.Invoke(new Action(() =>`
`320`	`320`	`{`
`321`	`321`	`dynamoViewModel.ShowOpenDialogAndOpenResultCommand.RaiseCanExecuteChanged();`
`322`	`322`	`dynamoViewModel.NewHomeWorkspaceCommand.RaiseCanExecuteChanged();`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ public DynamoView(DynamoViewModel dynamoViewModel)`
`256`	`256`	`{`
`257`	`257`	`fileTrustWarningPopup = new FileTrustWarning(this);`
`258`	`258`	`}`
`259`		`- if (!DynamoModel.IsTestMode && Application.Current != null)`
	`259`	`+ if (!DynamoModel.IsTestMode && string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`260`	`260`	`{`
`261`	`261`	`Application.Current.MainWindow = this;`
`262`	`262`	`}`
`@@ -1372,9 +1372,10 @@ private void DynamoView_Loaded(object sender, EventArgs e)`
`1372`	`1372`
`1373`	`1373`	`TrackStartupAnalytics();`
`1374`	`1374`
`1375`		`- // In native host scenario (e.g. Revit), the "Application.Current" will be "null". Therefore, the InCanvasSearchControl.OnRequestShowInCanvasSearch`
`1376`		`- // will not work. Instead, we have to check if the Owner Window (DynamoView) is deactivated or not.`
`1377`		`- if (Application.Current == null)`
	`1375`	`+ // In native host scenario (e.g. Revit), the InCanvasSearchControl.OnRequestShowInCanvasSearch`
	`1376`	`+ // will not work. Instead, we have to check if the Owner Window (DynamoView) is deactivated or not.`
	`1377`	`+`
	`1378`	`+ if (!string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName))`
`1378`	`1379`	`{`
`1379`	`1380`	`this.Deactivated += (s, args) => { HidePopupWhenWindowDeactivated(null); };`
`1380`	`1381`	`}`