Vnext dev refresh

Composite/AspNet/Razor/RazorFunction.cs

@@ -1,12 +1,16 @@
 using System;
+using System.Collections.Generic;
 using Composite.Core.Xml;
+using Composite.Functions;
+using Composite.Plugins.Functions.FunctionProviders.FileBasedFunctionProvider;
 
 namespace Composite.AspNet.Razor
 {
     /// <summary>
     /// Base class for c1 functions based on razor 
     /// </summary>
-    public abstract class RazorFunction : CompositeC1WebPage
+    public abstract class RazorFunction : CompositeC1WebPage, IParameterWidgetsProvider
+
     {
         /// <summary>
         /// Gets the function description. Override this to make a custom description.
@@ -35,5 +39,12 @@ public virtual Type FunctionReturnType
         {
             get { return typeof (XhtmlDocument); }
         }
+
+        /// <exclude />
+        public virtual IDictionary<string, WidgetFunctionProvider> GetParameterWidgets()
+        {
+            return null;
+        }
+
     }
 }

Composite/AspNet/UserControlFunction.cs

@@ -1,12 +1,15 @@
-using System.Web.UI;
+using System.Collections.Generic;
+using System.Web.UI;
 using Composite.Functions;
+using Composite.Plugins.Functions.FunctionProviders.FileBasedFunctionProvider;
 
 namespace Composite.AspNet
 {
     /// <summary>
     /// Base class for a UserControls that represents a C1 function
     /// </summary>
-    public abstract class UserControlFunction : UserControl
+    public abstract class UserControlFunction : UserControl, IParameterWidgetsProvider
+
     {
         /// <summary>
         /// Gets the function description.
@@ -24,5 +27,12 @@ public FunctionContextContainer FunctionContextContainer
             get; 
             set;
         }
+
+        /// <exclude />
+        public virtual IDictionary<string, WidgetFunctionProvider> GetParameterWidgets()
+        {
+            return null;
+        }
+
     }
 }

Composite/Composite.csproj

@@ -318,6 +318,7 @@
     <Compile Include="Plugins\Forms\WebChannel\UiControlFactories\TemplatedSvgIconSelectorUiControlFactory.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Plugins\Functions\FunctionProviders\FileBasedFunctionProvider\IParameterWidgetsProvider.cs" />
     <Compile Include="Plugins\Functions\WidgetFunctionProviders\StandardWidgetFunctionProvider\Utils\ConsoleIconSelectorWidgetFuntion.cs" />
     <Compile Include="Plugins\Functions\WidgetFunctionProviders\StandardWidgetFunctionProvider\Utils\SvgIconSelectorWidgetFuntion.cs" />
     <Compile Include="Plugins\Logging\LogTraceListeners\FileLogTraceListener\CircullarList.cs" />

Composite/Core/ServiceLocator.cs

@@ -18,9 +18,10 @@ namespace Composite.Core
     public static class ServiceLocator
     {
         private const string HttpContextKey = "HttpApplication.ServiceScope";
-        private static IServiceCollection _serviceCollection;
+        private static IServiceCollection _serviceCollection = new ServiceCollection();
         private static IServiceProvider _serviceProvider = null;
         private static ConcurrentDictionary<Type, bool> _hasTypeLookup = new ConcurrentDictionary<Type, bool>();
+        private static Func<IServiceCollection, IServiceProvider> _serviceProviderBuilder = s => s.BuildServiceProvider();
 
         /// <summary>
         /// Get service of type T
@@ -78,7 +79,7 @@ public static object GetRequiredService(Type serviceType)
             return ServiceProvider.GetRequiredService(serviceType);
         }
 
-        
+
         /// <summary>
         /// Get services of the specified type
         /// </summary>
@@ -90,7 +91,18 @@ public static IEnumerable<object> GetServices(Type serviceType)
         }
 
 
