GridView DataSource should be of type object (#193)

* GridView DataSource should be of type object

* AsDynamicEnumerable() should be internal

* Support DataSet

Author: hishamco

src/BlazorWebFormsComponents.Test/GridView/DataTableSupport.razor

@@ -1,17 +1,16 @@
 @using System.Data
-@using BlazorWebFormsComponents.Extensions
 @inherits TestComponentBase
 
 <Fixture Test="DataTableAsDataSourceWithAutoGenerateColumns">
 	<ComponentUnderTest>
-		<GridView DataSource="dataTable.AsDynamicEnumerable()" AutogenerateColumns="true">
+		<GridView ItemType="dynamic" DataSource="dataTable" AutogenerateColumns="true">
 		</GridView>
 	</ComponentUnderTest>
 </Fixture>
 
 <Fixture Test="DataTableAsDataSourceWithoutAutoGenerateColumns">
 	<ComponentUnderTest>
-		<GridView ItemType="dynamic" DataSource="dataTable.AsDynamicEnumerable()" AutogenerateColumns="false">
+		<GridView ItemType="dynamic" DataSource="dataTable" AutogenerateColumns="false">
 			<Columns>
 					<BoundField ItemType="dynamic" DataField="Name" HeaderText="Item Name" />
 					<BoundField ItemType="dynamic" DataField="Quantity" HeaderText="Item Quantity" />
@@ -20,16 +19,36 @@
 	</ComponentUnderTest>
 </Fixture>
 
-<Fixture Test="DataTableAsDataSource">
+<Fixture Test="DataTableWithEnumerableOfDataRowAsDataSource">
 	<ComponentUnderTest>
-		<GridView DataSource="dataTable.AsEnumerable()" AutogenerateColumns="true">
+		<GridView ItemType="dynamic" DataSource="dataTable.AsEnumerable()" AutogenerateColumns="true">
+		</GridView>
+	</ComponentUnderTest>
+</Fixture>
+
+<Fixture Test="DataSetAsDataSource">
+	<ComponentUnderTest>
+		<GridView ItemType="dynamic" DataSource="dataSet" AutogenerateColumns="true">
 		</GridView>
 	</ComponentUnderTest>
 </Fixture>
 
 @code {
+	DataSet dataSet = new DataSet();
 	DataTable dataTable = new DataTable();
 
+	void DataSetAsDataSource(Fixture fixture)
+	{
+		dataSet = GetDataSet();
+
+		var cut = fixture.GetComponentUnderTest();
+		var tableHeaders = cut.FindAll("th");
+		tableHeaders[0].TextContent.ShouldBe("Id");
+		tableHeaders[1].TextContent.ShouldBe("Name");
+		tableHeaders[2].TextContent.ShouldBe("Quantity");
+		tableHeaders.Count.ShouldBe(3, "Did not render 3 TH elements");
+	}
+
 	void DataTableAsDataSourceWithAutoGenerateColumns(Fixture fixture)
 	{
 		dataTable = GetDataTable();
@@ -53,7 +72,7 @@
 		tableHeaders.Count.ShouldBe(2, "Did not render 2 TH elements");
 	}
 
-  void DataTableAsDataSource(Fixture fixture)
+  void DataTableWithEnumerableOfDataRowAsDataSource(Fixture fixture)
 	{
 		dataTable = GetDataTable();
 
@@ -67,6 +86,14 @@
 		tableHeaders.Count.ShouldBe(5, "Did not render 5 TH elements");
 	}
 
+	DataSet GetDataSet()
+	{
+		var dataTable1 = GetDataTable();
+		dataSet.Tables.Add(dataTable1);
+
+		return dataSet;
+	}
+
 	DataTable GetDataTable()
 	{
 		dataTable.Columns.AddRange(new DataColumn[3]

src/BlazorWebFormsComponents/BaseModelBindingComponent.cs

@@ -1,6 +1,10 @@
-using Microsoft.AspNetCore.Components;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
+using Microsoft.AspNetCore.Components;
+using BlazorWebFormsComponents.Extensions;
 
 namespace BlazorWebFormsComponents
 {
@@ -28,12 +32,21 @@ public IEnumerable<ItemType> Items {
 		protected List<ItemType> ItemsList { get; set; }
 
     [Parameter]
-    public IEnumerable<ItemType> DataSource
+    public object DataSource
     {
       get { return Items; }
-      set { 
-        Items = value;
-        this.StateHasChanged();
+      set
+			{
+				if (!typeof(IEnumerable).IsAssignableFrom(value.GetType()) && value.GetType() != typeof(DataSet) && value.GetType() != typeof(DataTable))
+				{
+					throw new InvalidOperationException("The DataSource must have an object of type IEnumerable, DataSet or DataTable.");
+				}
+
+				TryBindToDataSet(ref value);
+				TryBindToDataTable(ref value);
+
+				Items = value as IEnumerable<ItemType>;
+				this.StateHasChanged();
       }
     }
 
@@ -52,6 +65,30 @@ protected override void OnAfterRender(bool firstRender)
 
 		}
 
+		private static void TryBindToDataSet(ref object value)
+		{
+			if (value.GetType() == typeof(DataSet))
+			{
+				var dataSet = (value as DataSet);
+				if (dataSet.Tables.Count > 0)
+				{
+					value = (dataSet.Tables[0] as object as DataTable).AsDynamicEnumerable();
+				}
+				else
+				{
+					value = Enumerable.Empty<ItemType>();
+				}
+			}
+		}
+
+		private static void TryBindToDataTable(ref object value)
+		{
+			if (value.GetType() == typeof(DataTable))
+			{
+				value = (value as DataTable).AsDynamicEnumerable();
+			}
+		}
+
 	}
 
 }

src/BlazorWebFormsComponents/Extensions/DataTableExtensions.cs

@@ -9,7 +9,7 @@ namespace BlazorWebFormsComponents.Extensions
 {
 	public static class DataTableExtensions
 	{
-		public static IEnumerable<dynamic> AsDynamicEnumerable(this DataTable table)
+		internal static IEnumerable<dynamic> AsDynamicEnumerable(this DataTable table)
 		{
 			if (table == null)
 			{

src/BlazorWebFormsComponents/GridViewColumnGenerator.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 
 namespace BlazorWebFormsComponents
@@ -21,7 +22,9 @@ public static void GenerateColumns<ItemType>(GridView<ItemType> gridView)
 			var propertiesInfo = type.GetProperties(BindingFlags.Instance | BindingFlags.Public);
 			if (propertiesInfo.Count() == 0)
 			{
-				propertiesInfo = gridView.DataSource.First()?.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public) ?? Enumerable.Empty<PropertyInfo>().ToArray();
+				propertiesInfo = (gridView.DataSource as IEnumerable<ItemType>).First()?.GetType()
+					.GetProperties(BindingFlags.Instance | BindingFlags.Public) ?? Enumerable.Empty<PropertyInfo>()
+					.ToArray();
 			}
 
 			foreach (var propertyInfo in propertiesInfo.Where(p => p.Name != IndexerPropertyName).OrderBy(x => x.MetadataToken))