Allow templating filter button

Author: programcsharp

Build/CommonAssemblyInfo.cs

@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.7.0")]
-[assembly: AssemblyFileVersion("2.7.0")]
+[assembly: AssemblyVersion("2.8.0")]
+[assembly: AssemblyFileVersion("2.8.0")]
 //[assembly: AssemblyInformationalVersion("2.5-filters")]

Griddly.Mvc/Griddly.Mvc.csproj

@@ -101,6 +101,7 @@
     <Compile Include="GriddlyExport.cs" />
     <Compile Include="GriddlyFilterBarSettings.cs" />
     <Compile Include="GriddlyParameterAttribute.cs" />
+    <Compile Include="IFilterSettings.cs" />
     <Compile Include="InternalExtensions.cs" />
     <Compile Include="GriddlyButton.cs" />
     <Compile Include="GriddlyColumn.cs" />

Griddly.Mvc/GriddlyCookieFilterValueProvider.cs

@@ -44,27 +44,37 @@ public ValueProviderResult GetValue(string key)
 
     public class GriddlyCookieFilterValueProviderFactory : ValueProviderFactory
     {
+        Func<ControllerContext, bool> _canProvide = null;
+
+        public GriddlyCookieFilterValueProviderFactory(Func<ControllerContext, bool> canProvide = null)
+        {
+            _canProvide = canProvide;
+        }
+
         public override IValueProvider GetValueProvider(ControllerContext controllerContext)
         {
             if (controllerContext.IsChildAction && controllerContext.HttpContext.Request.QueryString.Count == 0)
             {
-                var context = controllerContext.Controller.GetOrCreateGriddlyContext();
-                var cookie = controllerContext.HttpContext.Request.Cookies[context.CookieName];
-
-                if (cookie != null && !string.IsNullOrWhiteSpace(cookie.Value))
+                if (_canProvide?.Invoke(controllerContext) != false)
                 {
-                    try
+                    var context = controllerContext.Controller.GetOrCreateGriddlyContext();
+                    var cookie = controllerContext.HttpContext.Request.Cookies[context.CookieName];
+
+                    if (cookie != null && !string.IsNullOrWhiteSpace(cookie.Value))
                     {
-                        var data = JsonConvert.DeserializeObject<GriddlyFilterCookieData>(cookie.Value);
+                        try
+                        {
+                            var data = JsonConvert.DeserializeObject<GriddlyFilterCookieData>(cookie.Value);
 
-                        context.CookieData = data;
-                        context.IsDefaultSkipped = true;
+                            context.CookieData = data;
+                            context.IsDefaultSkipped = true;
 
-                        return new GriddlyCookieFilterValueProvider(context);
-                    }
-                    catch
-                    {
-                        // TODO: log it?
+                            return new GriddlyCookieFilterValueProvider(context);
+                        }
+                        catch
+                        {
+                            // TODO: log it?
+                        }
                     }
                 }
             }

Griddly.Mvc/GriddlyFilterBarSettings.cs

@@ -10,14 +10,10 @@
 
 namespace Griddly.Mvc
 {
-    public class GriddlyFilterBarSettings
+    public class GriddlyFilterBarSettings : IGriddlyFilterSettings
     {
-        public GriddlyFilterBarSettings()
-        {
-            Filters = new List<GriddlyFilter>();
-        }
-
-        public List<GriddlyFilter> Filters { get; set; }
+        public List<GriddlyFilter> Filters { get; set; } = new List<GriddlyFilter>();
+        public Func<object, object> FilterButtonTemplate { get; set; }
 
         public GriddlyFilterBarSettings FilterBox(string field, string caption, FilterDataType dataType = FilterDataType.Decimal, string htmlClass = null, string captionPlural = null, string group = null)
         {

Griddly.Mvc/GriddlySettings.cs

@@ -10,7 +10,7 @@
 
 namespace Griddly.Mvc
 {
-    public abstract class GriddlySettings
+    public abstract class GriddlySettings: IGriddlyFilterSettings
     {
         public static string DefaultClassName = null;
         public static string DefaultTableClassName = "table table-bordered table-hover";
@@ -88,6 +88,7 @@ public GriddlySettings()
         public Func<object, object> AfterTemplate { get; set; }
         public Func<GriddlySettings, object> FilterTemplate { get; set; }
         public Func<GriddlySettings, object> InlineFilterTemplate { get; set; }
+        public Func<object, object> FilterButtonTemplate { get; set; }
 
         public Func<object, object> RowClickUrl { get; set; }
 

Griddly.Mvc/IFilterSettings.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Griddly.Mvc
+{
+    public interface IGriddlyFilterSettings
+    {
+        List<GriddlyFilter> Filters { get; set; }
+        Func<object, object> FilterButtonTemplate { get; set; }
+    }
+}

Griddly/Views/Home/Test2Grid.cshtml

@@ -5,7 +5,21 @@
 
 @Html.Griddly(new GriddlySettings<TestGridItem>()
     {
-        PageSize = 5
+        PageSize = 5,
+        FilterButtonTemplate = @<div class="btn-group">
+  <button type="button" class="btn btn-default griddly-filter-invoke"><i class="glyphicon glyphicon-filter"></i><span class="hidden-xs hidden-sm"> Filter</span></button>
+  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    <span class="caret"></span>
+    <span class="sr-only">Toggle Dropdown</span>
+  </button>
+  <ul class="dropdown-menu">
+    <li><a href="#">Action</a></li>
+    <li><a href="#">Another action</a></li>
+    <li><a href="#">Something else here</a></li>
+    <li role="separator" class="divider"></li>
+    <li><a href="#">Separated link</a></li>
+  </ul>
+</div>
     }
 
     .Column(x => x.FirstName, "First Name" )

Griddly/Views/Shared/Griddly/Griddly.cshtml

@@ -340,7 +340,8 @@
 
 @helper RenderFormFiltersModal(GriddlySettings settings)
 {
-    @Html.Partial("Griddly/GriddlyFilters", settings.Filters)
+    @Html.Partial("Griddly/GriddlyFilters", settings)
+
 }
 
 @helper RenderFormFiltersInline(GriddlySettings settings)

Griddly/Views/Shared/Griddly/GriddlyFilterBar.cshtml

@@ -14,5 +14,5 @@
 <div class="griddly-filter-bar" data-role="griddly-filter-bar"
     data-griddly-filter-defaults="@Newtonsoft.Json.JsonConvert.SerializeObject(this.GetGriddlyDefaults())"
     data-griddly-currency-symbol="@Griddly.Mvc.GriddlyExtensions.CurrencySymbol">
-    @Html.Partial("Griddly/GriddlyFilters", Model.Filters)
+    @Html.Partial("Griddly/GriddlyFilters")
 </div>

Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml

@@ -9,10 +9,17 @@
     *
 *@
 
-@model List<GriddlyFilter>
+@model IGriddlyFilterSettings
 
-<a class="btn btn-default griddly-filter-invoke"><i class="glyphicon glyphicon-filter"></i><span class="hidden-xs hidden-sm"> Filter</span></a>
-@Html.Partial("Griddly/GriddlyFilterValues")
+@if (Model.FilterButtonTemplate != null)
+{
+    @Model.FilterButtonTemplate(null)
+}
+else
+{
+    <a class="btn btn-default griddly-filter-invoke"><i class="glyphicon glyphicon-filter"></i><span class="hidden-xs hidden-sm"> Filter</span></a>
+}
+@Html.Partial("Griddly/GriddlyFilterValues", Model.Filters)
 <span class="griddly-filter-statusall-show">Showing all</span>
 <a class="griddly-search-clear griddly-filter-statusfiltered-show" href="javascript:void(0)">Show All</a>
 <span class="griddly-filter-statusfiltered-show griddly-filter-statuscandefault-show">|</span>
@@ -26,7 +33,7 @@
             </div>
             <form class="form-horizontal">
                 <div class="modal-body">
-                    @Html.Partial("Griddly/GriddlyFilterForm")
+                    @Html.Partial("Griddly/GriddlyFilterForm", Model.Filters)
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default griddly-filter-cancel" data-dismiss="modal">Cancel</button>