Display conditions - Updated predicate VM to move logic to the model

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

@@ -38,15 +38,15 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         public void AddCondition(string type)
         {
             if (type == "Static")
-                DisplayConditionGroup.AddChild(new DisplayConditionPredicate {PredicateType = PredicateType.Static});
+                DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, PredicateType.Static));
             else if (type == "Dynamic")
-                DisplayConditionGroup.AddChild(new DisplayConditionPredicate {PredicateType = PredicateType.Dynamic});
+                DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, PredicateType.Dynamic));
             Update();
         }
 
         public void AddGroup()
         {
-            DisplayConditionGroup.AddChild(new DisplayConditionGroup());
+            DisplayConditionGroup.AddChild(new DisplayConditionGroup(DisplayConditionGroup));
             Update();
         }
 

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

@@ -48,7 +48,7 @@
                 Background="#ab47bc"
                 BorderBrush="#ab47bc"
                 Style="{StaticResource DisplayConditionButton}"
-                ToolTip="{Binding DisplayConditionPredicate.LeftPropertyPath}"
+                ToolTip="{Binding SelectedLeftSideProperty.DisplayPropertyPath}"
                 Click="PropertyButton_OnClick">
             <Button.ContextMenu>
                 <ContextMenu ItemsSource="{Binding LeftSideDataModel.Children}">
@@ -80,7 +80,7 @@
                 Style="{StaticResource DisplayConditionButtonLeftClickMenu}"
                 Background="#7B7B7B"
                 BorderBrush="#7B7B7B"
-                Content="{Binding DisplayConditionPredicate.Operator.Description}"
+                Content="{Binding SelectedOperator.Description}"
                 Click="PropertyButton_OnClick">
             <Button.ContextMenu>
                 <ContextMenu ItemsSource="{Binding Operators}">
@@ -109,7 +109,7 @@
                 Background="{DynamicResource PrimaryHueMidBrush}"
                 BorderBrush="{DynamicResource PrimaryHueMidBrush}"
                 Style="{StaticResource DisplayConditionButton}"
-                ToolTip="{Binding DisplayConditionPredicate.RightPropertyPath}"
+                ToolTip="{Binding SelectedRightSideProperty.DisplayPropertyPath}"
                 Click="PropertyButton_OnClick"
                 Visibility="{Binding ShowRightSidePropertySelection, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
             <Button.ContextMenu>
@@ -147,12 +147,12 @@
                         Command="{s:Action ActivateRightSideInputViewModel}"
                         HorizontalAlignment="Left">
                     <Grid>
-                        <StackPanel Visibility="{Binding DisplayConditionPredicate.RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" Orientation="Horizontal">
+                        <StackPanel Visibility="{Binding RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" Orientation="Horizontal">
                             <TextBlock Margin="0 0 3 0"
                                        FontWeight="Light"
                                        Text="{Binding SelectedLeftSideProperty.PropertyDescription.Prefix}"
                                        Visibility="{Binding SelectedLeftSideProperty.PropertyDescription.Prefix, Converter={StaticResource NullToVisibilityConverter}}"/>
-                            <TextBlock Text="{Binding DisplayConditionPredicate.RightStaticValue}"/>
+                            <TextBlock Text="{Binding RightStaticValue}"/>
                             <TextBlock Margin="3 0 0 0"
                                        FontWeight="Light"
                                        Text="{Binding SelectedLeftSideProperty.PropertyDescription.Affix}"
@@ -161,7 +161,7 @@
 
                         <TextBlock Text="« Enter a value »"
                                    FontStyle="Italic"
-                                   Visibility="{Binding DisplayConditionPredicate.RightStaticValue, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}" />
+                                   Visibility="{Binding RightStaticValue, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}" />
                     </Grid>
                 </Button>
                 <Border BorderBrush="{DynamicResource PrimaryHueMidBrush}"

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

@@ -29,9 +29,11 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         private DataModelInputViewModel _rightSideInputViewModel;
         private int _rightSideTransitionIndex;
         private DataModelVisualizationViewModel _selectedLeftSideProperty;
+        private DisplayConditionOperator _selectedOperator;
         private DataModelVisualizationViewModel _selectedRightSideProperty;
 
         private List<Type> _supportedInputTypes;
