Added dynamic column class name

Added button default class name
Fixed html stripping/encoding on export

Author: programcsharp

Griddly.Mvc/GriddlyButton.cs

@@ -29,6 +29,7 @@ public GriddlyButton()
 
             Enabled = true;
             Action = GriddlyButtonAction.Navigate;
+            ClassName = GriddlySettings.DefaultButtonClassName;
         }
 
         public GriddlyButton Add(GriddlyButton item)

Griddly.Mvc/GriddlyColumn.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Helpers;
 using System.Web.WebPages;
@@ -18,7 +20,8 @@ public abstract class GriddlyColumn
         public GriddlyFilter Filter { get; set; }
 
         public abstract HtmlString RenderCell(object row, bool encode = true);
-        public abstract object RenderCellValue(object row);
+        public abstract object RenderCellValue(object row, bool stripHtml = false);
+        public abstract string RenderClassName(object row);
 
         protected virtual HtmlString RenderValue(object value, bool encode = true)
         {
@@ -50,6 +53,33 @@ protected virtual HtmlString RenderValue(object value, bool encode = true)
     public class GriddlyColumn<TRow> : GriddlyColumn
     {
         public Func<TRow, object> Template { get; set; }
+        public Func<TRow, string> ClassNameExpression { get; set; }
+
+        static readonly Regex _htmlMatch = new Regex(@"<[^>]*>", RegexOptions.Compiled);
+
+        public override string RenderClassName(object row)
+        {
+            HashSet<string> classes = new HashSet<string>();
+
+            if (!string.IsNullOrWhiteSpace(ClassName))
+                classes.UnionWith(ClassName.Split(' '));
+
+            if (DefaultSort != null)
+                classes.Add("sorted_" + (DefaultSort == SortDirection.Descending ? "d" : "a"));
+
+            if (ClassNameExpression != null)
+            {
+                string additional = ClassNameExpression((TRow)row);
+
+                if (!string.IsNullOrWhiteSpace(additional))
+                    classes.UnionWith(additional.Split(' '));
+            }
+
+            if (classes.Count > 0)
+                return string.Join(" ", classes);
+            else
+                return null;
+        }
 
         public override HtmlString RenderCell(object row, bool encode = true)
         {
@@ -78,7 +108,7 @@ public override HtmlString RenderCell(object row, bool encode = true)
                 return RenderValue(value, encode);
         }
 
-        public override object RenderCellValue(object row)
+        public override object RenderCellValue(object row, bool stripHtml = false)
         {
             object value = null;
 
@@ -95,7 +125,10 @@ public override object RenderCellValue(object row)
                 throw new InvalidOperationException("Error rendering column \"" + Caption + "\"", ex);
             }
 
-            if (value is HtmlString)
+            // TODO: test if we need to match separately -- maybe we get a real string here and could strip?
+            if (stripHtml && (value is HtmlString || value is HelperResult || value is string))
+                value = _htmlMatch.Replace((string)value, "").Trim().Replace("  ", " ");
+            else if (value is HtmlString)
                 value = value.ToString();
             else if (value is HelperResult)
                 value = new HtmlString(((HelperResult)value).ToString());

Griddly.Mvc/GriddlyCsvResult.cs

@@ -23,8 +23,6 @@ public GriddlyCsvResult(IEnumerable<T> data, GriddlySettings settings, string na
             _format = format;
         }
 
-        static readonly Regex _htmlMatch = new Regex(@"<[^>]*>", RegexOptions.Compiled);
-
         public override void ExecuteResult(ControllerContext context)
         {
             string format = _format == GriddlyExportFormat.Tsv ? "tsv" : "csv";
@@ -45,10 +43,7 @@ public override void ExecuteResult(ControllerContext context)
                 {
                     for (int x = 0; x < _settings.Columns.Count; x++)
                     {
-                        object renderedValue = _settings.Columns[x].RenderCellValue(row);
-
-                        if (renderedValue is string)
-                            renderedValue = _htmlMatch.Replace((string)renderedValue, "").Trim().Replace("  ", " ");
+                        object renderedValue = _settings.Columns[x].RenderCellValue(row, true);
 
                         w.WriteField(renderedValue);
                     }

Griddly.Mvc/GriddlyExcelResult.cs

@@ -20,8 +20,7 @@ public GriddlyExcelResult(IEnumerable<T> data, GriddlySettings settings, string
             _name = name;
         }
 
-        static readonly Regex _aMatch = new Regex(@"<a\s[^>]*\s?href=""(.*?)"">(.*?)</a>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        static readonly Regex _htmlMatch = new Regex(@"<[^>]*>", RegexOptions.Compiled);
+        // static readonly Regex _aMatch = new Regex(@"<a\s[^>]*\s?href=""(.*?)"">(.*?)</a>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         public override void ExecuteResult(ControllerContext context)
         {
@@ -41,10 +40,7 @@ public override void ExecuteResult(ControllerContext context)
                 {
                     for (int x = 0; x < _settings.Columns.Count; x++)
                     {
-                        object renderedValue = _settings.Columns[x].RenderCellValue(row);
-
-                        if (renderedValue is string)
-                            renderedValue = _htmlMatch.Replace((string)renderedValue, "").Trim().Replace("  ", " ");
+                        object renderedValue = _settings.Columns[x].RenderCellValue(row, true);
 
                         ExcelRange cell = ws.Cells[y + 2, x + 1];
 

Griddly.Mvc/GriddlySelectColumn.cs

@@ -24,7 +24,12 @@ public override HtmlString RenderCell(object row, bool encode = true)
             return new HtmlString(input.ToString(TagRenderMode.SelfClosing));
         }
 
-        public override object RenderCellValue(object row)
+        public override object RenderCellValue(object row, bool stripHtml = false)
+        {
+            return null;
+        }
+
+        public override string RenderClassName(object row)
         {
             return null;
         }

Griddly.Mvc/GriddlySettings.cs

@@ -13,6 +13,7 @@ public abstract class GriddlySettings
     {
         public static string DefaultClassName = null;
         public static string DefaultTableClassName = "table table-bordered table-hover";
+        public static string DefaultButtonClassName = null;
         public static string ButtonTemplate = "~/Views/Shared/Griddly/BootstrapButton.cshtml";
         public static string ButtonListTemplate = "~/Views/Shared/Griddly/ButtonStrip.cshtml";
         public static HtmlString BoolTrueHtml = null;

Griddly/Views/Shared/Griddly/Griddly.cshtml

@@ -126,7 +126,7 @@
             @Html.AttributeNullable("data-id", TryEval(row, settings.IdProperty))>
             @foreach (GriddlyColumn column in settings.Columns)
             {
-                <td class="@column.ClassName @(column.DefaultSort != null ? (column.DefaultSort == SortDirection.Descending ? "sorted_d" : "sorted_a") : null)">@column.RenderCell(row)</td>
+                <td class="@column.RenderClassName()">@column.RenderCell(row)</td>
             }
         </tr>
     }