2.19.1 disable network traffic WIP (#14393)

mjkkirschner · pinzart90 · pinzart · web-flow · commit bb0f4b26f1c7 · 2023-09-11T11:25:45.000-04:00
* cherry pick analytics issue (#13328) * update * update * null checking * update * Update CoreNodeModelWpfResources.Designer.cs Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com> * Revert "cherry pick analytics issue (#13328)" This reverts commit 6f9761d. * cherry pick analytics issue (#13328) (#14085) * update * update * null checking * update * Update CoreNodeModelWpfResources.Designer.cs Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com> * Disable net traffic (#14083) * disable net traffic example * Update PackageManagerViewExtension.cs * update * Update DynamoModel.cs * Update PackageManagerViewExtension.cs * Update PackageManagerViewExtension.cs --------- Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com> * Update PreferencesViewModel.cs: crash due to null feature flags (#14087) * Update PreferencesViewModel.cs * Update PackageManagerViewExtensionTests.cs --------- Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com> * changes * remove comment * comments and disable notifications --------- Co-authored-by: pinzart90 <46732933+pinzart90@users.noreply.github.com> Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com>
diff --git a/src/DynamoApplications/StartupUtils.cs b/src/DynamoApplications/StartupUtils.cs
@@ -398,20 +398,21 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode,
             HostAnalyticsInfo info = new HostAnalyticsInfo(),
             bool isServiceMode = false)
         {
+
             var config = new DynamoModel.DefaultStartConfiguration
             {
                 GeometryFactoryPath = geometryFactoryPath,
                 ProcessMode = CLImode ? TaskProcessMode.Synchronous : TaskProcessMode.Asynchronous,
                 HostAnalyticsInfo = info,
                 CLIMode = CLImode,
-                AuthProvider = CLImode ? null : new Core.IDSDKManager(),
+                //TODO we currently use this like a no network comms flags - work on introducing a new flag or renaming this flag.
+                AuthProvider = CLImode || Dynamo.Logging.Analytics.DisableAnalytics ? null : new Core.IDSDKManager(),
                 UpdateManager = CLImode ? null : OSHelper.IsWindows() ? InitializeUpdateManager() : null,
                 StartInTestMode = CLImode,
                 PathResolver = CreatePathResolver(CLImode, preloaderLocation, userDataFolder, commonDataFolder),
                 IsServiceMode = isServiceMode,
                 Preferences = PreferenceSettings.Instance
             };
-
             var model = DynamoModel.Start(config);
             return model;
         }
diff --git a/src/DynamoCore/Logging/AnalyticsService.cs b/src/DynamoCore/Logging/AnalyticsService.cs
@@ -84,6 +84,12 @@ internal static bool IsADPOptedIn
 
         internal static bool IsADPAvailable()
         {
+            if (Analytics.DisableAnalytics ||
+                adpAnalyticsUI == null)
+            {
+                return false;
+            }
+
             return adpAnalyticsUI.IsProviderAvailable();
         }
 
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -761,10 +761,6 @@ protected DynamoModel(IStartConfiguration config)
                     }
                     catch (Exception e) { Logger.LogError($"could not start feature flags manager {e}"); };
                 });
-
-                //TODO just a test of feature flag event, safe to remove at any time.
-                DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved += CheckFeatureFlagTest;
-
             }
 
             // TBD: Do we need settings migrator for service mode? If we config the docker correctly, this could be skipped I think
@@ -1107,31 +1103,6 @@ private IPreferences CreateOrLoadPreferences(IPreferences preferences)
             return new PreferenceSettings();
         }
 
-        private void CheckFeatureFlagTest()
-        {
-            if (!DynamoModel.IsTestMode)
-            {
-                if (DynamoModel.FeatureFlags.CheckFeatureFlag<bool>("EasterEggIcon1", false))
-                {
-                    this.Logger.Log("EasterEggIcon1 is true FROM MODEL");
-
-                }
-                else
-                {
-                    this.Logger.Log("EasterEggIcon1 is false FROM MODEL");
-                }
-
-                if (DynamoModel.FeatureFlags.CheckFeatureFlag<string>("EasterEggMessage1", "NA") is var s && s != "NA")
-                {
-                    this.Logger.Log("EasterEggMessage1 is enabled FROM MODEL");
-                }
-                else
-                {
-                    this.Logger.Log("EasterEggMessage1 is disabled FROM MODEL");
-                }
-            }
-        }
-
         private void SetDefaultPythonTemplate()
         {
             // First check if the default python template is overridden by a PythonTemplate.py file in AppData
@@ -1475,7 +1446,6 @@ public void Dispose()
             {
                 FeatureFlags.MessageLogged -= LogMessageWrapper;
             }
-            DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved -= CheckFeatureFlagTest;
         }
 
         private void InitializeCustomNodeManager()
