Display conditions - List predicates WIP

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

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using Artemis.Core.Models.Profile.Conditions.Abstract;
+using Artemis.UI.Shared.DataModelVisualization.Shared;
 using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract
@@ -28,6 +30,13 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract
 
         public abstract void Update();
 
+        public virtual List<DataModelVisualizationViewModel> GetExtraDataModels()
+        {
+            if (Parent != null)
+                return Parent.GetExtraDataModels();
+            return new List<DataModelVisualizationViewModel>();
+        }
+
         public virtual void Delete()
         {
             Model.Parent.RemoveChild(Model);

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml

@@ -29,6 +29,7 @@
         </Grid.ColumnDefinitions>
         <Button Grid.Row="0"
                 Grid.Column="0"
+                ToolTip="Delete the group and all its children"
                 Style="{StaticResource MaterialDesignIconForegroundButton}"
                 HorizontalAlignment="Left"
                 Visibility="{Binding IsRootGroup, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, Mode=OneWay}"
@@ -40,11 +41,13 @@
         </Button>
         <Button Grid.Row="0"
                 Grid.Column="1"
+                ToolTip="Change the operator of the group"
                 Style="{StaticResource DisplayConditionButtonLeftClickMenu}"
                 Background="#E74C4C"
                 BorderBrush="#E74C4C"
                 Margin="3 1"
-                Content="{Binding SelectedBooleanOperator}">
+                Content="{Binding SelectedBooleanOperator}"
+                Visibility="{Binding DisplayBooleanOperator, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
             <Button.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="And" Command="{s:Action SelectBooleanOperator}" CommandParameter="And" />
@@ -57,6 +60,7 @@
         <Button x:Name="AddChildButton"
                 Grid.Row="0"
                 Grid.Column="2"
+                ToolTip="Add another condition to the current group"
                 HorizontalAlignment="Left"
                 Foreground="#4CE758"
                 Width="25"

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

@@ -23,6 +23,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         {
             _profileEditorService = profileEditorService;
             _displayConditionsVmFactory = displayConditionsVmFactory;
+
+            Children.CollectionChanged += (sender, args) => NotifyOfPropertyChange(nameof(DisplayBooleanOperator));
+
             Execute.PostToUIThread(async () =>
             {
                 await Task.Delay(50);
@@ -44,6 +47,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             set => SetAndNotify(ref _isInitialized, value);
         }
 
+        public bool DisplayBooleanOperator => Children.Count > 1;
         public string SelectedBooleanOperator => DisplayConditionGroup.BooleanOperator.Humanize();
 
         public void AttachView(UIElement view)

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionListPredicateView.xaml

@@ -14,11 +14,19 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Artemis.UI;component/ResourceDictionaries/DisplayConditions.xaml" />
                 <ResourceDictionary>
                     <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
                     <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
+                    <DataTemplate x:Key="DataModelDataTemplate">
+                        <Control x:Name="TemplateControl" Focusable="False" Template="{StaticResource DataModelSelectionTemplate}" />
+                        <DataTemplate.Triggers>
+                            <DataTrigger Binding="{Binding Data.ShowDataModelValues.Value, Source={StaticResource DataContextProxy}}" Value="True">
+                                <Setter TargetName="TemplateControl" Property="Template" Value="{StaticResource DataModelSelectionTemplateWithValues}" />
+                            </DataTrigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
                 </ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/Artemis.UI;component/ResourceDictionaries/DisplayConditions.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -28,13 +36,13 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Button Grid.Row="0"
                 Grid.Column="0"
+                ToolTip="Delete the list predicate and all its children"
                 Style="{StaticResource MaterialDesignIconForegroundButton}"
                 HorizontalAlignment="Left"
                 Foreground="#E74C4C"
@@ -62,7 +70,7 @@
                             <Setter Property="CommandTarget" Value="{Binding}" />
                             <Setter Property="IsEnabled" Value="{Binding IsMatchingFilteredTypes}" />
                             <Setter Property="IsSubmenuOpen" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
-                            <Setter Property="HeaderTemplate" Value="{StaticResource DataModelSelectionTemplate}" />
+                            <Setter Property="HeaderTemplate" Value="{StaticResource DataModelDataTemplate}" />
                         </Style>
                     </ContextMenu.ItemContainerStyle>
                 </ContextMenu>
@@ -83,7 +91,8 @@
                 Background="#7B7B7B"
                 BorderBrush="#7B7B7B"
                 Content="{Binding SelectedListOperator}"
-                Click="PropertyButton_OnClick">
+                Click="PropertyButton_OnClick"
+                HorizontalAlignment="Left">
             <Button.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="Any" Command="{s:Action SelectListOperator}" CommandParameter="Any" />
@@ -94,56 +103,18 @@
             </Button.ContextMenu>
         </Button>
 
-        <Button x:Name="AddChildButton"
-                Grid.Row="0"
-                Grid.Column="3"
-                HorizontalAlignment="Left"
-                Foreground="#4CE758"
-                Width="25"
-                Height="25">
-            <Button.Style>
-                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignIconForegroundButton}">
-                    <Style.Triggers>
-                        <EventTrigger RoutedEvent="Click">
-                            <EventTrigger.Actions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetProperty="ContextMenu.IsOpen">
-                                            <DiscreteBooleanKeyFrame KeyTime="0:0:0" Value="True" />
-                                        </BooleanAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </EventTrigger.Actions>
-                        </EventTrigger>
-                    </Style.Triggers>
-                </Style>
-            </Button.Style>
-            <materialDesign:PackIcon Kind="Add" Width="18" Height="18" />
-            <Button.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="Add static condition"
-                              ToolTip="A condition that compares a data model property to a static input"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="Static">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="FormTextarea" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Add dynamic condition"
-                              ToolTip="A condition that compares two data model properties"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="Dynamic">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="InsertLink" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Add group" ToolTip="A group can contain conditions and other groups" Command="{s:Action AddGroup}">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="CodeParentheses" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </ContextMenu>
-            </Button.ContextMenu>
-        </Button>
+        <ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" ItemsSource="{Binding Children}" Margin="0 4 0 0">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <materialDesign:TransitioningContent>
+                        <materialDesign:TransitioningContent.OpeningEffects>
+                            <materialDesign:TransitionEffect Kind="FadeIn" />
+                            <materialDesign:TransitionEffect Kind="SlideInFromLeft" />
+                        </materialDesign:TransitioningContent.OpeningEffects>
+                        <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
+                    </materialDesign:TransitioningContent>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
     </Grid>
 </UserControl>

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Timers;
@@ -22,7 +23,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         private readonly IDataModelVisualizationService _dataModelVisualizationService;
         private readonly IDisplayConditionsVmFactory _displayConditionsVmFactory;
         private bool _isInitialized;
-        private DataModelVisualizationViewModel _selectedListProperty;
+        private DataModelListViewModel _selectedListProperty;
         private DataModelPropertiesViewModel _targetDataModel;
         private readonly Timer _updateTimer;
 
@@ -66,7 +67,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             set => SetAndNotify(ref _targetDataModel, value);
         }
 
-        public DataModelVisualizationViewModel SelectedListProperty
+        public DataModelListViewModel SelectedListProperty
         {
             get => _selectedListProperty;
             set => SetAndNotify(ref _selectedListProperty, value);
@@ -132,12 +133,15 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         private void OnUpdateTimerOnElapsed(object sender, ElapsedEventArgs e)
         {
             if (TargetDataModelOpen)
-                TargetDataModel.Update(_dataModelVisualizationService);
+            {
+                TargetDataModel?.Update(_dataModelVisualizationService);
+                SelectedListProperty?.Update(_dataModelVisualizationService);
+            }
         }
 
         private void TargetDataModelUpdateRequested(object sender, EventArgs e)
         {
-            TargetDataModel.ApplyTypeFilter(true, typeof(IEnumerable));
+            TargetDataModel.ApplyTypeFilter(true, typeof(IList));
         }
 
         public void ApplyList()
@@ -148,6 +152,15 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             Update();
         }
 
+        public override List<DataModelVisualizationViewModel> GetExtraDataModels()
+        {
+            var list = base.GetExtraDataModels();
+            if (SelectedListProperty != null)
+                list.Add(SelectedListProperty.ListTypePropertyViewModel);
+
+            return list;
+        }
+
         public override void Update()
         {
             if (TargetDataModel == null)
@@ -157,9 +170,13 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
 
             // Update the selected list property
             if (DisplayConditionListPredicate.ListDataModel != null && DisplayConditionListPredicate.ListPropertyPath != null)
-                SelectedListProperty = TargetDataModel.GetChildByPath(DisplayConditionListPredicate.ListDataModel.PluginInfo.Guid, DisplayConditionListPredicate.ListPropertyPath);
+            {
+                var child = TargetDataModel.GetChildByPath(DisplayConditionListPredicate.ListDataModel.PluginInfo.Guid, DisplayConditionListPredicate.ListPropertyPath);
+                SelectedListProperty = child as DataModelListViewModel;
+            }
+
             // Ensure filtering is applied to include Enumerables only
-            TargetDataModel.ApplyTypeFilter(true, typeof(IEnumerable));
+            TargetDataModel.ApplyTypeFilter(true, typeof(IList));
 
             // Remove VMs of effects no longer applied on the layer
             var toRemove = Children.Where(c => !DisplayConditionListPredicate.Children.Contains(c.Model)).ToList();
@@ -174,19 +191,12 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             {
                 if (Children.Any(c => c.Model == childModel))
                     continue;
+                if (!(childModel is DisplayConditionGroup displayConditionGroup))
+                    continue;
 
-                switch (childModel)
-                {
-                    case DisplayConditionGroup displayConditionGroup:
-                        Children.Add(_displayConditionsVmFactory.DisplayConditionGroupViewModel(displayConditionGroup, this));
-                        break;
-                    case DisplayConditionListPredicate displayConditionListPredicate:
-                        Children.Add(_displayConditionsVmFactory.DisplayConditionListPredicateViewModel(displayConditionListPredicate, this));
-                        break;
-                    case DisplayConditionPredicate displayConditionPredicate:
-                        Children.Add(_displayConditionsVmFactory.DisplayConditionPredicateViewModel(displayConditionPredicate, this));
-                        break;
-                }
+                var viewModel = _displayConditionsVmFactory.DisplayConditionGroupViewModel(displayConditionGroup, this);
+                viewModel.IsRootGroup = true;
+                Children.Add(viewModel);
             }
 
             foreach (var childViewModel in Children)
@@ -196,10 +206,13 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
 
         private void ExecuteSelectListProperty(object context)
         {
-            if (!(context is DataModelVisualizationViewModel dataModelVisualizationViewModel))
+            if (!(context is DataModelListViewModel dataModelListViewModel))
                 return;
 
-            SelectedListProperty = dataModelVisualizationViewModel;
+            SelectedListProperty = dataModelListViewModel;
+            if (SelectedListProperty.ListTypePropertyViewModel == null)
+                SelectedListProperty.Update(_dataModelVisualizationService);
+
             ApplyList();
         }
     }

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml

@@ -21,6 +21,14 @@
                 <ResourceDictionary>
                     <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
                     <utilities:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
+                    <DataTemplate x:Key="DataModelDataTemplate">
+                        <Control x:Name="TemplateControl" Focusable="False" Template="{StaticResource DataModelSelectionTemplate}" />
+                        <DataTemplate.Triggers>
+                            <DataTrigger Binding="{Binding Data.ShowDataModelValues.Value, Source={StaticResource DataContextProxy}}" Value="True">
+                                <Setter TargetName="TemplateControl" Property="Template" Value="{StaticResource DataModelSelectionTemplateWithValues}" />
+                            </DataTrigger>
+                        </DataTemplate.Triggers>
+                    </DataTemplate>
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -34,6 +42,7 @@
         </Grid.ColumnDefinitions>
         <Button Grid.Row="0"
                 Grid.Column="0"
+                ToolTip="Delete the predicate"
                 Style="{StaticResource MaterialDesignIconForegroundButton}"
                 HorizontalAlignment="Left"
                 Foreground="#E74C4C"
@@ -61,7 +70,7 @@
                             <Setter Property="CommandTarget" Value="{Binding}" />
                             <Setter Property="IsEnabled" Value="{Binding IsMatchingFilteredTypes}" />
                             <Setter Property="IsSubmenuOpen" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
-                            <Setter Property="HeaderTemplate" Value="{StaticResource DataModelSelectionTemplate}" />
+                            <Setter Property="HeaderTemplate" Value="{StaticResource DataModelDataTemplate}" />
                         </Style>
                     </ContextMenu.ItemContainerStyle>
                 </ContextMenu>
@@ -124,7 +133,7 @@
                                 <Setter Property="CommandTarget" Value="{Binding}" />
                                 <Setter Property="IsEnabled" Value="{Binding IsMatchingFilteredTypes}" />
                                 <Setter Property="IsSubmenuOpen" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
-                                <Setter Property="HeaderTemplate" Value="{StaticResource DataModelSelectionTemplate}" />
+                                <Setter Property="HeaderTemplate" Value="{StaticResource DataModelDataTemplate}" />
                             </Style>
                         </ContextMenu.ItemContainerStyle>
                     </ContextMenu>

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

@@ -54,6 +54,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             _dataModelService = dataModelService;
             _eventAggregator = eventAggregator;
             _updateTimer = new Timer(500);
+            _supportedInputTypes = new List<Type>();
 
             SelectLeftPropertyCommand = new DelegateCommand(ExecuteSelectLeftProperty);
             SelectRightPropertyCommand = new DelegateCommand(ExecuteSelectRightProperty);