Conditions - Simplified adding new parts to conditions

Conditions - Added toggle for switching between static and dynamic conditions
Conditions - Automatically change to list condition when selecting a list and vice versa

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupView.xaml

@@ -98,42 +98,9 @@
             </Button.Style>
             <Button.ContextMenu>
                 <ContextMenu>
-                    <ContextMenu.Resources>
-                        <Converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
-                    </ContextMenu.Resources>
-                    <MenuItem Header="Add static condition"
-                              ToolTip="A condition that compares with a static input"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="Static">
+                    <MenuItem Header="Add condition" ToolTip="A condition that compares with another value" Command="{s:Action AddCondition}">
                         <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="FormTextarea" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Add dynamic condition"
-                              ToolTip="A condition that compares with a data model property"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="Dynamic">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="Link" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Add self condition"
-                              ToolTip="A condition that compares with a property contained in the list"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="DynamicList"
-                              IsEnabled="{Binding Data.DynamicListConditionSupported, Source={StaticResource DataContextProxy}}"
-                              Visibility="{Binding Data.IsListGroup, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Source={StaticResource DataContextProxy}}">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="UndoVariant" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Add list condition"
-                              ToolTip="A condition that evaluates on items in a list"
-                              Command="{s:Action AddCondition}"
-                              CommandParameter="List"
-                              Visibility="{Binding Data.IsListGroup, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}, Source={StaticResource DataContextProxy}}">
-                        <MenuItem.Icon>
-                            <materialDesign:PackIcon Kind="FormatListBulleted" />
+                            <materialDesign:PackIcon Kind="Equal" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem Header="Add group" ToolTip="A group can contain conditions and other groups" Command="{s:Action AddGroup}">

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
+using Artemis.UI.Extensions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions;
@@ -26,11 +27,6 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             : base(dataModelConditionGroup)
         {
             IsListGroup = isListGroup;
-            if (IsListGroup)
-                DynamicListConditionSupported = !((DataModelConditionList) dataModelConditionGroup.Parent).IsPrimitiveList;
-            else
-                DynamicListConditionSupported = false;
-
             _profileEditorService = profileEditorService;
             _dataModelConditionsVmFactory = dataModelConditionsVmFactory;
 
@@ -44,7 +40,6 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         }
 
         public bool IsListGroup { get; }
-        public bool DynamicListConditionSupported { get; }
         public DataModelConditionGroup DataModelConditionGroup => (DataModelConditionGroup) Model;
 
         public bool IsRootGroup
@@ -71,26 +66,12 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             _profileEditorService.UpdateSelectedProfileElement();
         }
 
-        public void AddCondition(string type)
+        public void AddCondition()
         {
-            if (type == "Static")
-            {
-                if (!IsListGroup)
-                    DataModelConditionGroup.AddChild(new DataModelConditionPredicate(DataModelConditionGroup, ProfileRightSideType.Static));
-                else
-                    DataModelConditionGroup.AddChild(new DataModelConditionListPredicate(DataModelConditionGroup, ListRightSideType.Static));
-            }
-            else if (type == "Dynamic")
-            {
-                if (!IsListGroup)
-                    DataModelConditionGroup.AddChild(new DataModelConditionPredicate(DataModelConditionGroup, ProfileRightSideType.Dynamic));
-                else
-                    DataModelConditionGroup.AddChild(new DataModelConditionListPredicate(DataModelConditionGroup, ListRightSideType.Dynamic));
-            }
-            else if (type == "DynamicList" && IsListGroup)
-                DataModelConditionGroup.AddChild(new DataModelConditionListPredicate(DataModelConditionGroup, ListRightSideType.DynamicList));
-            else if (type == "List" && !IsListGroup)
-                DataModelConditionGroup.AddChild(new DataModelConditionList(DataModelConditionGroup));
+            if (!IsListGroup)
+                DataModelConditionGroup.AddChild(new DataModelConditionPredicate(DataModelConditionGroup, ProfileRightSideType.Dynamic));
+            else
+                DataModelConditionGroup.AddChild(new DataModelConditionListPredicate(DataModelConditionGroup, ProfileRightSideType.Dynamic));
 
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
@@ -135,9 +116,13 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                         break;
                 }
             }
