CGI-FR#2958 Remove 'Connection State' and 'Last status update' columns

judramos · Nov 29, 2024 · c30e0fa · c30e0fa
1 parent f0a2365
commit c30e0fa
Show file tree

Hide file tree

Showing 25 changed files with 2,337 additions and 70 deletions.
diff --git a/src/IoTHub.Portal.Client/Components/Concentrators/ConcentratorSearch.razor b/src/IoTHub.Portal.Client/Components/Concentrators/ConcentratorSearch.razor
@@ -20,20 +20,6 @@
                     </MudRadioGroup>
 
                 </MudItem>
-                <MudItem xs="12" md="6">
-                    <MudText>Connection state</MudText>
-                    <MudRadioGroup @bind-SelectedOption="@searchState" Style="display:flex;align-items:baseline">
-                        <MudItem md="4" sm="12">
-                            <MudRadio Option=@("true") Color="Color.Primary" id="searchStateConnected">Connected</MudRadio>
-                        </MudItem>
-                        <MudItem md="4" sm="12">
-                            <MudRadio Option=@("false") Color="Color.Primary" id="searchStateDisconnected">Disconnected</MudRadio>
-                        </MudItem>
-                        <MudItem md="4" sm="12">
-                            <MudRadio Option=@("") Color="Color.Secondary" id="searchStateAll">All</MudRadio>
-                        </MudItem>
-                    </MudRadioGroup>
-                </MudItem>
             </MudGrid>
 
             <MudItem xs="12">

diff --git a/src/IoTHub.Portal.Client/Dialogs/Layer/LinkDeviceLayerDialog.razor b/src/IoTHub.Portal.Client/Dialogs/Layer/LinkDeviceLayerDialog.razor
@@ -228,6 +228,7 @@
         deviceDetails.IsConnected = device.IsConnected;
         deviceDetails.IsEnabled = device.IsEnabled;
         deviceDetails.StatusUpdatedTime = device.StatusUpdatedTime;
+        deviceDetails.LastActivityTime = device.LastActivityTime;
         deviceDetails.Labels = device.Labels.ToList();
         deviceDetails.LayerId = device.LayerId;
 

diff --git a/src/IoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor b/src/IoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
@@ -80,20 +80,6 @@
                             </MudRadioGroup>
 
                         </MudItem>
-                        <MudItem xs="12" md="6">
-                            <MudText>Connection state</MudText>
-                            <MudRadioGroup @bind-SelectedOption="@searchState" Style="display:flex;align-items:baseline">
-                                <MudItem md="4" sm="12">
-                                    <MudRadio Option=@("true") Color="Color.Primary" id="searchStateConnected">Connected</MudRadio>
-                                </MudItem>
-                                <MudItem md="4" sm="12">
-                                    <MudRadio Option=@("false") Color="Color.Primary" id="searchStateDisconnected">Disconnected</MudRadio>
-                                </MudItem>
-                                <MudItem md="4" sm="12">
-                                    <MudRadio Option=@("") Color="Color.Secondary" id="searchStateAll">All</MudRadio>
-                                </MudItem>
-                            </MudRadioGroup>
-                        </MudItem>
                     </MudGrid>
 
                     <MudItem xs="12">
@@ -161,8 +147,7 @@
                 <MudTh></MudTh>
                 <MudTh><MudTableSortLabel id="sortDeviceId" SortLabel="Id" T="DeviceListItem">Device</MudTableSortLabel></MudTh>
                 <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="IsEnabled" T="DeviceListItem">Allowed</MudTableSortLabel></MudTh>
-                <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="IsConnected" T="DeviceListItem">Connection state</MudTableSortLabel></MudTh>
-                <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="StatusUpdatedTime" T="DeviceListItem">Last status update</MudTableSortLabel></MudTh>
+                <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="LastActivityTime" T="DeviceListItem">Last activity time</MudTableSortLabel></MudTh>
                 @if (Portal.IsLoRaSupported)
                 {
                     <MudTh Style="text-align: center">Telemetry</MudTh>
@@ -199,21 +184,7 @@
                     }
                 </MudTd>
 
