Display conditions - Implemented lists in the core, UI needs more work

src/Artemis.UI/ResourceDictionaries/DisplayConditions.xaml

@@ -2,7 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:dataModel="clr-namespace:Artemis.UI.Shared.DataModelVisualization.Shared;assembly=Artemis.UI.Shared"
                     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-                    xmlns:s="https://github.com/canton7/Stylet">
+                    xmlns:s="https://github.com/canton7/Stylet"
+                    xmlns:converters="clr-namespace:Artemis.UI.Converters">
     <Style x:Key="DisplayConditionButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignFlatAccentBgButton}">
         <Setter Property="Margin" Value="3 0" />
         <Setter Property="Padding" Value="6 4" />
@@ -90,7 +91,6 @@
                                             Margin="15 0.5 0 0"
                                             Visibility="{Binding ShowViewModel, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
                         </StackPanel>
-
                     </Grid>
                 </DataTemplate>
             </StackPanel.Resources>

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/Abstract/DisplayConditionViewModel.cs

@@ -30,11 +30,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract
 
         public abstract void Update();
 
-        public virtual List<DataModelVisualizationViewModel> GetExtraDataModels()
+        public virtual DataModelPropertiesViewModel GetDataModelOverride()
         {
-            if (Parent != null)
-                return Parent.GetExtraDataModels();
-            return new List<DataModelVisualizationViewModel>();
+            return Parent?.GetDataModelOverride();
         }
 
         public virtual void Delete()

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListPredicateViewModel.cs

@@ -152,13 +152,12 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             Update();
         }
 
-        public override List<DataModelVisualizationViewModel> GetExtraDataModels()
+        public override DataModelPropertiesViewModel GetDataModelOverride()
         {
-            var list = base.GetExtraDataModels();
             if (SelectedListProperty != null)
-                list.Add(SelectedListProperty.ListTypePropertyViewModel);
+                 return (DataModelPropertiesViewModel) SelectedListProperty.GetListTypeViewModel(_dataModelVisualizationService);
 
-            return list;
+            return base.GetDataModelOverride();
         }
 
         public override void Update()
@@ -210,9 +209,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
                 return;
 
             SelectedListProperty = dataModelListViewModel;
-            if (SelectedListProperty.ListTypePropertyViewModel == null)
-                SelectedListProperty.Update(_dataModelVisualizationService);
-
             ApplyList();
         }
     }

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateViewModel.cs

@@ -202,6 +202,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             if (LeftSideDataModel == null || DisplayConditionPredicate.PredicateType == PredicateType.Dynamic && RightSideDataModel == null)
                 return;
 
+            if (GetDataModelOverride() != null)
+                LeftSideDataModel = GetDataModelOverride();
+
             // If static, only allow selecting properties also supported by input
             if (DisplayConditionPredicate.PredicateType == PredicateType.Static)
                 LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
@@ -221,6 +224,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             if (DisplayConditionPredicate.PredicateType == PredicateType.Dynamic)
             {
                 SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Right);
+                if (GetDataModelOverride() != null)
+                    RightSideDataModel = GetDataModelOverride();
+
                 RightSideDataModel.ApplyTypeFilter(true, leftSideType);
             }
             else