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

Display DeviceID when the device has no Name #287

Merged
merged 1 commit into from
Feb 21, 2022
Merged

Display DeviceID when the device has no Name #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 6 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 @@ -17,7 +17,7 @@
<MudExpansionPanel Text="Search panel">
<MudGrid>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="searchID" Placeholder="DeviceID"></MudTextField>
<MudTextField @bind-Value="searchID" Placeholder="DeviceID / DeviceName"></MudTextField>
</MudItem>
<MudItem xs="12" md="6">
@*<MudTextField @bind-Value="searchName" Placeholder="Name"></MudTextField>*@
Expand Down Expand Up @@ -102,7 +102,9 @@
<img height="25" src="@context.ImageUrl" />
</MudTd>
<MudTd DataLabel="Device" Style="word-break: break-all;">
<a href="@($"devices/{@context.DeviceID}{(@context.SupportLoRaFeatures ? "?isLora=true": "")}")">@context.DeviceName</a>
<a href="@($"devices/{@context.DeviceID}{(@context.SupportLoRaFeatures ? "?isLora=true": "")}")">
@(string.IsNullOrEmpty(context.DeviceName) ? context.DeviceID : context.DeviceName)
</a>
</MudTd>

<MudTd DataLabel="Status" Style="text-align: center">
Expand Down Expand Up @@ -154,7 +156,6 @@
private string searchID = "";
private string searchStatus = "";
private string searchState = "";
// private string searchName = "";

private int[] pageSizeOptions = new int[] { 2, 5, 10 };

Expand Down Expand Up @@ -193,7 +194,6 @@
searchID = "";
searchStatus = "";
searchState = "";
// searchName = "";
}

/// <summary>
Expand Down Expand Up @@ -224,12 +224,12 @@
private bool FilterFunc(DeviceListItem item)
{
bool flagID = checkFlag(item.DeviceID, searchID);
bool flagName = checkFlag(item.DeviceName, searchID);
bool flagStatus = checkFlag(item.IsEnabled.ToString(), searchStatus);
bool flagState = checkFlag(item.IsConnected.ToString(), searchState);
// bool flagLocation = checkFlag(item.Name, searchName);

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

return false;
Expand Down