Resolve ColumnId on render instead of in the constructor

Author: jehhynes

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("3.7.6")]
-[assembly: AssemblyFileVersion("3.7.6")]
+[assembly: AssemblyVersion("3.7.7")]
+[assembly: AssemblyFileVersion("3.7.7")]
 //[assembly: AssemblyInformationalVersion("2.5-filters")]

Griddly.Mvc/GriddlyColumn.cs

@@ -20,11 +20,7 @@ public GriddlyColumn(LambdaExpression expression, string caption, string columnI
     {
         Expression = expression;
         Caption = caption;
-
-        ColumnId = columnId != null ? columnId
-         : expression != null ? GetIdFromExpression(expression)
-         : !string.IsNullOrEmpty(ExpressionString) ? ExpressionString
-         : Caption;
+        ColumnId = columnId;
     }
 
     string GetIdFromExpression(LambdaExpression expression)
@@ -51,7 +47,15 @@ string GetIdFromExpression(LambdaExpression expression)
     public double? ExportWidth { get; set; }
     public ColumnRenderMode RenderMode { get; set; }
     public bool Visible { get; set; } = true;
-    public string ColumnId { get; set; }
+    protected string ColumnId;
+
+    public string GetColumnId()
+    {
+        return ColumnId != null ? ColumnId
+            : !string.IsNullOrEmpty(ExpressionString) ? ExpressionString
+            : Caption;
+    }
+
     public SummaryAggregateFunction? SummaryFunction { get; set; }
     public object SummaryValue { get; set; }
     public IDictionary<string, object> HeaderHtmlAttributes { get; set; }

Griddly.NetCore.Razor/Pages/Shared/Griddly/Griddly.cshtml

@@ -217,7 +217,7 @@
                 <colgroup>
                     @foreach (GriddlyColumn column in settings.Columns)
                     {
-                        <col @Html.AttributeIf("style", column.Width != null, "width:" + column.Width) data-field="@Griddly.Mvc.GriddlyFilterExtensions.GetField(column)" @Html.AttributeNullable("data-columnid", column.ColumnId) @Html.AttributeIf("class", !column.Visible, "column-hidden") />
+                        <col @Html.AttributeIf("style", column.Width != null, "width:" + column.Width) data-field="@Griddly.Mvc.GriddlyFilterExtensions.GetField(column)" @Html.AttributeNullable("data-columnid", column.GetColumnId()) @Html.AttributeIf("class", !column.Visible, "column-hidden") />
                     }
                 </colgroup>
                 <thead>

Griddly/Views/Shared/Griddly/Griddly.cshtml

@@ -225,7 +225,7 @@
             <colgroup>
                 @foreach (GriddlyColumn column in settings.Columns)
                 {
-                    <col @Html.AttributeIf("style", column.Width != null, "width:" + column.Width) data-field="@Griddly.Mvc.GriddlyFilterExtensions.GetField(column)" @Html.AttributeNullable("data-columnid", column.ColumnId) @Html.AttributeIf("class", !column.Visible, "column-hidden") />
+                    <col @Html.AttributeIf("style", column.Width != null, "width:" + column.Width) data-field="@Griddly.Mvc.GriddlyFilterExtensions.GetField(column)" @Html.AttributeNullable("data-columnid", column.GetColumnId()) @Html.AttributeIf("class", !column.Visible, "column-hidden") />
                 }
             </colgroup>
     <thead>