Added support for output as an array of objects for newer versions of datatables.js. (fixed embedded resources)

Author: offspringer

Mvc.JQuery.Datatables/DataTablesResult.cs

@@ -1,77 +1,100 @@
-using System.Web;
-using System.Web.Script.Serialization;
+using Mvc.JQuery.Datatables.Models;
+using Mvc.JQuery.Datatables.Reflection;
+using Mvc.JQuery.Datatables.Util;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Web;
 using System.Web.Mvc;
-using Mvc.JQuery.Datatables.Models;
-using Mvc.JQuery.Datatables.Reflection;
-using Mvc.JQuery.Datatables.Util;
+using System.Web.Script.Serialization;
 
 namespace Mvc.JQuery.Datatables
 {
-    public abstract class DataTablesResult  : ActionResult
+    public abstract class DataTablesResult : ActionResult
     {
         /// <typeparam name="TSource"></typeparam>
         /// <typeparam name="TTransform"></typeparam>
         /// <param name="q">A queryable for the data. The properties of this can be marked up with [DataTablesAttribute] to control sorting/searchability/visibility</param>
         /// <param name="dataTableParam"></param>
         /// <param name="transform">//a transform for custom column rendering e.g. to do a custom date row => new { CreatedDate = row.CreatedDate.ToString("dd MM yy") } </param>
         /// <returns></returns>
-        public static DataTablesResult<TSource> Create<TSource, TTransform>(IQueryable<TSource> q, DataTablesParam dataTableParam, Func<TSource, TTransform> transform)
+        public static DataTablesResult<TSource> Create<TSource, TTransform>(IQueryable<TSource> q, DataTablesParam dataTableParam,
+            Func<TSource, TTransform> transform, ArrayOutputType? arrayOutput = null)
         {
             var result = new DataTablesResult<TSource>(q, dataTableParam);
+
             result.Data = result.Data
                 .Transform<TSource, Dictionary<string, object>>(row => TransformTypeInfo.MergeTransformValuesIntoDictionary(transform, row))
-                .Transform<Dictionary<string, object>, Dictionary<string, object>>(StringTransformers.StringifyValues)
-                .Transform<Dictionary<string, object>, object[]>(d => d.Values.ToArray());
-                
+                .Transform<Dictionary<string, object>, Dictionary<string, object>>(StringTransformers.StringifyValues);
+
+            result.Data = ApplyOutputRules(result.Data, arrayOutput);
+
             return result;
         }
 
-        public static DataTablesResult<TSource> Create<TSource>(IQueryable<TSource> q, DataTablesParam dataTableParam)
+        public static DataTablesResult<TSource> Create<TSource>(IQueryable<TSource> q, DataTablesParam dataTableParam,
+            ArrayOutputType? arrayOutput = null)
         {
             var result = new DataTablesResult<TSource>(q, dataTableParam);
 
             result.Data = result.Data
                 .Transform<TSource, Dictionary<string, object>>(DataTablesTypeInfo<TSource>.ToDictionary)
-                .Transform<Dictionary<string, object>, Dictionary<string, object>>(StringTransformers.StringifyValues)
-                .Transform<Dictionary<string, object>, object[]>(d => d.Values.ToArray()); ;
+                .Transform<Dictionary<string, object>, Dictionary<string, object>>(StringTransformers.StringifyValues);
+
+            result.Data = ApplyOutputRules(result.Data, arrayOutput);
+
             return result;
         }
 
+        private static DataTablesData ApplyOutputRules(DataTablesData sourceData, ArrayOutputType? arrayOutput = null)
+        {
+            DataTablesData outputData = sourceData;
+
+            switch (arrayOutput)
+            {
+                case ArrayOutputType.ArrayOfObjects:
+                    // Nothing is needed
+                    break;
+                case ArrayOutputType.BiDimensionalArray:
+                default:
+                    outputData = sourceData.Transform<Dictionary<string, object>, object[]>(d => d.Values.ToArray());
+                    break;
+            }
+
+            return outputData;
+        }
 
         /// <param name="transform">Should be a Func<T, TTransform></param>
-        public static DataTablesResult Create(IQueryable queryable, DataTablesParam dataTableParam, object transform)
+        public static DataTablesResult Create(IQueryable queryable, DataTablesParam dataTableParam, object transform,
+            ArrayOutputType? arrayOutput = null)
         {
             var s = "Create";
             var openCreateMethod = typeof(DataTablesResult).GetMethods().Single(x => x.Name == s && x.GetGenericArguments().Count() == 2);
             var queryableType = queryable.GetType().GetGenericArguments()[0];
             var transformType = transform.GetType().GetGenericArguments()[1];
             var closedCreateMethod = openCreateMethod.MakeGenericMethod(queryableType, transformType);
-            return (DataTablesResult)closedCreateMethod.Invoke(null, new object[] { queryable, dataTableParam, transform });
+            return (DataTablesResult)closedCreateMethod.Invoke(null, new object[] { queryable, dataTableParam, transform, arrayOutput });
         }
 
-        public static DataTablesResult Create(IQueryable queryable, DataTablesParam dataTableParam)
+        public static DataTablesResult Create(IQueryable queryable, DataTablesParam dataTableParam,
+            ArrayOutputType? arrayOutput = null)
         {
             var s = "Create";
             var openCreateMethod = typeof(DataTablesResult).GetMethods().Single(x => x.Name == s && x.GetGenericArguments().Count() == 1);
             var queryableType = queryable.GetType().GetGenericArguments()[0];
             var closedCreateMethod = openCreateMethod.MakeGenericMethod(queryableType);
-            return (DataTablesResult)closedCreateMethod.Invoke(null, new object[] { queryable, dataTableParam });
+            return (DataTablesResult)closedCreateMethod.Invoke(null, new object[] { queryable, dataTableParam, arrayOutput });
         }
 
-        public static DataTablesResult<T> CreateResultUsingEnumerable<T>(IEnumerable<T> q, DataTablesParam dataTableParam)
+        public static DataTablesResult<T> CreateResultUsingEnumerable<T>(IEnumerable<T> q, DataTablesParam dataTableParam,
+            ArrayOutputType? arrayOutput = null)
         {
-            return Create(q.AsQueryable(), dataTableParam);
+            return Create(q.AsQueryable(), dataTableParam, arrayOutput);
         }
- 
     }
 
-
     public class DataTablesResult<TSource> : DataTablesResult
     {
-
         public DataTablesData Data { get; set; }
 
         internal DataTablesResult(IQueryable<TSource> q, DataTablesParam dataTableParam)
@@ -87,18 +110,20 @@ public override void ExecuteResult(ControllerContext context)
         {
             if (context == null)
                 throw new ArgumentNullException("context");
+
             HttpResponseBase response = context.HttpContext.Response;
 
             var scriptSerializer = new JavaScriptSerializer()
             {
                 MaxJsonLength = int.MaxValue
             };
+
             response.Write(scriptSerializer.Serialize(this.Data));
         }
 
         DataTablesData GetResults(IQueryable<TSource> data, DataTablesParam param)
         {
-            var totalRecords = data.Count(); //annoying this, as it causes an extra evaluation..
+            var totalRecords = data.Count(); // annoying this, as it causes an extra evaluation..
 
             var filters = new DataTablesFiltering();
 
@@ -110,7 +135,6 @@ DataTablesData GetResults(IQueryable<TSource> data, DataTablesParam param)
             var skipped = filteredData.Skip(param.iDisplayStart);
             var page = (param.iDisplayLength <= 0 ? skipped : skipped.Take(param.iDisplayLength)).ToArray();
 
-            
             var result = new DataTablesData
             {
                 iTotalRecords = totalRecords,
@@ -121,7 +145,5 @@ DataTablesData GetResults(IQueryable<TSource> data, DataTablesParam param)
 
             return result;
         }
-
-        
     }
 }

Mvc.JQuery.Datatables/Models/ArrayOutputType.cs

@@ -0,0 +1,9 @@
+
+namespace Mvc.JQuery.Datatables.Models
+{
+    public enum ArrayOutputType
+    {
+        BiDimensionalArray,
+        ArrayOfObjects
+    }
+}

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

@@ -82,6 +82,7 @@
     <Compile Include="DataTablesFiltering.cs" />
     <Compile Include="DataTablesFilterAttribute.cs" />
     <Compile Include="LengthMenuVm.cs" />
+    <Compile Include="Models\ArrayOutputType.cs" />
     <Compile Include="Models\ColDef.cs" />
     <Compile Include="ColumnFilterSettingsVm.cs" />
     <Compile Include="DataTablesAttribute.cs" />