Core - Streamlined public parts of profile creation

UI - Started adjusting the VMs for the layer refactor

src/Artemis.Core/Models/Profile/Conditions/Abstract/DisplayConditionPart.cs

@@ -61,7 +61,7 @@ namespace Artemis.Core
         /// <returns></returns>
         public abstract bool EvaluateObject(object target);
 
-        internal abstract void ApplyToEntity();
+        internal abstract void Save();
         internal abstract DisplayConditionPartEntity GetEntity();
 
         #region IDisposable

src/Artemis.Core/Models/Profile/Conditions/DisplayConditionGroup.cs

@@ -105,14 +105,14 @@ namespace Artemis.Core
             };
         }
 
-        internal override void ApplyToEntity()
+        internal override void Save()
         {
             Entity.BooleanOperator = (int) BooleanOperator;
 
             Entity.Children.Clear();
             Entity.Children.AddRange(Children.Select(c => c.GetEntity()));
             foreach (var child in Children)
-                child.ApplyToEntity();
+                child.Save();
         }
 
         internal override DisplayConditionPartEntity GetEntity()

src/Artemis.Core/Models/Profile/Conditions/DisplayConditionList.cs

@@ -116,7 +116,7 @@ namespace Artemis.Core
             CompiledListAccessor = lambda.Compile();
         }
         
-        internal override void ApplyToEntity()
+        internal override void Save()
         {
             // Target list
             if (ListDataModel != null)
@@ -132,7 +132,7 @@ namespace Artemis.Core
             Entity.Children.Clear();
             Entity.Children.AddRange(Children.Select(c => c.GetEntity()));
             foreach (var child in Children)
-                child.ApplyToEntity();
+                child.Save();
         }
 
         internal override DisplayConditionPartEntity GetEntity()

src/Artemis.Core/Models/Profile/Conditions/DisplayConditionListPredicate.cs

@@ -190,22 +190,31 @@ namespace Artemis.Core
             return result;
         }
 
-        internal override void ApplyToEntity()
+        internal override void Save()
         {
             Entity.PredicateType = (int) PredicateType;
-            Entity.ListDataModelGuid = ListDataModel?.PluginInfo?.Guid;
-            Entity.ListPropertyPath = ListPropertyPath;
+            if (ListDataModel != null)
+            {
+                Entity.ListDataModelGuid = ListDataModel.PluginInfo.Guid;
+                Entity.ListPropertyPath = ListPropertyPath;
+            }
 
             Entity.LeftPropertyPath = LeftPropertyPath;
             Entity.RightPropertyPath = RightPropertyPath;
             Entity.RightStaticValue = JsonConvert.SerializeObject(RightStaticValue);
 
-            Entity.OperatorPluginGuid = Operator?.PluginInfo?.Guid;
-            Entity.OperatorType = Operator?.GetType().Name;
+            if (Operator != null)
+            {
+                Entity.OperatorPluginGuid = Operator.PluginInfo.Guid;
+                Entity.OperatorType = Operator.GetType().Name;
+            }
         }
 
-        internal void Initialize()
+        private void Initialize()
         {
+            ConditionOperatorStore.ConditionOperatorAdded += ConditionOperatorStoreOnConditionOperatorAdded;
+            ConditionOperatorStore.ConditionOperatorRemoved += ConditionOperatorStoreOnConditionOperatorRemoved;
+
             // Left side
             if (Entity.LeftPropertyPath != null && ListContainsInnerPath(Entity.LeftPropertyPath))
                 UpdateLeftSide(Entity.LeftPropertyPath);
@@ -222,7 +231,7 @@ namespace Artemis.Core
             if (PredicateType == ProfileRightSideType.Dynamic && Entity.RightPropertyPath != null)
             {
                 if (ListContainsInnerPath(Entity.RightPropertyPath))
-                    UpdateLeftSide(Entity.LeftPropertyPath);
+                    UpdateRightSideDynamic(Entity.RightPropertyPath);
             }
             // Right side static
             else if (PredicateType == ProfileRightSideType.Static && Entity.RightStaticValue != null)
@@ -384,5 +393,37 @@ namespace Artemis.Core
                 Expression.Property
             );
         }