+        private object _rightStaticValue;
 
         public DisplayConditionPredicateViewModel(DisplayConditionPredicate displayConditionPredicate, DisplayConditionViewModel parent, IProfileEditorService profileEditorService,
             IDataModelVisualizationService dataModelVisualizationService, IDataModelService dataModelService, IEventAggregator eventAggregator)
@@ -46,7 +48,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             SelectRightPropertyCommand = new DelegateCommand(ExecuteSelectRightProperty);
             SelectOperatorCommand = new DelegateCommand(ExecuteSelectOperatorCommand);
 
-            Initialize();
+            // Initialize async, no need to wait for it
+            Task.Run(Initialize);
         }
 
         public DisplayConditionPredicate DisplayConditionPredicate => (DisplayConditionPredicate) Model;
@@ -83,6 +86,12 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             set => SetAndNotify(ref _selectedRightSideProperty, value);
         }
 
+        public object RightStaticValue
+        {
+            get => _rightStaticValue;
+            set => SetAndNotify(ref _rightStaticValue, value);
+        }
+
         public int RightSideTransitionIndex
         {
             get => _rightSideTransitionIndex;
@@ -101,121 +110,15 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             set => SetAndNotify(ref _operators, value);
         }
 
-        public void Initialize()
+        public DisplayConditionOperator SelectedOperator
         {
-            Task.Run(() =>
-            {
-                // Get the data models
-                LeftSideDataModel = _dataModelVisualizationService.GetMainDataModelVisualization();
-                RightSideDataModel = _dataModelVisualizationService.GetMainDataModelVisualization();
-                if (!_dataModelVisualizationService.GetPluginExtendsDataModel(_profileEditorService.GetCurrentModule()))
-                {
-                    LeftSideDataModel.Children.Add(_dataModelVisualizationService.GetPluginDataModelVisualization(_profileEditorService.GetCurrentModule()));
-                    RightSideDataModel.Children.Add(_dataModelVisualizationService.GetPluginDataModelVisualization(_profileEditorService.GetCurrentModule()));
-                }
-
-                // Determine which types are currently supported
-                var editors = _dataModelVisualizationService.RegisteredDataModelEditors;
-                _supportedInputTypes = editors.Select(e => e.SupportedType).ToList();
-                _supportedInputTypes.AddRange(editors.Where(e => e.CompatibleConversionTypes != null).SelectMany(e => e.CompatibleConversionTypes));
-
-                IsInitialized = true;
-                Update();
-            });
+            get => _selectedOperator;
+            set => SetAndNotify(ref _selectedOperator, value);
         }
 
