6893: DYN-6956 symbol nodes should not show in HomeWorkspace context. (#15204)

mjkkirschner · web-flow · commit ddb326a13724 · 2024-05-10T15:43:19.000-04:00
diff --git a/src/LibraryViewExtensionWebView2/Handlers/NodeItemDataProvider.cs b/src/LibraryViewExtensionWebView2/Handlers/NodeItemDataProvider.cs
@@ -27,6 +27,10 @@ class LoadedTypeItem
         public string itemType { get; set; }
         public string description { get; set; }
         public string keywords { get; set; }
+        /// <summary>
+        /// controls if a type is shown in the library in the homeworkspace context.
+        /// </summary>
+        public bool hiddenInWorkspaceContext { get; set; }
     }
 
     class LoadedTypeData<T> where T : LoadedTypeItem
@@ -41,6 +45,9 @@ class NodeItemDataProvider : ResourceProviderBase
     {
         protected NodeSearchModel model;
         private IconResourceProvider iconProvider;
+        readonly string[] typesToHideInHomeWorkspaces = {
+            typeof(Graph.Nodes.CustomNodes.Symbol).ToString(),
+            typeof(Graph.Nodes.CustomNodes.Output).ToString() };
         /// <summary>
         /// Constructor
         /// </summary>
@@ -169,8 +176,12 @@ public static string GetFullyQualifiedName(NodeSearchElement element)
                 description = element.Description,
                 keywords = element.SearchKeywords.Any()
                         ? element.SearchKeywords.Where(s => !string.IsNullOrEmpty(s)).Aggregate((x, y) => string.Format("{0}, {1}", x, y))
-                        : string.Empty
+                        : string.Empty,
             };
+            if (typesToHideInHomeWorkspaces.Contains(element.CreationName))
+            {
+                item.hiddenInWorkspaceContext = true;
+            }
 
             //If this element is not a custom node then we are done. The icon url for custom node is different
             if (!element.ElementType.HasFlag(ElementTypes.CustomNode)) return item;
diff --git a/src/LibraryViewExtensionWebView2/LibraryViewController.cs b/src/LibraryViewExtensionWebView2/LibraryViewController.cs
@@ -753,5 +753,13 @@ public static async Task<string> ExecuteScriptFunctionAsync(WebView2 webView2, s
             script += ");";
             return await webView2.ExecuteScriptAsync(script);
         }
+        /// <summary>
+        /// Gives the library UI information on Dynamo's current context.
+        /// </summary>
+        /// <param name="type"></param>
+        internal void UpdateContext(string type)
+        {
+            ExecuteScriptFunctionAsync(browser,"libController.setHostContext", type);
+        }
     }
 }
diff --git a/src/LibraryViewExtensionWebView2/ViewExtension.cs b/src/LibraryViewExtensionWebView2/ViewExtension.cs
@@ -1,4 +1,5 @@
 using System.Windows;
+using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Extensions;
@@ -37,7 +38,17 @@ public void Loaded(ViewLoadedParams viewLoadedParams)
                 controller = new LibraryViewController(viewLoadedParams.DynamoWindow, viewLoadedParams.CommandExecutive, customization);
                 (viewLoadedParams.DynamoWindow.DataContext as DynamoViewModel).PropertyChanged += handleDynamoViewPropertyChanges;
             }
-            
+            viewParams.CurrentWorkspaceChanged += ViewParams_CurrentWorkspaceChanged;
+        }
+
+        private void ViewParams_CurrentWorkspaceChanged(IWorkspaceModel workspace)
+        {
+            var type = workspace switch
+            {
+                HomeWorkspaceModel _ => "home",
+                CustomNodeWorkspaceModel _ => "custom"
+            };
+            controller.UpdateContext(type);
         }
 
         //hide browser directly when startpage is shown to deal with air space problem.
@@ -78,7 +89,10 @@ protected void Dispose(bool disposing)
             {
                 (viewParams.DynamoWindow.DataContext as DynamoViewModel).PropertyChanged -= handleDynamoViewPropertyChanges;
             }
-          
+            if (viewParams != null)
+            {
+                viewParams.CurrentWorkspaceChanged -= ViewParams_CurrentWorkspaceChanged;
+            }
 
             customization = null;
             controller = null;
diff --git a/src/LibraryViewExtensionWebView2/web/library/librarie.min.js b/src/LibraryViewExtensionWebView2/web/library/librarie.min.js
diff --git a/src/LibraryViewExtensionWebView2/web/library/library.html b/src/LibraryViewExtensionWebView2/web/library/library.html
@@ -183,6 +183,7 @@
             }, replaceImageDelayTime);
         }
 
+ 
         function refreshLibraryView(libraryController) {
             window.chrome.webview.postMessage("RefreshLibrary");
         }
@@ -194,6 +195,9 @@
 
         refreshLibraryView(libController);
 
+        //initial state
+        libController.setHostContext("home")
+
         var searchCallback = null;
         function completeSearch(searchLoadedTypes){
             searchCallback(JSON.parse(searchLoadedTypes));

Original file line number	Diff line number	Diff line change
`@@ -753,5 +753,13 @@ public static async Task<string> ExecuteScriptFunctionAsync(WebView2 webView2, s`
`753`	`753`	`script += ");";`
`754`	`754`	`return await webView2.ExecuteScriptAsync(script);`
`755`	`755`	`}`
	`756`	`+ /// <summary>`
	`757`	`+ /// Gives the library UI information on Dynamo's current context.`
	`758`	`+ /// </summary>`
	`759`	`+ /// <param name="type"></param>`
	`760`	`+ internal void UpdateContext(string type)`
	`761`	`+ {`
	`762`	`+ ExecuteScriptFunctionAsync(browser,"libController.setHostContext", type);`
	`763`	`+ }`
`756`	`764`	`}`
`757`	`765`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@`
`183`	`183`	`}, replaceImageDelayTime);`
`184`	`184`	`}`
`185`	`185`
	`186`	`+`
`186`	`187`	`function refreshLibraryView(libraryController) {`
`187`	`188`	`window.chrome.webview.postMessage("RefreshLibrary");`
`188`	`189`	`}`
`@@ -194,6 +195,9 @@`
`194`	`195`
`195`	`196`	`refreshLibraryView(libController);`
`196`	`197`
	`198`	`+ //initial state`
	`199`	`+ libController.setHostContext("home")`
	`200`	`+`
`197`	`201`	`var searchCallback = null;`
`198`	`202`	`function completeSearch(searchLoadedTypes){`
`199`	`203`	`searchCallback(JSON.parse(searchLoadedTypes));`