Enum Support & Nested Sort / Filter

PrimeNG.TableFilter.Test/PrimeNG.TableFilter.Test.csproj

@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
   <ItemGroup>

PrimeNG.TableFilter/Core/LinqOperator.cs

@@ -49,7 +49,14 @@ public void AddFilterProperty(
             OperatorEnumeration operatorAction, 
             bool isNegation = false)
         {
-            var property = _context.DataSetType.GetProperty(propertyName);
+            PropertyInfo property = null;
+            foreach (var item in propertyName.Split('.'))
+            {
+                if (property == null)
+                    property = _context.DataSetType.GetProperty(item.FirstCharToUpper());
+                else
+                    property = property.PropertyType.GetProperty(item.FirstCharToUpper());
+            }
             var propertyType = property?.PropertyType;
 
             if (propertyType == null)
@@ -59,7 +66,7 @@ public void AddFilterProperty(
                 throw new ArgumentException($"Property ${propertyName} not support method ${extensionMethod}");
 
             var castValue = ObjectCasterUtil.CastPropertiesType(property, propertyValue);
-            var propertyConstant = Expression.Constant(castValue, propertyType);
+            var propertyConstant = propertyType.IsEnum ? Expression.Constant(castValue, typeof(int)) : Expression.Constant(castValue, propertyType);
 
             if (IsNullableType(propertyType))
             {
@@ -90,8 +97,14 @@ public void AddFilterProperty(
                         return;
                     case string _:
                         {
-                            var propertyAccess = Expression.MakeMemberAccess(_context.ParameterExpression,
-                                property ?? throw new InvalidOperationException());
+                            MemberExpression propertyAccess = null;
+                            foreach (var item in propertyName.Split('.'))
+                            {
+                                if (propertyAccess == null)
+                                    propertyAccess = Expression.PropertyOrField(_context.ParameterExpression, item.FirstCharToUpper());
+                                else
+                                    propertyAccess = Expression.PropertyOrField(propertyAccess, item.FirstCharToUpper());
+                            }
 
                             var methodInfo = propertyType.GetMethod(extensionMethod, new[] { propertyType });
                             if (isNegation)
@@ -193,13 +206,31 @@ public void ThenByDescending(string orderProperty) =>
 
         private void BaseOrderExecute(string command, string orderByProperty)
         {
-            var property = _context.DataSetType.GetProperty(orderByProperty);
-            var propertyAccess =
-                Expression.MakeMemberAccess(_context.ParameterExpression,
-                    property ?? throw new InvalidOperationException());
+            PropertyInfo property = null;
+            foreach (var item in orderByProperty.Split('.'))
+            {
+                if (property == null)
+                    property = _context.DataSetType.GetProperty(item.FirstCharToUpper());
+                else
+                    property = property.PropertyType.GetProperty(item.FirstCharToUpper());
+            }
+            var propertyType = property?.PropertyType;
+
+            if (propertyType == null)
+                return;
+
+            MemberExpression propertyAccess = null;
+            foreach (var item in orderByProperty.Split('.'))
+            {
+                if (propertyAccess == null)
+                    propertyAccess = Expression.PropertyOrField(_context.ParameterExpression, item);
+                else
+                    propertyAccess = Expression.PropertyOrField(propertyAccess, item);
+            }
+
             var orderByExpression = Expression.Lambda(propertyAccess, _context.ParameterExpression);
             var resultExpression = Expression.Call(typeof(Queryable), command,
-                new[] { _context.DataSetType, property.PropertyType },
+                new[] { _context.DataSetType, propertyType },
                 _context.DataSet.Expression, Expression.Quote(orderByExpression));
             _context.DataSet = _context.DataSet.Provider.CreateQuery<TEntity>(resultExpression);
         }
@@ -220,8 +251,13 @@ private static bool IsNullableType(Type propertyType)
         /// <returns><code>True</code> if nullable, otherwise <code>False</code></returns>
         private static bool IsNumericType(Type propertyType)
         {
-            return (propertyType == typeof(short) || propertyType == typeof(short?) || propertyType == typeof(int) || propertyType == typeof(int?) || propertyType == typeof(long) || propertyType == typeof(long?)
-                  || propertyType == typeof(float) || propertyType == typeof(float?) || propertyType == typeof(double) || propertyType == typeof(double?) || propertyType == typeof(decimal) || propertyType == typeof(decimal?));
+            return ((propertyType == typeof(short) || propertyType == typeof(short?)) || 
+                (propertyType == typeof(int) || propertyType == typeof(int?)) || 
+                (propertyType == typeof(long) || propertyType == typeof(long?)) || 
+                (propertyType == typeof(float) || propertyType == typeof(float?)) || 
+                (propertyType == typeof(double) || propertyType == typeof(double?)) || 
+                (propertyType == typeof(decimal) || propertyType == typeof(decimal?)) ||
+                (propertyType.IsEnum || (Nullable.GetUnderlyingType(propertyType)?.IsEnum == true)));
         }
         /// <summary>
         /// Checks if for provided <paramref name="propertyType"/>, <paramref name="extensionMethod"/> is valid

PrimeNG.TableFilter/Core/TableFilterManager.cs

@@ -49,16 +49,16 @@ public void MultipleOrderDataSet(TableFilterModel tableFilterPayload)
                   {
                       case (int)SortingEnumeration.OrderByAsc:
                           if (o.i == 0)
-                              _linqOperator.OrderBy(o.value.Field.FirstCharToUpper());
+                              _linqOperator.OrderBy(o.value.Field);
                           else
-                              _linqOperator.ThenBy(o.value.Field.FirstCharToUpper());
+                              _linqOperator.ThenBy(o.value.Field);
                           break;
 
                       case (int)SortingEnumeration.OrderByDesc:
                           if (o.i == 0)
-                              _linqOperator.OrderByDescending(o.value.Field.FirstCharToUpper());
+                              _linqOperator.OrderByDescending(o.value.Field);
                           else
-                              _linqOperator.ThenByDescending(o.value.Field.FirstCharToUpper());
+                              _linqOperator.ThenByDescending(o.value.Field);
                           break;
 
                       default:
@@ -77,11 +77,11 @@ public void SingleOrderDataSet(TableFilterModel tableFilterPayload)
             switch (tableFilterPayload.SortOrder)
             {
                 case (int)SortingEnumeration.OrderByAsc:
-                    _linqOperator.OrderBy(tableFilterPayload.SortField.FirstCharToUpper());
+                    _linqOperator.OrderBy(tableFilterPayload.SortField);
                     break;
 
                 case (int)SortingEnumeration.OrderByDesc:
-                    _linqOperator.OrderByDescending(tableFilterPayload.SortField.FirstCharToUpper());
+                    _linqOperator.OrderByDescending(tableFilterPayload.SortField);
                     break;
 
                 default:
@@ -112,87 +112,85 @@ private void BaseFilterDataSet(string key, TableFilterContext value, OperatorEnu
             switch (value.MatchMode)
             {
                 case ConstantTypeMatchModeStartsWith:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantStartsWith
                         , operatorAction);
                     break;
 
                 case ConstantTypeMatchModeContains:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantContains
                         , operatorAction);
                     break;
 
                 case ConstantTypeMatchModeIn:
-                    _linqOperator.AddFilterListProperty(key.FirstCharToUpper(), value.Value
+                    _linqOperator.AddFilterListProperty(key, value.Value
                         , operatorAction);
                     break;
 
                 case ConstantTypeMatchModeEndsWith:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantEndsWith
                         , OperatorEnumeration.None);
                     break;
 
                 case ConstantTypeMatchModeEquals:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantEquals
                         , operatorAction);
                     break;
 
                 case ConstantTypeMatchModeNotContains:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantContains
                         , OperatorEnumeration.None, true);
                     break;
 
                 case ConstantTypeMatchModeNotEquals:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantEquals
                         , operatorAction, true);
                     break;
                 case ConstantTypeMatchModeDateIs:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantDateIs
                         , operatorAction);
                     break;
                 case ConstantTypeMatchModeDateIsNot:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantDateIs
                         , operatorAction, true);
                     break;
                 case ConstantTypeMatchModeDateBefore:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantBefore
                         , operatorAction);
                     break;
                 case ConstantTypeMatchModeDateAfter:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantAfter
                         , operatorAction);
                     break;
                 case ConstantTypeMatchModeLessThan:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantLessThan
                         , operatorAction);
                     break;
                 case ConstantTypeMatchModeLessOrEqualsThan:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantLessThanOrEqual
                         , operatorAction);
                     break;
                 case ConstantTypeMatchModeGreaterThan:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantGreaterThan
                         , operatorAction);
                     break;
                 case ConstantTypeMatchModeGreaterOrEqualsThan:
-                    _linqOperator.AddFilterProperty(key.FirstCharToUpper(), value.Value,
+                    _linqOperator.AddFilterProperty(key, value.Value,
                         LinqOperatorConstants.ConstantGreaterThanOrEqual
                         , operatorAction);
                     break;
-
-
                 default:
                     throw new System.ArgumentException("Invalid Match mode!");
             }

PrimeNG.TableFilter/Models/TableFilterModel.cs

@@ -5,11 +5,11 @@ namespace PrimeNG.TableFilter.Models
 {
     public class TableFilterModel
     {
-        public Dictionary<string, object> Filters { get; set; }
-        public int First { get; set; }
-        public int Rows { get; set; }
+        public Dictionary<string, object> Filters { get; set; } = new Dictionary<string, object>();
+        public int First { get; set; } = 0;
+        public int Rows { get; set; } = 10;
         public string SortField { get; set; }
         public int SortOrder { get; set; }
-        public List<TableFilterSortMeta> MultiSortMeta { get; set; }
+        public List<TableFilterSortMeta> MultiSortMeta { get; set; } = new List<TableFilterSortMeta>();
     }
 }

PrimeNG.TableFilter/PrimeNG.TableFilter.csproj

@@ -9,7 +9,7 @@
     <RepositoryUrl>https://github.com/Kusumoto/PrimeNG.TableFilter</RepositoryUrl>
     <Version>2.1.2</Version>
     <PackageVersion>2.1.2</PackageVersion>
