Feature: Update devices pagination to distinguish devices that have t…

…elemetry #1641 (#1658) * Update devices listing to distinguish devices that have telemetry #1641 * Fix unit test ShowDeviceTelemetry_Clicked_LoRaDeviceTelemetryDialogIsShown
CGI-FR · Dec 9, 2022 · a7b271f · a7b271f
1 parent 343de2d
commit a7b271f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor b/src/AzureIoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
@@ -225,7 +225,7 @@
                 @if (Portal.IsLoRaSupported)
                 {
                     <MudTd DataLabel="Telemetry" Style="text-align: center">
-                        @if (context.SupportLoRaFeatures)
+                        @if (context.HasLoRaTelemetry)
                         {
                             <MudTooltip Text="See device telemetries">
                                 <MudIconButton id="@($"show-device-telemetry-{@context.DeviceID}")" Icon="@Icons.Filled.ShowChart" Color="Color.Default" OnClick="@(() => ShowDeviceTelemetry(context))" />

diff --git a/src/AzureIoTHub.Portal.Server/Services/DeviceServiceBase.cs b/src/AzureIoTHub.Portal.Server/Services/DeviceServiceBase.cs
@@ -121,6 +121,7 @@ public async Task<PaginatedResult<DeviceListItem>> GetDevices(string searchText
                     StatusUpdatedTime = device.StatusUpdatedTime,
                     DeviceModelId = device.DeviceModelId,
                     SupportLoRaFeatures = device is LorawanDevice,
+                    HasLoRaTelemetry = device is LorawanDevice && ((LorawanDevice) device).Telemetry.Any(),
                     Labels = device.Labels
                         .Union(device.DeviceModel.Labels)
                         .Select(x => new LabelDto

diff --git a/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs b/src/AzureIoTHub.Portal.Shared/Models/v1.0/DeviceListItem.cs
@@ -47,6 +47,11 @@ public class DeviceListItem
         /// </summary>
         public bool SupportLoRaFeatures { get; set; }
 
+        /// <summary>
+        /// A value indicating whether the device has telemetry.
+        /// </summary>
+        public bool HasLoRaTelemetry { get; set; }
+
         /// <summary>
         /// The device last status updated time.
         /// </summary>

diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs
@@ -391,7 +391,7 @@ public void ShowDeviceTelemetry_Clicked_LoRaDeviceTelemetryDialogIsShown()
                     service.GetDevices($"{this.apiBaseUrl}?pageNumber=0&pageSize=10&searchText=&searchStatus=&searchState=&orderBy=&modelId="))
                 .ReturnsAsync(new PaginationResult<DeviceListItem>
                 {
-                    Items = new[] { new DeviceListItem { DeviceID = deviceId, SupportLoRaFeatures = true } }
+                    Items = new[] { new DeviceListItem { DeviceID = deviceId, SupportLoRaFeatures = true, HasLoRaTelemetry = true } }
                 });
 
             _ = this.mockDeviceClientService.Setup(service => service.GetAvailableLabels())