-        public override void Update()
-        {
-            if (!IsInitialized)
-                return;
-
-            // If static, only allow selecting properties also supported by input
-            if (DisplayConditionPredicate.PredicateType == PredicateType.Static)
-                LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
-
-            // Determine the left side property first
-            SelectedLeftSideProperty = DisplayConditionPredicate.LeftPropertyPath != null
-                ? LeftSideDataModel.GetChildByPath(DisplayConditionPredicate.LeftDataModelGuid, DisplayConditionPredicate.LeftPropertyPath)
-                : null;
-            var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
-
-            // Get the supported operators
-            Operators = _dataModelService.GetCompatibleConditionOperators(leftSideType);
-            if (DisplayConditionPredicate.Operator == null || !DisplayConditionPredicate.Operator.SupportsType(leftSideType))
-                DisplayConditionPredicate.Operator = Operators.FirstOrDefault(o => o.SupportsType(leftSideType));
-
-            if (DisplayConditionPredicate.PredicateType == PredicateType.Dynamic)
-                UpdateRightSideDynamic(leftSideType);
-            else
-                UpdateRightSideStatic(leftSideType);
-
-            DisplayConditionPredicate.CreateExpression(_dataModelService);
-            NotifyOfPropertyChange(nameof(DisplayConditionPredicate));
-        }
-
-        #region Dynamic input
-
-        private void UpdateRightSideDynamic(Type leftSideType)
-        {
-            // Right side may only select properties matching the left side
-            if (SelectedLeftSideProperty != null)
-                RightSideDataModel.ApplyTypeFilter(true, leftSideType);
-            else
-                RightSideDataModel.ApplyTypeFilter(true);
-
-            // Determine the right side property
-            if (DisplayConditionPredicate.RightPropertyPath != null)
-            {
-                // Ensure the right side property still matches the left side type, else set it to null
-                var selectedProperty = RightSideDataModel.GetChildByPath(DisplayConditionPredicate.RightDataModelGuid, DisplayConditionPredicate.RightPropertyPath);
-                SelectedRightSideProperty = selectedProperty.IsMatchingFilteredTypes ? selectedProperty : null;
-            }
-            else
-                SelectedRightSideProperty = null;
-        }
-
-        #endregion
-
-        #region Static input
-
-        private void UpdateRightSideStatic(Type leftSideType)
-        {
-            if (DisplayConditionPredicate.RightStaticValue != null && DisplayConditionPredicate.RightStaticValue.GetType() != leftSideType)
-                DisplayConditionPredicate.RightStaticValue = null;
-        }
-
-        public void ActivateRightSideInputViewModel()
-        {
-            if (SelectedLeftSideProperty?.PropertyInfo == null)
-                return;
-
-            RightSideTransitionIndex = 1;
-            RightSideInputViewModel = _dataModelVisualizationService.GetDataModelInputViewModel(
-                SelectedLeftSideProperty.PropertyInfo.PropertyType,
-                SelectedLeftSideProperty.PropertyDescription,
-                DisplayConditionPredicate.RightStaticValue,
-                UpdateInputValue
-            );
-            _eventAggregator.Subscribe(this);
-        }
-
-        public void UpdateInputValue(object value, bool isSubmitted)
-        {
-            if (isSubmitted)
-            {
-                var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
-
-                if (value != null && value.GetType() != leftSideType)
-                    DisplayConditionPredicate.RightStaticValue = Convert.ChangeType(value, leftSideType);
-                else
-                    DisplayConditionPredicate.RightStaticValue = value;
-                Update();
-            }
-
-            RightSideTransitionIndex = 0;
-            RightSideInputViewModel = null;
-            _eventAggregator.Unsubscribe(this);
-        }
+        public DelegateCommand SelectLeftPropertyCommand { get; }
+        public DelegateCommand SelectRightPropertyCommand { get; }
+        public DelegateCommand SelectOperatorCommand { get; }
 
         public void Handle(MainWindowKeyEvent message)
         {
@@ -237,32 +140,119 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
                 RightSideInputViewModel.Submit();
         }
 
