Skip to content

Commit 3f99d6d

Browse files
authored
DYN-8943: Show node name for single autocomplete (#16270)
1 parent 8a4ec95 commit 3f99d6d

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

src/NodeAutoCompleteViewExtension/ViewModels/DNADropdownViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ namespace Dynamo.NodeAutoComplete.ViewModels
55
public class DNADropdownViewModel
66
{
77
public string Description { get; set; }
8+
public string Parameters { get; set; }
89
public ImageSource SmallIcon { get; set; }
910
}
1011
}

src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ internal void PopulateAutoComplete()
971971
Topology = new TopologyItem
972972
{
973973
Nodes = new List<NodeItem> { new NodeItem {
974-
Id = new Guid().ToString(),
974+
Id = Guid.NewGuid().ToString(),
975975
Type = new NodeType { Id = x.CreationName } } },
976976
Connections = new List<ConnectionItem>()
977977
}
@@ -1016,10 +1016,11 @@ internal void PopulateAutoComplete()
10161016
SearchViewModelRequestBitmapSource(iconRequest);
10171017
dict[singleResult.CreationName] = iconRequest.Icon;
10181018
}
1019-
comboboxResults = QualifiedResults.Select(x => new DNADropdownViewModel
1019+
comboboxResults = FullSingleResults.Where(x => x.Score * 100 > minClusterConfidenceScore).Select(x => new DNADropdownViewModel
10201020
{
10211021
Description = x.Description,
1022-
SmallIcon = dict[x.Topology.Nodes.First().Type.Id],
1022+
Parameters = x.Parameters,
1023+
SmallIcon = dict[x.CreationName],
10231024
});
10241025
}
10251026
else

src/NodeAutoCompleteViewExtension/ViewModels/SingleResultItem.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ public SingleResultItem(NodeSearchElement model, double score = 1.0)
1010
{
1111
Assembly = model.Assembly;
1212
IconName = model.IconName;
13-
Description = model.Description;
13+
Description = model.Name;
14+
Parameters = model.Parameters;
1415
CreationName = model.CreationName;
1516
PortToConnect = model.AutoCompletionNodeElementInfo.PortToConnect;
1617
Score = score;
@@ -28,6 +29,8 @@ public SingleResultItem(NodeSearchElementViewModel x) : this(x.Model)
2829

2930
internal string Description { get; set; }
3031

32+
internal string Parameters { get; set; }
33+
3134
internal string CreationName { get; set; }
3235

3336
internal int PortToConnect { get; set; }

src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,12 @@
195195
</Style>
196196
</Image.Style>
197197
</Image>
198-
<TextBlock Text="{Binding Description}" FontSize="12" Foreground="White" Height="15"/>
198+
<TextBlock FontSize="12" Height="15">
199+
<Run Text="{Binding Description, Mode=OneWay}"
200+
Foreground="White" />
201+
<Run Text="{Binding Parameters, Mode=OneWay}"
202+
Foreground="#abafb3" />
203+
</TextBlock>
199204
</StackPanel>
200205
</DataTemplate>
201206
</ComboBox.ItemTemplate>

0 commit comments

Comments
 (0)