Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "DYN-6769 Improving Dynamo Load Graph II (#15108)" #15130

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Revert "DYN-6769 Improving Dynamo Load Graph II (#15108)" #15130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ public partial class DynamoViewModel : ViewModelBase, IDynamoViewModel

internal DynamoMLDataPipelineExtension MLDataPipelineExtension { get; set; }

internal static Dictionary<string, NodeSearchElementViewModel> DefaultAutocompleteCandidates = new Dictionary<string, NodeSearchElementViewModel>();

/// <summary>
/// Collection of Right SideBar tab items: view extensions and docked windows.
/// </summary>
Expand Down
19 changes: 5 additions & 14 deletions src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,24 +185,15 @@ private void InitializeDefaultAutoCompleteCandidates()
// TODO: These are basic input types in Dynamo
// This should be only served as a temporary default case.
var queries = new List<string>(){"String", "Number Slider", "Integer Slider", "Number", "Boolean", "Watch", "Watch 3D", "Python Script"};
var nodeNamesList = DynamoViewModel.DefaultAutocompleteCandidates.Keys.ToList();
if (nodeNamesList.Where(queries.Contains).Any() == true)
foreach (var query in queries)
{
DefaultResults = DynamoViewModel.DefaultAutocompleteCandidates.Values;
}
else
{
foreach (var query in queries)
var foundNode = Search(query).Where(n => n.Name.Equals(query)).FirstOrDefault();
if(foundNode != null)
{
var foundNode = Search(query).Where(n => n.Name.Equals(query)).FirstOrDefault();
if (foundNode != null)
{
candidates.Add(foundNode);
DynamoViewModel.DefaultAutocompleteCandidates.Add(foundNode.Name, foundNode);
}
candidates.Add(foundNode);
}
DefaultResults = candidates;
}
DefaultResults = candidates;
}

internal MLNodeAutoCompletionRequest GenerateRequestForMLAutocomplete()
Expand Down
Loading