-        #endregion
+        public void Initialize()
+        {
+            // Get the data models
+            LeftSideDataModel = _dataModelVisualizationService.GetMainDataModelVisualization();
+            RightSideDataModel = _dataModelVisualizationService.GetMainDataModelVisualization();
+            if (!_dataModelVisualizationService.GetPluginExtendsDataModel(_profileEditorService.GetCurrentModule()))
+            {
+                LeftSideDataModel.Children.Add(_dataModelVisualizationService.GetPluginDataModelVisualization(_profileEditorService.GetCurrentModule()));
+                RightSideDataModel.Children.Add(_dataModelVisualizationService.GetPluginDataModelVisualization(_profileEditorService.GetCurrentModule()));
+            }
 
-        #region Commands
+            // Determine which types are currently supported
+            var editors = _dataModelVisualizationService.RegisteredDataModelEditors;
+            _supportedInputTypes = editors.Select(e => e.SupportedType).ToList();
+            _supportedInputTypes.AddRange(editors.Where(e => e.CompatibleConversionTypes != null).SelectMany(e => e.CompatibleConversionTypes));
 
-        public DelegateCommand SelectLeftPropertyCommand { get; }
-        public DelegateCommand SelectRightPropertyCommand { get; }
-        public DelegateCommand SelectOperatorCommand { get; }
+            IsInitialized = true;
+            Update();
+        }
+
+        public override void Update()
+        {
+            if (!IsInitialized)
+                return;
+
+            // If static, only allow selecting properties also supported by input
+            if (DisplayConditionPredicate.PredicateType == PredicateType.Static)
+                LeftSideDataModel.ApplyTypeFilter(false, _supportedInputTypes.ToArray());
+
+            // Determine the left side property first
+            SelectedLeftSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Left);
+            var leftSideType = SelectedLeftSideProperty?.PropertyInfo?.PropertyType;
+
+            // Get the supported operators
+            Operators = _dataModelService.GetCompatibleConditionOperators(leftSideType);
+            if (DisplayConditionPredicate.Operator == null)
+                DisplayConditionPredicate.UpdateOperator(Operators.FirstOrDefault(o => o.SupportsType(leftSideType)));
+            SelectedOperator = DisplayConditionPredicate.Operator;
+
+            // Determine the right side
+            if (DisplayConditionPredicate.PredicateType == PredicateType.Dynamic)
+            {
+                SelectedRightSideProperty = LeftSideDataModel.GetChildForCondition(DisplayConditionPredicate, DisplayConditionSide.Right);
+                RightSideDataModel.ApplyTypeFilter(true, leftSideType);
+            }
+            else
+                RightStaticValue = DisplayConditionPredicate.RightStaticValue;
+        }
+
+        public void ApplyLeftSide()
+        {
+            DisplayConditionPredicate.UpdateLeftSide(SelectedLeftSideProperty.DataModel, SelectedLeftSideProperty.PropertyPath);
+            SelectedOperator = DisplayConditionPredicate.Operator;
+            Update();
+        }
+
+        public void ApplyRightSideDynamic()
+        {
+            DisplayConditionPredicate.UpdateRightSide(SelectedRightSideProperty.DataModel, SelectedRightSideProperty.PropertyPath);
+            Update();
+        }
+
+        public void ApplyRightSideStatic(object value, bool isSubmitted)
+        {
+            if (isSubmitted)
+            {
+                DisplayConditionPredicate.UpdateRightSide(value);
+                Update();
+            }
+
+            RightSideTransitionIndex = 0;
+            RightSideInputViewModel = null;
+            RightStaticValue = value;
+            _eventAggregator.Unsubscribe(this);
+        }
+
+        public void ApplyOperator()
+        {
+            DisplayConditionPredicate.UpdateOperator(SelectedOperator);
+            Update();
+        }
+
+        public void ActivateRightSideInputViewModel()
+        {
+            if (SelectedLeftSideProperty?.PropertyInfo == null)
+                return;
+
+            RightSideTransitionIndex = 1;
+            RightSideInputViewModel = _dataModelVisualizationService.GetDataModelInputViewModel(
+                SelectedLeftSideProperty.PropertyInfo.PropertyType,
+                SelectedLeftSideProperty.PropertyDescription,
+                DisplayConditionPredicate.RightStaticValue,
+                ApplyRightSideStatic
+            );
+            _eventAggregator.Subscribe(this);
+        }
 
         private void ExecuteSelectLeftProperty(object context)
         {
-            if (!(context is DataModelVisualizationViewModel vm))
+            if (!(context is DataModelVisualizationViewModel dataModelVisualizationViewModel))
                 return;
 
-            DisplayConditionPredicate.LeftPropertyPath = vm.GetCurrentPath();
-            DisplayConditionPredicate.LeftDataModelGuid = vm.DataModel.PluginInfo.Guid;
-            Update();
+            SelectedLeftSideProperty = dataModelVisualizationViewModel;
+            ApplyLeftSide();
         }
 
         private void ExecuteSelectRightProperty(object context)
         {
-            if (!(context is DataModelVisualizationViewModel vm))
+            if (!(context is DataModelVisualizationViewModel dataModelVisualizationViewModel))
                 return;
 
-            DisplayConditionPredicate.RightPropertyPath = vm.GetCurrentPath();
-            DisplayConditionPredicate.RightDataModelGuid = vm.DataModel.PluginInfo.Guid;
-            Update();
+            SelectedRightSideProperty = dataModelVisualizationViewModel;
+            ApplyRightSideDynamic();
         }
 
         private void ExecuteSelectOperatorCommand(object context)
@@ -270,10 +260,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             if (!(context is DisplayConditionOperator displayConditionOperator))
                 return;
 
-            DisplayConditionPredicate.Operator = displayConditionOperator;
-            Update();
+            SelectedOperator = displayConditionOperator;
+            ApplyOperator();
         }
-
-        #endregion
     }
 }

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

@@ -32,7 +32,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
 
             // Ensure the layer has a root display condition group
             if (e.RenderProfileElement.DisplayConditionGroup == null)
-                e.RenderProfileElement.DisplayConditionGroup = new DisplayConditionGroup();
+                e.RenderProfileElement.DisplayConditionGroup = new DisplayConditionGroup(null);
 
             RootGroup = _displayConditionsVmFactory.DisplayConditionGroupViewModel(e.RenderProfileElement.DisplayConditionGroup, null);
             RootGroup.IsRootGroup = true;