Data model visualization - Simplified and improved VMs

Layer conditions - Added left side property selection

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

@@ -0,0 +1,67 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.UI.Shared.Services;
+
+namespace Artemis.UI.Shared.DataModelVisualization.Shared
+{
+    public class DataModelListPropertiesViewModel : DataModelPropertiesViewModel
+    {
+        private object _displayValue;
+        private int _index;
+        private Type _listType;
+
+        public DataModelListPropertiesViewModel(DataModel dataModel, DataModelVisualizationViewModel parent, PropertyInfo propertyInfo) : base(dataModel, parent, propertyInfo)
+        {
+        }
+
+        public int Index
+        {
+            get => _index;
+            set => SetAndNotify(ref _index, value);
+        }
+
+        public Type ListType
+        {
+            get => _listType;
+            set => SetAndNotify(ref _listType, value);
+        }
+
+        public object DisplayValue
+        {
+            get => _displayValue;
+            set => SetAndNotify(ref _displayValue, value);
+        }
+
+        public override void Update(IDataModelVisualizationService dataModelVisualizationService)
+        {
+            // Display value gets updated by parent, don't do anything if it is null
+            if (DisplayValue == null)
+                return;
+
+            ListType = DisplayValue.GetType();
+            PopulateProperties(dataModelVisualizationService);
+            foreach (var dataModelVisualizationViewModel in Children)
+                dataModelVisualizationViewModel.Update(dataModelVisualizationService);
+        }
+
+        public override object GetCurrentValue()
+        {
+            return DisplayValue;
+        }
+
+        private void PopulateProperties(IDataModelVisualizationService dataModelVisualizationService)
+        {
+            if (Children.Any())
+                return;
+
+            foreach (var propertyInfo in ListType.GetProperties())
+            {
+                var child = CreateChild(dataModelVisualizationService, propertyInfo);
+                if (child != null)
+                    Children.Add(child);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.UI.Shared.Services;
+
+namespace Artemis.UI.Shared.DataModelVisualization.Shared
+{
+    public class DataModelListPropertyViewModel : DataModelPropertyViewModel
+    {
+        private int _index;
+        private Type _listType;
+
+        public DataModelListPropertyViewModel(DataModel dataModel, DataModelVisualizationViewModel parent, PropertyInfo propertyInfo) : base(dataModel, parent, propertyInfo)
+        {
+        }
+
+        public int Index
+        {
+            get => _index;
+            set => SetAndNotify(ref _index, value);
+        }
+
+        public Type ListType
+        {
+            get => _listType;
+            set => SetAndNotify(ref _listType, value);
+        }
+
+        public override object GetCurrentValue()
+        {
+            return DisplayValue;
+        }
+
+        public override void Update(IDataModelVisualizationService dataModelVisualizationService)
+        {
+            // Display value gets updated by parent, don't do anything if it is null
+            if (DisplayValue == null)
+                return;
+
+            if (DisplayViewModel == null && dataModelVisualizationService.RegisteredDataModelDisplays.Any(d => d.SupportedType == DisplayValue.GetType()))
+                dataModelVisualizationService.GetDataModelDisplayViewModel(DisplayValue.GetType());
+
+            ListType = DisplayValue.GetType();
+            UpdateDisplayParameters();
+        }
+    }
+}

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

@@ -1,7 +1,8 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
+using System;
+using System.Collections;
 using System.Reflection;
+using Artemis.Core.Extensions;
+using Artemis.Core.Plugins.Abstract.DataModels;
 using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
 using Artemis.UI.Shared.Services;
 using Stylet;
@@ -10,25 +11,12 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
 {
     public class DataModelListViewModel : DataModelVisualizationViewModel
     {
-        private readonly IDataModelVisualizationService _dataModelVisualizationService;
-        private BindableCollection<DataModelVisualizationViewModel> _children;
         private string _count;
         private IList _list;
 
-        internal DataModelListViewModel(PropertyInfo propertyInfo, DataModelPropertyAttribute propertyDescription, DataModelVisualizationViewModel parent, 
-            IDataModelVisualizationService dataModelVisualizationService)
+        internal DataModelListViewModel(DataModel dataModel, DataModelVisualizationViewModel parent, PropertyInfo propertyInfo) : base(dataModel, parent, propertyInfo)
         {
-            _dataModelVisualizationService = dataModelVisualizationService;
-            PropertyInfo = propertyInfo;
-            Parent = parent;
-            PropertyDescription = propertyDescription;
-            Children = new BindableCollection<DataModelVisualizationViewModel>();
-        }
-
-        public BindableCollection<DataModelVisualizationViewModel> Children
-        {
-            get => _children;
-            set => SetAndNotify(ref _children, value);
+            ListChildren = new BindableCollection<DataModelVisualizationViewModel>();
         }
 
         public IList List
@@ -37,43 +25,67 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
             set => SetAndNotify(ref _list, value);
         }
 
+        public BindableCollection<DataModelVisualizationViewModel> ListChildren { get; set; }
+
         public string Count
         {
             get => _count;
             set => SetAndNotify(ref _count, value);
         }
 
-        public override void Update()
+        public override void Update(IDataModelVisualizationService dataModelVisualizationService)
         {
-            if (PropertyInfo != null && Parent?.Model != null && PropertyInfo.GetValue(Parent.Model) is IList listValue)
-            {
-                Model = new List<object>(listValue.Cast<object>());
-                List = (IList) Model;
-            }
+            List = GetCurrentValue() as IList;
+            if (List == null)
+                return;
 
             var index = 0;
             foreach (var item in List)
             {
                 DataModelVisualizationViewModel child;
-                if (Children.Count <= index)
+                if (ListChildren.Count <= index)
                 {
-                    child = CreateChild(_dataModelVisualizationService, item);
-                    Children.Add(child);
+                    child = CreateListChild(dataModelVisualizationService, item.GetType());
+                    ListChildren.Add(child);
                 }
                 else
+                    child = ListChildren[index];
+
+                if (child is DataModelListPropertiesViewModel dataModelListClassViewModel)
                 {
-                    child = Children[index];
-                    child.Model = item;
+                    dataModelListClassViewModel.DisplayValue = item;
+                    dataModelListClassViewModel.Index = index;
+                }
+                else if (child is DataModelListPropertyViewModel dataModelListPropertyViewModel)
+                {
+                    dataModelListPropertyViewModel.DisplayValue = item;
+                    dataModelListPropertyViewModel.Index = index;
                 }
 
-                child.Update();
+                child.Update(dataModelVisualizationService);
                 index++;
             }
 
-            while (Children.Count > List.Count)
-                Children.RemoveAt(Children.Count - 1);
+            while (ListChildren.Count > List.Count)
+                ListChildren.RemoveAt(ListChildren.Count - 1);
 
-            Count = $"{Children.Count} {(Children.Count == 1 ? "item" : "items")}";
+            Count = $"{ListChildren.Count} {(ListChildren.Count == 1 ? "item" : "items")}";
+        }
+
+        protected DataModelVisualizationViewModel CreateListChild(IDataModelVisualizationService dataModelVisualizationService, Type listType)
+        {
+            // If a display VM was found, prefer to use that in any case
+            var typeViewModel = dataModelVisualizationService.GetDataModelDisplayViewModel(listType);
+            if (typeViewModel != null)
+                return new DataModelListPropertyViewModel(DataModel, this, PropertyInfo) {DisplayViewModel = typeViewModel};
+            // For primitives, create a property view model, it may be null that is fine
+            if (listType.IsPrimitive || listType == typeof(string))
+                return new DataModelListPropertyViewModel(DataModel, this, PropertyInfo);
+            // For other value types create a child view model
+            if (listType.IsClass || listType.IsStruct())
+                return new DataModelListPropertiesViewModel(DataModel, this, PropertyInfo);
+
+            return null;
         }
     }
 }

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

@@ -0,0 +1,42 @@
+using System.Linq;
+using System.Reflection;
+using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.UI.Shared.Services;
+
+namespace Artemis.UI.Shared.DataModelVisualization.Shared
+{
+    public class DataModelPropertiesViewModel : DataModelVisualizationViewModel
+    {
+        internal DataModelPropertiesViewModel(DataModel dataModel, DataModelVisualizationViewModel parent, PropertyInfo propertyInfo) : base(dataModel, parent, propertyInfo)
+        {
+        }
+        
+        public override void Update(IDataModelVisualizationService dataModelVisualizationService)
+        {
+            PopulateProperties(dataModelVisualizationService);
+            foreach (var dataModelVisualizationViewModel in Children)
+                dataModelVisualizationViewModel.Update(dataModelVisualizationService);
+        }
+
+        public override object GetCurrentValue()
+        {
+            return Parent.IsRootViewModel ? DataModel : base.GetCurrentValue();
+        }
+
+     
+
+        private void PopulateProperties(IDataModelVisualizationService dataModelVisualizationService)
+        {
+            if (Children.Any())
+                return;
+
+            var modelType = Parent.IsRootViewModel ? DataModel.GetType() : PropertyInfo.PropertyType;
+            foreach (var propertyInfo in modelType.GetProperties())
+            {
+                var child = CreateChild(dataModelVisualizationService, propertyInfo);
+                if (child != null)
+                    Children.Add(child);
+            }
+        }
+    }
+}

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

@@ -1,20 +1,26 @@
-using System.Reflection;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using System.Linq;
+using System.Reflection;
+using Artemis.Core.Plugins.Abstract.DataModels;
+using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Shared.DataModelVisualization.Shared
 {
     public class DataModelPropertyViewModel : DataModelVisualizationViewModel
     {
+        private object _displayValue;
         private DataModelDisplayViewModel _displayViewModel;
         private bool _showNull;
         private bool _showToString;
         private bool _showViewModel;
 
-        internal DataModelPropertyViewModel(PropertyInfo propertyInfo, DataModelPropertyAttribute propertyDescription, DataModelVisualizationViewModel parent)
+        internal DataModelPropertyViewModel(DataModel dataModel, DataModelVisualizationViewModel parent, PropertyInfo propertyInfo) : base(dataModel, parent, propertyInfo)
         {
-            PropertyInfo = propertyInfo;
-            Parent = parent;
-            PropertyDescription = propertyDescription;
+        }
+
+        public object DisplayValue
+        {
+            get => _displayValue;
+            set => SetAndNotify(ref _displayValue, value);
         }
 
         public DataModelDisplayViewModel DisplayViewModel
@@ -41,19 +47,22 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
             set => SetAndNotify(ref _showViewModel, value);
         }
 
-        public override void Update()
+        public override void Update(IDataModelVisualizationService dataModelVisualizationService)
         {
-            if (PropertyInfo != null && Parent?.Model != null)
-            {
-                Model = PropertyInfo.GetValue(Parent.Model);
-                DisplayViewModel?.UpdateValue(Model);
-            }
+            if (DisplayViewModel == null && dataModelVisualizationService.RegisteredDataModelDisplays.Any(d => d.SupportedType == PropertyInfo.PropertyType))
+                dataModelVisualizationService.GetDataModelDisplayViewModel(PropertyInfo.PropertyType);
 
-            ShowToString = Model != null && DisplayViewModel == null;
-            ShowNull = Model == null;
-            ShowViewModel = Model != null && DisplayViewModel != null;
+            DisplayValue = GetCurrentValue();
+            UpdateDisplayParameters();
+        }
 
-            UpdateListStatus();
+        protected void UpdateDisplayParameters()
+        {
+            ShowToString = DisplayValue != null && DisplayViewModel == null;
+            ShowNull = DisplayValue == null;
+            ShowViewModel = DisplayValue != null && DisplayViewModel != null;
+
+            DisplayViewModel?.UpdateValue(DisplayValue);
         }
     }
 }

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

@@ -1,60 +0,0 @@
-using System.Reflection;
-using Artemis.Core.Extensions;
-using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
-using Artemis.UI.Shared.Services;
-using Stylet;
-
-namespace Artemis.UI.Shared.DataModelVisualization.Shared
-{
-    public class DataModelViewModel : DataModelVisualizationViewModel
-    {
-        private readonly IDataModelVisualizationService _dataModelVisualizationService;
-        private BindableCollection<DataModelVisualizationViewModel> _children;
-
-        internal DataModelViewModel()
-        {
-            Children = new BindableCollection<DataModelVisualizationViewModel>();
-        }
-
-        internal DataModelViewModel(PropertyInfo propertyInfo, object model, DataModelPropertyAttribute propertyDescription, DataModelVisualizationViewModel parent,
-            IDataModelVisualizationService dataModelVisualizationService)
-        {
-            _dataModelVisualizationService = dataModelVisualizationService;
-            PropertyInfo = propertyInfo;
-            Model = model;
-            PropertyDescription = propertyDescription;
-            Parent = parent;
-            Children = new BindableCollection<DataModelVisualizationViewModel>();
-
-            PopulateProperties();
-        }
-
-        public BindableCollection<DataModelVisualizationViewModel> Children
-        {
-            get => _children;
-            set => SetAndNotify(ref _children, value);
-        }
-
-        public void PopulateProperties()
-        {
-            Children.Clear();
-            foreach (var propertyInfo in Model.GetType().GetProperties())
-            {
-                var child = CreateChild(_dataModelVisualizationService, propertyInfo);
-                if (child != null)
-                    Children.Add(child);
-            }
-        }
-
-        public override void Update()
-        {
-            if (PropertyInfo != null && PropertyInfo.PropertyType.IsStruct())
-                Model = PropertyInfo.GetValue(Parent.Model);
-
-            foreach (var dataModelVisualizationViewModel in Children)
-                dataModelVisualizationViewModel.Update();
-
-            UpdateListStatus();
-        }
-    }
-}

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

@@ -1,8 +1,11 @@
 using System;
 using System.Collections;
+using System.Linq;
 using System.Reflection;
 using Artemis.Core.Extensions;
+using Artemis.Core.Plugins.Abstract.DataModels;
 using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
+using Artemis.UI.Shared.Exceptions;
 using Artemis.UI.Shared.Services;
 using Humanizer;
 using Stylet;
@@ -11,22 +14,31 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
 {
     public abstract class DataModelVisualizationViewModel : PropertyChangedBase
     {
-        private bool _isListProperty;
-        private string _listDescription;
-        private object _model;
+        private BindableCollection<DataModelVisualizationViewModel> _children;
+        private DataModel _dataModel;
         private DataModelVisualizationViewModel _parent;
         private DataModelPropertyAttribute _propertyDescription;
         private PropertyInfo _propertyInfo;
-        private Type _propertyType;
 
-        internal DataModelVisualizationViewModel()
+        internal DataModelVisualizationViewModel(DataModel dataModel, DataModelVisualizationViewModel parent, PropertyInfo propertyInfo)
         {
+            DataModel = dataModel;
+            PropertyInfo = propertyInfo;
+            Parent = parent;
+            Children = new BindableCollection<DataModelVisualizationViewModel>();
+
+            if (dataModel == null && parent == null && propertyInfo == null)
+                IsRootViewModel = true;
+            else
+                GetDescription();
         }
 
-        public DataModelPropertyAttribute PropertyDescription
+        public bool IsRootViewModel { get; }
+
+        public DataModel DataModel
         {
-            get => _propertyDescription;
-            protected set => SetAndNotify(ref _propertyDescription, value);
+            get => _dataModel;
+            set => SetAndNotify(ref _dataModel, value);
         }
 
         public PropertyInfo PropertyInfo
@@ -35,10 +47,10 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
             protected set => SetAndNotify(ref _propertyInfo, value);
         }
 
-        public Type PropertyType
+        public DataModelPropertyAttribute PropertyDescription
         {
-            get => _propertyType;
-            set => SetAndNotify(ref _propertyType, value);
+            get => _propertyDescription;
+            protected set => SetAndNotify(ref _propertyDescription, value);
         }
 
         public DataModelVisualizationViewModel Parent
@@ -47,25 +59,53 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
             protected set => SetAndNotify(ref _parent, value);
         }
 
-        public object Model
+        public BindableCollection<DataModelVisualizationViewModel> Children
         {
-            get => _model;
-            set => SetAndNotify(ref _model, value);
+            get => _children;
+            set => SetAndNotify(ref _children, value);
         }
 
-        public bool IsListProperty
+        public abstract void Update(IDataModelVisualizationService dataModelVisualizationService);
+
+        public virtual object GetCurrentValue()
         {
-            get => _isListProperty;
-            set => SetAndNotify(ref _isListProperty, value);
+            return Parent == null ? null : PropertyInfo.GetValue(Parent.GetCurrentValue());
         }
 
-        public string ListDescription
+        public DataModelVisualizationViewModel GetChildByPath(Guid dataModelGuid, string propertyPath)
         {
-            get => _listDescription;
-            set => SetAndNotify(ref _listDescription, value);
+            var path = propertyPath.Split(".");
+            var currentPart = path.First();
+
+            if (IsRootViewModel)
+            {
+                var child = Children.FirstOrDefault(c => c.DataModel.PluginInfo.Guid == dataModelGuid);
+                return child?.GetChildByPath(dataModelGuid, propertyPath);
+            }
+            else
+            {
+                var child = Children.FirstOrDefault(c => c.DataModel.PluginInfo.Guid == dataModelGuid && c.PropertyInfo?.Name == currentPart);
+                if (child == null)
+                    return null;
+
+                if (path.Length > 1)
+                    return child.GetChildByPath(dataModelGuid, string.Join(".", path.Skip(1)));
+                return child;
+            }
+            
         }
 
-        public abstract void Update();
+        public string GetCurrentPath()
+        {
+            if (Parent == null)
+                return PropertyInfo?.Name;
+
+            if (PropertyInfo == null)
+                return Parent.GetCurrentPath();
+
+            var parentPath = Parent.GetCurrentPath();
+            return parentPath != null ? $"{parentPath}.{PropertyInfo.Name}" : PropertyInfo.Name;
+        }
 
         protected DataModelVisualizationViewModel CreateChild(IDataModelVisualizationService dataModelVisualizationService, PropertyInfo propertyInfo)
         {
@@ -73,64 +113,33 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
             if (Attribute.IsDefined(propertyInfo, typeof(DataModelIgnoreAttribute)))
                 return null;
 
-            var dataModelPropertyAttribute = (DataModelPropertyAttribute) Attribute.GetCustomAttribute(propertyInfo, typeof(DataModelPropertyAttribute));
-            // If no DataModelProperty attribute was provided, pull one out of our ass
-            if (dataModelPropertyAttribute == null)
-                dataModelPropertyAttribute = new DataModelPropertyAttribute {Name = propertyInfo.Name.Humanize()};
-
             // If a display VM was found, prefer to use that in any case
             var typeViewModel = dataModelVisualizationService.GetDataModelDisplayViewModel(propertyInfo.PropertyType);
             if (typeViewModel != null)
-                return new DataModelPropertyViewModel(propertyInfo, dataModelPropertyAttribute, this) {DisplayViewModel = typeViewModel};
+                return new DataModelPropertyViewModel(DataModel, this, propertyInfo) {DisplayViewModel = typeViewModel};
             // For primitives, create a property view model, it may be null that is fine
             if (propertyInfo.PropertyType.IsPrimitive || propertyInfo.PropertyType == typeof(string))
-                return new DataModelPropertyViewModel(propertyInfo, dataModelPropertyAttribute, this);
+                return new DataModelPropertyViewModel(DataModel, this, propertyInfo);
             if (typeof(IList).IsAssignableFrom(propertyInfo.PropertyType))
-                return new DataModelListViewModel(propertyInfo, dataModelPropertyAttribute, this, dataModelVisualizationService);
-            // For other value types create a child view model if the value type is not null
+                return new DataModelListViewModel(DataModel, this, propertyInfo);
+            // For other value types create a child view model
             if (propertyInfo.PropertyType.IsClass || propertyInfo.PropertyType.IsStruct())
-            {
-                var value = propertyInfo.GetValue(Model);
-                if (value == null)
-                    return null;
-
-                return new DataModelViewModel(propertyInfo, value, dataModelPropertyAttribute, this, dataModelVisualizationService);
-            }
+                return new DataModelPropertiesViewModel(DataModel, this, propertyInfo);
 
             return null;
         }
 
-        protected DataModelVisualizationViewModel CreateChild(IDataModelVisualizationService dataModelVisualizationService, object value)
+        private void GetDescription()
         {
-            var dataModelPropertyAttribute = new DataModelPropertyAttribute {Name = "Unknown property"};
-
-            // If a display VM was found, prefer to use that in any case
-            var typeViewModel = dataModelVisualizationService.GetDataModelDisplayViewModel(value.GetType());
-            if (typeViewModel != null)
-                return new DataModelPropertyViewModel(null, dataModelPropertyAttribute, this) {Model = value, DisplayViewModel = typeViewModel};
-            // For primitives, create a property view model, it may be null that is fine
-            if (value.GetType().IsPrimitive || value is string)
-                return new DataModelPropertyViewModel(null, dataModelPropertyAttribute, this) {Model = value};
-            // For other value types create a child view model if the value type is not null
-            if (value.GetType().IsClass || value.GetType().IsStruct())
-                return new DataModelViewModel(null, value, dataModelPropertyAttribute, this, dataModelVisualizationService);
-
-            return null;
-        }
-
-        protected void UpdateListStatus()
-        {
-            if (Parent is DataModelListViewModel listViewModel)
-            {
-                IsListProperty = true;
-                ListDescription = $"List item [{listViewModel.List.IndexOf(Model)}]";
-                PropertyType = Model.GetType();
-            }
+            // If this is the first child of a root view model, use the data model description
+            if (Parent.IsRootViewModel)
+                PropertyDescription = DataModel?.DataModelDescription;
+            // Rely on property info for the description
+            else if (PropertyInfo != null)
+                PropertyDescription = (DataModelPropertyAttribute) Attribute.GetCustomAttribute(PropertyInfo, typeof(DataModelPropertyAttribute)) ??
+                                      new DataModelPropertyAttribute {Name = PropertyInfo.Name.Humanize()};
             else
-            {
-                IsListProperty = false;
-                PropertyType = PropertyInfo?.PropertyType;
-            }
+                throw new ArtemisSharedUIException("Failed to get property description because plugin info is null but the parent has a datamodel");
         }
     }
 }