-                <MudTd DataLabel="Connection" Style="text-align: center">
-                    @if (context.IsConnected)
-                    {
-                        <MudTooltip Text="Device is connected">
-                            <MudIcon Icon="@Icons.Material.Filled.Wifi" Color="Color.Success" />
-                        </MudTooltip>
-                    }
-                    else
-                    {
-                        <MudTooltip Text="Device is not connected">
-                            <MudIcon Icon="@Icons.Material.Filled.WifiOff" Color="Color.Error" />
-                        </MudTooltip>
-                    }
-                </MudTd>
-                <MudTd DataLabel="LSU" Style="text-align: center">@context.StatusUpdatedTime</MudTd>
+                <MudTd DataLabel="LSU" Style="text-align: center">@context.LastActivityTime</MudTd>
 
                 @if (Portal.IsLoRaSupported)
                 {

diff --git a/src/IoTHub.Portal.Client/Pages/Layer/LayerListPage.razor b/src/IoTHub.Portal.Client/Pages/Layer/LayerListPage.razor
@@ -150,6 +150,7 @@
         deviceDetails.IsConnected = device.IsConnected;
         deviceDetails.IsEnabled = device.IsEnabled;
         deviceDetails.StatusUpdatedTime = device.StatusUpdatedTime;
+        deviceDetails.LastActivityTime = device.LastActivityTime;
         deviceDetails.Labels = device.Labels.ToList();
         deviceDetails.LayerId = device.LayerId;
 

diff --git a/src/IoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor b/src/IoTHub.Portal.Client/Pages/LoRaWAN/Concentrator/ConcentratorListPage.razor
@@ -12,8 +12,7 @@
     <MudItem xs="12">
         <MudTable T="ConcentratorDto" id="concentrators-listing" ServerData=@LoadItems Dense=true Hover=true Bordered=true Striped=true @ref="table" Loading="@IsLoading" OnRowClick="@((e) => GoToDetails(e.Item))" RowStyle="cursor: pointer;">
             <ColGroup>
-                <col style="width: 60%;" />
-                <col style="width: 10%;" />
+                <col style="width: 70%;" />
                 <col style="width: 10%;" />
                 <col style="width: 10%;" />
                 <col style="width: 10%;" />
@@ -31,7 +30,6 @@
             <HeaderContent>
                 <MudTh><MudTableSortLabel SortLabel="Name" T="ConcentratorDto">Device</MudTableSortLabel></MudTh>
                 <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="IsEnabled" T="ConcentratorDto">Allowed</MudTableSortLabel></MudTh>
-                <MudTh Style="text-align: center"><MudTableSortLabel SortLabel="IsConnected" T="ConcentratorDto">Connection state</MudTableSortLabel></MudTh>
                 <MudTh Style="text-align: center">See details</MudTh>
                 <MudTh Style="text-align: center">Delete</MudTh>
             </HeaderContent>
@@ -54,20 +52,6 @@
                     }
                 </MudTd>
 
-                <MudTd DataLabel="Connection" Style="text-align: center">
-                    @if (context.IsConnected)
-                    {
-                        <MudTooltip Text="Concentrator is connected">
-                            <MudIcon Icon="@Icons.Material.Filled.Wifi" Color="Color.Success" />
-                        </MudTooltip>
-                    }
-                    else
-                    {
-                        <MudTooltip Text="Concentrator is not connected">
-                            <MudIcon Icon="@Icons.Material.Filled.WifiOff" Color="Color.Error" />
-                        </MudTooltip>
-                    }
-                </MudTd>
                 <MudTd DataLabel="Details" Style="text-align: center">
                     <MudTooltip Text="See concentrator details">
                         <MudIconButton Icon="@Icons.Material.Filled.Visibility" Color="Color.Default" OnClick="@(() => GoToDetails(context))" />

diff --git a/src/IoTHub.Portal.Domain/Entities/Device.cs b/src/IoTHub.Portal.Domain/Entities/Device.cs
@@ -30,6 +30,11 @@ public class Device : EntityBase
         /// </summary>
         public DateTime StatusUpdatedTime { get; set; }
 
+        /// <summary>
+        /// Gets or sets the last activity time.
+        /// </summary>
+        public DateTime LastActivityTime { get; set; }
+
         /// <summary>
         /// The current version of the device stored n he database
         /// </summary>

