don't initialize the direct manipulation extension when asm is not loaded (#13219)

mjkkirschner · web-flow · commit 753d4ec323d5 · 2022-08-15T17:31:03.000-04:00
The tests passed for the latest commit here: https://master-5.jenkins.autodesk.com/job/Dynamo/job/DynamoSelfServe/job/pullRequestValidation/6802/ merging.
diff --git a/src/DynamoCore/Extensions/ReadyParams.cs b/src/DynamoCore/Extensions/ReadyParams.cs
@@ -29,9 +29,7 @@ internal ReadyParams(DynamoModel dynamoM)
             dynamoModel.WorkspaceCleared += OnCurrentWorkspaceModelCleared;
             dynamoModel.WorkspaceRemoveStarted += OnCurrentWorkspaceRemoveStarted;
             dynamoM.Logger.NotificationLogged += OnNotificationRecieved;
-            startupParams = new StartupParams(dynamoModel.AuthenticationManager.AuthProvider,
-                dynamoModel.PathManager, new ExtensionLibraryLoader(dynamoModel), dynamoModel.CustomNodeManager,
-                new Version(dynamoModel.Version), dynamoModel.PreferenceSettings, dynamoModel.LinterManager);
+            startupParams = new StartupParams(dynamoModel);
         }
 
         /// <summary>
diff --git a/src/DynamoCore/Extensions/StartupParams.cs b/src/DynamoCore/Extensions/StartupParams.cs
@@ -3,6 +3,7 @@
 using Dynamo.Interfaces;
 using Dynamo.Library;
 using Dynamo.Linting;
+using Dynamo.Models;
 using Greg;
 
 namespace Dynamo.Extensions
@@ -56,6 +57,11 @@ public class StartupParams
         public LinterManager LinterManager => linterManager;
         private readonly LinterManager linterManager;
 
