Refactoring of SelectorHelper into SelectorDiscoveryService

riganti · Mar 26, 2023 · 5e1a806 · 5e1a806
1 parent cf7304f
commit 5e1a806
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/src/AutoUI/Core/AutoUIExtensions.cs b/src/AutoUI/Core/AutoUIExtensions.cs
@@ -3,6 +3,7 @@
 using DotVVM.AutoUI.Configuration;
 using DotVVM.AutoUI.Controls;
 using DotVVM.AutoUI.Metadata;
+using DotVVM.AutoUI.PropertyHandlers;
 using DotVVM.Framework.Configuration;
 using DotVVM.Framework.Controls;
 using DotVVM.Framework.ViewModel.Validation;
@@ -27,6 +28,7 @@ public static IDotvvmServiceCollection AddAutoUI(this IDotvvmServiceCollection s
             RegisterResourceFileProviders(services.Services, autoUiConfiguration);
 
             services.Services.Configure<DotvvmConfiguration>(AddAutoUIConfiguration);
+            services.Services.AddSingleton<ISelectorDiscoveryService, SelectorDiscoveryService>();
 
             return services;
         }

diff --git a/src/AutoUI/Core/Controls/AutoFormBase.cs b/src/AutoUI/Core/Controls/AutoFormBase.cs
@@ -18,9 +18,13 @@ namespace DotVVM.AutoUI.Controls
     public abstract class AutoFormBase : CompositeControl 
     {
         protected readonly IServiceProvider services;
+
+        private readonly ISelectorDiscoveryService selectorDiscoveryService;
+
         public AutoFormBase(IServiceProvider services)
         {
             this.services = services;
+            this.selectorDiscoveryService = services.GetRequiredService<ISelectorDiscoveryService>();
         }
 
 
@@ -50,6 +54,7 @@ public AutoFormBase(IServiceProvider services)
         public static readonly DotvvmCapabilityProperty FieldPropsProperty =
             DotvvmCapabilityProperty.RegisterCapability<FieldProps, AutoFormBase>();
 
+
         protected AutoUIContext CreateAutoUiContext()
         {
             return new AutoUIContext(this.GetDataContextType().NotNull(), services) {
@@ -200,7 +205,7 @@ protected virtual void SetFieldVisibility(HtmlGenericControl field, PropertyDisp
             {
                 try
                 {
-                    var dataSource = SelectorHelper.DiscoverSelectorDataSourceBinding(context, selector.SelectionType);
+                    var dataSource = selectorDiscoveryService.DiscoverSelectorDataSourceBinding(context, selector.SelectionType);
                     var nonEmptyBinding =
                         dataSource.GetProperty<DataSourceLengthBinding>().Binding.GetProperty<IsMoreThanZeroBindingProperty>().Binding;
                     field.SetValueRaw(HtmlGenericControl.VisibleProperty, nonEmptyBinding);

diff --git a/src/AutoUI/Core/PropertyHandlers/FormEditors/MultiSelectorCheckBoxFormEditorProvider.cs b/src/AutoUI/Core/PropertyHandlers/FormEditors/MultiSelectorCheckBoxFormEditorProvider.cs
@@ -3,6 +3,7 @@
 using DotVVM.Framework.Compilation.ControlTree;
 using DotVVM.Framework.Controls;
 using DotVVM.Framework.Utils;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DotVVM.AutoUI.PropertyHandlers.FormEditors;
 
@@ -17,7 +18,8 @@ public override bool CanHandleProperty(PropertyDisplayMetadata property, AutoUIC
     public override DotvvmControl CreateControl(PropertyDisplayMetadata property, AutoEditor.Props props, AutoUIContext context)
     {
         var selectorConfiguration = property.SelectionConfiguration!;
-        var selectorDataSourceBinding = SelectorHelper.DiscoverSelectorDataSourceBinding(context, selectorConfiguration.SelectionType);
+        var selectorDiscoveryService = context.Services.GetRequiredService<ISelectorDiscoveryService>();
+        var selectorDataSourceBinding = selectorDiscoveryService.DiscoverSelectorDataSourceBinding(context, selectorConfiguration.SelectionType);
         var nestedDataContext = context.CreateChildDataContextStack(selectorConfiguration.SelectionType);
 
         return new Repeater()

diff --git a/src/AutoUI/Core/PropertyHandlers/FormEditors/SelectorComboBoxFormEditorProvider.cs b/src/AutoUI/Core/PropertyHandlers/FormEditors/SelectorComboBoxFormEditorProvider.cs
@@ -2,6 +2,7 @@
 using DotVVM.AutoUI.Metadata;
 using DotVVM.Framework.Controls;
 using DotVVM.Framework.Utils;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DotVVM.AutoUI.PropertyHandlers.FormEditors
 {
@@ -16,7 +17,8 @@ public override bool CanHandleProperty(PropertyDisplayMetadata property, AutoUIC
         public override DotvvmControl CreateControl(PropertyDisplayMetadata property, AutoEditor.Props props, AutoUIContext context)
         {
             var selectorConfiguration = property.SelectionConfiguration!;
-            var selectorDataSourceBinding = SelectorHelper.DiscoverSelectorDataSourceBinding(context, selectorConfiguration.SelectionType);
+            var selectorDiscoveryService = context.Services.GetRequiredService<ISelectorDiscoveryService>();
+            var selectorDataSourceBinding = selectorDiscoveryService.DiscoverSelectorDataSourceBinding(context, selectorConfiguration.SelectionType);
             var nestedDataContext = context.CreateChildDataContextStack(selectorConfiguration.SelectionType);
 
             return new ComboBox()

diff --git a/src/AutoUI/Core/PropertyHandlers/ISelectorDiscoveryService.cs b/src/AutoUI/Core/PropertyHandlers/ISelectorDiscoveryService.cs
@@ -0,0 +1,9 @@
+using System;
+using DotVVM.Framework.Binding.Expressions;
+
+namespace DotVVM.AutoUI.PropertyHandlers;
+
+public interface ISelectorDiscoveryService
+{
+    IValueBinding DiscoverSelectorDataSourceBinding(AutoUIContext autoUiContext, Type propertyType);
+}
diff --git a/...I/Core/PropertyHandlers/SelectorHelper.cs → ...pertyHandlers/SelectorDiscoveryService.cs b/...I/Core/PropertyHandlers/SelectorHelper.cs → ...pertyHandlers/SelectorDiscoveryService.cs
@@ -10,10 +10,10 @@
 
 namespace DotVVM.AutoUI.PropertyHandlers
 {
-    public class SelectorHelper
+    public class SelectorDiscoveryService : ISelectorDiscoveryService 
     {
 
-        public static IValueBinding DiscoverSelectorDataSourceBinding(AutoUIContext autoUiContext, Type propertyType)
+        public IValueBinding DiscoverSelectorDataSourceBinding(AutoUIContext autoUiContext, Type propertyType)
         {
             var viewModelType = typeof(ISelectorViewModel<>).MakeGenericType(propertyType);
 
@@ -49,7 +49,7 @@ public static IValueBinding DiscoverSelectorDataSourceBinding(AutoUIContext auto
             throw new DotvvmControlException($"No property of type {viewModelType.FullName} was found in the viewmodel {autoUiContext.DataContextStack}!");
         }
 
-        private static Expression[] FindSelectorProperties(Expression parent, Type selectorViewModelType)
+        protected virtual Expression[] FindSelectorProperties(Expression parent, Type selectorViewModelType)
         {
             var directProperties = parent.Type
                 .GetProperties(BindingFlags.Instance | BindingFlags.Public)