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

Small fixes on gateway detail page #215

Merged
merged 3 commits into from
Feb 8, 2022
Merged

Small fixes on gateway detail page #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ef3207
Fix layout on gateway detail page
audserraCGI Feb 7, 2022
6c5d431
Update Connection string dialog
audserraCGI Feb 7, 2022
0d75b46
Smaller font on logs dialog
audserraCGI Feb 8, 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
29 changes: 16 additions & 13 deletions src/AzureIoTHub.Portal/Client/Pages/Gateways/ConnectionString.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@
<MudDialog>
<DialogContent>
<MudCard Outlined="true">
<MudCardContent Class="connectionString-modal-card">
<div class="form-group">
<MudText Style="text-decoration:underline">Device Id :</MudText>
<p>@DeviceId</p>
</div>
<div class="form-group">
<MudText Style="text-decoration:underline">Symmetric Key :</MudText>
<p>@SymmetricKey</p>
</div>
<div class="form-group">
<MudText Style="text-decoration:underline">Service Endpoint : </MudText>
<p>@Endpoint</p>
</div>

<MudCardContent>
<MudGrid>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Device Id :</b></MudText>
<MudTextField @bind-Value="@DeviceId" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" />
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Symmetric Key :</b></MudText>
<MudTextField @bind-Value="@SymmetricKey" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" />
</MudItem>
<MudItem xs="12">
<MudText Style="text-decoration:underline"><b>Service Endpoint :</b></MudText>
<MudTextField @bind-Value="@Endpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" />
</MudItem>
</MudGrid>
</MudCardContent>
</MudCard>
</DialogContent>
Expand Down
31 changes: 9 additions & 22 deletions src/AzureIoTHub.Portal/Client/Pages/Gateways/GatewayDetailPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
</MudCardHeader>
<MudCardContent>
<div class="d-flex justify-center mb-4">
<MudButton Variant="Variant.Filled" Color="Color.Dark" OnClick="ShowConnectionString">Show Connection String</MudButton>
<MudButton Variant="Variant.Filled" Color="Color.Dark" OnClick="ShowConnectionString">Connect</MudButton>
</div>
@*<MudText Align="Align.Center" Typo="Typo.h6">@gateway.Type</MudText>*@
</MudCardContent>
</MudCard>
</MudItem>
Expand All @@ -44,15 +43,11 @@
<MudCard>
<EditForm Model="@Gateway" OnValidSubmit="UpdateDevice">
<DataAnnotationsValidator />
<MudCardHeader>
<CardHeaderContent>
<MudText>Edge Device Details</MudText>
</CardHeaderContent>
</MudCardHeader>
<MudCardContent>
<MudText Typo="Typo.h6" Class="mb-6">Edge Device Details</MudText>
<MudGrid>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@Gateway.Type" Label="Type" Variant="Variant.Outlined" ReadOnly="true" />
<MudTextField @bind-Value="@Gateway.Type" Label="Type" Variant="Variant.Outlined" ReadOnly="true" Required="true"/>
</MudItem>
<MudItem xs="12" md="6">
<MudSelect T="string" @bind-Value="@Gateway.Environment" Label="Environment" AnchorOrigin="Origin.BottomCenter" Variant="Variant.Outlined">
Expand Down Expand Up @@ -99,30 +94,22 @@
<MudTextField @bind-Value="@Gateway.NbDevices" Label="Nbr of connected devices" Variant="Variant.Outlined" ReadOnly="true" />
</MudItem>
<MudItem xs="12" md="6">
<MudTextField @bind-Value="@Gateway.NbModules" Label="Nbr of modules" Variant="Variant.Outlined" ReadOnly="true" />
<MudTextField @bind-Value="@Gateway.NbModules" Label="Nbr of desired modules" Variant="Variant.Outlined" ReadOnly="true" />
</MudItem>

<MudItem xs="12">
<MudCard>
<MudCardHeader>
<CardHeaderContent>
<MudText>Last deployment</MudText>
</CardHeaderContent>
</MudCardHeader>
<MudCardContent>
<MudText Typo="Typo.h6" Class="mb-6">Last deployment</MudText>
<MudGrid>
<MudItem xs="12" md="4">
<MudTextField @bind-Value="@Gateway.LastDeployment.Name" Label="Name" Variant="Variant.Filled" Margin="Margin.Dense" Disabled="true" />
<MudTextField @bind-Value="@Gateway.LastDeployment.Name" Label="Name" Variant="Variant.Outlined" Margin="Margin.Dense" Disabled="true" />
</MudItem>
<MudItem xs="12" md="4">
<MudTextField @bind-Value="@Gateway.LastDeployment.DateCreation" Label="Date" Variant="Variant.Filled" Margin="Margin.Dense" Disabled="true" />
<MudTextField @bind-Value="@Gateway.LastDeployment.DateCreation" Label="Date" Variant="Variant.Outlined" Margin="Margin.Dense" Disabled="true" />
</MudItem>
<MudItem xs="12" md="4">
<MudTextField @bind-Value="@Gateway.LastDeployment.Status" Label="Status" Variant="Variant.Filled" Margin="Margin.Dense" Disabled="true" />
<MudTextField @bind-Value="@Gateway.LastDeployment.Status" Label="Status" Variant="Variant.Outlined" Margin="Margin.Dense" Disabled="true" />
</MudItem>
</MudGrid>
</MudCardContent>
</MudCard>
</MudItem>

</MudGrid>
Expand Down Expand Up @@ -273,7 +260,7 @@
parameter.Add(nameof(Portal.Shared.Models.Gateway.SymmetricKey), Gateway.SymmetricKey);


DialogService.Show<ConnectionString>("Edge Device Connection String", parameter);
DialogService.Show<ConnectionString>("Connect Edge Device", parameter);
}
catch (HttpRequestException e)
{
Expand Down
2 changes: 1 addition & 1 deletion src/AzureIoTHub.Portal/Client/Pages/Gateways/Logs.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</MudTd>
<MudTd DataLabel="Type" Style="text-align: center">@context.LogLevel</MudTd>
<MudTd DataLabel="NbDevices" Style="text-align: center;">
<MudTextField T="string" Text="@context.Text" Lines="3" Disabled="true"></MudTextField>
<MudTextField T="string" Style="font-size: 0.875em;" DisableUnderLine="true" Text="@context.Text" Lines="3" ReadOnly="true"></MudTextField>
</MudTd>
@*<MudTd DataLabel="NbDevices" Style="text-align: center;word-break: break-all;">@context.Text</MudTd>*@
</RowTemplate>
Expand Down