Add test, use new feature flag

Author: reddyashish

src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs

@@ -211,6 +211,7 @@ public WorkspaceModel CurrentSpace
         /// <summary>
         /// Controls if the the ML data ingestion pipeline is beta from feature flag
         /// </summary>
+        [Obsolete("This flag is not needed anymore and will be removed in a future version of Dynamo. Use EnableDNADataIngestionPipeline instead")]
         internal bool IsDNADataIngestionPipelineinBeta
         {
             get
@@ -219,6 +220,17 @@ internal bool IsDNADataIngestionPipelineinBeta
             }
         }
 
+        /// <summary>
+        /// Controls if the the ML data ingestion pipeline is enabled or not.
+        /// </summary>
+        internal bool EnableDNADataIngestionPipeline
+        {
+            get
+            {
+                return DynamoModel.FeatureFlags?.CheckFeatureFlag("EnableDNADataIngestionPipeline", false) ?? false;
+            }
+        }
+
         /// <summary>
         /// Controls if the cluster node autocomplete placement feature is enabled from feature flag
         /// </summary>
@@ -3332,26 +3344,31 @@ private void CloseHomeWorkspace(object parameter)
             // Upon closing a workspace, validate if the workspace is valid to be sent to the ML datapipeline and then send it.
             if (!DynamoModel.IsTestMode && !HomeSpace.HasUnsavedChanges && (currentWorkspaceViewModel?.IsHomeSpace ?? true) && HomeSpace.HasRunWithoutCrash)
             {
-                // Currently IsDNADataIngestionPipelineinBeta is set to true for debug builds and false for release builds. so we need to modify it here, when testing the pipeline in debug builds.
-                if (!IsDNADataIngestionPipelineinBeta && Model.CurrentWorkspace.IsValidForFDX && currentWorkspaceViewModel.Checksum != string.Empty)
+                if (preferencesViewModel.IsMLAutocompleteTOUApproved)
                 {
-                    if (HasDifferentialCheckSum())
+                    // Currently IsDNADataIngestionPipelineinBeta is set to true for debug builds and false for release builds. so we need to modify it here, when testing the pipeline in debug builds.
+                    if (EnableDNADataIngestionPipeline && Model.CurrentWorkspace.IsValidForFDX && currentWorkspaceViewModel.Checksum != string.Empty)
                     {
-                        Model.Logger.Log("This Workspace is being shared to train the Dynamo Machine Learning model.", LogLevel.File);
-                        var workspacePath = model.CurrentWorkspace.FileName;
-
-                        Task.Run(() =>
+                        if (HasDifferentialCheckSum())
                         {
-                            try
-                            {
-                                MLDataPipelineExtension.DynamoMLDataPipeline.SendWorkspaceLog(workspacePath);
-                            }
-                            catch (Exception ex)
+                            Model.Logger.Log("This Workspace is being shared to train the Dynamo Machine Learning model.", LogLevel.File);
+                            MLDataPipelineExtension.DynamoMLDataPipeline.isWorkspaceSharedWithML = true;
+
+                            var workspacePath = model.CurrentWorkspace.FileName;
+
+                            Task.Run(() =>
                             {
-                                Model.Logger.Log("Failed to share this workspace with ML pipeline.", LogLevel.File);
-                                Model.Logger.Log(ex.StackTrace, LogLevel.File);
-                            }
-                        });
+                                try
+                                {
+                                    MLDataPipelineExtension.DynamoMLDataPipeline.SendWorkspaceLog(workspacePath);
+                                }
+                                catch (Exception ex)
+                                {
+                                    Model.Logger.Log("Failed to share this workspace with ML pipeline.", LogLevel.File);
+                                    Model.Logger.Log(ex.StackTrace, LogLevel.File);
+                                }
+                            });
+                        }
                     }
                 }
             }

src/DynamoMLDataPipeline/DynamoMLDataPipeline.cs

