Conditions UI - Open dropdowns automatically when editing static values

Conditions UI - Added missing defaults for enum/bool
Data models - Use enum descriptions in display

src/Artemis.Core/Plugins/DataModelExpansions/DataModel.cs

@@ -58,7 +58,7 @@ namespace Artemis.Core.DataModelExpansions
         /// <param name="key">The key of the child, must be unique to this data model</param>
         /// <param name="name">An optional name, if not provided the key will be used in a humanized form</param>
         /// <param name="description">An optional description</param>
-        public DataModel AddDynamicChild(DataModel dynamicDataModel, string key, string name = null, string description = null)
+        public T AddDynamicChild<T>(T dynamicDataModel, string key, string name = null, string description = null) where T : DataModel
         {
             if (dynamicDataModel == null)
                 throw new ArgumentNullException(nameof(dynamicDataModel));

src/Artemis.UI.Shared/Artemis.UI.Shared.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=utilities/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertyViewModel.cs

@@ -45,7 +45,8 @@ namespace Artemis.UI.Shared
             }
 
             DisplayValue = GetCurrentValue();
-            DisplayValueType = DataModelPath.GetPropertyType();
+            DisplayValueType = DisplayValue != null ? DisplayValue.GetType() : DataModelPath.GetPropertyType();
+
             UpdateDisplayParameters();
         }
 

src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayViewModel.cs

@@ -1,4 +1,6 @@
-namespace Artemis.UI.Shared.DefaultTypes.DataModel.Display
+using System;
+
+namespace Artemis.UI.Shared.DefaultTypes.DataModel.Display
 {
     public class DefaultDataModelDisplayViewModel : DataModelDisplayViewModel<object>
     {
@@ -24,6 +26,9 @@
 
         protected override void OnDisplayValueUpdated()
         {
+            if (DisplayValue is Enum enumDisplayValue)
+                DisplayValue = EnumUtilities.HumanizeValue(enumDisplayValue);
+
             ShowToString = DisplayValue != null;
             ShowNull = DisplayValue == null;
         }

src/Artemis.UI.Shared/Services/DataModelUIService.cs

@@ -216,13 +216,6 @@ namespace Artemis.UI.Shared.Services
 
         private DataModelInputViewModel InstantiateDataModelInputViewModel(DataModelVisualizationRegistration registration, DataModelPropertyAttribute description, object initialValue)
         {
-            // The view models expecting value types shouldn't be given null, avoid that
-            if (registration.SupportedType.IsValueType)
-            {
-                if (initialValue == null)
-                    initialValue = Activator.CreateInstance(registration.SupportedType);
-            }
-
             // This assumes the type can be converted, that has been checked when the VM was created
             if (initialValue != null && initialValue.GetType() != registration.SupportedType)
                 initialValue = Convert.ChangeType(initialValue, registration.SupportedType);

src/Artemis.UI.Shared/Utilities/EnumUtilities.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
 using System.Linq;
 using Humanizer;
 
@@ -12,23 +10,6 @@ namespace Artemis.UI.Shared
     /// </summary>
     public static class EnumUtilities
     {
-        /// <summary>
-        ///     Gets a human readable description of the given enum value
-        /// </summary>
-        /// <param name="value">The value to get a description for</param>
-        /// <returns>A human readable description of the given enum value</returns>
-        public static string Description(this Enum value)
-        {
-            object[] attributes = value.GetType().GetField(value.ToString()).GetCustomAttributes(typeof(DescriptionAttribute), false);
-            if (attributes.Any())
-                return (attributes.First() as DescriptionAttribute).Description;
-
-            // If no description is found, the least we can do is replace underscores with spaces
-            // You can add your own custom default formatting logic here
-            TextInfo ti = CultureInfo.CurrentCulture.TextInfo;
-            return ti.ToTitleCase(ti.ToLower(value.ToString().Replace("_", " ")));
-        }
-
         /// <summary>
         ///     Creates a list containing a <see cref="ValueDescription" /> for each value in the enum type
         /// </summary>

src/Artemis.UI/DefaultTypes/DataModel/Input/BoolDataModelInputView.xaml

@@ -14,7 +14,8 @@
     <ComboBox Width="140"
               materialDesign:ComboBoxAssist.ClassicMode="True"
               materialDesign:ValidationAssist.UsePopup="True"
-              HorizontalAlignment="Left">
+              HorizontalAlignment="Left"
+              IsDropDownOpen="True">
         <ComboBoxItem Content="True" IsSelected="{Binding InputValue}" />
         <ComboBoxItem Content="False" IsSelected="{Binding InputValue, Converter={StaticResource InverseBooleanConverter}}"/>
     </ComboBox>

src/Artemis.UI/DefaultTypes/DataModel/Input/EnumDataModelInputView.xaml

@@ -13,5 +13,6 @@
               ItemsSource="{Binding Path=EnumValues}"
               SelectedValuePath="Value"
               DisplayMemberPath="Description"
-              SelectedValue="{Binding Path=InputValue}" />
+              SelectedValue="{Binding Path=InputValue}" 
+              IsDropDownOpen="True"/>
 </UserControl>

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

@@ -113,14 +113,16 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             if (DataModelConditionPredicate.Operator == null)
                 DataModelConditionPredicate.UpdateOperator(Operators.FirstOrDefault(o => o.SupportsType(leftSideType ?? typeof(object))));
             SelectedOperator = DataModelConditionPredicate.Operator;
+
             if (SelectedOperator == null || !SelectedOperator.SupportsRightSide)
             {
                 DisposeRightSideStaticViewModel();
                 DisposeRightSideDynamicViewModel();
+                return;
             }
 
             // Ensure the right side has the proper VM
-            if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic && SelectedOperator.SupportsRightSide)
+            if (DataModelConditionPredicate.PredicateType == ProfileRightSideType.Dynamic)
             {
                 DisposeRightSideStaticViewModel();
                 if (RightSideSelectionViewModel == null)
@@ -129,13 +131,16 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
                 RightSideSelectionViewModel.ChangeDataModelPath(DataModelConditionPredicate.RightPath);
                 RightSideSelectionViewModel.FilterTypes = new[] {leftSideType};
             }
-            else if (SelectedOperator.SupportsRightSide)
+            else
             {
                 DisposeRightSideDynamicViewModel();
                 if (RightSideInputViewModel == null)
                     CreateRightSideInputViewModel(leftSideType);
 
-                RightSideInputViewModel.Value = DataModelConditionPredicate.RightStaticValue;
+                if (leftSideType != null && leftSideType.IsValueType && DataModelConditionPredicate.RightStaticValue == null)
+                    RightSideInputViewModel.Value = leftSideType.GetDefault();
+                else
+                    RightSideInputViewModel.Value = DataModelConditionPredicate.RightStaticValue;
                 if (RightSideInputViewModel.TargetType != leftSideType)
                     RightSideInputViewModel.UpdateTargetType(leftSideType);
             }