Update package 5.0.4

gustavnavar · Jan 15, 2024 · 0019067 · 0019067
1 parent d1ae637
commit 0019067
Show file tree

Hide file tree

Showing 136 changed files with 29,796 additions and 62 deletions.
diff --git a/.gitignore b/.gitignore
@@ -74,3 +74,5 @@
 /GridBlazorGrpc.Client/obj
 /GridBlazorGrpc.Server/obj
 /GridBlazorGrpc.Shared/obj
+/GridBlazorSpring/bin
+/GridBlazorSpring/obj
diff --git a/Grid.Blazor.sln b/Grid.Blazor.sln
@@ -41,6 +41,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GridBlazorGrpc.Client", "Gr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GridBlazorGrpc.Server", "GridBlazorGrpc.Server\GridBlazorGrpc.Server.csproj", "{FD560288-98BB-45C3-AD8E-5085E62AB6EA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GridBlazorSpring", "GridBlazorSpring\GridBlazorSpring.csproj", "{C0F887ED-EE28-4966-8EE1-A78D97490F29}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -123,12 +125,16 @@ Global
 		{FD560288-98BB-45C3-AD8E-5085E62AB6EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD560288-98BB-45C3-AD8E-5085E62AB6EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD560288-98BB-45C3-AD8E-5085E62AB6EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0F887ED-EE28-4966-8EE1-A78D97490F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0F887ED-EE28-4966-8EE1-A78D97490F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0F887ED-EE28-4966-8EE1-A78D97490F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0F887ED-EE28-4966-8EE1-A78D97490F29}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {895FF79E-EBAE-48F1-BB99-DEE7E62B0DB6}
 		VisualSVNWorkingCopyRoot = .
+		SolutionGuid = {895FF79E-EBAE-48F1-BB99-DEE7E62B0DB6}
 	EndGlobalSection
 EndGlobal
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.4</Version>
+    <Version>5.0.5</Version>
     <Title>GridBlazor</Title>
     <Description>Grid components for Blazor</Description>
     <Summary>Grid components for Blazor</Summary>

diff --git a/GridBlazor/Pagination/GridPager.cs b/GridBlazor/Pagination/GridPager.cs
@@ -71,7 +71,7 @@ public GridPager(IGrid grid)
             else
             {
                 ParameterName = DefaultPageQueryParameter;
-                MaxDisplayedPages = MaxDisplayedPages;
+                MaxDisplayedPages = DefaultMaxDisplayedPages;
                 PageSize = DefaultPageSize;
 
                 _query = grid.Query;

diff --git a/GridBlazorClientSide.Server/Controllers/SampleDataController.cs b/GridBlazorClientSide.Server/Controllers/SampleDataController.cs
@@ -15,7 +15,7 @@
 
 namespace GridBlazorClientSide.Server.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("api/[controller]/[action]")]
     public class SampleDataController : Controller
     {
         private readonly NorthwindDbContext _context;
@@ -25,7 +25,7 @@ public SampleDataController(NorthwindDbContext context)
             _context = context;
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrdersGrid()
         {
             var repository = new OrdersRepository(_context);
@@ -42,7 +42,7 @@ public async Task<ActionResult> GetOrdersGrid()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetOrdersGridordersAutoGenerateColumns()
         {
             var repository = new OrdersRepository(_context);
@@ -60,7 +60,7 @@ public ActionResult GetOrdersGridordersAutoGenerateColumns()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrdersGridWithTotals()
         {
             var repository = new OrdersRepository(_context);
@@ -77,7 +77,7 @@ public async Task<ActionResult> GetOrdersGridWithTotals()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetOrdersGridWithCount()
         {
             var repository = new OrdersRepository(_context);
@@ -94,7 +94,7 @@ public ActionResult GetOrdersGridWithCount()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrdersGridSearchable()
         {
             var repository = new OrdersRepository(_context);
@@ -112,7 +112,7 @@ public async Task<ActionResult> GetOrdersGridSearchable()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrdersGridExtSorting()
         {
             var repository = new OrdersRepository(_context);
@@ -130,7 +130,7 @@ public async Task<ActionResult> GetOrdersGridExtSorting()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrdersGridGroupable()
         {
             var repository = new OrdersRepository(_context);
@@ -148,7 +148,7 @@ public async Task<ActionResult> GetOrdersGridGroupable()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetVirtualizedOrdersGrid()
         {
             var repository = new OrdersRepository(_context);
@@ -166,7 +166,7 @@ public async Task<ActionResult> GetVirtualizedOrdersGrid()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetMaxFreight(string clientName)
         {
             var repository = new OrdersRepository(_context);
@@ -179,7 +179,7 @@ public ActionResult GetMaxFreight(string clientName)
             return Ok(new Order() { Freight = server.ItemsToDisplay.Items.Max(r => r.Freight) });
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetMinFreight(string clientName)
         {
             var repository = new OrdersRepository(_context);
@@ -192,7 +192,7 @@ public ActionResult GetMinFreight(string clientName)
             return Ok(new Order() { Freight = server.ItemsToDisplay.Items.Min(r => r.Freight) });
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrdersGridWithSubgrids()
         {
             var repository = new OrdersRepository(_context);
@@ -209,7 +209,7 @@ public async Task<ActionResult> GetOrdersGridWithSubgrids()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> OrderColumnsListFilter()
         {
             var repository = new OrdersRepository(_context);
@@ -226,7 +226,7 @@ public async Task<ActionResult> OrderColumnsListFilter()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> OrderColumnsWithEdit()
         {
             var repository = new OrdersRepository(_context);
@@ -243,7 +243,7 @@ public async Task<ActionResult> OrderColumnsWithEdit()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> OrderColumnsWithCrud()
         {
             var repository = new OrdersRepository(_context);
@@ -260,7 +260,7 @@ public async Task<ActionResult> OrderColumnsWithCrud()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> OrderColumnsWithSubgridCrud()
         {
             var repository = new OrdersRepository(_context);
@@ -277,7 +277,7 @@ public async Task<ActionResult> OrderColumnsWithSubgridCrud()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetOrderColumnsWithErrors()
         {
             var random = new Random();
@@ -298,7 +298,7 @@ public ActionResult GetOrderColumnsWithErrors()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrdersGridAllFeatures()
         {
             var repository = new OrdersRepository(_context);
@@ -316,7 +316,7 @@ public async Task<ActionResult> GetOrdersGridAllFeatures()
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetCustomersNames()
         {
             // get all customer ids in the grid with the current filters
@@ -331,7 +331,7 @@ public ActionResult GetCustomersNames()
             return Ok(customers);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetAllCustomers()
         {
             var repository = new CustomersRepository(_context);
@@ -340,7 +340,7 @@ public ActionResult GetAllCustomers()
                     .ToList());
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetAllCustomers2()
         {
             var repository = new CustomersRepository(_context);
@@ -349,7 +349,7 @@ public ActionResult GetAllCustomers2()
                     .ToList());
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetAllContacts()
         {
             var repository = new CustomersRepository(_context);
@@ -358,7 +358,7 @@ public ActionResult GetAllContacts()
                     .ToList());
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetAllEmployees()
         {
             var repository = new EmployeeRepository(_context);
@@ -368,7 +368,7 @@ public ActionResult GetAllEmployees()
                     .ToList());
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetAllShippers()
         {
             var repository = new ShipperRepository(_context);
@@ -378,7 +378,7 @@ public ActionResult GetAllShippers()
                     .ToList());
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetAllProducts()
         {
             var repository = new ProductRepository(_context);
@@ -388,7 +388,7 @@ public ActionResult GetAllProducts()
                     .ToList());
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrderDetailsGrid(int OrderId)
         {
             var orderDetails = (new OrderDetailsRepository(_context)).GetForOrder(OrderId);
@@ -405,7 +405,7 @@ public async Task<ActionResult> GetOrderDetailsGrid(int OrderId)
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrderDetailsGridWithCrud(int OrderId)
         {
             var orderDetails = (new OrderDetailsRepository(_context)).GetForOrder(OrderId);
@@ -422,7 +422,7 @@ public async Task<ActionResult> GetOrderDetailsGridWithCrud(int OrderId)
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetOrderDetailsGridAllFeatures(int OrderId)
         {
             var orderDetails = (new OrderDetailsRepository(_context)).GetForOrder(OrderId);
@@ -439,7 +439,7 @@ public async Task<ActionResult> GetOrderDetailsGridAllFeatures(int OrderId)
             return Ok(items);
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetCustomersGrid()
         {
             var repository = new CustomersRepository(_context);
@@ -456,7 +456,7 @@ public async Task<ActionResult> GetCustomersGrid()
             return Ok(items);
         }
 
-        [HttpPost("[action]")]
+        [HttpPost]
         public async Task<ActionResult> Add1ToFreight(int id)
         {
             if (ModelState.IsValid)
@@ -488,7 +488,7 @@ public async Task<ActionResult> Add1ToFreight(int id)
             });
         }
 
-        [HttpPost("[action]")]
+        [HttpPost]
         public async Task<ActionResult> Subtract1ToFreight(int id)
         {
             if (ModelState.IsValid)
@@ -520,7 +520,7 @@ public async Task<ActionResult> Subtract1ToFreight(int id)
             });
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public async Task<ActionResult> GetEmployeesGrid()
         {
             var repository = new EmployeeRepository(_context);
@@ -537,7 +537,7 @@ public async Task<ActionResult> GetEmployeesGrid()
             return Ok(items);
         }
 
-        [HttpPost("[action]")]
+        [HttpPost]
         public async Task<ActionResult> SetEmployeePhoto([FromBody] Employee employee)
         {
             if (ModelState.IsValid)
@@ -564,7 +564,7 @@ public async Task<ActionResult> SetEmployeePhoto([FromBody] Employee employee)
             });
         }
 
-        [HttpGet("[action]")]
+        [HttpGet]
         public ActionResult GetTrucksGrid()
         {
             var repository = new EmployeeRepository(_context);

diff --git a/GridBlazorClientSide.Server/GridBlazorClientSide.Server.csproj b/GridBlazorClientSide.Server/GridBlazorClientSide.Server.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>
-    <Version>5.0.2</Version>
+    <Version>5.0.5</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/GridBlazorGrpc.Server/GridBlazorGrpc.Server.csproj b/GridBlazorGrpc.Server/GridBlazorGrpc.Server.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>
-		<Version>5.0.2</Version>
+		<Version>5.0.5</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/GridBlazorGrpc.Server/Services/GridServerService.cs b/GridBlazorGrpc.Server/Services/GridServerService.cs
@@ -303,10 +303,10 @@ public async ValueTask<IEnumerable<string>> GetCustomersNames(QueryDictionary<st
             var orderRepository = new OrdersRepository(_context);
             var server = new GridCoreServer<Order>(orderRepository.GetAll(), query, true, "ordersGrid", 
                 ColumnCollections.OrderColumns);
-            return ((GridBase<Order>)server.Grid).GridItems.Where(r => !string.IsNullOrWhiteSpace(r.CustomerID))
+            return await ((GridBase<Order>)server.Grid).GridItems.Where(r => !string.IsNullOrWhiteSpace(r.CustomerID))
                     .Select(r => r.Customer).Distinct()
                     .Select(r => r.CompanyName)
-                    .ToList();
+                    .ToListAsync();
         }
 
         public async ValueTask<IEnumerable<SelectItem>> GetAllCustomers()

diff --git a/GridBlazorSpring/App.razor b/GridBlazorSpring/App.razor
@@ -0,0 +1,10 @@
+<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p>Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
+</Router>