From 6638eae1267f16e45cc83f39550adb8db217a010 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Fri, 26 Aug 2022 22:58:31 +0200
Subject: [PATCH] Node picker - Put data model nodes at the top, then static,
 then alphabetical

---
 .../Screens/VisualScripting/NodePickerView.axaml           | 7 ++++---
 .../Screens/VisualScripting/NodePickerViewModel.cs         | 6 ++++++
 src/Artemis.VisualScripting/Nodes/List/ListOperatorNode.cs | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml b/src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml
index 2b0f71345..ce5f36c37 100644
--- a/src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml
+++ b/src/Artemis.UI/Screens/VisualScripting/NodePickerView.axaml
@@ -38,7 +38,8 @@
                       Grid.Row="1"
                       Items="{CompiledBinding Categories}"
                       IsVisible="{CompiledBinding Categories.Count}"
-                      SelectedItem="{CompiledBinding SelectedNode}">
+                      SelectedItem="{CompiledBinding SelectedNode}"
+                      ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                 <TreeView.Styles>
                     <Style Selector="TreeViewItem">
                         <Setter Property="IsExpanded" Value="True" />
@@ -47,8 +48,8 @@
                 <TreeView.DataTemplates>
                     <TreeDataTemplate DataType="{x:Type core:NodeData}">
                         <StackPanel Margin="-15 1 0 1" Background="Transparent" PointerReleased="InputElement_OnPointerReleased">
-                            <TextBlock Classes="BodyStrongTextBlockStyle" Text="{Binding Name}"></TextBlock>
-                            <TextBlock Foreground="{DynamicResource TextFillColorSecondary}" Text="{Binding Description}"></TextBlock>
+                            <TextBlock Classes="BodyStrongTextBlockStyle" Text="{Binding Name}" TextWrapping="Wrap"></TextBlock>
+                            <TextBlock Foreground="{DynamicResource TextFillColorSecondary}" Text="{Binding Description}" TextWrapping="Wrap"></TextBlock>
                         </StackPanel>
                     </TreeDataTemplate>
                     <TreeDataTemplate ItemsSource="{Binding Items}">
diff --git a/src/Artemis.UI/Screens/VisualScripting/NodePickerViewModel.cs b/src/Artemis.UI/Screens/VisualScripting/NodePickerViewModel.cs
index 06459b9b8..eb1f5d014 100644
--- a/src/Artemis.UI/Screens/VisualScripting/NodePickerViewModel.cs
+++ b/src/Artemis.UI/Screens/VisualScripting/NodePickerViewModel.cs
@@ -10,6 +10,7 @@ using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;
 using Avalonia;
 using DynamicData;
+using DynamicData.Binding;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.VisualScripting;
@@ -35,6 +36,11 @@ public class NodePickerViewModel : ActivatableViewModelBase
 
         nodeSourceList.Connect()
             .Filter(nodeFilter)
+            .Sort(SortExpressionComparer<NodeData>
+                .Descending(d => d.Category == "Data Model")
+                .ThenByDescending(d => d.Category == "Static")
+                .ThenByAscending(d => d.Category)
+                .ThenByAscending(d => d.Name))
             .GroupWithImmutableState(n => n.Category)
             .Bind(out ReadOnlyObservableCollection<DynamicData.List.IGrouping<NodeData, string>> categories)
             .Subscribe();
diff --git a/src/Artemis.VisualScripting/Nodes/List/ListOperatorNode.cs b/src/Artemis.VisualScripting/Nodes/List/ListOperatorNode.cs
index 78614819d..7a7d4e056 100644
--- a/src/Artemis.VisualScripting/Nodes/List/ListOperatorNode.cs
+++ b/src/Artemis.VisualScripting/Nodes/List/ListOperatorNode.cs
@@ -4,7 +4,7 @@ using Artemis.VisualScripting.Nodes.List.Screens;
 
 namespace Artemis.VisualScripting.Nodes.List;
 
-[Node("List Operator", "Checks if any/all/no value in the input list matches the input value", "List", InputType = typeof(IEnumerable), OutputType = typeof(bool))]
+[Node("List Operator (Simple)", "Checks if any/all/no value in the input list matches the input value", "List", InputType = typeof(IEnumerable), OutputType = typeof(bool))]
 public class ListOperatorNode : Node<ListOperator, ListOperatorNodeCustomViewModel>
 {
     public ListOperatorNode() : base("List Operator", "Checks if any/all/no value in the input list matches the input value")