diff --git a/src/DynamoCore/Scheduler/UpdateRenderPackageAsyncTask.cs b/src/DynamoCore/Scheduler/UpdateRenderPackageAsyncTask.cs
@@ -230,7 +230,7 @@ private void GetTessellationDataFromGraphicItem(Guid outputPortId, IGraphicItem
                 var previousMeshVertexCount = package.MeshVertexCount;
 
                 //Todo Plane tessellation needs to be handled here vs in LibG currently
-                bool instancingEnabled = DynamoModel.FeatureFlags.CheckFeatureFlag<bool>("graphics-primitive-instancing", false);
+                bool instancingEnabled = DynamoModel.FeatureFlags?.CheckFeatureFlag<bool>("graphics-primitive-instancing", false) ?? false;
                 if (graphicItem is Plane plane)
                 {
                     CreatePlaneTessellation(package, plane);
diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
@@ -1114,7 +1114,7 @@ public bool NodeAutocompleteMachineLearningIsBeta
         {
             get
             {
-                return DynamoModel.FeatureFlags.CheckFeatureFlag("NodeAutocompleteMachineLearningIsBeta", false);
+                return DynamoModel.FeatureFlags?.CheckFeatureFlag("NodeAutocompleteMachineLearningIsBeta", false) ?? false;
             }
         }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Watch3D/HelixWatch3DViewModel.cs b/src/DynamoCoreWpf/ViewModels/Watch3D/HelixWatch3DViewModel.cs
@@ -1853,7 +1853,7 @@ internal virtual void AggregateRenderPackages(IEnumerable<HelixRenderPackage> pa
                         //If we have any line geometry that was not associated with an instance,
                         //remove the previously added line data from the render package so the remaining lines can be added to the scene.
                         if (rp.LineVertexRangesAssociatedWithInstancing.Any() 
-                            && DynamoModel.FeatureFlags.CheckFeatureFlag<bool>("graphics-primitive-instancing", false))
+                            && DynamoModel.FeatureFlags?.CheckFeatureFlag<bool>("graphics-primitive-instancing", false) == true)
                         {
                             //For each range of line vertices add the line data and instances to the scene
                             var j = 0;
@@ -1946,7 +1946,7 @@ internal virtual void AggregateRenderPackages(IEnumerable<HelixRenderPackage> pa
                     //If we have any mesh geometry that was not associated with an instance, remove the previously added
                     //mesh data from the render package so the remaining mesh can be added to the scene.
                     if (rp.MeshVertexRangesAssociatedWithInstancing.Any() 
-                        && DynamoModel.FeatureFlags.CheckFeatureFlag<bool>("graphics-primitive-instancing", false))
+                        && DynamoModel.FeatureFlags?.CheckFeatureFlag<bool>("graphics-primitive-instancing", false) == true)
                     {
                         //For each range of mesh vertices add the mesh data and instances to the scene
                         var j = 0;
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -1307,19 +1307,6 @@ private void DynamoView_Loaded(object sender, EventArgs e)
                 this.Deactivated += (s, args) => { HidePopupWhenWindowDeactivated(null); };
             }
             loaded = true;
-
-
-            //The following code illustrates use of FeatureFlagsManager.
-            //safe to remove.
-            if (DynamoModel.FeatureFlags != null)
-            {
-                CheckTestFlags();
-            }
-            //if feature flags is not yet initialized, subscribe to the event and wait.
-            else
-            {
-                DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved += CheckTestFlags;
-            }            
         }
 
         private void GuideFlowEvents_GuidedTourStart(GuidedTourStateEventArgs args)
@@ -1333,42 +1320,12 @@ private void GuideFlowEvents_GuidedTourStart(GuidedTourStateEventArgs args)
         /// <summary>
         /// Close Popup when the Dynamo window is not in the foreground.
         /// </summary>
-
         private void HidePopupWhenWindowDeactivated(object obj)
         {
             var workspace = this.ChildOfType<WorkspaceView>();
             if (workspace != null)
                 workspace.HideAllPopUp(obj);
         }
-        /// <summary>
-        /// check some test flags from launch darkly.
-        /// code is safe to remove at any time.
-        /// </summary>
-        private void CheckTestFlags()
-        {
-            if (!DynamoModel.IsTestMode)
-            {
-                //feature flag test.
-                if (DynamoModel.FeatureFlags?.CheckFeatureFlag<bool>("EasterEggIcon1", false) == true)
-                {
-                    dynamoViewModel.Model.Logger.Log("EasterEggIcon1 is true from view");
-                }
-                else
-                {
-                    dynamoViewModel.Model.Logger.Log("EasterEggIcon1 is false from view");
-                }
-
-                if (DynamoModel.FeatureFlags?.CheckFeatureFlag<string>("EasterEggMessage1", "NA") is string ffs && ffs != "NA")
-                {
-                    dynamoViewModel.Model.Logger.Log("EasterEggMessage1 is enabled from view");
-                    MessageBoxService.Show(this, ffs, "EasterEggMessage1", MessageBoxButton.OK, MessageBoxImage.Asterisk);
-                }
-                else
-                {
-                    dynamoViewModel.Model.Logger.Log("EasterEggMessage1 is disabled from view");
-                }
-            }
-        }
 
         private void TrackStartupAnalytics()
         {
@@ -1968,8 +1925,6 @@ private void WindowClosed(object sender, EventArgs e)
             this.dynamoViewModel.RequestReturnFocusToView -= OnRequestReturnFocusToView;
             this.dynamoViewModel.Model.WorkspaceSaving -= OnWorkspaceSaving;
             this.dynamoViewModel.Model.WorkspaceOpened -= OnWorkspaceOpened;
-            DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved -= CheckTestFlags;
-
             this.dynamoViewModel.RequestEnableShortcutBarItems -= DynamoViewModel_RequestEnableShortcutBarItems;
             this.dynamoViewModel.RequestExportWorkSpaceAsImage -= OnRequestExportWorkSpaceAsImage;
 
diff --git a/src/DynamoPackages/PackageManagerExtension.cs b/src/DynamoPackages/PackageManagerExtension.cs
@@ -337,9 +337,16 @@ internal bool CheckIfPackagesTargetOtherHosts(IEnumerable<PackageVersion> newPac
         {
             // determine if any of the packages are targeting other hosts
             var containsPackagesThatTargetOtherHosts = false;
-
-            // Known hosts
-            var knownHosts = PackageManagerClient.GetKnownHosts();
+            //fallback list of hosts as of 9/8/23
+            IEnumerable<string> knownHosts =  new List<string> { "Revit", "Civil 3D", "Alias", "Advance Steel", "FormIt" };
+            //if analytics is disabled, treat this as network black out
+            //and don't ask dpm for known hosts.
+            //TODO we currently use this like a no network comms flags - work on introducing a new flag or renaming this flag.
+            if (!Dynamo.Logging.Analytics.DisableAnalytics)
+            {
+                // Known hosts
+                knownHosts = PackageManagerClient.GetKnownHosts();
+            }
 
             // Sandbox, special case: Warn if any package targets only one known host
             if (String.IsNullOrEmpty(Host))
diff --git a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs
@@ -157,7 +157,6 @@ private void RaisePackageHostNotifications(IEnumerable<Package> packages)
                         Resources.TitlePackageTargetOtherHost));
                 }
             }
-
         }
 
         private void RequestLoadLayoutSpecs(IEnumerable<Package> packages)
