Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/975 fix refresh on pagination #1005

Merged
merged 4 commits into from
Aug 1, 2022
Merged

Bugfix/975 fix refresh on pagination #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
745012e
Fix pagination refresh on devices #975
hocinehacherouf Aug 1, 2022
8543cf4
Fix pagination refresh on edge devices #975
hocinehacherouf Aug 1, 2022
8eaf4f9
Fix pagination refresh on concentrators #975
hocinehacherouf Aug 1, 2022
3090879
Add unit tests on table refresh on edge and concentrators #975
hocinehacherouf Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Devices/DevicesListPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public void WhenAddNewDeviceClickShouldNavigateToNewDevicePage()
}

[Test]
public async Task WhenRefreshClickShouldReloadFromApi()
public void ClickOnRefreshShouldReloadDevices()
{
// Arrange
_ = this.mockDeviceClientService.Setup(service =>
Expand All @@ -152,16 +152,10 @@ public async Task WhenRefreshClickShouldReloadFromApi()
_ = this.mockDeviceTagSettingsClientService.Setup(service => service.GetDeviceTags())
.ReturnsAsync(new List<DeviceTag>());


// Act
var cut = RenderComponent<DeviceListPage>();
cut.WaitForAssertion(() => cut.Find("#tableRefreshButton"));

for (var i = 0; i < 3; i++)
{
cut.Find("#tableRefreshButton").Click();
await Task.Delay(100);
}
// Act
cut.WaitForElement("#tableRefreshButton").Click();

// Assert
cut.WaitForAssertion(() => MockRepository.VerifyAll());
Expand Down
20 changes: 20 additions & 0 deletions src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/EdgeDevices/EdgeDeviceListPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,25 @@ public void ClickToItemShouldRedirectToEdgeDetailsPage()
cut.WaitForAssertion(() => Services.GetService<FakeNavigationManager>()?.Uri.Should().EndWith($"/edge/devices/{deviceId}"));
cut.WaitForAssertion(() => MockRepository.VerifyAll());
}

[Test]
public void ClickOnRefreshShouldReloadEdgeDevices()
{
// Arrange
var expectedUrl = "api/edge/devices?pageSize=10&searchText=&searchStatus=&searchType=";
_ = this.mockEdgeDeviceClientService.Setup(service => service.GetDevices(expectedUrl))
.ReturnsAsync(new PaginationResult<IoTEdgeListItem>
{
Items = Array.Empty<IoTEdgeListItem>()
});

var cut = RenderComponent<EdgeDeviceListPage>();

// Act
cut.WaitForElement("#tableRefreshButton").Click();

// Assert
cut.WaitForAssertion(() => MockRepository.VerifyAll());
}
}
}
22 changes: 22 additions & 0 deletions ...reIoTHub.Portal.Server.Tests.Unit/Pages/LoRaWan/Concentrator/ConcentratorListPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,27 @@ public void ClickOnAddNewDeviceShouldNavigateToNewDevicePage()
cut.WaitForAssertion(() => MockRepository.VerifyAll());
cut.WaitForAssertion(() => Services.GetService<FakeNavigationManager>()?.Uri.Should().EndWith("/lorawan/concentrators/new"));
}

[Test]
public void ClickOnRefreshShouldReloadConcentrators()
{
// Arrange
var expectedUri = "api/lorawan/concentrators?pageSize=10";

_ = this.mockLoRaWanConcentratorsClientService.Setup(service =>
service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
.ReturnsAsync(new PaginationResult<Concentrator>
{
Items = Array.Empty<Concentrator>()
});

var cut = RenderComponent<ConcentratorListPage>();

// Act
cut.WaitForElement("#tableRefreshButton").Click();

// Assert
cut.WaitForAssertion(() => MockRepository.VerifyAll());
}
}
}
19 changes: 12 additions & 7 deletions src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceListPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<MudText Typo="Typo.h6">Devices</MudText>
<MudSpacer />
<MudTooltip Text="Refresh list">
<MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick=@Search Size="Size.Medium" id="tableRefreshButton" Class="ma-2"></MudIconButton>
<MudIconButton Icon="@Icons.Material.Filled.Refresh" OnClick="@Refresh" Size="Size.Medium" id="tableRefreshButton" Class="ma-2"></MudIconButton>
</MudTooltip>
<MudTooltip Text="Add device">
<MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" id="addDeviceButton" />
Expand Down Expand Up @@ -173,7 +173,7 @@

private bool IsLoading { get; set; } = true;

private Dictionary<int, string> Pages { get; set; } = new();
private readonly Dictionary<int, string> pages = new();

private IEnumerable<DeviceTag> TagList { get; set; } = new List<DeviceTag>();

