Skip to content

Display input port type specific default suggestions only #11268

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

Merged
zeusongit merged 9 commits into from
Nov 25, 2020
Merged

Display input port type specific default suggestions only #11268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d19d551
add analytics to extensions load event
Zeus1717 Nov 17, 2020
38c0a53
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into up-mstr
Zeus1717 Nov 18, 2020
fa72604
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into prim…
Zeus1717 Nov 20, 2020
8947c95
input port type specific default suggestions
Zeus1717 Nov 20, 2020
21c4129
Revert "input port type specific default suggestions"
Zeus1717 Nov 23, 2020
3988790
Update NodeAutoCompleteSearchViewModel.cs
Zeus1717 Nov 24, 2020
30b9e6b
cleanup
Zeus1717 Nov 24, 2020
f94ab8b
test fix
Zeus1717 Nov 25, 2020
4644f86
test fix
Zeus1717 Nov 25, 2020
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
21 changes: 19 additions & 2 deletions src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,25 @@ internal void PopulateAutoCompleteCandidates()
// If node match searchElements found, use default suggestions
if (!searchElementsCache.Any())
{
searchElementsCache = DefaultResults.Select(e => e.Model).ToList();
FilteredResults = DefaultResults;
searchElementsCache = DefaultResults.Select(e => e.Model).ToList();
switch (PortViewModel.PortModel.GetInputPortType())
{
case "int":
FilteredResults = DefaultResults.Where(e => e.Name == "Number Slider" || e.Name == "Integer Slider").ToList();
break;
case "double":
FilteredResults = DefaultResults.Where(e => e.Name == "Number Slider" || e.Name == "Integer Slider").ToList();
break;
case "string":
FilteredResults = DefaultResults.Where(e => e.Name == "String").ToList();
break;
case "bool":
FilteredResults = DefaultResults.Where(e => e.Name == "Boolean").ToList();
break;
default:
FilteredResults = DefaultResults;
break;
}
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions test/DynamoCoreWpfTests/NodeAutoCompleteSearchTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,8 @@ public void NodeSuggestions_SkippedSuggestions()

// The initial list will fill the FilteredResults with a list of default options
searchViewModel.PopulateAutoCompleteCandidates();
Assert.AreEqual(5, searchViewModel.FilteredResults.Count());
Assert.AreEqual("String", searchViewModel.FilteredResults.FirstOrDefault().Name);
Assert.AreEqual(2, searchViewModel.FilteredResults.Count());
Assert.AreEqual("Number Slider", searchViewModel.FilteredResults.FirstOrDefault().Name);
}
}
}