@@ -61,6 +61,8 @@ internal string ProductionCollectionID
         // Points to the Dynamo version.
         internal Version DynamoVersion { get; set; }
 
+        internal bool isWorkspaceSharedWithML { get; set; }
+
         // Id of the user sending the post request.
         private string GetUserId()
         {
@@ -296,11 +298,6 @@ void SendToMLDataPipeline(string filePath, RestClient client, string token)
 
         public void SendWorkspaceLog(string filePath)
         {
-            if (!DynamoModel.PreferenceSettings.IsMLAutocompleteTOUApproved)
-            {
-                throw new InvalidOperationException("User has opted out of data collection, this function shouldn't be called.");
-            }
-
             // Depending on whether we are using Stage or Prod, a token needs to be retrieved 
             // using client and secret id from the app created in the respective environment.
             var token = GetAuthorizationToken();

src/DynamoMLDataPipeline/Properties/AssemblyInfo.cs

@@ -12,6 +12,7 @@
 [assembly: Guid("f2fcfd49-84bc-4c0e-90c1-5a327d017c4e")]
 
 [assembly: InternalsVisibleTo("DynamoCoreWpf")]
+[assembly: InternalsVisibleTo("DynamoCoreWpfTests")]
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version

test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj

@@ -178,6 +178,11 @@
       <Project>{1E92CDB0-644C-4EAA-8AB8-EFDD193A0484}</Project>
       <Name>GraphNodeManagerViewExtension</Name>
     </ProjectReference>
+	<ProjectReference Include="..\..\src\DynamoMLDataPipeline\DynamoMLDataPipeline.csproj">
+	  <Project>{F2FCFD49-84BC-4C0E-90C1-5A327D017C4E}</Project>
+	  <Name>DynamoMLDataPipeline</Name>
+	  <Private>False</Private>
+	</ProjectReference>
     <ProjectReference Include="..\DynamoCoreTests\DynamoCoreTests.csproj">
       <Project>{472084ed-1067-4b2c-8737-3839a6143eb2}</Project>
       <Name>DynamoCoreTests</Name>

test/DynamoCoreWpfTests/DynamoViewTests.cs

@@ -17,6 +17,7 @@
 using Dynamo.Wpf.ViewModels.Core;
 using Dynamo.Wpf.Views;
 using NUnit.Framework;
+using DynamoMLDataPipeline;
 
 
 namespace DynamoCoreWpfTests
@@ -203,5 +204,31 @@ public void TestToastNotificationClosingBehavior()
             bool isToastNotificationVisible = (bool)(ViewModel.MainGuideManager?.ExitTourPopupIsVisible);
             Assert.IsFalse(isToastNotificationVisible);
         }
+
+        // Terms of use test on workspace close event.
+        [Test]
+        public void TestTOUWorkspaceClose()
+        {
+            // Open workspace with test mode as false, to verify trust warning.
+            DynamoModel.IsTestMode = false;
+            Open(@"core\watch\WatchDictionary.dyn");
+            ViewModel.PreferenceSettings.IsMLAutocompleteTOUApproved = false;
+
+            // Close workspace
+            Assert.IsTrue(ViewModel.CloseHomeWorkspaceCommand.CanExecute(null));
+            ViewModel.CloseHomeWorkspaceCommand.Execute(null);
+
+            Assert.IsFalse(ViewModel.MLDataPipelineExtension.DynamoMLDataPipeline.isWorkspaceSharedWithML);
+
+            //reopen
+            Open(@"core\watch\WatchDictionary.dyn");
+            ViewModel.PreferenceSettings.IsMLAutocompleteTOUApproved = true;
+
+            // Close workspace
+            Assert.IsTrue(ViewModel.CloseHomeWorkspaceCommand.CanExecute(null));
+            ViewModel.CloseHomeWorkspaceCommand.Execute(null);
+
+            Assert.IsTrue(ViewModel.MLDataPipelineExtension.DynamoMLDataPipeline.isWorkspaceSharedWithML);
+        }
     }
 }