Expand Down Expand Up @@ -204,9 +204,9 @@
{
PaginationResult<DeviceListItem> result;

if (Pages.Keys.Contains(state.Page))
if (pages.Keys.Contains(state.Page))
{
result = await DeviceClientService.GetDevices(Pages[state.Page]);
result = await DeviceClientService.GetDevices(pages[state.Page]);
}
else
{
Expand All @@ -217,12 +217,12 @@
uri += $"&tag.{searchTag.Key}={searchTag.Value}";
}

_ = Pages.TryAdd(state.Page, uri);
_ = pages.TryAdd(state.Page, uri);

result = await DeviceClientService.GetDevices(uri);
}

_ = Pages.TryAdd(state.Page + 1, result.NextPage);
_ = pages.TryAdd(state.Page + 1, result.NextPage);

return new TableData<DeviceListItem>
{
Expand Down Expand Up @@ -263,11 +263,16 @@

private void Search()
{
Pages.Clear();
pages.Clear();

table.ReloadServerData();
}

private void Refresh()
{
table.ReloadServerData();
}

/// <summary>
/// Prompts a pop-up windows to confirm the device's deletion.
/// </summary>
Expand Down
19 changes: 12 additions & 7 deletions src/AzureIoTHub.Portal/Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<MudText Typo="Typo.h6">Edge Devices</MudText>
<MudSpacer />
<MudTooltip Text="Refresh list">
<MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="Search" Class="ma-2"></MudIconButton>
<MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="@Refresh" id="tableRefreshButton" Class="ma-2"></MudIconButton>
</MudTooltip>
<MudTooltip Text="Add device">
<MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="ShowAddDialog" />
Expand Down Expand Up @@ -126,37 +126,42 @@
private SearchModel searchModel = new();

readonly DialogOptions maxWidth = new() { MaxWidth = MaxWidth.Medium, FullWidth = true };
private Dictionary<int, string> Pages { get; set; } = new();
private readonly Dictionary<int, string> pages = new();

private bool IsLoading { get; set; } = true;

private void Search()
{
Pages.Clear();
pages.Clear();

table.ReloadServerData();
}

private void Refresh()
{
table.ReloadServerData();
}

private async Task<TableData<IoTEdgeListItem>> LoadItems(TableState state)
{
try
{
PaginationResult<IoTEdgeListItem> result;

if (Pages.Keys.Contains(state.Page))
if (pages.Keys.Contains(state.Page))
{
result = await EdgeDeviceClientService.GetDevices(Pages[state.Page]);
result = await EdgeDeviceClientService.GetDevices(pages[state.Page]);
}
else
{
var uri = $"api/edge/devices?pageSize={state.PageSize}&searchText={HttpUtility.UrlEncode(searchModel.DeviceId)}&searchStatus={searchModel.Status}&searchType={searchModel.Type}";

_ = Pages.TryAdd(state.Page, uri);
_ = pages.TryAdd(state.Page, uri);

result = await EdgeDeviceClientService.GetDevices(uri);
}

_ = Pages.TryAdd(state.Page + 1, result.NextPage);
_ = pages.TryAdd(state.Page + 1, result.NextPage);

return new TableData<IoTEdgeListItem>
{
Expand Down
19 changes: 12 additions & 7 deletions src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<MudText Typo="Typo.h6">LoRaWAN Concentrators</MudText>
<MudSpacer />
<MudTooltip Text="Refresh list">
<MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="Search" Class="ma-2"></MudIconButton>
<MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="@Refresh" id="tableRefreshButton" Class="ma-2"></MudIconButton>
</MudTooltip>
<MudTooltip Text="Add LoRaWAN concentrator">
<MudFab id="add-concentrator" Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Size="Size.Medium" OnClick="AddDevice" />
Expand Down Expand Up @@ -99,7 +99,7 @@

private MudTable<Concentrator> table;

private Dictionary<int, string> Pages { get; } = new();
private readonly Dictionary<int, string> pages = new();

private bool IsLoading { get; set; } = true;

Expand All @@ -109,20 +109,20 @@
{
PaginationResult<Concentrator> result;

if (Pages.Keys.Contains(state.Page))
if (pages.Keys.Contains(state.Page))
{
result = await LoRaWanConcentratorsClientService.GetConcentrators(Pages[state.Page]);
result = await LoRaWanConcentratorsClientService.GetConcentrators(pages[state.Page]);
}
else
{
var uri = $"api/lorawan/concentrators?pageSize={state.PageSize}";

_ = Pages.TryAdd(state.Page, uri);
_ = pages.TryAdd(state.Page, uri);

result = await LoRaWanConcentratorsClientService.GetConcentrators(uri);
}

_ = Pages.TryAdd(state.Page + 1, result.NextPage);
_ = pages.TryAdd(state.Page + 1, result.NextPage);

IsLoading = false;

Expand Down Expand Up @@ -161,11 +161,16 @@

private void Search()
{
Pages.Clear();
pages.Clear();

table.ReloadServerData();
}

private void Refresh()
{
table.ReloadServerData();
}

private void GoToDetails(Concentrator item)
{
NavigationManager.NavigateTo($"/lorawan/concentrators/{item.DeviceId}");
Expand Down