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

Issue #103 gateway module log modal is out of the screen for large logs #116

Merged
merged 17 commits into from
Jan 27, 2022
Merged

Issue #103 gateway module log modal is out of the screen for large logs #116

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a5a7763
fix #88 (#92)
Sben65 Jan 24, 2022
8ba2f4a
Merge branch 'main' of https://github.com/CGI-FR/iot-hub-portal
Sben65 Jan 25, 2022
0bb5fec
Merge branch 'main' of https://github.com/CGI-FR/iot-hub-portal
Sben65 Jan 26, 2022
032ddd4
Merge branch 'main' of https://github.com/CGI-FR/iot-hub-portal
Sben65 Jan 26, 2022
24561ec
Merge branch 'main' of https://github.com/CGI-FR/iot-hub-portal
Sben65 Jan 27, 2022
13f6c96
fix #76 check the DevEui at device creation
Sben65 Jan 25, 2022
8453454
adding scroll in the logs modal
Sben65 Jan 27, 2022
0773b6a
fix #103
Sben65 Jan 27, 2022
bb33eb0
Merge branch 'main' into issue_#103_Gateway_module_log_modal_is_out_o…
kbeaugrand Jan 27, 2022
96336bd
Merge branch 'main' of https://github.com/CGI-FR/iot-hub-portal
Sben65 Jan 27, 2022
f4dbae4
fix #76 check the DevEui at device creation
Sben65 Jan 25, 2022
468a30f
adding scroll in the logs modal
Sben65 Jan 27, 2022
7efec0b
fix #103
Sben65 Jan 27, 2022
86f4325
add of missing code
Sben65 Jan 27, 2022
40772e5
Merge branch 'issue_#103_Gateway_module_log_modal_is_out_of_the_scree…
Sben65 Jan 27, 2022
caa445a
add of missing code
Sben65 Jan 27, 2022
55146bb
code cleanup
Sben65 Jan 27, 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
2 changes: 1 addition & 1 deletion src/AzureIoTHub.Portal/Client/Pages/Gateways/Detail.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ else
Snackbar.Add($"Error<br>Status : {c2dResult.Status};<br>Payload : {c2dResult.Payload};", Severity.Error,
(option) =>
{
option.VisibleStateDuration = 100000;
option.VisibleStateDuration = 10000;
});
}
}
Expand Down
11 changes: 7 additions & 4 deletions 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 @@ -3,17 +3,17 @@
@using Newtonsoft.Json;


<MudDialog>
<MudDialog Style="max-width:fit-content;">
<DialogContent>
<MudCard Outlined="true" >
<MudCard Outlined="true" Style="width:800px;max-height: 600px; overflow-y: scroll">
<MudCardContent>

<MudItem xs="12">
<MudTable Items="@payloads" Dense=true Breakpoint="Breakpoint.Sm" Hover=true Bordered=true Striped=true>
<ColGroup>
<col style="width: 20%;" />
<col style="width: 10%;" />
<col style="width: 30%;" />
<col style="width: 40%;" />
</ColGroup>

<HeaderContent>
Expand All @@ -26,7 +26,10 @@
@context.TimeStamp
</MudTd>
<MudTd DataLabel="Type" Style="text-align: center">@context.LogLevel</MudTd>
<MudTd DataLabel="NbDevices" Style="text-align: center;word-break: break-all;">@context.Text</MudTd>
<MudTd DataLabel="NbDevices" Style="text-align: center;">
<MudTextField T="string" Text="@context.Text" Lines="3" Disabled="true"></MudTextField>
</MudTd>
@*<MudTd DataLabel="NbDevices" Style="text-align: center;word-break: break-all;">@context.Text</MudTd>*@
</RowTemplate>
<PagerContent>
<MudTablePager PageSizeOptions="@pageSizeOptions"></MudTablePager>
Expand Down
5 changes: 0 additions & 5 deletions src/AzureIoTHub.Portal/Server/Controllers/DevicesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,6 @@ public async Task<IActionResult> CreateDeviceAsync(DeviceDetails device)
{
try
{
if (!Eui.TryParse(device.DeviceID, out ulong deviceIdConvert) && device.DeviceType == "LoRa Device")
{
throw new InvalidOperationException("the device id is in the wrong format.");
}

// Create a new Twin from the form's fields.
var newTwin = new Twin()
{
Expand Down