src/Artemis.UI.Shared/Exceptions/ArtemisUIException.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace Artemis.UI.Shared.Exceptions
+{
+    public class ArtemisSharedUIException : Exception
+    {
+        internal ArtemisSharedUIException()
+        {
+        }
+
+        internal ArtemisSharedUIException(string message) : base(message)
+        {
+        }
+
+        internal ArtemisSharedUIException(string message, Exception inner) : base(message, inner)
+        {
+        }
+    }
+}

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

@@ -18,6 +18,8 @@ namespace Artemis.UI.Shared.Services
         private readonly IKernel _kernel;
         private readonly List<DataModelVisualizationRegistration> _registeredDataModelDisplays;
         private readonly List<DataModelVisualizationRegistration> _registeredDataModelEditors;
+        private DataModelPropertiesViewModel _cachedMainDataModel;
+        private Dictionary<Plugin, DataModelPropertiesViewModel> _cachedDataModels;
 
         public DataModelVisualizationService(IDataModelService dataModelService, IKernel kernel)
         {
@@ -25,28 +27,66 @@ namespace Artemis.UI.Shared.Services
             _kernel = kernel;
             _registeredDataModelEditors = new List<DataModelVisualizationRegistration>();
             _registeredDataModelDisplays = new List<DataModelVisualizationRegistration>();
+            _cachedDataModels = new Dictionary<Plugin, DataModelPropertiesViewModel>();
         }
 