diff --git a/src/IoTHub.Portal.Domain/Entities/IDevice.cs b/src/IoTHub.Portal.Domain/Entities/IDevice.cs
@@ -35,6 +35,11 @@ public interface IDevice
         /// </summary>
         public DateTime StatusUpdatedTime { get; set; }
 
+        /// <summary>
+        /// Gets or sets the last activity time.
+        /// </summary>
+        public DateTime LastActivityTime { get; set; }
+
         /// <summary>
         /// The device labels.
         /// </summary>

diff --git a/src/IoTHub.Portal.Infrastructure/Mappers/DeviceTwinMapper.cs b/src/IoTHub.Portal.Infrastructure/Mappers/DeviceTwinMapper.cs
@@ -36,6 +36,7 @@ public DeviceDetails CreateDeviceDetails(Twin twin, IEnumerable<string> tags)
                 IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 StatusUpdatedTime = twin.StatusUpdatedTime ?? DateTime.MinValue,
+                LastActivityTime = twin.LastActivityTime ?? DateTime.MinValue,
                 LayerId = DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.LayerId))
             };
 
@@ -57,6 +58,7 @@ public DeviceListItem CreateDeviceListItem(Twin twin)
                 IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 StatusUpdatedTime = twin.StatusUpdatedTime ?? DateTime.MinValue,
+                LastActivityTime = twin.LastActivityTime ?? DateTime.MinValue,
                 DeviceName = DeviceHelper.RetrieveTagValue(twin, nameof(DeviceListItem.DeviceName)),
                 Image = this.deviceModelImageManager.GetDeviceModelImageAsync(DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.ModelId))!).Result,
                 SupportLoRaFeatures = bool.Parse(DeviceHelper.RetrieveTagValue(twin, nameof(DeviceListItem.SupportLoRaFeatures)) ?? "false"),

diff --git a/src/IoTHub.Portal.Infrastructure/Mappers/LoRaDeviceMapper.cs b/src/IoTHub.Portal.Infrastructure/Mappers/LoRaDeviceMapper.cs
@@ -35,6 +35,7 @@ public LoRaDeviceDetails CreateDeviceDetails(Twin twin, IEnumerable<string> tags
                 IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 StatusUpdatedTime = twin.StatusUpdatedTime ?? DateTime.MinValue,
+                LastActivityTime = twin.LastActivityTime ?? DateTime.MinValue,
                 LayerId = DeviceHelper.RetrieveTagValue(twin, nameof(LoRaDeviceDetails.LayerId)),
                 GatewayID = DeviceHelper.RetrieveDesiredPropertyValue(twin, nameof(LoRaDeviceDetails.GatewayID)),
                 SensorDecoder =
@@ -150,6 +151,7 @@ public DeviceListItem CreateDeviceListItem(Twin twin)
                 IsEnabled = twin.Status == DeviceStatus.Enabled,
                 LayerId = DeviceHelper.RetrieveTagValue(twin, nameof(LoRaDeviceDetails.LayerId)),
                 StatusUpdatedTime = twin.StatusUpdatedTime ?? DateTime.MinValue,
+                LastActivityTime = twin.LastActivityTime ?? DateTime.MinValue,
                 SupportLoRaFeatures =
                     bool.Parse(DeviceHelper.RetrieveTagValue(twin, nameof(DeviceListItem.SupportLoRaFeatures)) ??
                                "false")

diff --git a/src/IoTHub.Portal.Infrastructure/Services/DeviceServiceBase.cs b/src/IoTHub.Portal.Infrastructure/Services/DeviceServiceBase.cs
@@ -104,6 +104,7 @@ public async Task<PaginatedResult<DeviceListItem>> GetDevices(string searchText
                     IsEnabled = device.IsEnabled,
                     IsConnected = device.IsConnected,
                     StatusUpdatedTime = device.StatusUpdatedTime,
+                    LastActivityTime = device.LastActivityTime,
                     DeviceModelId = device.DeviceModelId,
                     SupportLoRaFeatures = device is LorawanDevice,
                     HasLoRaTelemetry = device is LorawanDevice && ((LorawanDevice) device).Telemetry.Any(),