+
             if (viewModels.Any())
                 Items.AddRange(viewModels);
 
+            // Ensure the items are in the same order as on the model
+            ((BindableCollection<DataModelConditionViewModel>) Items).Sort(i => Model.Children.IndexOf(i.Model));
+
             foreach (DataModelConditionViewModel childViewModel in Items)
                 childViewModel.Update();
 
@@ -147,6 +132,36 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             OnUpdated();
         }
 
+        public void ConvertToConditionList(DataModelConditionPredicateViewModel predicateViewModel)
+        {
+            // Store the old index and remove the old predicate
+            int index = DataModelConditionGroup.Children.IndexOf(predicateViewModel.Model);
+            DataModelConditionGroup.RemoveChild(predicateViewModel.Model);
+
+            // Insert a list in the same position
+            DataModelConditionList list = new DataModelConditionList(DataModelConditionGroup);
+            list.UpdateList(predicateViewModel.LeftSideSelectionViewModel.DataModelPath);
+            DataModelConditionGroup.AddChild(list, index);
+
+            // Update to switch the VMs
+            Update();
+        }
+
+        public void ConvertToPredicate(DataModelConditionListViewModel listViewModel)
+        {
+            // Store the old index and remove the old predicate
+            int index = DataModelConditionGroup.Children.IndexOf(listViewModel.Model);
+            DataModelConditionGroup.RemoveChild(listViewModel.Model);
+
+            // Insert a list in the same position
+            DataModelConditionPredicate predicate = new DataModelConditionPredicate(DataModelConditionGroup, ProfileRightSideType.Dynamic);
+            predicate.UpdateLeftSide(listViewModel.TargetSelectionViewModel.DataModelPath);
+            DataModelConditionGroup.AddChild(predicate, index);
+
+            // Update to switch the VMs
+            Update();
+        }
+
         public event EventHandler Updated;
 
         protected virtual void OnUpdated()

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

@@ -135,39 +135,27 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             SelectedOperator = DataModelConditionListPredicate.Operator;
             if (SelectedOperator == null || !SelectedOperator.SupportsRightSide)
             {
-                DisposeRightSideStatic();
-                DisposeRightSideDynamic();
+                DisposeRightSideStaticViewModel();
+                DisposeRightSideDynamicViewModel();
             }
 
             // Ensure the right side has the proper VM
-            ListRightSideType type = DataModelConditionListPredicate.PredicateType;
-            if ((type == ListRightSideType.Dynamic || type == ListRightSideType.DynamicList) && SelectedOperator.SupportsRightSide)
+            if (DataModelConditionListPredicate.PredicateType == ProfileRightSideType.Dynamic && SelectedOperator.SupportsRightSide)
             {
-                DisposeRightSideStatic();
+                DisposeRightSideStaticViewModel();
                 if (RightSideSelectionViewModel == null)
-                {
-                    RightSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
-                    RightSideSelectionViewModel.ButtonBrush = (Brush) Application.Current.FindResource("PrimaryHueMidBrush");
-                    RightSideSelectionViewModel.PropertySelected += RightSideOnPropertySelected;
-
-                    if (DataModelConditionListPredicate.PredicateType == ListRightSideType.DynamicList)
-                        RightSideSelectionViewModel.ChangeDataModel((DataModelPropertiesViewModel) GetListDataModel());
-                }
+                    CreateRightSideSelectionViewModel();
 
                 RightSideSelectionViewModel.FilterTypes = new[] {leftSideType};
                 RightSideSelectionViewModel.ChangeDataModelPath(DataModelConditionListPredicate.RightPath);
             }
             else if (SelectedOperator.SupportsRightSide)
             {
-                DisposeRightSideDynamic();
+                DisposeRightSideDynamicViewModel();
                 if (RightSideInputViewModel == null)
-                {
-                    RightSideInputViewModel = _dataModelUIService.GetStaticInputViewModel(leftSideType, LeftSideSelectionViewModel.DataModelPath?.GetPropertyDescription());
-                    RightSideInputViewModel.Value = DataModelConditionListPredicate.RightStaticValue;
-                    RightSideInputViewModel.ButtonBrush = (Brush) Application.Current.FindResource("PrimaryHueMidBrush");
-                    RightSideInputViewModel.ValueUpdated += RightSideOnValueEntered;
-                }
+                    CreateRightSideInputViewModel(leftSideType);
 
+                RightSideInputViewModel.Value = DataModelConditionListPredicate.RightStaticValue;
                 if (RightSideInputViewModel.TargetType != leftSideType)
                     RightSideInputViewModel.UpdateTargetType(leftSideType);
             }
@@ -184,12 +172,9 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
         public void ApplyRightSideDynamic()
         {
-            if (DataModelConditionListPredicate.PredicateType == ListRightSideType.Dynamic)
-                DataModelConditionListPredicate.UpdateRightSideDynamic(RightSideSelectionViewModel.DataModelPath);
-            else if (DataModelConditionListPredicate.PredicateType == ListRightSideType.DynamicList)
-                DataModelConditionListPredicate.UpdateRightSideDynamicList(RightSideSelectionViewModel.DataModelPath);
-
+            DataModelConditionListPredicate.UpdateRightSideDynamic(RightSideSelectionViewModel.DataModelPath);
             _profileEditorService.UpdateSelectedProfileElement();
+
             Update();
         }
 
@@ -232,6 +217,24 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             ApplyOperator();
         }
 
+        #region IDisposable
+
+        public void Dispose()
+        {
+            if (!_isPrimitiveList)
+            {
+                LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
+                LeftSideSelectionViewModel.Dispose();
+            }
+
+            DisposeRightSideStaticViewModel();
+            DisposeRightSideDynamicViewModel();
+        }
+
+        #endregion
+
+        #region Event handlers
+
         private void LeftSideOnPropertySelected(object sender, DataModelInputDynamicEventArgs e)
         {
             ApplyLeftSide();
@@ -247,36 +250,59 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             ApplyRightSideStatic(e.Value);
         }
 
-        private void DisposeRightSideStatic()
+        private void RightSideSelectionViewModelOnSwitchToStaticRequested(object sender, EventArgs e)
         {
-            if (RightSideInputViewModel != null)
-            {
-                RightSideInputViewModel.ValueUpdated -= RightSideOnValueEntered;
-                RightSideInputViewModel.Dispose();
-                RightSideInputViewModel = null;
-            }
+            DataModelConditionListPredicate.PredicateType = ProfileRightSideType.Static;
+            Update();
         }
 
-        private void DisposeRightSideDynamic()
+        private void RightSideInputViewModelOnSwitchToDynamicRequested(object? sender, EventArgs e)
         {
-            if (RightSideSelectionViewModel != null)
-            {
-                RightSideSelectionViewModel.PropertySelected -= RightSideOnPropertySelected;
-                RightSideSelectionViewModel.Dispose();
-                RightSideSelectionViewModel = null;
-            }
+            DataModelConditionListPredicate.PredicateType = ProfileRightSideType.Dynamic;
+            Update();
         }
 
-        public void Dispose()
-        {
-            if (!_isPrimitiveList)
-            {
-                LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
-                LeftSideSelectionViewModel.Dispose();
-            }
+        #endregion
 
-            DisposeRightSideDynamic();
-            DisposeRightSideStatic();
+        #region View model management
+
+        private void CreateRightSideSelectionViewModel()
+        {
+            RightSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+            RightSideSelectionViewModel.ButtonBrush = (Brush) Application.Current.FindResource("PrimaryHueMidBrush");
+            RightSideSelectionViewModel.DisplaySwitchButton = true;
+            RightSideSelectionViewModel.PropertySelected += RightSideOnPropertySelected;
+            RightSideSelectionViewModel.SwitchToStaticRequested += RightSideSelectionViewModelOnSwitchToStaticRequested;
         }
+
+        private void CreateRightSideInputViewModel(Type leftSideType)
+        {
+            RightSideInputViewModel = _dataModelUIService.GetStaticInputViewModel(leftSideType, LeftSideSelectionViewModel.DataModelPath?.GetPropertyDescription());
+            RightSideInputViewModel.ButtonBrush = (Brush) Application.Current.FindResource("PrimaryHueMidBrush");
+            RightSideInputViewModel.ValueUpdated += RightSideOnValueEntered;
+            RightSideInputViewModel.SwitchToDynamicRequested += RightSideInputViewModelOnSwitchToDynamicRequested;
+        }
+
+        private void DisposeRightSideStaticViewModel()
+        {
+            if (RightSideInputViewModel == null)
+                return;
+            RightSideInputViewModel.ValueUpdated -= RightSideOnValueEntered;
+            RightSideInputViewModel.SwitchToDynamicRequested -= RightSideInputViewModelOnSwitchToDynamicRequested;
+            RightSideInputViewModel.Dispose();
+            RightSideInputViewModel = null;
+        }
+
+        private void DisposeRightSideDynamicViewModel()
+        {
+            if (RightSideSelectionViewModel == null)
+                return;
+            RightSideSelectionViewModel.PropertySelected -= RightSideOnPropertySelected;
+            RightSideSelectionViewModel.SwitchToStaticRequested -= RightSideSelectionViewModelOnSwitchToStaticRequested;
+            RightSideSelectionViewModel.Dispose();
+            RightSideSelectionViewModel = null;
+        }
+
+        #endregion
     }
 }

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

@@ -58,12 +58,9 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             _profileEditorService.UpdateSelectedProfileElement();
         }
 
-        public void AddCondition(string type)
+        public void AddCondition()
         {
-            if (type == "Static")
-                DataModelConditionList.AddChild(new DataModelConditionPredicate(DataModelConditionList, ProfileRightSideType.Static));
-            else if (type == "Dynamic")
-                DataModelConditionList.AddChild(new DataModelConditionPredicate(DataModelConditionList, ProfileRightSideType.Dynamic));
+            DataModelConditionList.AddChild(new DataModelConditionPredicate(DataModelConditionList, ProfileRightSideType.Dynamic));
 
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
@@ -86,16 +83,28 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
         public void Initialize()
         {
             TargetSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
-            TargetSelectionViewModel.FilterTypes = new[] {typeof(IEnumerable<>)};
+            TargetSelectionViewModel.PropertySelected += TargetSelectionViewModelOnPropertySelected;
+
+            IReadOnlyCollection<DataModelVisualizationRegistration> editors = _dataModelUIService.RegisteredDataModelEditors;
+            List<Type> supportedInputTypes = editors.Select(e => e.SupportedType).ToList();
+            supportedInputTypes.AddRange(editors.Where(e => e.CompatibleConversionTypes != null).SelectMany(e => e.CompatibleConversionTypes));
+            supportedInputTypes.Add(typeof(IEnumerable<>));
+            TargetSelectionViewModel.FilterTypes = supportedInputTypes.ToArray();
+
             TargetSelectionViewModel.ButtonBrush = new SolidColorBrush(Color.FromRgb(71, 108, 188));
             TargetSelectionViewModel.Placeholder = "Select a list";
-            TargetSelectionViewModel.PropertySelected += TargetSelectionViewModelOnPropertySelected;
 
             Update();
         }
 
         public void ApplyList()
         {
+            if (!TargetSelectionViewModel.DataModelPath.GetPropertyType().IsGenericEnumerable())
+            {
+                if (Parent is DataModelConditionGroupViewModel groupViewModel)
+                    groupViewModel.ConvertToPredicate(this);
+                return;
+            }
             DataModelConditionList.UpdateList(TargetSelectionViewModel.DataModelPath);
             _profileEditorService.UpdateSelectedProfileElement();
 
@@ -109,7 +118,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
             // Remove VMs of effects no longer applied on the layer
             Items.RemoveRange(Items.Where(c => !DataModelConditionList.Children.Contains(c.Model)).ToList());
-            
+
             if (DataModelConditionList.ListPath == null || !DataModelConditionList.ListPath.IsValid)
                 return;
 
@@ -125,6 +134,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 viewModel.IsRootGroup = true;
                 viewModels.Add(viewModel);
             }
+
             if (viewModels.Any())
                 Items.AddRange(viewModels);
 

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

@@ -96,7 +96,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             IReadOnlyCollection<DataModelVisualizationRegistration> editors = _dataModelUIService.RegisteredDataModelEditors;
             _supportedInputTypes = editors.Select(e => e.SupportedType).ToList();
             _supportedInputTypes.AddRange(editors.Where(e => e.CompatibleConversionTypes != null).SelectMany(e => e.CompatibleConversionTypes));
-
+            _supportedInputTypes.Add(typeof(IEnumerable<>));
             Update();
         }
 