+        /// <summary>
+        /// Replaces the default services container by registering a builder for your own IServiceProvider.
+        /// You must register this during the service configuration phase, see <see cref="Composite.Core.Application.ApplicationStartupAttribute"/> and the ConfigureServices method.
+        /// </summary>
+        /// <param name="serviceProviderBuilder">A callback function that returns your custom IServiceProvider</param>
+        public static void SetServiceProvider(Func<IServiceCollection, IServiceProvider> serviceProviderBuilder)
+        {
+            Verify.ArgumentNotNull(serviceProviderBuilder, nameof(serviceProviderBuilder));
+            Verify.IsNull(_serviceProvider, "ServiceProvider already created and cannot be replaced at this time. Your custom ServiceProvider must be set during application startup - see ApplicationStartupAttribute and ConfigureServices().");
 
+            _serviceProviderBuilder = serviceProviderBuilder;
+        }
 
         /// <summary>
         /// Gets an application service provider
@@ -106,7 +118,7 @@ internal static IServiceProvider ServiceProvider
         }
 
 
-  
+
         internal static bool HasService(Type serviceType)
         {
             Verify.ArgumentNotNull(serviceType, nameof(serviceType));
@@ -116,9 +128,9 @@ internal static bool HasService(Type serviceType)
 
             if (!_hasTypeLookup.TryGetValue(serviceType, out hasType))
             {
-                if (_serviceCollection.Any(sd => 
+                if (_serviceCollection.Any(sd =>
                     sd.ServiceType.IsAssignableFrom(serviceType)
-                || (serviceType.IsGenericType 
+                || (serviceType.IsGenericType
                     && sd.ServiceType.IsAssignableFrom(serviceType.GetGenericTypeDefinition()))))
                 {
                     hasType = true;
@@ -151,18 +163,14 @@ internal static IServiceCollection ServiceCollection
             {
                 Verify.IsNull(_serviceProvider, "ServiceCollection accessed after ServiceProvider build-up - call out of sequence.");
 
-                if (_serviceCollection == null)
-                {
-                    _serviceCollection = new ServiceCollection();
-                }
                 return _serviceCollection;
-            } 
+            }
         }
 
 
         internal static void BuildServiceProvider()
         {
-            _serviceProvider = _serviceCollection.BuildServiceProvider();
+            _serviceProvider = _serviceProviderBuilder(_serviceCollection);
         }
 
 

Composite/Plugins/Functions/FunctionProviders/FileBasedFunctionProvider/FileBasedFunction.cs

@@ -58,7 +58,7 @@ public virtual IEnumerable<ParameterProfile> ParameterProfiles
 			    foreach (var param in Parameters.Values)
 			    {
 			        BaseValueProvider defaultValueProvider = new NoValueValueProvider();
-			        WidgetFunctionProvider widgetProvider = null;
+			        WidgetFunctionProvider widgetProvider = param.WidgetProvider;
 			        string label = param.Name;
 			        bool isRequired = true;
 			        string helpText = String.Empty;
@@ -82,8 +82,6 @@ public virtual IEnumerable<ParameterProfile> ParameterProfiles
 			                defaultValueProvider = new ConstantValueProvider(param.Attribute.DefaultValue);
 			            }
 
-			            widgetProvider = param.WidgetProvider;
-
 			            hideInSimpleView = param.Attribute.HideInSimpleView;
 			        }
 

Composite/Plugins/Functions/FunctionProviders/FileBasedFunctionProvider/FunctionBasedFunctionProviderHelper.cs

@@ -13,7 +13,7 @@ namespace Composite.Plugins.Functions.FunctionProviders.FileBasedFunctionProvide
     /// </summary>
     public static class FunctionBasedFunctionProviderHelper
     {
-        private static readonly string LogTitle = typeof (FunctionBasedFunctionProviderHelper).FullName;
+        private static readonly string LogTitle = typeof(FunctionBasedFunctionProviderHelper).FullName;
 
         /// <summary>
         /// Gets the function description from the <see cref="FunctionAttribute" />.
@@ -44,7 +44,8 @@ public static string GetDescription(string functionName, object functionObject)
         /// <returns></returns>
         public static IDictionary<string, FunctionParameter> GetParameters(object functionObject, Type baseFunctionType, string filePath)
         {
-            var dict = new Dictionary<string, FunctionParameter>();
+            var functionParameters = new Dictionary<string, FunctionParameter>();
+            IDictionary<string, WidgetFunctionProvider> parameterWidgets = GetParameterWidgets(functionObject);
 
             var type = functionObject.GetType();
             while (type != baseFunctionType && type != null)
@@ -59,15 +60,13 @@ public static IDictionary<string, FunctionParameter> GetParameters(object functi
                     // Skipping explicitly ignored attributes
                     if (property.GetCustomAttributes(typeof(FunctionParameterIgnoreAttribute), false).Any()) continue;
 
-
                     var propType = property.PropertyType;
                     var name = property.Name;
 
                     FunctionParameterAttribute attr = null;
                     var attributes = property.GetCustomAttributes(typeof(FunctionParameterAttribute), false).Cast<FunctionParameterAttribute>().ToList();
 
-
-                    if(attributes.Count > 1)
+                    if (attributes.Count > 1)
                     {
                         Log.LogWarning(LogTitle, "More than one '{0}' attribute defined on property '{1}'. Location: '{2}'"
                                                  .FormatWith(typeof(FunctionParameterAttribute).Name, name, filePath));
@@ -77,13 +76,14 @@ public static IDictionary<string, FunctionParameter> GetParameters(object functi
                         attr = attributes.FirstOrDefault();
                     }
 
-                    WidgetFunctionProvider widgetProvider = null;
+                    WidgetFunctionProvider attibuteBasedWidgetProvider = null;
+                    WidgetFunctionProvider methodBasedWidgetProvider = null;
 
                     if (attr != null && attr.HasWidgetMarkup)
                     {
                         try
                         {
-                            widgetProvider = attr.GetWidgetFunctionProvider(type, property);
+                            attibuteBasedWidgetProvider = attr.GetWidgetFunctionProvider(type, property);
                         }
                         catch (Exception ex)
                         {
@@ -93,16 +93,32 @@ public static IDictionary<string, FunctionParameter> GetParameters(object functi
                         }
                     }
 
-                    if (!dict.ContainsKey(name))
+                    parameterWidgets.TryGetValue(name, out methodBasedWidgetProvider);
+
+                    if (methodBasedWidgetProvider!=null && attibuteBasedWidgetProvider!=null)
+                    {
+                        Log.LogWarning(LogTitle, "Widget for property {0} is defined in both {1} attribute and in {2}() method. Remove one of the definitions. Location: '{3}'"
+                                                 .FormatWith(property.Name, nameof(FunctionParameterAttribute), nameof(IParameterWidgetsProvider.GetParameterWidgets), filePath));
+                    }
+
+                    if (!functionParameters.ContainsKey(name))
                     {
-                        dict.Add(name, new FunctionParameter(name, propType, attr, widgetProvider));
+                        functionParameters.Add(name, new FunctionParameter(name, propType, attr, attibuteBasedWidgetProvider ?? methodBasedWidgetProvider));
                     }
                 }
 
                 type = type.BaseType;
             }
 
-            return dict;
+            return functionParameters;
+        }
+
+        private static IDictionary<string, WidgetFunctionProvider> GetParameterWidgets(object functionObject)
+        {
+            var widgetsProvider = functionObject as IParameterWidgetsProvider;
+            IDictionary<string, WidgetFunctionProvider> parameterWidgets = widgetsProvider != null ? widgetsProvider.GetParameterWidgets() : null;
+
+            return parameterWidgets ?? new Dictionary<string, WidgetFunctionProvider>();
         }
     }
 }

Composite/Plugins/Functions/FunctionProviders/FileBasedFunctionProvider/IParameterWidgetsProvider.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using Composite.Functions;
+
+namespace Composite.Plugins.Functions.FunctionProviders.FileBasedFunctionProvider
+{
+    /// <exclude />
+    public interface IParameterWidgetsProvider
+    {
+        /// <exclude />
+        IDictionary<string, WidgetFunctionProvider> GetParameterWidgets();
+    }
+}