diff --git a/src/NodeServices/Analytics.cs b/src/NodeServices/Analytics.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 
 namespace Dynamo.Logging
 {
@@ -7,6 +7,7 @@ namespace Dynamo.Logging
     /// </summary>
     public static class Analytics
     {
+        //TODO we currently use this like a no network comms flags - work on introducing a new flag or renaming this flag.
         /// <summary>
         /// Disables all analytics collection for the lifetime of the process.
         /// To ensure that no analytics get through, please set set this flag to false before the DynamoModel is constructed.
diff --git a/src/Notifications/NotificationCenterController.cs b/src/Notifications/NotificationCenterController.cs
@@ -92,10 +92,11 @@ internal NotificationCenterController(DynamoView view, DynamoLogger dynLogger)
                 VerticalOffset = notificationPopupVerticalOffset
             };
             logger = dynLogger;
-            
+
             // If user turns on the feature, they will need to restart Dynamo to see the count
             // This ensures no network traffic when Notification center feature is turned off
-            if (dynamoViewModel.PreferenceSettings.EnableNotificationCenter) 
+            //TODO we currently use DisableAnalytics like a no network comms flags - work on introducing a new flag or renaming this flag.
+            if (dynamoViewModel.PreferenceSettings.EnableNotificationCenter && !Dynamo.Logging.Analytics.DisableAnalytics ) 
             {               
                 InitializeBrowserAsync();
                 RequestNotifications();
diff --git a/test/DynamoCoreWpfTests/PackageManagerViewExtensionTests.cs b/test/DynamoCoreWpfTests/PackageManagerViewExtensionTests.cs
@@ -271,6 +271,7 @@ void PackageManagerViewExtensionTests_NotificationLogged(NotificationMessage obj
                 count = count + 1;
             }
         }
+
         [Test]
         public void PackageManagerViewExtesion_SendsNotificationForPackagesThatTargetDifferentHost_AtLatePackageLoad()
         {

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,12 @@ internal static bool IsADPOptedIn`
`84`	`84`
`85`	`85`	`internal static bool IsADPAvailable()`
`86`	`86`	`{`
	`87`	`+ if (Analytics.DisableAnalytics \|\|`
	`88`	`+ adpAnalyticsUI == null)`
	`89`	`+ {`
	`90`	`+ return false;`
	`91`	`+ }`
	`92`	`+`
`87`	`93`	`return adpAnalyticsUI.IsProviderAvailable();`
`88`	`94`	`}`
`89`	`95`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ private void GetTessellationDataFromGraphicItem(Guid outputPortId, IGraphicItem`
`230`	`230`	`var previousMeshVertexCount = package.MeshVertexCount;`
`231`	`231`
`232`	`232`	`//Todo Plane tessellation needs to be handled here vs in LibG currently`
`233`		`- bool instancingEnabled = DynamoModel.FeatureFlags.CheckFeatureFlag<bool>("graphics-primitive-instancing", false);`
	`233`	`+ bool instancingEnabled = DynamoModel.FeatureFlags?.CheckFeatureFlag<bool>("graphics-primitive-instancing", false) ?? false;`
`234`	`234`	`if (graphicItem is Plane plane)`
`235`	`235`	`{`
`236`	`236`	`CreatePlaneTessellation(package, plane);`
Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ public bool NodeAutocompleteMachineLearningIsBeta`
`1114`	`1114`	`{`
`1115`	`1115`	`get`
`1116`	`1116`	`{`
`1117`		`- return DynamoModel.FeatureFlags.CheckFeatureFlag("NodeAutocompleteMachineLearningIsBeta", false);`
	`1117`	`+ return DynamoModel.FeatureFlags?.CheckFeatureFlag("NodeAutocompleteMachineLearningIsBeta", false) ?? false;`
`1118`	`1118`	`}`
`1119`	`1119`	`}`
`1120`	`1120`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,6 @@ private void RaisePackageHostNotifications(IEnumerable<Package> packages)`
`157`	`157`	`Resources.TitlePackageTargetOtherHost));`
`158`	`158`	`}`
`159`	`159`	`}`
`160`		`-`
`161`	`160`	`}`
`162`	`161`
`163`	`162`	`private void RequestLoadLayoutSpecs(IEnumerable<Package> packages)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`
`3`	`3`	`namespace Dynamo.Logging`
`4`	`4`	`{`
`@@ -7,6 +7,7 @@ namespace Dynamo.Logging`
`7`	`7`	`/// </summary>`
`8`	`8`	`public static class Analytics`
`9`	`9`	`{`
	`10`	`+ //TODO we currently use this like a no network comms flags - work on introducing a new flag or renaming this flag.`
`10`	`11`	`/// <summary>`
`11`	`12`	`/// Disables all analytics collection for the lifetime of the process.`
`12`	`13`	`/// To ensure that no analytics get through, please set set this flag to false before the DynamoModel is constructed.`