@@ -115,33 +115,25 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             SelectedOperator = DataModelConditionPredicate.Operator;
             if (SelectedOperator == null || !SelectedOperator.SupportsRightSide)
             {
-                DisposeRightSideStatic();
-                DisposeRightSideDynamic();
+                DisposeRightSideStaticViewModel();
+                DisposeRightSideDynamicViewModel();
             }
 
             // Ensure the right side has the proper VM
             if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic && SelectedOperator.SupportsRightSide)
             {
-                DisposeRightSideStatic();
+                DisposeRightSideStaticViewModel();
                 if (RightSideSelectionViewModel == null)
-                {
-                    RightSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
-                    RightSideSelectionViewModel.ButtonBrush = (Brush) Application.Current.FindResource("PrimaryHueMidBrush");
-                    RightSideSelectionViewModel.PropertySelected += RightSideOnPropertySelected;
-                }
+                    CreateRightSideSelectionViewModel();
 
                 RightSideSelectionViewModel.ChangeDataModelPath(DataModelConditionPredicate.RightPath);
                 RightSideSelectionViewModel.FilterTypes = new[] {leftSideType};
             }
             else if (SelectedOperator.SupportsRightSide)
             {
-                DisposeRightSideDynamic();
+                DisposeRightSideDynamicViewModel();
                 if (RightSideInputViewModel == null)
-                {
-                    RightSideInputViewModel = _dataModelUIService.GetStaticInputViewModel(leftSideType, LeftSideSelectionViewModel.DataModelPath?.GetPropertyDescription());
-                    RightSideInputViewModel.ButtonBrush = (Brush) Application.Current.FindResource("PrimaryHueMidBrush");
-                    RightSideInputViewModel.ValueUpdated += RightSideOnValueEntered;
-                }
+                    CreateRightSideInputViewModel(leftSideType);
 
                 RightSideInputViewModel.Value = DataModelConditionPredicate.RightStaticValue;
                 if (RightSideInputViewModel.TargetType != leftSideType)
@@ -151,6 +143,13 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
         public void ApplyLeftSide()
         {
+            if (LeftSideSelectionViewModel.DataModelPath.GetPropertyType().IsGenericEnumerable())
+            {
+                if (Parent is DataModelConditionGroupViewModel groupViewModel)
+                    groupViewModel.ConvertToConditionList(this);
+                return;
+            }
+
             DataModelConditionPredicate.UpdateLeftSide(LeftSideSelectionViewModel.DataModelPath);
             _profileEditorService.UpdateSelectedProfileElement();
 
@@ -182,6 +181,75 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             Update();
         }
 
+        private void ExecuteSelectOperatorCommand(object context)
+        {
+            if (!(context is ConditionOperator DataModelConditionOperator))
+                return;
+
+            SelectedOperator = DataModelConditionOperator;
+            ApplyOperator();
+        }
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            if (LeftSideSelectionViewModel != null)
+            {
+                LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
+                LeftSideSelectionViewModel.Dispose();
+                LeftSideSelectionViewModel = null;
+            }
+
+            DisposeRightSideStaticViewModel();
+            DisposeRightSideDynamicViewModel();
+        }
+
+        #endregion
+
+        #region View model creation
+
+        private void CreateRightSideSelectionViewModel()
+        {
+            RightSideSelectionViewModel = _dataModelUIService.GetDynamicSelectionViewModel(_profileEditorService.GetCurrentModule());
+            RightSideSelectionViewModel.ButtonBrush = (Brush) Application.Current.FindResource("PrimaryHueMidBrush");
+            RightSideSelectionViewModel.DisplaySwitchButton = true;
+            RightSideSelectionViewModel.PropertySelected += RightSideOnPropertySelected;
+            RightSideSelectionViewModel.SwitchToStaticRequested += RightSideSelectionViewModelOnSwitchToStaticRequested;
+        }
+
+        private void CreateRightSideInputViewModel(Type leftSideType)
+        {
+            RightSideInputViewModel = _dataModelUIService.GetStaticInputViewModel(leftSideType, LeftSideSelectionViewModel.DataModelPath?.GetPropertyDescription());
+            RightSideInputViewModel.ButtonBrush = (Brush) Application.Current.FindResource("PrimaryHueMidBrush");
+            RightSideInputViewModel.ValueUpdated += RightSideOnValueEntered;
+            RightSideInputViewModel.SwitchToDynamicRequested += RightSideInputViewModelOnSwitchToDynamicRequested;
+        }
+
+        private void DisposeRightSideStaticViewModel()
+        {
+            if (RightSideInputViewModel == null)
+                return;
+            RightSideInputViewModel.ValueUpdated -= RightSideOnValueEntered;
+            RightSideInputViewModel.SwitchToDynamicRequested -= RightSideInputViewModelOnSwitchToDynamicRequested;
+            RightSideInputViewModel.Dispose();
+            RightSideInputViewModel = null;
+        }
+
+        private void DisposeRightSideDynamicViewModel()
+        {
+            if (RightSideSelectionViewModel == null)
+                return;
+            RightSideSelectionViewModel.PropertySelected -= RightSideOnPropertySelected;
+            RightSideSelectionViewModel.SwitchToStaticRequested -= RightSideSelectionViewModelOnSwitchToStaticRequested;
+            RightSideSelectionViewModel.Dispose();
+            RightSideSelectionViewModel = null;
+        }
+
+        #endregion
+
+        #region Event handlers
+
         private void LeftSideOnPropertySelected(object sender, DataModelInputDynamicEventArgs e)
         {
             ApplyLeftSide();
@@ -197,46 +265,19 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             ApplyRightSideStatic(e.Value);
         }
 
