Conditions - Fixed a null check during value retreival

Test data model - Moved to right folder

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

@@ -127,7 +127,7 @@ namespace Artemis.UI.Shared
                 if (PropertyInfo.GetGetMethod() == null)
                     return null;
 
-                return Parent == null ? null : PropertyInfo.GetValue(Parent.GetCurrentValue());
+                return Parent?.GetCurrentValue() == null ? null : PropertyInfo.GetValue(Parent.GetCurrentValue());
             }
             catch (Exception)
             {

src/Artemis.UI.Shared/ResourceDictionaries/DataModelConditions.xaml

@@ -31,12 +31,12 @@
         <StackPanel>
             <StackPanel.Resources>
                 <DataTemplate DataType="{x:Type dataModel:DataModelPropertiesViewModel}">
-                    <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" />
+                    <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" ToolTipService.ShowOnDisabled="True"/>
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type dataModel:DataModelListViewModel}">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="FormatListBulleted" VerticalAlignment="Center" Margin="0 0 5 0" />
-                        <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" VerticalAlignment="Center" />
+                        <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" ToolTipService.ShowOnDisabled="True" VerticalAlignment="Center" />
                     </StackPanel>
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type dataModel:DataModelPropertyViewModel}">
@@ -54,12 +54,12 @@
         <StackPanel>
             <StackPanel.Resources>
                 <DataTemplate DataType="{x:Type dataModel:DataModelPropertiesViewModel}">
-                    <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" />
+                    <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" ToolTipService.ShowOnDisabled="True"/>
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type dataModel:DataModelListViewModel}">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon Kind="FormatListBulleted" VerticalAlignment="Center" Margin="0 0 5 0" />
-                        <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" VerticalAlignment="Center" />
+                        <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" ToolTipService.ShowOnDisabled="True" VerticalAlignment="Center"/>
                     </StackPanel>
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type dataModel:DataModelPropertyViewModel}">
@@ -70,7 +70,7 @@
                         </Grid.ColumnDefinitions>
 
                         <!-- Value description -->
-                        <TextBlock Grid.Column="0" Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" />
+                        <TextBlock Grid.Column="0" Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" ToolTipService.ShowOnDisabled="True"/>
 
                         <!-- Value display -->
                         <StackPanel Grid.Column="1">

src/Artemis.sln

@@ -82,7 +82,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.Plugins.Modules.Ove
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataModelExpansions", "DataModelExpansions", "{5A5B55D7-F631-467A-A16F-B880DE4E8909}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.DataModelExpansions.TestData", "Artemis.Plugins.DataModelExpansions.TestData\Artemis.Plugins.DataModelExpansions.TestData.csproj", "{5353C9A2-2D9A-4051-8599-AFE56D54B882}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Artemis.Plugins.DataModelExpansions.TestData", "Plugins\Artemis.Plugins.DataModelExpansions.TestData\Artemis.Plugins.DataModelExpansions.TestData.csproj", "{5353C9A2-2D9A-4051-8599-AFE56D54B882}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/Artemis.Plugins.DataModelExpansions.TestData.csproj

@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
+    <ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Plugins/Artemis.Plugins.DataModelExpansions.TestData/DataModels/PluginDataModel.cs

@@ -8,7 +8,7 @@ namespace Artemis.Plugins.DataModelExpansions.TestData.DataModels
     {
         public PluginDataModel()
         {
-            PluginSubDataModel = new PluginSubDataModel();
+            // PluginSubDataModel = new PluginSubDataModel();
             ListItems = new List<SomeListItem>();
             for (var i = 0; i < 20; i++)
                 ListItems.Add(new SomeListItem {ItemName = $"Item {i + 1}", Number = i});