Update package 5.0.7

gustavnavar · Jan 18, 2024 · 745d7e5 · 745d7e5
1 parent d79a37d
commit 745d7e5
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 31 deletions.
diff --git a/GridBlazor/GridBlazor.csproj b/GridBlazor/GridBlazor.csproj
@@ -6,7 +6,7 @@
     <LangVersion>11.0</LangVersion>
     <GenerateEmbeddedFilesManifest>True</GenerateEmbeddedFilesManifest>
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
-    <Version>5.0.6</Version>
+    <Version>5.0.7</Version>
     <Title>GridBlazor</Title>
     <Description>Grid components for Blazor</Description>
     <Summary>Grid components for Blazor</Summary>

diff --git a/GridBlazor/Pages/GridComponent.razor.cs b/GridBlazor/Pages/GridComponent.razor.cs
@@ -721,8 +721,10 @@ public async Task InitExtSorting(IList<ColumnOrderValue> payloads)
             foreach (var payload in payloads)
             {
                 Payload = payload;
-                await AddExtSorting();
+                Grid.AddQueryString(ColumnOrderValue.DefaultSortingQueryParameter, Payload.ToString());
             }
+            await UpdateGrid();
+            await OnExtSortChanged();
         }
 
         public async Task AddExtSorting()

diff --git a/GridBlazorSpring/ColumnCollections/ColumnCollections.cs b/GridBlazorSpring/ColumnCollections/ColumnCollections.cs
@@ -137,7 +137,7 @@ public class ColumnCollections
             .RenderValueAs(o => o.Customer.IsVip ? Strings.BoolTrueLabel : Strings.BoolFalseLabel);
         };
 
-        public static Action<IGridColumnCollection<Order>, Func<object, Task<string>>> OrderColumnsGroupable = (c, customerNameLabel) =>
+        public static Action<IGridColumnCollection<Order>> OrderColumnsGroupable = c =>
         {
             /* Adding "OrderID" column: */
             c.Add(o => o.OrderID).Titled(SharedResource.Number).SetWidth(100);
@@ -150,8 +150,7 @@ public class ColumnCollections
             c.Add(o => o.Customer.CompanyName).Titled(SharedResource.CompanyName)
             .ThenSortBy(o => o.ShipVia)
             .ThenSortByDescending(o => o.Freight)
-            .SetWidth(250)
-            .SetGroupLabel(customerNameLabel);
+            .SetWidth(250);
 
             /* Adding "ContactName" column: */
             c.Add(o => o.Customer.ContactName).Titled(SharedResource.ContactName);

diff --git a/GridBlazorSpring/GridBlazorSpring.csproj b/GridBlazorSpring/GridBlazorSpring.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>5.0.5</Version>
+    <Version>5.0.7</Version>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
   </PropertyGroup>
 

diff --git a/GridBlazorSpring/Pages/Groupable.razor b/GridBlazorSpring/Pages/Groupable.razor
@@ -43,7 +43,7 @@ else
 
         var query = new QueryDictionary<StringValues>();
         string url = "http://localhost:8080/" + "api/SampleData/GetOrdersGridGroupable";
-        Action<IGridColumnCollection<Order>> columns = c => ColumnCollections.OrderColumnsGroupable(c, SetCustomerNameLabel);
+        Action<IGridColumnCollection<Order>> columns = ColumnCollections.OrderColumnsGroupable;
         var client = new GridClient<Order>(HttpClient, url, query, false, "ordersGrid", columns, locale)
             .Sortable()
             .Filterable()
@@ -69,21 +69,4 @@ else
             _initGrouping = true;
         }
     }
-
-    protected async Task<string> SetCustomerNameLabel(object value)
-    {
-        if (value.GetType() == typeof(string))
-        {
-            decimal? max;
-            decimal? min;
-            var clientName = (string)value;
-            var urlParameters = _grid.GetLink().Replace("?", "&");
-            string url = "http://localhost:8080/" + $"api/SampleData/GetMaxFreight?clientName={clientName}";
-            max = (await HttpClient.GetFromJsonAsync<Order>(url + urlParameters))?.Freight;
-            url = "http://localhost:8080/" + $"api/SampleData/GetMinFreight?clientName={clientName}";
-            min = (await HttpClient.GetFromJsonAsync<Order>(url + urlParameters))?.Freight;
-            return clientName + "<span class='ml-5'>Max Freight: " + max?.ToString() + "</span><span class='ml-5'>Min Freight: " + min?.ToString() + "</span>";
-        }
-        return value.ToString();
-    }
 }
diff --git a/GridCore/Filtering/FilterGridItemsProcessor.cs b/GridCore/Filtering/FilterGridItemsProcessor.cs
@@ -37,7 +37,7 @@ public IQueryable<T> Process(IQueryable<T> items)
             if (_process != null)
                 return _process(items);
 
-            if (items == null || items.Count() == 0)
+            if (items == null)
                 return items;
 
             var source = items.Expression;

diff --git a/GridCore/GridCore.csproj b/GridCore/GridCore.csproj
@@ -7,7 +7,7 @@
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
     <Product>GridCore</Product>
     <PackageId>GridCore</PackageId>
-    <Version>7.0.3</Version>
+    <Version>7.0.4</Version>
     <Title>GridCore</Title>
     <Description>Grid core component</Description>
     <Summary>Grid core component</Summary>

diff --git a/GridCore/Pagination/PagerGridItemsProcessor.cs b/GridCore/Pagination/PagerGridItemsProcessor.cs
@@ -32,7 +32,7 @@ public IQueryable<T> Process(IQueryable<T> items)
             if (_process != null)
                 return _process(items);
 
-            if (items == null || items.Count() == 0)
+            if (items == null)
                 return items;
 
             if (_grid.PagingType == PagingType.Virtualization)

diff --git a/GridCore/Searching/SearchGridItemsProcessor.cs b/GridCore/Searching/SearchGridItemsProcessor.cs
@@ -38,7 +38,7 @@ public IQueryable<T> Process(IQueryable<T> items)
             if(_process != null)
                 return _process(items);
 
-            if (items == null || items.Count() == 0)
+            if (items == null)
                 return items;
 
             if (_grid.SearchOptions.Enabled && !string.IsNullOrWhiteSpace(_settings.SearchValue))

diff --git a/GridCore/Sorting/SortGridItemsProcessor.cs b/GridCore/Sorting/SortGridItemsProcessor.cs
@@ -37,7 +37,7 @@ public IQueryable<T> Process(IQueryable<T> items)
             if (_process != null)
                 return _process(items);
 
-            if (items == null || items.Count() == 0)
+            if (items == null)
                 return items;
 
             if (_settings.SortValues?.Count() > 0)

diff --git a/GridCore/Totals/TotalsGridItemsProcessor.cs b/GridCore/Totals/TotalsGridItemsProcessor.cs
@@ -29,7 +29,7 @@ public IQueryable<T> Process(IQueryable<T> items)
             if (_process != null)
                 return _process(items);
 
-            if (items == null || items.Count() == 0)
+            if (items == null)
                 return items;
 
             if (_grid.PagingType == PagingType.Virtualization && _grid.Pager.NoTotals)

diff --git a/GridMvc/GridMvc.csproj b/GridMvc/GridMvc.csproj
@@ -8,7 +8,7 @@
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
     <Product>GridMvc</Product>
     <PackageId>GridMvcCore</PackageId>
-    <Version>7.0.3</Version>
+    <Version>7.0.4</Version>
     <Title>GridMvc</Title>
     <Description>ASP.NET MVC Grid component</Description>
     <Summary>ASP.NET MVC Grid component</Summary>