-        private void ExecuteSelectOperatorCommand(object context)
+        private void RightSideSelectionViewModelOnSwitchToStaticRequested(object sender, EventArgs e)
         {
-            if (!(context is ConditionOperator DataModelConditionOperator))
-                return;
-
-            SelectedOperator = DataModelConditionOperator;
-            ApplyOperator();
+            DataModelConditionPredicate.PredicateType = ProfileRightSideType.Static;
+            Update();
         }
 
-        private void DisposeRightSideStatic()
+
+        private void RightSideInputViewModelOnSwitchToDynamicRequested(object? sender, EventArgs e)
         {
-            if (RightSideInputViewModel != null)
-            {
-                RightSideInputViewModel.ValueUpdated -= RightSideOnValueEntered;
-                RightSideInputViewModel.Dispose();
-                RightSideInputViewModel = null;
-            }
+            DataModelConditionPredicate.PredicateType = ProfileRightSideType.Dynamic;
+            Update();
         }
 
-        private void DisposeRightSideDynamic()
-        {
-            if (RightSideSelectionViewModel != null)
-            {
-                RightSideSelectionViewModel.PropertySelected -= RightSideOnPropertySelected;
-                RightSideSelectionViewModel.Dispose();
-                RightSideSelectionViewModel = null;
-            }
-        }
-
-        public void Dispose()
-        {
-            if (LeftSideSelectionViewModel != null)
-            {
-                LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
-                LeftSideSelectionViewModel.Dispose();
-                LeftSideSelectionViewModel = null;
-            }
-
-            DisposeRightSideStatic();
-            DisposeRightSideDynamic();
-        }
+        #endregion
     }
 }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/ConditionalDataBinding/ConditionalDataBindingModeViewModel.cs

@@ -56,17 +56,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
 
         #endregion
 
-        public void AddCondition(string type)
-        {
-            DataBindingCondition<TLayerProperty, TProperty> condition = ConditionalDataBinding.AddCondition();
-
-            // Find the VM of the new condition
-            DataBindingConditionViewModel<TLayerProperty, TProperty> viewModel = ConditionViewModels.First(c => c.DataBindingCondition == condition);
-            viewModel.ActiveItem.AddCondition(type);
-
-            _profileEditorService.UpdateSelectedProfileElement();
-        }
-
         private void UpdateConditionViewModels()
         {
             _updating = true;