Data model - Support all lists implementing IEnumerable<>

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionListViewModel.cs

@@ -86,7 +86,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         public void Initialize()
         {
             TargetSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
-            TargetSelectionViewModel.FilterTypes = new[] {typeof(IList)};
+            TargetSelectionViewModel.FilterTypes = new[] {typeof(IEnumerable<>)};
             TargetSelectionViewModel.ButtonBrush = new SolidColorBrush(Color.FromRgb(71, 108, 188));
             TargetSelectionViewModel.Placeholder = "Select a list";
             TargetSelectionViewModel.PropertySelected += TargetSelectionViewModelOnPropertySelected;

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionPredicateViewModel.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 using Artemis.Core;
-using Artemis.Core.DataModelExpansions;
 using Artemis.Core.Services;
 using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
@@ -83,19 +82,6 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
         public DelegateCommand SelectOperatorCommand { get; }
 
-        public void Dispose()
-        {
-            if (LeftSideSelectionViewModel != null)
-            {
-                LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
-                LeftSideSelectionViewModel.Dispose();
-                LeftSideSelectionViewModel = null;
-            }
-
-            DisposeRightSideStatic();
-            DisposeRightSideDynamic();
-        }
-
         public override void Delete()
         {
             base.Delete();
@@ -118,7 +104,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         {
             LeftSideSelectionViewModel.FilterTypes = _supportedInputTypes.ToArray();
             LeftSideSelectionViewModel.ChangeDataModelPath(DataModelConditionPredicate.LeftPath);
-            
+
             Type leftSideType = LeftSideSelectionViewModel.DataModelPath?.GetPropertyType();
 
             // Get the supported operators
@@ -239,5 +225,18 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 RightSideSelectionViewModel = null;
             }
         }
+
+        public void Dispose()
+        {
+            if (LeftSideSelectionViewModel != null)
+            {
+                LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
+                LeftSideSelectionViewModel.Dispose();
+                LeftSideSelectionViewModel = null;
+            }
+
+            DisposeRightSideStatic();
+            DisposeRightSideDynamic();
+        }
     }
 }