set IsFirstRun to false if hide report options is true (#11530)

mjkkirschner · web-flow · commit 42595c00d562 · 2021-03-08T14:06:24.000-05:00
* Update DynamoView.xaml.cs

* add test
add internal setter

* review comments

Co-authored-by: michael kirschner &lt;michael.kirschner@autodesk.com&gt;
diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs
@@ -146,14 +146,14 @@ public void CheckIsFirstRun(Window ownerWindow, IBrandingResourceProvider resour
         {
             resourceProvider = resource;
             // First run of Dynamo
-            if (dynamoViewModel.Model.PreferenceSettings.IsFirstRun)
+            if (dynamoViewModel.Model.PreferenceSettings.IsFirstRun
+                && !dynamoViewModel.HideReportOptions
+                && !DynamoModel.IsTestMode)
             {
-                FirstRun = false;
-
                 //Prompt user for detailed reporting
-                if (!DynamoModel.IsTestMode)
                     ShowUsageReportingPrompt(ownerWindow);
             }
+            FirstRun = false;
         }
 
         [Obsolete("Function will be removed in Dynamo 3.0, please set IsUsageReportingApproved.")]
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -503,7 +503,7 @@ public bool BackgroundPreviewActive
             get { return BackgroundPreviewViewModel.Active; }
         }
 
-        public bool HideReportOptions { get; }
+        public bool HideReportOptions { get; internal set; }
 
         /// <summary>
         /// Indicates if whether the Iron Python dialog box should be displayed before each new session.
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -909,11 +909,9 @@ private void DynamoView_Loaded(object sender, EventArgs e)
             //Backing up IsFirstRun to determine whether to show Gallery
             var isFirstRun = dynamoViewModel.Model.PreferenceSettings.IsFirstRun;
 
-            if (!dynamoViewModel.HideReportOptions)
-            {
-                // If first run, Collect Info Prompt will appear
-                UsageReportingManager.Instance.CheckIsFirstRun(this, dynamoViewModel.BrandingResourceProvider);
-            }
+            // If first run, Collect Info Prompt will appear
+            UsageReportingManager.Instance.CheckIsFirstRun(this, dynamoViewModel.BrandingResourceProvider);
+            
 
             WorkspaceTabs.SelectedIndex = 0;
             dynamoViewModel = (DataContext as DynamoViewModel);
diff --git a/test/DynamoCoreWpfTests/CoreUITests.cs b/test/DynamoCoreWpfTests/CoreUITests.cs
@@ -666,6 +666,17 @@ public void PreferenceSettings_ShowEdges_Save()
             Assert.True(resultSetting.ShowEdges);
         }
 
+        [Test]
+        public void PreferenceSettings_IsFirstRun_And_HideReportOptions()
+        {
+            ViewModel.HideReportOptions = true;
+            ViewModel.Model.PreferenceSettings.IsFirstRun = true;
+            //force the dynamoview's loaded handler to be called again - 
+            View.RaiseEvent(new RoutedEventArgs(FrameworkElement.LoadedEvent));
+
+            Assert.IsFalse(ViewModel.PreferenceSettings.IsFirstRun);
+        }
+
         private void RestartTestSetup(bool startInTestMode)
         {
             // Shutdown Dynamo and restart it

Original file line number	Diff line number	Diff line change
`@@ -146,14 +146,14 @@ public void CheckIsFirstRun(Window ownerWindow, IBrandingResourceProvider resour`
`146`	`146`	`{`
`147`	`147`	`resourceProvider = resource;`
`148`	`148`	`// First run of Dynamo`
`149`		`- if (dynamoViewModel.Model.PreferenceSettings.IsFirstRun)`
	`149`	`+ if (dynamoViewModel.Model.PreferenceSettings.IsFirstRun`
	`150`	`+ && !dynamoViewModel.HideReportOptions`
	`151`	`+ && !DynamoModel.IsTestMode)`
`150`	`152`	`{`
`151`		`- FirstRun = false;`
`152`		`-`
`153`	`153`	`//Prompt user for detailed reporting`
`154`		`- if (!DynamoModel.IsTestMode)`
`155`	`154`	`ShowUsageReportingPrompt(ownerWindow);`
`156`	`155`	`}`
	`156`	`+ FirstRun = false;`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`[Obsolete("Function will be removed in Dynamo 3.0, please set IsUsageReportingApproved.")]`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ public bool BackgroundPreviewActive`
`503`	`503`	`get { return BackgroundPreviewViewModel.Active; }`
`504`	`504`	`}`
`505`	`505`
`506`		`- public bool HideReportOptions { get; }`
	`506`	`+ public bool HideReportOptions { get; internal set; }`
`507`	`507`
`508`	`508`	`/// <summary>`
`509`	`509`	`/// Indicates if whether the Iron Python dialog box should be displayed before each new session.`