-    <TargetFrameworks>net462;netstandard2.1;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.1;net6.0;net5.0;net7.0</TargetFrameworks>
 	<CheckEolTargetFramework>false</CheckEolTargetFramework>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <AssemblyVersion>2.1.2</AssemblyVersion>
@@ -21,8 +21,8 @@
     <Folder Include="Utils\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.13" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.25" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\LICENSE.md">

PrimeNG.TableFilter/Properties/PublishProfiles/Net4.6.2.pubxml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net462\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net462</TargetFramework>
+  </PropertyGroup>
+</Project>

PrimeNG.TableFilter/Properties/PublishProfiles/Net5.0.pubxml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net5.0\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net5.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>

PrimeNG.TableFilter/Properties/PublishProfiles/Net6.0.pubxml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net6.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>

PrimeNG.TableFilter/Properties/PublishProfiles/Net7.0.pubxml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net7.0\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>net7.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>

PrimeNG.TableFilter/Properties/PublishProfiles/NetStandard2.1.pubxml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\netstandard2.1\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>netstandard2.1</TargetFramework>
+  </PropertyGroup>
+</Project>

PrimeNG.TableFilter/Utils/ObjectCasterUtil.cs

@@ -42,7 +42,9 @@ public static object CastPropertiesTypeList(PropertyInfo property, object value)
             if (property?.PropertyType == typeof(decimal))
                 return arrayCast.ToObject<List<decimal>>();
             if (property?.PropertyType == typeof(decimal?))
-                return arrayCast.ToObject<List<decimal?>>();
+                return arrayCast.ToObject<List<decimal?>>();
+            if (Nullable.GetUnderlyingType(property?.PropertyType).IsEnum)
+                return arrayCast.ToObject<List<int?>>();
 
             return arrayCast.ToObject<List<string>>();
         }
@@ -81,8 +83,9 @@ public static object CastPropertiesType(PropertyInfo property, object value)
             if (property?.PropertyType == typeof(decimal))
                 return Convert.ToDecimal(value);
             if (property?.PropertyType == typeof(decimal?))
-                return Convert.ToDecimal(value);
-
+                return Convert.ToDecimal(value);
+            if (property?.PropertyType.IsEnum == true)
+                return Convert.ToInt32(value);
 
             return value.ToString();
         }