-        public DataModelViewModel GetMainDataModelVisualization()
+        public IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelEditors => _registeredDataModelEditors.AsReadOnly();
+        public IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelDisplays => _registeredDataModelDisplays.AsReadOnly();
+
+        public DataModelPropertiesViewModel GetMainDataModelVisualization(bool useCache)
         {
-            var viewModel = new DataModelViewModel();
+            // Return from cache if found
+            if (useCache && _cachedMainDataModel != null)
+                return _cachedMainDataModel;
+
+            var viewModel = new DataModelPropertiesViewModel(null, null, null);
             foreach (var dataModelExpansion in _dataModelService.DataModelExpansions)
-                viewModel.Children.Add(new DataModelViewModel(null, dataModelExpansion, dataModelExpansion.DataModelDescription, viewModel, this));
+                viewModel.Children.Add(new DataModelPropertiesViewModel(dataModelExpansion, viewModel, null));
+
+            // Update to populate children
+            viewModel.Update(this);
+
+            // Add to cache
+            _cachedMainDataModel = viewModel;
 
             return viewModel;
         }
 
-        public DataModelViewModel GetPluginDataModelVisualization(Plugin plugin)
+        public DataModelPropertiesViewModel GetPluginDataModelVisualization(Plugin plugin, bool useCache)
         {
+            // Return from cache if found
+            var isCached = _cachedDataModels.TryGetValue(plugin, out var cachedMainDataModel);
+            if (useCache && isCached)
+                return cachedMainDataModel;
+
             var dataModel = _dataModelService.GetPluginDataModel(plugin);
             if (dataModel == null)
                 return null;
 
-            var viewModel = new DataModelViewModel();
-            viewModel.Children.Add(new DataModelViewModel(null, dataModel, dataModel.DataModelDescription, viewModel, this));
+            var viewModel = new DataModelPropertiesViewModel(null, null, null);
+            viewModel.Children.Add(new DataModelPropertiesViewModel(dataModel, viewModel, null));
+
+            // Update to populate children
+            viewModel.Update(this);
+
+            // Add to cache
+            if (!isCached)
+                _cachedDataModels.Add(plugin, viewModel);
+
             return viewModel;
         }
 
+        public bool GetPluginExtendsDataModel(Plugin plugin)
+        {
+            return _dataModelService.GetPluginExtendsDataModel(plugin);
+        }
+
+        public void BustCache()
+        {
+            _cachedMainDataModel = null;
+            _cachedDataModels.Clear();
+        }
+
         public DataModelVisualizationRegistration RegisterDataModelInput<T>(PluginInfo pluginInfo) where T : DataModelInputViewModel
         {
             var viewModelType = typeof(T);
@@ -133,8 +173,17 @@ namespace Artemis.UI.Shared.Services
 
     public interface IDataModelVisualizationService : IArtemisSharedUIService
     {
-        DataModelViewModel GetMainDataModelVisualization();
-        DataModelViewModel GetPluginDataModelVisualization(Plugin plugin);
+        DataModelPropertiesViewModel GetMainDataModelVisualization(bool useCached);
+        DataModelPropertiesViewModel GetPluginDataModelVisualization(Plugin plugin, bool useCached);
+
+        /// <summary>
+        ///     Determines whether the given plugin expands the main data model
+        /// </summary>
+        /// <param name="plugin"></param>
+        /// <returns></returns>
+        bool GetPluginExtendsDataModel(Plugin plugin);
+
+        void BustCache();
 
         DataModelVisualizationRegistration RegisterDataModelInput<T>(PluginInfo pluginInfo) where T : DataModelInputViewModel;
         DataModelVisualizationRegistration RegisterDataModelDisplay<T>(PluginInfo pluginInfo) where T : DataModelDisplayViewModel;
@@ -142,5 +191,7 @@ namespace Artemis.UI.Shared.Services
         void RemoveDataModelDisplay(DataModelVisualizationRegistration registration);
 
         DataModelDisplayViewModel GetDataModelDisplayViewModel(Type propertyType);
+        IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelEditors { get; }
+        IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelDisplays { get; }
     }
 }

src/Artemis.UI.Shared/Services/Interfaces/IProfileEditorService.cs

@@ -27,6 +27,7 @@ namespace Artemis.UI.Shared.Services.Interfaces
         void RedoUpdateProfile(ProfileModule module);
         void StopRegularRender();
         void ResumeRegularRender();
+        Module GetCurrentModule();
 
         /// <summary>
         ///     Occurs when a new profile is selected

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

@@ -189,6 +189,11 @@ namespace Artemis.UI.Shared.Services
             }
         }
 
+        public Module GetCurrentModule()
+        {
+            return (Module) SelectedProfile?.PluginInfo.Instance;
+        }
+
         public event EventHandler<ProfileElementEventArgs> ProfileSelected;
         public event EventHandler<ProfileElementEventArgs> SelectedProfileUpdated;
         public event EventHandler<ProfileElementEventArgs> ProfileElementSelected;