Merge pull request mcintyre321#138 from bak-t/master

ColDefs serialization fix & refactoring.

Author: mcintyre321

Mvc.JQuery.Datatables.Core/DataTableConfigVm.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Mime;
 using System.Web.Routing;
@@ -255,44 +256,45 @@ private static string ConvertDictionaryToJsonBody(IDictionary<string, object> di
 
         private static string ConvertColumnDefsToJson(ColDef[] columns)
         {
-            var nonSortableColumns = columns.Select((x, idx) => x.Sortable ? -1 : idx).Where( x => x > -1).ToArray();
-            var nonVisibleColumns = columns.Select((x, idx) => x.Visible ? -1 : idx).Where(x => x > -1).ToArray();
-            var nonSearchableColumns = columns.Select((x, idx) => x.Searchable ? -1 : idx).Where(x => x > -1).ToArray();
-            var mRenderColumns = columns.Select((x, idx) => string.IsNullOrEmpty(x.MRenderFunction) ? new { x.MRenderFunction, Index = -1 } : new { x.MRenderFunction, Index = idx }).Where(x => x.Index > -1).ToArray();
-            var CssClassColumns = columns.Select((x, idx) => string.IsNullOrEmpty(x.CssClass) ? new { x.CssClass, Index = -1 } : new { x.CssClass, Index = idx }).Where(x => x.Index > -1).ToArray();
-            
-
+            Func<bool, bool> isFalse = x => x == false;
+            Func<string, bool> isNonEmptyString = x => !string.IsNullOrEmpty(x);
 
             var defs = new List<dynamic>();
 
-            if (nonSortableColumns.Any())
-                defs.Add(new { bSortable = false, aTargets = nonSortableColumns });
-            if (nonVisibleColumns.Any())
-                defs.Add(new { bVisible = false, aTargets = nonVisibleColumns });
-            if (nonSearchableColumns.Any())
-                defs.Add(new { bSearchable = false, aTargets = nonSearchableColumns }); 
-            if (mRenderColumns.Any())
-                foreach (var mRenderColumn in mRenderColumns)
-                {
-                    defs.Add(new { mRender = "%" + mRenderColumn.MRenderFunction + "%", aTargets = new[] {mRenderColumn.Index} });
-                }
-            if (CssClassColumns.Any())
-                foreach (var CssClassColumn in CssClassColumns)
-                {
-                    defs.Add(new { className = CssClassColumn.CssClass, aTargets = new[] { CssClassColumn.Index } });
-                }
-
-            for(var i=0;i<columns.Length;i++)
-            {
-                if (columns[i].Width != null)
-                {
-                    defs.Add(new { width = columns[i].Width, aTargets = new[] { i} });
-                }
-            }
-             
+            defs.AddRange(ConvertColumnDefsToTargetedProperty(
+                jsonPropertyName: "bSortable",
+                propertySelector: column => column.Sortable,
+                propertyPredicate: isFalse,
+                columns: columns));
+            defs.AddRange(ConvertColumnDefsToTargetedProperty(
+                jsonPropertyName: "bVisible",
+                propertySelector: column => column.Visible,
+                propertyPredicate: isFalse,
+                columns: columns));
+            defs.AddRange(ConvertColumnDefsToTargetedProperty(
+                jsonPropertyName: "bSearchable",
+                propertySelector: column => column.Searchable,
+                propertyPredicate: isFalse,
+                columns: columns));
+            defs.AddRange(ConvertColumnDefsToTargetedProperty(
+                jsonPropertyName: "mRender",
+                propertySelector: column => column.MRenderFunction,
+                propertyConverter: x => new JRaw(x),
+                propertyPredicate: isNonEmptyString,
+                columns: columns));
+            defs.AddRange(ConvertColumnDefsToTargetedProperty(
+                jsonPropertyName: "className",
+                propertySelector: column => column.CssClass,
+                propertyPredicate: isNonEmptyString,
+                columns: columns));
+            defs.AddRange(ConvertColumnDefsToTargetedProperty(
+                jsonPropertyName: "width",
+                propertySelector: column => column.Width,
+                propertyPredicate: isNonEmptyString,
+                columns: columns));
 
             if (defs.Count > 0)
-                return new JavaScriptSerializer().Serialize(defs).Replace("\"%", "").Replace("%\"", "");
+                return JsonConvert.SerializeObject(defs);
 
             return "[]";
         }
@@ -312,5 +314,42 @@ private static IDictionary<string, object> ConvertObjectToDictionary(object obj)
             // Doing this way because RouteValueDictionary converts to Json in wrong format
             return new Dictionary<string, object>(new RouteValueDictionary(obj));
         }
+
+        private static IEnumerable<JObject> ConvertColumnDefsToTargetedProperty<TProperty>(
+            string jsonPropertyName,
+            Func<ColDef, TProperty> propertySelector,
+            Func<TProperty, bool> propertyPredicate,
+            IEnumerable<ColDef> columns)
+        {
+            return ConvertColumnDefsToTargetedProperty(
+                jsonPropertyName,
+                propertySelector,
+                propertyPredicate,
+                x => x,
+                columns);
+        }
+
+        private static IEnumerable<JObject> ConvertColumnDefsToTargetedProperty<TProperty, TResult>(
+            string jsonPropertyName,
+            Func<ColDef, TProperty> propertySelector,
+            Func<TProperty, bool> propertyPredicate,
+            Func<TProperty, TResult> propertyConverter,
+            IEnumerable<ColDef> columns)
+        {
+            return columns
+                .Select((x, idx) => new { rawPropertyValue = propertySelector(x), idx })
+                .Where(x => propertyPredicate(x.rawPropertyValue))
+                .GroupBy(
+                    x => x.rawPropertyValue,
+                    (rawPropertyValue, groupedItems) => new
+                    {
+                        rawPropertyValue,
+                        indices = groupedItems.Select(x => x.idx)
+                    })
+                .Select(x => new JObject(
+                    new JProperty(jsonPropertyName, propertyConverter(x.rawPropertyValue)),
+                    new JProperty("aTargets", new JArray(x.indices))
+                    ));
+        }
     }
 }

Mvc.JQuery.Datatables.Example/Mvc.JQuery.Datatables.Example.csproj

@@ -52,8 +52,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EmbeddedResourceVirtualPathProvider, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\EmbeddedResourceVirtualPathProvider\EmbeddedResourceVirtualPathProvider\bin\Debug\EmbeddedResourceVirtualPathProvider.dll</HintPath>
+      <HintPath>..\packages\EmbeddedResourceVirtualPathProvider.1.3.2\lib\net40\EmbeddedResourceVirtualPathProvider.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework">
       <HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>

Mvc.JQuery.Datatables.Example/packages.config

@@ -4,11 +4,11 @@
   <package id="EmbeddedResourceVirtualPathProvider" version="1.3.2" targetFramework="net45" />
   <package id="EntityFramework" version="6.1.1" targetFramework="net45" />
   <package id="jQuery" version="2.1.4" targetFramework="net45" />
-  <package id="jquery-globalize" version="0.1.1" targetFramework="net4" />
   <package id="jQuery.UI.Combined" version="1.11.4" targetFramework="net45" />
   <package id="jQuery.UI.i18n" version="1.10.2" targetFramework="net4" />
   <package id="jQuery.Validation" version="1.8.0.1" targetFramework="net45" />
   <package id="jQuery.vsdoc" version="1.6" targetFramework="net4" />
+  <package id="jquery-globalize" version="0.1.1" targetFramework="net4" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />