Skip to content

Commit

Permalink
Merge pull request #46 from michelin/fix-null-values
Browse files Browse the repository at this point in the history 
Fix device search panel
  • Loading branch information
@Sben65
Sben65 authored Dec 8, 2021
2 parents 426cbb9 + ea878ab commit 2cc7cb4
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 61 deletions.
134 changes: 73 additions & 61 deletions src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceListPage.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,25 @@
</MudCardHeader>
<MudCardContent>
<MudGrid>
<MudItem xs="12">
<MudTextField @bind-Value="searchString" Placeholder="Search" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField>
<MudItem md="6" sm="12">
<MudItem xs="12" Class="custom-form" Style="margin-top:1em;margin-bottom:1em;">
<MudItem md="2" sm="12">
<MudText>DeviceID : </MudText>
</MudItem>
<MudItem md="10" sm="12">
<MudTextField @bind-Value="searchID" Placeholder="DeviceID" Class="mb-2"></MudTextField>
</MudItem>
</MudItem>
<MudItem xs="12" Class="custom-form" Style="margin-top:1em;margin-bottom:1em;">
<MudItem md="2" sm="12">
<MudText>Location : </MudText>
</MudItem>
<MudItem md="10" sm="12">
<MudTextField @bind-Value="searchLocation" Placeholder="Location" Margin="Margin.Dense"></MudTextField>
</MudItem>
</MudItem>
</MudItem>
<MudItem xs="6">
<MudItem md="6" sm="12">
<MudText>Status : </MudText>
<MudRadioGroup @bind-SelectedOption="@searchStatus" Style="display:flex;align-items:baseline">
<MudItem md="4" sm="12">
Expand All @@ -34,7 +49,7 @@
<MudRadio Option="@("")" Color="Color.Secondary">All</MudRadio>
</MudItem>
</MudRadioGroup>
<MudDivider />
<MudDivider Style="margin-top:1em;margin-bottom:1em;" />
<MudText>Connection state : </MudText>
<MudRadioGroup @bind-SelectedOption="@searchState" Style="display:flex;align-items:baseline">
<MudItem md="4" sm="12">
Expand All @@ -48,37 +63,12 @@
</MudItem>
</MudRadioGroup>
</MudItem>

<MudItem xs=6>
<MudItem xs="12" Class="custom-form">
<MudItem md="2" sm="12">
<MudText>Location : </MudText>
</MudItem>
<MudItem md="10" sm="12">
<MudTextField @bind-Value="searchLocation" Placeholder="Location" Margin="Margin.Dense"></MudTextField>
</MudItem>
</MudItem>
<MudItem xs="12" Class="custom-form">
<MudItem md="2" sm="12">
<MudText>AppEUI : </MudText>
</MudItem>
<MudItem md="10" sm="12" Class="custom-form">
<MudTextField @bind-Value="searchAppEUI" Placeholder="AppEUI" Margin="Margin.Dense"></MudTextField>
</MudItem>
</MudItem>
<MudItem xs="12" Class="custom-form">
<MudItem md="2" sm="12">
<MudText>AppKey : </MudText>
</MudItem>
<MudItem md="10" sm="12">
<MudTextField @bind-Value="searchAppKey" Placeholder="AppKey" Margin="Margin.Dense"></MudTextField>
</MudItem>
</MudItem>
</MudItem>
</MudGrid>

</MudCardContent>
<MudCardActions>
<MudSpacer></MudSpacer>
<MudButton Variant="Variant.Outlined" Color="Color.Success" Style="margin:0.5em;">Search</MudButton>
<MudButton Variant="Variant.Outlined" Color="Color.Primary" Style="margin:0.5em;" OnClick="Reset">Reset</MudButton>
</MudCardActions>
</MudCard>
Expand Down Expand Up @@ -118,7 +108,7 @@
<MudTh Style="text-align: center">Delete</MudTh>
</HeaderContent>
<RowTemplate>
<MudTd Style="text-align: center">
<MudTd Style="text-align: center">
<img height="25" src="@context.ImageUrl" />
</MudTd>
<MudTd DataLabel="Device" Style="word-break: break-all;">
Expand All @@ -134,9 +124,9 @@
{
<MudIcon Icon="@Icons.Filled.Error" Color="Color.Error" />
}
</MudTd>
<MudTd DataLabel="Connection" Style="text-align: center">
</MudTd>

<MudTd DataLabel="Connection" Style="text-align: center">
@if (context.IsConnected)
{
<MudIcon Icon="@Icons.Filled.Wifi" Color="Color.Success" />
Expand All @@ -145,20 +135,20 @@
{
<MudIcon Icon="@Icons.Filled.WifiOff" Color="Color.Error" />
}
</MudTd>
<MudTd DataLabel="LAT" Style="text-align: center">@context.LastActivityDate</MudTd>
<MudTd DataLabel="Details" Style="text-align: center">
<a href="devices/@context.DeviceID"><MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" /></a>
</MudTd>
<MudTd DataLabel="Delete" Style="text-align: center">
<MudIconButton Color="Color.Default" Icon="@Icons.Material.Filled.Delete" Size="Size.Medium" OnClick="@(e => DeleteDevice(context))"></MudIconButton>
</MudTd>
</RowTemplate>
<PagerContent>
<MudTablePager PageSizeOptions="@pageSizeOptions"></MudTablePager>
</PagerContent>
</MudTable>
</MudItem>
</MudTd>
<MudTd DataLabel="LAT" Style="text-align: center">@context.LastActivityDate</MudTd>
<MudTd DataLabel="Details" Style="text-align: center">
<a href="devices/@context.DeviceID"><MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" /></a>
</MudTd>
<MudTd DataLabel="Delete" Style="text-align: center">
<MudIconButton Color="Color.Default" Icon="@Icons.Material.Filled.Delete" Size="Size.Medium" OnClick="@(e => DeleteDevice(context))"></MudIconButton>
</MudTd>
</RowTemplate>
<PagerContent>
<MudTablePager PageSizeOptions="@pageSizeOptions"></MudTablePager>
</PagerContent>
</MudTable>
</MudItem>
}
<MudItem xs="12">
<a href="devices/new"><MudFab Color="Color.Secondary" Icon="@Icons.Material.Filled.Add" Label="Add a new device" /></a>
Expand All @@ -168,7 +158,7 @@

@code {
private DeviceListItem[] result;
private string searchString = "";
private string searchID = "";
private string searchStatus = "";
private string searchState = "";
private string searchLocation = "";
Expand Down Expand Up @@ -205,7 +195,7 @@
/// <returns></returns>
private void Reset()
{
searchString = "";
searchID = "";
searchStatus = "";
searchState = "";
searchLocation = "";
Expand Down Expand Up @@ -234,23 +224,45 @@
}

/// <summary>
/// Filter the list of devices, based on fields set in the search panel
/// Filters the list of devices, based on fields set in the search panel
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
/// <param name="item">Device represented in the current row</param>
/// <returns>Boolean</returns>
private bool FilterFunc(DeviceListItem item)
{
bool flagName = string.IsNullOrWhiteSpace(searchString) || item.DeviceID.Contains(searchString, StringComparison.OrdinalIgnoreCase);
bool flagStatus = string.IsNullOrWhiteSpace(searchStatus) || item.IsEnabled.ToString().Contains(searchStatus, StringComparison.OrdinalIgnoreCase);
bool flagState = string.IsNullOrWhiteSpace(searchState) || item.IsConnected.ToString().Contains(searchState, StringComparison.OrdinalIgnoreCase);
bool flagLocation = string.IsNullOrWhiteSpace(searchLocation) || item.LocationCode.Contains(searchLocation, StringComparison.OrdinalIgnoreCase);
bool flagAppEUI = string.IsNullOrWhiteSpace(searchAppEUI) || item.AppEUI.Contains(searchAppEUI, StringComparison.OrdinalIgnoreCase);
bool flagAppKey = string.IsNullOrWhiteSpace(searchAppKey) || item.AppKey.Contains(searchAppKey, StringComparison.OrdinalIgnoreCase);
bool flagID = checkFlag(item.DeviceID, searchID);
bool flagStatus = checkFlag(item.IsEnabled.ToString(), searchStatus);
bool flagState = checkFlag(item.IsConnected.ToString(), searchState);
bool flagLocation = checkFlag(item.LocationCode, searchLocation);
bool flagAppEUI = checkFlag(item.AppEUI, searchAppEUI);
bool flagAppKey = checkFlag(item.AppKey, searchAppKey);

// Current row is shown only if all the flags are true
if (flagName && flagStatus && flagState && flagLocation && flagAppEUI && flagAppKey)
if (flagID && flagStatus && flagState && flagLocation && flagAppEUI && flagAppKey)
return true;

return false;
}

/// <summary>
/// Checks if the specific device value matches the search criteria
/// </summary>
/// <param name="deviceValue">Device attribute being compared</param>
/// <param name="searchString">Field value in the search panel</param>
/// <returns>True if it matches of field is empty</returns>
private bool checkFlag(string deviceValue, string searchString)
{
bool flag;
try
{
flag = string.IsNullOrWhiteSpace(searchString) || deviceValue.Contains(searchString, StringComparison.OrdinalIgnoreCase);
}

//May happen if the device attribute is set to null
catch (NullReferenceException)
{
flag = false;
}
return flag;
}
}
1 change: 1 addition & 0 deletions src/AzureIoTHub.Portal/Server/Mappers/DeviceTwinMapper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public DeviceListItem CreateDeviceListItem(Twin twin)
ImageUrl = this.deviceModelImageManager.ComputeImageUri(Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.ModelId))),
IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
IsEnabled = twin.Status == DeviceStatus.Enabled,
LocationCode = Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.LocationCode)),
LastActivityDate = twin.LastActivityTime.GetValueOrDefault(DateTime.MinValue)
};
}
Expand Down

0 comments on commit 2cc7cb4

Please sign in to comment.