Properly update sort field classes in inline filters

Properly update sort field classes on griddly result page refresh

Author: programcsharp

Build/CommonAssemblyInfo.cs

@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.63.0")]
-[assembly: AssemblyFileVersion("1.0.63.0")]
+[assembly: AssemblyVersion("1.0.64.0")]
+[assembly: AssemblyFileVersion("1.0.64.0")]

Griddly.Mvc/GriddlyColumn.cs

@@ -4,6 +4,7 @@
 using System.Web;
 using System.Web.Helpers;
 using System.Web.WebPages;
+using System.Linq;
 
 namespace Griddly.Mvc
 {
@@ -21,7 +22,7 @@ public abstract class GriddlyColumn
 
         public abstract HtmlString RenderCell(object row, bool encode = true);
         public abstract object RenderCellValue(object row, bool stripHtml = false);
-        public abstract string RenderClassName(object row);
+        public abstract string RenderClassName(object row, GriddlyResultPage page);
 
         protected virtual HtmlString RenderValue(object value, bool encode = true)
         {
@@ -57,15 +58,17 @@ public class GriddlyColumn<TRow> : GriddlyColumn
 
         static readonly Regex _htmlMatch = new Regex(@"<[^>]*>", RegexOptions.Compiled);
 
-        public override string RenderClassName(object row)
+        public override string RenderClassName(object row, GriddlyResultPage page)
         {
             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"));
+            SortField field = !string.IsNullOrWhiteSpace(SortField) ? page.SortFields.FirstOrDefault(x => x.Field == SortField) : null;
+
+            if (field != null)
+                classes.Add("sorted_" + (field.Direction == SortDirection.Descending ? "d" : "a"));
 
             if (ClassNameExpression != null)
             {

Griddly.Mvc/GriddlySelectColumn.cs

@@ -29,7 +29,7 @@ public override object RenderCellValue(object row, bool stripHtml = false)
             return null;
         }
 
-        public override string RenderClassName(object row)
+        public override string RenderClassName(object row, GriddlyResultPage page)
         {
             return null;
         }

Griddly/Scripts/griddly.js

@@ -219,14 +219,23 @@
                     var currentDirection = currentPos != -1 ? this.options.sortFields[currentPos].Direction : "Descending";
                     var newDirection = currentDirection == "Descending" ? "Ascending" : "Descending";
 
+                    var inlineFilters = $("tr.griddly-filters-inline", this.element);
+
                     if (!this.options.isMultiSort || !event.ctrlKey)
                     {
                         for (var i = 0; i < this.options.sortFields.length; i++)
                         {
                             var thisSortField = this.options.sortFields[i].Field;
 
                             if (thisSortField != sortField)
-                                $(event.currentTarget).parents("tr").find("th[data-griddly-sortfield='" + thisSortField + "']").removeClass("sorted_a").removeClass("sorted_d");
+                            {
+                                var oldSortDisplay = $(event.currentTarget).parents("tr").find("th[data-griddly-sortfield='" + thisSortField + "']");
+
+                                if (inlineFilters.length)
+                                    oldSortDisplay = [oldSortDisplay[0], inlineFilters[0].cells[oldSortDisplay[0].cellIndex]];
+
+                                $(oldSortDisplay).removeClass("sorted_a").removeClass("sorted_d");
+                            }
                         }
 
                         this.options.sortFields = [];
@@ -237,11 +246,17 @@
                     else
                         this.options.sortFields.push({ Field: sortField, Direction: newDirection });
 
+
+                    var newSortDisplay = [event.currentTarget];
+
+                    if (inlineFilters.length)
+                        newSortDisplay.push(inlineFilters[0].cells[newSortDisplay[0].cellIndex]);
+
                     if (newDirection == "Ascending")
-                        $(event.currentTarget).removeClass("sorted_d").addClass("sorted_a");
+                        $(newSortDisplay).removeClass("sorted_d").addClass("sorted_a");
                     else
-                        $(event.currentTarget).removeClass("sorted_a").addClass("sorted_d");
-
+                        $(newSortDisplay).removeClass("sorted_a").addClass("sorted_d");
+                    
                     this.refresh(true);
                 }
             }, this));

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.RenderClassName(row)">@column.RenderCell(row)</td>
+                <td class="@column.RenderClassName(row, Model)">@column.RenderCell(row)</td>
             }
         </tr>
     }