+
+        #region Event handlers
+
+        private void ConditionOperatorStoreOnConditionOperatorAdded(object sender, ConditionOperatorStoreEvent e)
+        {
+            var conditionOperator = e.Registration.ConditionOperator;
+            if (Entity.OperatorPluginGuid == conditionOperator.PluginInfo.Guid && Entity.OperatorType == conditionOperator.GetType().Name)
+                UpdateOperator(conditionOperator);
+        }
+
+        private void ConditionOperatorStoreOnConditionOperatorRemoved(object sender, ConditionOperatorStoreEvent e)
+        {
+            if (e.Registration.ConditionOperator != Operator)
+                return;
+            Operator = null;
+            CompiledListPredicate = null;
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <inheritdoc />
+        protected override void Dispose(bool disposing)
+        {
+            ConditionOperatorStore.ConditionOperatorAdded -= ConditionOperatorStoreOnConditionOperatorAdded;
+            ConditionOperatorStore.ConditionOperatorRemoved -= ConditionOperatorStoreOnConditionOperatorRemoved;
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
     }
 }

src/Artemis.Core/Models/Profile/Conditions/DisplayConditionPredicate.cs

@@ -232,7 +232,7 @@ namespace Artemis.Core
             return $"[Static] {LeftPropertyPath} {Operator.Description} {RightStaticValue}";
         }
 
-        internal override void ApplyToEntity()
+        internal override void Save()
         {
             Entity.PredicateType = (int) PredicateType;
             Entity.LeftDataModelGuid = LeftDataModel?.PluginInfo?.Guid;
@@ -250,6 +250,8 @@ namespace Artemis.Core
         {
             DataModelStore.DataModelAdded += DataModelStoreOnDataModelAdded;
             DataModelStore.DataModelRemoved += DataModelStoreOnDataModelRemoved;
+            ConditionOperatorStore.ConditionOperatorAdded += ConditionOperatorStoreOnConditionOperatorAdded;
+            ConditionOperatorStore.ConditionOperatorRemoved += ConditionOperatorStoreOnConditionOperatorRemoved;
 
             // Left side
             if (Entity.LeftDataModelGuid != null)
@@ -415,19 +417,6 @@ namespace Artemis.Core
             );
         }
 
-        private Expression CreateListAccessor(DataModel dataModel, string path, ParameterExpression listParameter)
-        {
-            var listType = dataModel.GetListTypeInPath(path);
-            if (listType == null)
-                throw new ArtemisCoreException($"Cannot create a list accessor at path {path} because the path does not contain a list");
-
-            path = dataModel.GetListInnerPath(path);
-            return path.Split('.').Aggregate<string, Expression>(
-                Expression.Convert(listParameter, listType), // Cast to the appropriate type
-                Expression.Property
-            );
-        }
-
         #region Event handlers
 
         private void DataModelStoreOnDataModelAdded(object sender, DataModelStoreEvent e)
@@ -454,6 +443,23 @@ namespace Artemis.Core
             }
         }
 
+        private void ConditionOperatorStoreOnConditionOperatorAdded(object sender, ConditionOperatorStoreEvent e)
+        {
+            var conditionOperator = e.Registration.ConditionOperator;
+            if (Entity.OperatorPluginGuid == conditionOperator.PluginInfo.Guid && Entity.OperatorType == conditionOperator.GetType().Name)
+                UpdateOperator(conditionOperator);
+        }
+
+        private void ConditionOperatorStoreOnConditionOperatorRemoved(object sender, ConditionOperatorStoreEvent e)
+        {
+            if (e.Registration.ConditionOperator != Operator)
+                return;
+
+            Operator = null;
+            CompiledStaticPredicate = null;
+            CompiledDynamicPredicate = null;
+        }
+
         #endregion
 
         /// <inheritdoc />
@@ -461,6 +467,8 @@ namespace Artemis.Core
         {
             DataModelStore.DataModelAdded -= DataModelStoreOnDataModelAdded;
             DataModelStore.DataModelRemoved -= DataModelStoreOnDataModelRemoved;
+            ConditionOperatorStore.ConditionOperatorAdded -= ConditionOperatorStoreOnConditionOperatorAdded;
+            ConditionOperatorStore.ConditionOperatorRemoved -= ConditionOperatorStoreOnConditionOperatorRemoved;
 
             base.Dispose(disposing);
         }