+        /// <summary>
+        /// Returns true if ASM/LibG are loaded. May only be valid in sandbox sessions.
+        /// </summary>
+        internal bool IsGeometryLibraryLoaded { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="StartupParams"/> class.
         /// </summary>
@@ -65,7 +71,7 @@ public class StartupParams
         /// <param name="customNodeManager"><see cref="ICustomNodeManager"/> for DynamoModel</param>
         /// <param name="dynamoVersion"><see cref="Version"/> for DynamoModel</param>
         /// <param name="preferences"><see cref="IPreferences"/> for DynamoModel</param>
-        [Obsolete("Use constructor with LinterManager parameter instead")]
+        [Obsolete("Use internal constructor")]
         public StartupParams(IAuthProvider provider, IPathManager pathManager,
             ILibraryLoader libraryLoader, ICustomNodeManager customNodeManager,
             Version dynamoVersion, IPreferences preferences)
@@ -77,7 +83,7 @@ public StartupParams(IAuthProvider provider, IPathManager pathManager,
             this.dynamoVersion = dynamoVersion;
             this.preferences = preferences;
         }
-
+        [Obsolete("Use internal constructor")]
         /// <summary>
         /// Initializes a new instance of the <see cref="StartupParams"/> class.
         /// </summary>
@@ -100,5 +106,20 @@ public StartupParams(IAuthProvider provider, IPathManager pathManager,
             this.preferences = preferences;
             this.linterManager = linterManager;
         }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StartupParams"/> class.
+        /// </summary>
+        internal StartupParams(DynamoModel dynamoModel)
+        {
+            this.authProvider = dynamoModel.AuthenticationManager.AuthProvider;
+            this.pathManager = dynamoModel.PathManager;
+            this.libraryLoader = new ExtensionLibraryLoader(dynamoModel);
+            this.customNodeManager = dynamoModel.CustomNodeManager;
+            this.dynamoVersion = new Version(dynamoModel.Version);
+            this.preferences = dynamoModel.PreferenceSettings;
+            this.linterManager = dynamoModel.LinterManager;
+            this.IsGeometryLibraryLoaded = dynamoModel.IsASMLoaded;
+        }
+
     }
 }
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -867,9 +867,7 @@ protected DynamoModel(IStartConfiguration config)
 
             if (extensions.Any())
             {
-                var startupParams = new StartupParams(config.AuthProvider,
-                    pathManager, new ExtensionLibraryLoader(this), CustomNodeManager,
-                    GetType().Assembly.GetName().Version, PreferenceSettings, LinterManager);
+                var startupParams = new StartupParams(this);
 
                 foreach (var ext in extensions)
                 {
diff --git a/src/DynamoCoreWpf/Extensions/ViewStartupParams.cs b/src/DynamoCoreWpf/Extensions/ViewStartupParams.cs
@@ -19,13 +19,7 @@ public IExtensionManager ExtensionManager
         }
 
         internal ViewStartupParams(DynamoViewModel dynamoVM) :
-            base(dynamoVM.Model.AuthenticationManager.AuthProvider,
-                dynamoVM.Model.PathManager,
-                new ExtensionLibraryLoader(dynamoVM.Model), 
-				dynamoVM.Model.CustomNodeManager,
-                dynamoVM.Model.GetType().Assembly.GetName().Version,
-                dynamoVM.Model.PreferenceSettings,
-                dynamoVM.Model.LinterManager)
+            base(dynamoVM.Model)
         {
             dynamoViewModel = dynamoVM;
         }
diff --git a/src/DynamoManipulation/DynamoManipulationExtension.cs b/src/DynamoManipulation/DynamoManipulationExtension.cs
@@ -8,6 +8,7 @@
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Nodes.ZeroTouch;
 using Dynamo.Graph.Workspaces;
+using Dynamo.Logging;
 using Dynamo.Models;
 using Dynamo.Visualization;
 using Dynamo.Wpf.Extensions;
@@ -16,7 +17,7 @@
 
 namespace Dynamo.Manipulation
 {
-    public class DynamoManipulationExtension : IViewExtension
+    public class DynamoManipulationExtension : IViewExtension,ILogSource
     {
         private IEnumerable<NodeModel> manipulatorNodes;
         private ManipulatorDaemon manipulatorDaemon;
@@ -25,6 +26,8 @@ public class DynamoManipulationExtension : IViewExtension
         //Keeps track of Node Guids for which event handler is attached.
         private HashSet<Guid> trackedNodeGuids = new HashSet<Guid>();
 
+        public event Action<ILogMessage> MessageLogged;
+
         internal IWatch3DViewModel BackgroundPreviewViewModel { get; private set; }
         internal IRenderPackageFactory RenderPackageFactory { get; private set; }
         internal IWorkspaceModel WorkspaceModel 
@@ -118,18 +121,28 @@ public string Name
 
         public void Dispose()
         {
-            manipulatorDaemon.KillAll();
+            manipulatorDaemon?.KillAll();
 
             UnregisterEventHandlers();
         }
 
         public void Startup(ViewStartupParams viewStartupParams)
         {
+            if (!viewStartupParams.IsGeometryLibraryLoaded)
+            {
+                MessageLogged(LogMessage.Info($"GeometryLibrary was not loaded, skipping {nameof(DynamoManipulationExtension)}"));
+                return;
+            };
             manipulatorDaemon = ManipulatorDaemon.Create(new NodeManipulatorFactoryLoader());
         }
 
         public void Loaded(ViewLoadedParams viewLoadedParams)
         {
+            if (!viewLoadedParams.StartupParams.IsGeometryLibraryLoaded)
+            {
+                MessageLogged(LogMessage.Info($"GeometryLibrary was not loaded, skipping {nameof(DynamoManipulationExtension)}"));
+                return;
+            };
             viewParams = viewLoadedParams;
 
             WorkspaceModel = viewParams.CurrentWorkspaceModel;
@@ -151,11 +164,16 @@ private void RegisterEventHandlers()
 
         private void UnregisterEventHandlers()
         {
-            viewParams.SelectionCollectionChanged -= UpdateManipulators;
-            viewParams.CurrentWorkspaceChanged -= OnCurrentWorkspaceChanged;
-
-            BackgroundPreviewViewModel.CanNavigateBackgroundPropertyChanged -= Watch3DViewModelNavigateBackgroundPropertyChanged;
-            BackgroundPreviewViewModel.ViewMouseDown -= Watch3DViewModelOnViewMouseDown;
+            if (viewParams != null)
+            {
+                viewParams.SelectionCollectionChanged -= UpdateManipulators;
+                viewParams.CurrentWorkspaceChanged -= OnCurrentWorkspaceChanged;
+            }
+            if (BackgroundPreviewViewModel != null)
+            {
+                BackgroundPreviewViewModel.CanNavigateBackgroundPropertyChanged -= Watch3DViewModelNavigateBackgroundPropertyChanged;
+                BackgroundPreviewViewModel.ViewMouseDown -= Watch3DViewModelOnViewMouseDown;
+            }
         }
 
         private void Watch3DViewModelOnViewMouseDown(object o, MouseButtonEventArgs mouseButtonEventArgs)
diff --git a/src/DynamoManipulation/NodeManipulator.cs b/src/DynamoManipulation/NodeManipulator.cs
@@ -494,19 +494,17 @@ private RenderPackageCache GenerateRenderPackages()
                 return packages;
             }
 
-            // This check is required as for some reason LibG fails to load, geometry nodes are null
-            // and we must return immediately before proceeding with further calls to ProtoGeometry
-            if (IsNodeNull(Node.CachedValue)) return packages;
+            // This check is required if for some reason LibG fails to load, geometry nodes are null
+            // and we must return immediately before proceeding with further calls to ProtoGeometry.
+
+            if (IsNodeNull(Node.CachedValue) || Node.CachedValue.IsFunction) return packages;
 
             AssignInputNodes();
-            
             active = UpdatePosition();
-
             if (!IsEnabled())
             {
                 return packages;
             }
-
             // Blocking call to build render packages only in UI thread
             // to avoid race condition with gizmo members b/w scheduler and UI threads.
             // Race condition can occur if say one gizmo is moving due to another gizmo
diff --git a/test/DynamoCoreWpfTests/CoreUITests.cs b/test/DynamoCoreWpfTests/CoreUITests.cs
@@ -1057,9 +1057,7 @@ public void WarningShowsWhenSavingWithLinterWarningsOrErrors()
             Mock<LinterExtensionBase> mockLinter = new Mock<LinterExtensionBase>() { CallBase = true };
             SetupMockLinter(mockLinter);
 
-            var startupParams = new StartupParams(Model.AuthenticationManager.AuthProvider,
-                Model.PathManager, new ExtensionLibraryLoader(Model), Model.CustomNodeManager,
-                Model.GetType().Assembly.GetName().Version, Model.PreferenceSettings, Model.LinterManager);
+            var startupParams = new StartupParams(Model);
 
             mockLinter.Object.InitializeBase(Model.LinterManager);
             mockLinter.Object.Startup(startupParams);

Original file line number	Diff line number	Diff line change
`@@ -867,9 +867,7 @@ protected DynamoModel(IStartConfiguration config)`
`867`	`867`
`868`	`868`	`if (extensions.Any())`
`869`	`869`	`{`
`870`		`- var startupParams = new StartupParams(config.AuthProvider,`
`871`		`- pathManager, new ExtensionLibraryLoader(this), CustomNodeManager,`
`872`		`- GetType().Assembly.GetName().Version, PreferenceSettings, LinterManager);`
	`870`	`+ var startupParams = new StartupParams(this);`
`873`	`871`
`874`	`872`	`foreach (var ext in extensions)`
`875`	`873`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,7 @@ public IExtensionManager ExtensionManager`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`internal ViewStartupParams(DynamoViewModel dynamoVM) :`
`22`		`- base(dynamoVM.Model.AuthenticationManager.AuthProvider,`
`23`		`- dynamoVM.Model.PathManager,`
`24`		`- new ExtensionLibraryLoader(dynamoVM.Model),`
`25`		`- dynamoVM.Model.CustomNodeManager,`
`26`		`- dynamoVM.Model.GetType().Assembly.GetName().Version,`
`27`		`- dynamoVM.Model.PreferenceSettings,`
`28`		`- dynamoVM.Model.LinterManager)`
	`22`	`+ base(dynamoVM.Model)`
`29`	`23`	`{`
`30`	`24`	`dynamoViewModel = dynamoVM;`
`31`	`25`	`}`