Fix #1902 - Fix query search parameters in lorawan concentrator list …

…page (#1918)
CGI-FR · Mar 18, 2023 · 4dbeb05 · 4dbeb05
1 parent ee40e2f
commit 4dbeb05
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/src/AzureIoTHub.Portal.Client/Components/Concentrators/ConcentratorSearch.razor b/src/AzureIoTHub.Portal.Client/Components/Concentrators/ConcentratorSearch.razor
@@ -58,9 +58,9 @@
     {
         var searchInfo = new ConcentratorSearchInfo
         {
-            SearchKeyword = searchKeyword,
-            SearchStatus = searchStatus,
-            SearchState = searchState
+            SearchText = searchKeyword,
+            Status = searchStatus,
+            State = searchState
         };
         await OnSearch.InvokeAsync(searchInfo);
     }

diff --git a/src/AzureIoTHub.Portal.Client/Models/ConcentratorSearchInfo.cs b/src/AzureIoTHub.Portal.Client/Models/ConcentratorSearchInfo.cs
@@ -5,8 +5,8 @@ namespace AzureIoTHub.Portal.Client.Models
 {
     public class ConcentratorSearchInfo
     {
-        public string? SearchKeyword { get; set; }
-        public string? SearchStatus { get; set; }
-        public string? SearchState { get; set; }
+        public string? SearchText { get; set; }
+        public string? Status { get; set; }
+        public string? State { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor b/src/AzureIoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
@@ -124,7 +124,7 @@
                     break;
             }
 
-            var uri = $"api/lorawan/concentrators?pageNumber={state.Page}&pageSize={state.PageSize}&orderBy={orderBy}&keyword={this.concentratorSearchInfo.SearchKeyword}&status={this.concentratorSearchInfo.SearchStatus}&state={this.concentratorSearchInfo.SearchState}";
+            var uri = $"api/lorawan/concentrators?pageNumber={state.Page}&pageSize={state.PageSize}&orderBy={orderBy}&searchText={this.concentratorSearchInfo.SearchText}&status={this.concentratorSearchInfo.Status}&state={this.concentratorSearchInfo.State}";
 
             var result = await LoRaWanConcentratorsClientService.GetConcentrators(uri);
 
@@ -176,7 +176,7 @@
             this.concentratorSearchInfo = concentratorSearchInfo;
         }
 
-        table.ReloadServerData();
+        await table.ReloadServerData();
     }
 
     private void Refresh()

diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Concentrators/ConcentratorSearchTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Components/Concentrators/ConcentratorSearchTests.cs
@@ -29,9 +29,9 @@ public void SearchConcentrators_ClickOnSearch_SearchIsFired()
             var receivedEvents = new List<ConcentratorSearchInfo>();
             var expectedConcentratorSearchInfo = new ConcentratorSearchInfo
             {
-                SearchKeyword = searchKeyword,
-                SearchState = string.Empty,
-                SearchStatus = string.Empty
+                SearchText = searchKeyword,
+                State = string.Empty,
+                Status = string.Empty
             };
 
             var cut = RenderComponent<ConcentratorSearch>(parameters => parameters.Add(p => p.OnSearch, (searchInfo) =>
@@ -60,9 +60,9 @@ public void SearchConcentrators_ClickOnReset_SearchKeyworkIsSetToEmptyAndSearchI
             var receivedEvents = new List<ConcentratorSearchInfo>();
             var expectedConcentratorSearchInfo = new ConcentratorSearchInfo
             {
-                SearchKeyword = string.Empty,
-                SearchState = string.Empty,
-                SearchStatus = string.Empty
+                SearchText = string.Empty,
+                State = string.Empty,
+                Status = string.Empty
             };
 
             var cut = RenderComponent<ConcentratorSearch>(parameters => parameters.Add(p => p.OnSearch, (searchInfo) =>

diff --git a/...reIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/ConcentratorListPageTests.cs b/...reIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/ConcentratorListPageTests.cs
@@ -47,7 +47,7 @@ public override void Setup()
         public void ConcentratorListPageShouldLoadAndShowConcentrators()
         {
             // Arrange
-            var expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&keyword=&status=&state=";
+            var expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&searchText=&status=&state=";
 
             _ = this.mockLoRaWanConcentratorClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
@@ -75,7 +75,7 @@ public void ConcentratorListPageShouldLoadAndShowConcentrators()
         public void ConcentratorListPageShouldProcessProblemDetailsExceptionWhenIssueOccursOnLoadingConcentrators()
         {
             // Arrange
-            var expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&keyword=&status=&state=";
+            var expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&searchText=&status=&state=";
 
             _ = this.mockLoRaWanConcentratorClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
@@ -97,7 +97,7 @@ public void ClickToItemShouldRedirectToConcentratorDetailsPage()
         {
             // Arrange
             var deviceId = Guid.NewGuid().ToString();
-            var expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&keyword=&status=&state=";
+            var expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&searchText=&status=&state=";
 
             _ = this.mockLoRaWanConcentratorClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
@@ -127,7 +127,7 @@ public void ClickToItemShouldRedirectToConcentratorDetailsPage()
         public void ClickOnAddNewDeviceShouldNavigateToNewDevicePage()
         {
             // Arrange
-            const string expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&keyword=&status=&state=";
+            const string expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&searchText=&status=&state=";
 
             _ = this.mockLoRaWanConcentratorClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
@@ -156,7 +156,7 @@ public void ClickOnAddNewDeviceShouldNavigateToNewDevicePage()
         public void ClickOnRefreshShouldReloadConcentrators()
         {
             // Arrange
-            var expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&keyword=&status=&state=";
+            var expectedUri = "api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&searchText=&status=&state=";
 
             _ = this.mockLoRaWanConcentratorClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
@@ -181,11 +181,11 @@ public void ClickOnSearchShouldSearchConcentrators()
             var searchKeyword = Fixture.Create<string>();
             var concentratorSearchInfo = new ConcentratorSearchInfo
             {
-                SearchKeyword = searchKeyword,
-                SearchState = string.Empty,
-                SearchStatus = string.Empty
+                SearchText = searchKeyword,
+                State = string.Empty,
+                Status = string.Empty
             };
-            var expectedUri = $"api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&keyword=&status=&state=";
+            var expectedUri = $"api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&searchText=&status=&state=";
 
             _ = this.mockLoRaWanConcentratorClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
@@ -199,7 +199,7 @@ public void ClickOnSearchShouldSearchConcentrators()
                     }
                 });
 
-            var expectedUriWithFilter = $"api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&keyword={concentratorSearchInfo.SearchKeyword}&status={concentratorSearchInfo.SearchStatus}&state={concentratorSearchInfo.SearchState}";
+            var expectedUriWithFilter = $"api/lorawan/concentrators?pageNumber=0&pageSize=10&orderBy=&searchText={concentratorSearchInfo.SearchText}&status={concentratorSearchInfo.Status}&state={concentratorSearchInfo.State}";
 
             _ = this.mockLoRaWanConcentratorClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUriWithFilter.Equals(s, StringComparison.Ordinal))))