From 439eafa4581bba3245a3d0360a291d9395b132c2 Mon Sep 17 00:00:00 2001 From: Karen Kuo Date: Mon, 29 Sep 2025 13:53:26 -0400 Subject: [PATCH 1/5] DYN-8972: Disable data collection agreements in NoNetworkMode --- src/DynamoCoreWpf/Services/UsageReportingManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs index 4c09d4aae9e..ed7829b981f 100644 --- a/src/DynamoCoreWpf/Services/UsageReportingManager.cs +++ b/src/DynamoCoreWpf/Services/UsageReportingManager.cs @@ -82,7 +82,9 @@ public void CheckIsFirstRun(Window ownerWindow, IBrandingResourceProvider resour && dynamoViewModel.Model.PreferenceSettings.IsFirstRun && !dynamoViewModel.HideReportOptions && !Analytics.DisableAnalytics - && !DynamoModel.IsTestMode) + && !DynamoModel.IsTestMode + && !dynamoViewModel.Model.NoNetworkMode + ) { //Prompt user for detailed reporting ShowUsageReportingPrompt(ownerWindow); From 99977c7e187fd0b73178e9468420c29348fb60d4 Mon Sep 17 00:00:00 2001 From: Karen Kuo Date: Mon, 29 Sep 2025 13:54:47 -0400 Subject: [PATCH 2/5] Small fix --- src/DynamoCoreWpf/Services/UsageReportingManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs index ed7829b981f..34e0d9f064e 100644 --- a/src/DynamoCoreWpf/Services/UsageReportingManager.cs +++ b/src/DynamoCoreWpf/Services/UsageReportingManager.cs @@ -83,8 +83,7 @@ public void CheckIsFirstRun(Window ownerWindow, IBrandingResourceProvider resour && !dynamoViewModel.HideReportOptions && !Analytics.DisableAnalytics && !DynamoModel.IsTestMode - && !dynamoViewModel.Model.NoNetworkMode - ) + && !dynamoViewModel.Model.NoNetworkMode) { //Prompt user for detailed reporting ShowUsageReportingPrompt(ownerWindow); From 049890265f99ca3864fe12e4cda2b0d563508b69 Mon Sep 17 00:00:00 2001 From: Karen Kuo Date: Mon, 29 Sep 2025 15:03:09 -0400 Subject: [PATCH 3/5] Add NoNetWorkCheck to ToggleIsAnalyticsReportingApproved() --- src/DynamoCoreWpf/Services/UsageReportingManager.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs index 34e0d9f064e..68e7b9b64b2 100644 --- a/src/DynamoCoreWpf/Services/UsageReportingManager.cs +++ b/src/DynamoCoreWpf/Services/UsageReportingManager.cs @@ -100,6 +100,7 @@ public void ToggleIsAnalyticsReportingApproved(object parameter) throw new InvalidOperationException( "DynamoView must be supplied for this command"); } + MessageBoxImage.Information); ShowUsageReportingPrompt(ownerWindow); } From d9b84a3154494bcdbc5a823274b5be1990865245 Mon Sep 17 00:00:00 2001 From: Karen Kuo Date: Mon, 29 Sep 2025 15:03:56 -0400 Subject: [PATCH 4/5] Add NoNetWorkCheck to ToggleIsAnalyticsReportingApproved() --- src/DynamoCoreWpf/Services/UsageReportingManager.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs index 68e7b9b64b2..df2c49e4fce 100644 --- a/src/DynamoCoreWpf/Services/UsageReportingManager.cs +++ b/src/DynamoCoreWpf/Services/UsageReportingManager.cs @@ -100,7 +100,19 @@ public void ToggleIsAnalyticsReportingApproved(object parameter) throw new InvalidOperationException( "DynamoView must be supplied for this command"); } + + // Skip analytics prompt in no-network mode + if (dynamoViewModel?.Model?.NoNetworkMode == true) + { + Dynamo.Wpf.Utilities.MessageBoxService.Show( + ownerWindow, + "Data collection settings are not available in no-network mode.", + "No Network Mode", + MessageBoxButton.OK, MessageBoxImage.Information); + return; + } + ShowUsageReportingPrompt(ownerWindow); } From 500a69b1630ad8111617ded457023ba8f26f91d1 Mon Sep 17 00:00:00 2001 From: Karen Kuo Date: Mon, 29 Sep 2025 16:06:47 -0400 Subject: [PATCH 5/5] Hide analytics toggle in no-network mode instead of showing message --- src/DynamoCoreWpf/Services/UsageReportingManager.cs | 12 ------------ src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs index df2c49e4fce..45c340af53f 100644 --- a/src/DynamoCoreWpf/Services/UsageReportingManager.cs +++ b/src/DynamoCoreWpf/Services/UsageReportingManager.cs @@ -101,18 +101,6 @@ public void ToggleIsAnalyticsReportingApproved(object parameter) "DynamoView must be supplied for this command"); } - // Skip analytics prompt in no-network mode - if (dynamoViewModel?.Model?.NoNetworkMode == true) - { - Dynamo.Wpf.Utilities.MessageBoxService.Show( - ownerWindow, - "Data collection settings are not available in no-network mode.", - "No Network Mode", - MessageBoxButton.OK, - MessageBoxImage.Information); - return; - } - ShowUsageReportingPrompt(ownerWindow); } diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs index ed37c2367ba..25d17733c10 100644 --- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs @@ -793,7 +793,7 @@ protected DynamoViewModel(StartConfiguration startConfiguration) this.model.CommandCompleted += OnModelCommandCompleted; this.model.RequestsCrashPrompt += CrashReportTool.ShowCrashWindow; - this.HideReportOptions = startConfiguration.HideReportOptions; + this.HideReportOptions = startConfiguration.HideReportOptions || model.NoNetworkMode; UsageReportingManager.Instance.InitializeCore(this); this.WatchHandler = startConfiguration.WatchHandler; var pmExtension = model.GetPackageManagerExtension();