Updated to latest moonlight and mooncore version. Done refactoring to async scheme and other changes. Recreated database migrations and cleaned models
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
<i class="icon-chevron-left"></i>
|
||||
Back
|
||||
</a>
|
||||
<WButton OnClick="_ => Form.Submit()" CssClasses="btn btn-primary">
|
||||
<WButton OnClick="Form.SubmitAsync" CssClasses="btn btn-primary">
|
||||
<i class="icon-check"></i>
|
||||
Create
|
||||
</WButton>
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
await ApiClient.Post("api/admin/servers", Request);
|
||||
|
||||
await ToastService.Success("Successfully created Server");
|
||||
await ToastService.SuccessAsync("Successfully created Server");
|
||||
Navigation.NavigateTo("/admin/servers/all");
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
@page "/admin/servers/all"
|
||||
|
||||
@using MoonCore.Blazor.FlyonUi.Alerts
|
||||
@using MoonCore.Blazor.FlyonUi.DataTables
|
||||
@using MoonCore.Blazor.FlyonUi.Toasts
|
||||
@using MoonCore.Helpers
|
||||
@using MoonCore.Models
|
||||
@@ -9,6 +8,9 @@
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.Servers
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.Stars
|
||||
@using MoonCore.Blazor.FlyonUi.Components
|
||||
@using MoonCore.Blazor.FlyonUi.Grid
|
||||
@using MoonCore.Blazor.FlyonUi.Grid.Columns
|
||||
@using Moonlight.Shared.Http.Responses.Admin.Users
|
||||
|
||||
@inject HttpApiClient ApiClient
|
||||
@inject AlertService AlertService
|
||||
@@ -28,98 +30,136 @@
|
||||
</PageHeader>
|
||||
</div>
|
||||
|
||||
<DataTable @ref="Table" TItem="ServerResponse">
|
||||
<Configuration>
|
||||
<Pagination TItem="ServerResponse" ItemSource="LoadData" />
|
||||
|
||||
<DataTableColumn TItem="ServerResponse" Field="@(x => x.Id)" Name="Id"/>
|
||||
<DataTableColumn TItem="ServerResponse" Field="@(x => x.Name)" Name="Name">
|
||||
<ColumnTemplate>
|
||||
<a class="text-primary" href="/admin/servers/all/update/@context.Id">
|
||||
@context.Name
|
||||
<DataGrid @ref="Grid"
|
||||
TGridItem="ServerResponse"
|
||||
EnablePagination="true"
|
||||
ItemsProvider="ItemsProviderAsync">
|
||||
<PropertyColumn Field="x => x.Id"/>
|
||||
<TemplateColumn Title="Name">
|
||||
<td>
|
||||
<a class="text-primary" href="/admin/servers/all/update/@context.Id">
|
||||
@context.Name
|
||||
</a>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="Owner">
|
||||
<td>
|
||||
@{
|
||||
var owner = Users.GetValueOrDefault(context.OwnerId);
|
||||
}
|
||||
|
||||
<span>
|
||||
@(owner?.Username ?? "N/A")
|
||||
</span>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="Node">
|
||||
<td>
|
||||
@{
|
||||
var node = Nodes.GetValueOrDefault(context.NodeId);
|
||||
}
|
||||
|
||||
<span>
|
||||
@(node?.Name ?? "N/A")
|
||||
</span>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="Star">
|
||||
<td>
|
||||
@{
|
||||
var star = Stars.GetValueOrDefault(context.StarId);
|
||||
}
|
||||
|
||||
<span>
|
||||
@(star?.Name ?? "N/A")
|
||||
</span>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="Actions">
|
||||
<td>
|
||||
<div class="flex justify-end">
|
||||
<a href="/admin/servers/all/update/@(context.Id)" class="text-primary mr-2 sm:mr-3">
|
||||
<i class="icon-pencil text-base"></i>
|
||||
</a>
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
<DataTableColumn TItem="ServerResponse" Field="@(x => x.NodeId)" Name="Node">
|
||||
<ColumnTemplate>
|
||||
@{
|
||||
var node = Nodes.FirstOrDefault(x => x.Id == context.NodeId);
|
||||
}
|
||||
|
||||
<span>
|
||||
@(node?.Name ?? "N/A")
|
||||
</span>
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
<DataTableColumn TItem="ServerResponse" Field="@(x => x.StarId)" Name="Star">
|
||||
<ColumnTemplate>
|
||||
@{
|
||||
var star = Stars.FirstOrDefault(x => x.Id == context.StarId);
|
||||
}
|
||||
|
||||
<span>
|
||||
@(star?.Name ?? "N/A")
|
||||
</span>
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
<DataTableColumn TItem="ServerResponse">
|
||||
<ColumnTemplate>
|
||||
<div class="flex justify-end">
|
||||
<a href="/admin/servers/all/update/@(context.Id)" class="text-primary mr-2 sm:mr-3">
|
||||
<i class="icon-pencil text-base"></i>
|
||||
</a>
|
||||
|
||||
<a href="#" @onclick="() => Delete(context)" @onclick:preventDefault
|
||||
class="text-error">
|
||||
<i class="icon-trash text-base"></i>
|
||||
</a>
|
||||
</div>
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
</Configuration>
|
||||
</DataTable>
|
||||
<a href="#" @onclick="() => DeleteAsync(context)" @onclick:preventDefault
|
||||
class="text-error">
|
||||
<i class="icon-trash text-base"></i>
|
||||
</a>
|
||||
</div>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
</DataGrid>
|
||||
|
||||
@code
|
||||
{
|
||||
private DataTable<ServerResponse> Table;
|
||||
|
||||
private List<StarResponse> Stars = new();
|
||||
private List<NodeResponse> Nodes = new();
|
||||
private DataGrid<ServerResponse> Grid;
|
||||
|
||||
private async Task<IPagedData<ServerResponse>> LoadData(PaginationOptions options)
|
||||
private Dictionary<int, StarResponse> Stars = new();
|
||||
private Dictionary<int, NodeResponse> Nodes = new();
|
||||
private Dictionary<int, UserResponse> Users = new();
|
||||
|
||||
private async Task<DataGridItemResult<ServerResponse>> ItemsProviderAsync(
|
||||
DataGridItemRequest request
|
||||
)
|
||||
{
|
||||
// Clear potential previous data
|
||||
var data = await ApiClient.GetJson<PagedData<ServerResponse>>($"api/admin/servers?page={options.Page}&pageSize={options.PerPage}");
|
||||
var query = $"?startIndex={request.StartIndex}&count={request.Count}";
|
||||
|
||||
foreach (var item in data.Items)
|
||||
var countedData = await ApiClient.GetJson<CountedData<ServerResponse>>($"api/admin/servers{query}");
|
||||
|
||||
// Fetch relations
|
||||
|
||||
var nodesToFetch = countedData.Items
|
||||
.Where(x => !Nodes.ContainsKey(x.Id))
|
||||
.Select(x => x.Id)
|
||||
.Distinct();
|
||||
|
||||
foreach (var id in nodesToFetch)
|
||||
{
|
||||
if (Nodes.All(x => x.Id != item.NodeId))
|
||||
{
|
||||
var node = await ApiClient.GetJson<NodeResponse>($"api/admin/servers/nodes/{item.NodeId}");
|
||||
Nodes.Add(node);
|
||||
}
|
||||
|
||||
if (Stars.All(x => x.Id != item.StarId))
|
||||
{
|
||||
var star = await ApiClient.GetJson<StarResponse>($"api/admin/servers/stars/{item.StarId}");
|
||||
Stars.Add(star);
|
||||
}
|
||||
var node = await ApiClient.GetJson<NodeResponse>($"api/admin/servers/nodes/{id}");
|
||||
Nodes[node.Id] = node;
|
||||
}
|
||||
|
||||
return data;
|
||||
var starsToFetch = countedData.Items
|
||||
.Where(x => !Stars.ContainsKey(x.Id))
|
||||
.Select(x => x.Id)
|
||||
.Distinct();
|
||||
|
||||
foreach (var id in starsToFetch)
|
||||
{
|
||||
var star = await ApiClient.GetJson<StarResponse>($"api/admin/servers/stars/{id}");
|
||||
Stars[star.Id] = star;
|
||||
}
|
||||
|
||||
var usersToFetch = countedData.Items
|
||||
.Where(x => !Users.ContainsKey(x.Id))
|
||||
.Select(x => x.Id)
|
||||
.Distinct();
|
||||
|
||||
foreach (var id in usersToFetch)
|
||||
{
|
||||
var user = await ApiClient.GetJson<UserResponse>($"api/admin/users/{id}");
|
||||
Users[user.Id] = user;
|
||||
}
|
||||
|
||||
return new()
|
||||
{
|
||||
Items = countedData.Items,
|
||||
TotalCount = countedData.TotalCount
|
||||
};
|
||||
}
|
||||
|
||||
private async Task Delete(ServerResponse response)
|
||||
|
||||
private async Task DeleteAsync(ServerResponse response)
|
||||
{
|
||||
await AlertService.ConfirmDanger(
|
||||
await AlertService.ConfirmDangerAsync(
|
||||
"Server deletion",
|
||||
$"Do you really want to delete the server '{response.Name}'",
|
||||
async () =>
|
||||
{
|
||||
await ApiClient.Delete($"api/admin/servers/{response.Id}");
|
||||
await ToastService.Success("Successfully deleted server");
|
||||
await ToastService.SuccessAsync("Successfully deleted server");
|
||||
|
||||
await Table.Refresh();
|
||||
await Grid.RefreshAsync();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.update")]
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<LazyLoader Load="LoadAsync">
|
||||
<PageHeader Title="Update Server">
|
||||
<a href="/admin/servers/all" class="btn btn-secondary">
|
||||
<i class="icon-chevron-left"></i>
|
||||
Back
|
||||
</a>
|
||||
<WButton OnClick="_ => Form.Submit()" CssClasses="btn btn-primary">
|
||||
<WButton OnClick="Form.SubmitAsync" CssClasses="btn btn-primary">
|
||||
<i class="icon-check"></i>
|
||||
Update
|
||||
</WButton>
|
||||
@@ -58,7 +58,7 @@
|
||||
public List<NodeAllocationResponse> Allocations = new();
|
||||
public UserResponse Owner;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
Server = await ApiClient.GetJson<ServerResponse>($"api/admin/servers/{Id}");
|
||||
|
||||
@@ -67,7 +67,6 @@
|
||||
Name = Server.Name,
|
||||
AllocationIds = Server.AllocationIds,
|
||||
OwnerId = Server.OwnerId,
|
||||
Bandwidth = Server.Bandwidth,
|
||||
Cpu = Server.Cpu,
|
||||
Disk = Server.Disk,
|
||||
DockerImageIndex = Server.DockerImageIndex,
|
||||
@@ -96,7 +95,7 @@
|
||||
|
||||
await ApiClient.Patch($"api/admin/servers/{Id}", Request);
|
||||
|
||||
await ToastService.Success("Successfully updated server");
|
||||
await ToastService.SuccessAsync("Successfully updated server");
|
||||
Navigation.NavigateTo("/admin/servers/all");
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,7 @@
|
||||
<i class="icon-chevron-left"></i>
|
||||
Back
|
||||
</a>
|
||||
<WButton OnClick="_ => Form.Submit()" CssClasses="btn btn-primary">
|
||||
<WButton OnClick="Form.SubmitAsync" CssClasses="btn btn-primary">
|
||||
<i class="icon-check"></i>
|
||||
Create
|
||||
</WButton>
|
||||
@@ -71,7 +71,7 @@ TODO: EnableTransparentMode, EnableDynamicFirewall
|
||||
{
|
||||
await ApiClient.Post("api/admin/servers/nodes", Request);
|
||||
|
||||
await ToastService.Success("Successfully created node");
|
||||
await ToastService.SuccessAsync("Successfully created node");
|
||||
Navigation.NavigateTo("/admin/servers/nodes");
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
@using Microsoft.Extensions.Logging
|
||||
@using MoonCore.Blazor.FlyonUi.Alerts
|
||||
@using MoonCore.Blazor.FlyonUi.DataTables
|
||||
@using MoonCore.Blazor.FlyonUi.Toasts
|
||||
@using MoonCore.Helpers
|
||||
@using MoonCore.Models
|
||||
@@ -11,6 +10,8 @@
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.Nodes.Statistics
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.Nodes.Sys
|
||||
@using MoonCore.Blazor.FlyonUi.Components
|
||||
@using MoonCore.Blazor.FlyonUi.Grid
|
||||
@using MoonCore.Blazor.FlyonUi.Grid.Columns
|
||||
|
||||
@inject HttpApiClient ApiClient
|
||||
@inject NodeService NodeService
|
||||
@@ -32,153 +33,151 @@
|
||||
</PageHeader>
|
||||
</div>
|
||||
|
||||
<DataTable TItem="NodeResponse">
|
||||
<Configuration>
|
||||
<Pagination TItem="NodeResponse" ItemSource="LoadData"/>
|
||||
<DataGrid @ref="Grid"
|
||||
TGridItem="NodeResponse"
|
||||
EnablePagination="true"
|
||||
ItemsProvider="ItemsProviderAsync">
|
||||
<PropertyColumn Field="x => x.Id"/>
|
||||
<TemplateColumn Title="Name">
|
||||
<td>
|
||||
<a class="text-primary" href="/admin/servers/nodes/update/@(context.Id)">
|
||||
@context.Name
|
||||
</a>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
<PropertyColumn Field="x => x.Fqdn"/>
|
||||
<TemplateColumn Title="Status">
|
||||
<td>
|
||||
@{
|
||||
var isFetched = StatusResponses.TryGetValue(context.Id, out var data);
|
||||
}
|
||||
|
||||
<DataTableColumn TItem="NodeResponse" Field="@(x => x.Id)" Name="Id"/>
|
||||
<DataTableColumn TItem="NodeResponse" Field="@(x => x.Name)" Name="Name">
|
||||
<ColumnTemplate>
|
||||
<a class="text-primary" href="/admin/servers/nodes/update/@(context.Id)">
|
||||
@context.Name
|
||||
</a>
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
<DataTableColumn TItem="NodeResponse" Field="@(x => x.Fqdn)" Name="Fqdn"/>
|
||||
<DataTableColumn TItem="NodeResponse" Field="@(x => x.Fqdn)" Name="Status">
|
||||
<ColumnTemplate>
|
||||
@{
|
||||
var isFetched = StatusResponses.TryGetValue(context.Id, out var data);
|
||||
}
|
||||
|
||||
@if (isFetched)
|
||||
@if (isFetched)
|
||||
{
|
||||
if (data == null)
|
||||
{
|
||||
if (data == null)
|
||||
<div class="text-error flex items-center">
|
||||
<i class="icon-server-off text-base me-1"></i>
|
||||
<span>
|
||||
API Error
|
||||
</span>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
if (data.RoundtripSuccess)
|
||||
{
|
||||
<div class="text-success flex items-center">
|
||||
<i class="icon-check text-base me-1"></i>
|
||||
<span>Online (@(data.Version))</span>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-error flex items-center">
|
||||
<i class="icon-server-off text-base me-1"></i>
|
||||
<span>
|
||||
API Error
|
||||
<span class="me-2">
|
||||
Error
|
||||
</span>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
if (data.RoundtripSuccess)
|
||||
{
|
||||
<div class="text-success flex items-center">
|
||||
<i class="icon-check text-base me-1"></i>
|
||||
<span>Online (@(data.Version))</span>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-error flex items-center">
|
||||
<i class="icon-server-off text-base me-1"></i>
|
||||
<span class="me-2">
|
||||
Error
|
||||
</span>
|
||||
<a @onclick="() => ShowErrorDetails(context.Id)" @onclick:preventDefault
|
||||
href="#" class="ms-1 text-base-content/40">Details</a>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-gray-500">
|
||||
<i class="icon-loader text-base me-1 align-middle"></i>
|
||||
<span class="align-middle">Loading</span>
|
||||
</div>
|
||||
}
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
<DataTableColumn TItem="NodeResponse"
|
||||
Name="Utilization"
|
||||
HeaderCss="p-2 font-semibold text-left hidden xl:table-cell"
|
||||
ColumnCss="p-2 text-left font-normal hidden xl:table-cell">
|
||||
<ColumnTemplate>
|
||||
@{
|
||||
var isFetched = Statistics.TryGetValue(context.Id, out var data);
|
||||
}
|
||||
|
||||
@if (isFetched)
|
||||
{
|
||||
if (data == null)
|
||||
{
|
||||
<div class="flex items-center text-error">
|
||||
<i class="icon-server-off text-base me-1"></i>
|
||||
<span>
|
||||
API Error
|
||||
</span>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="flex flex-row">
|
||||
<div class="flex items-center">
|
||||
<i class="text-primary text-base me-2 icon-cpu"></i>
|
||||
<span>@(Math.Round(data.Cpu.Usage))%</span>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center ms-5">
|
||||
<i class="text-primary text-base me-2 icon-memory-stick"></i>
|
||||
<span>
|
||||
@(Math.Round((data.Memory.Total - data.Memory.Free - data.Memory.Cached) / (double)data.Memory.Total * 100))%
|
||||
</span>
|
||||
</div>
|
||||
<a @onclick="() => ShowErrorDetailsAsync(context.Id)" @onclick:preventDefault
|
||||
href="#" class="ms-1 text-base-content/40">Details</a>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="flex items-center text-gray-500">
|
||||
<i class="icon-loader text-base me-1"></i>
|
||||
<span>Loading</span>
|
||||
</div>
|
||||
}
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
<DataTableColumn TItem="NodeResponse">
|
||||
<ColumnTemplate>
|
||||
<div class="flex justify-end">
|
||||
<a href="/admin/servers/nodes/update/@(context.Id)" class="text-primary mr-2 sm:mr-3">
|
||||
<i class="icon-pencil text-base"></i>
|
||||
</a>
|
||||
|
||||
<a href="#" @onclick="() => Delete(context)" @onclick:preventDefault
|
||||
class="text-error">
|
||||
<i class="icon-trash text-base"></i>
|
||||
</a>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-gray-500">
|
||||
<i class="icon-loader text-base me-1 align-middle"></i>
|
||||
<span class="align-middle">Loading</span>
|
||||
</div>
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
</Configuration>
|
||||
</DataTable>
|
||||
}
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="Utilization">
|
||||
<td>
|
||||
@{
|
||||
var isFetched = Statistics.TryGetValue(context.Id, out var data);
|
||||
}
|
||||
|
||||
@if (isFetched)
|
||||
{
|
||||
if (data == null)
|
||||
{
|
||||
<div class="flex items-center text-error">
|
||||
<i class="icon-server-off text-base me-1"></i>
|
||||
<span>
|
||||
API Error
|
||||
</span>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="flex flex-row">
|
||||
<div class="flex items-center">
|
||||
<i class="text-primary text-base me-2 icon-cpu"></i>
|
||||
<span>@(Math.Round(data.Cpu.Usage))%</span>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center ms-5">
|
||||
<i class="text-primary text-base me-2 icon-memory-stick"></i>
|
||||
<span>
|
||||
@(Math.Round((data.Memory.Total - data.Memory.Free - data.Memory.Cached) / (double)data.Memory.Total * 100))%
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="flex items-center text-gray-500">
|
||||
<i class="icon-loader text-base me-1"></i>
|
||||
<span>Loading</span>
|
||||
</div>
|
||||
}
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
<TemplateColumn Title="Actions">
|
||||
<td>
|
||||
<div class="flex justify-end">
|
||||
<a href="/admin/servers/nodes/update/@(context.Id)" class="text-primary mr-2 sm:mr-3">
|
||||
<i class="icon-pencil text-base"></i>
|
||||
</a>
|
||||
|
||||
<a href="#" @onclick="() => DeleteAsync(context)" @onclick:preventDefault
|
||||
class="text-error">
|
||||
<i class="icon-trash text-base"></i>
|
||||
</a>
|
||||
</div>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
</DataGrid>
|
||||
|
||||
@code
|
||||
{
|
||||
private DataTable<NodeResponse> Table;
|
||||
private DataGrid<NodeResponse> Grid;
|
||||
|
||||
private Dictionary<int, NodeSystemStatusResponse?> StatusResponses = new();
|
||||
private Dictionary<int, StatisticsResponse?> Statistics = new();
|
||||
|
||||
private async Task<IPagedData<NodeResponse>> LoadData(PaginationOptions options)
|
||||
|
||||
private async Task<DataGridItemResult<NodeResponse>> ItemsProviderAsync(
|
||||
DataGridItemRequest request
|
||||
)
|
||||
{
|
||||
var query = $"?startIndex={request.StartIndex}&count={request.Count}";
|
||||
|
||||
var countedData = await ApiClient.GetJson<CountedData<NodeResponse>>($"api/admin/servers/nodes{query}");
|
||||
|
||||
Statistics.Clear();
|
||||
StatusResponses.Clear();
|
||||
|
||||
var result = await ApiClient.GetJson<PagedData<NodeResponse>>(
|
||||
$"api/admin/servers/nodes?page={options.Page}&pageSize={options.PerPage}"
|
||||
);
|
||||
|
||||
|
||||
Task.Run(async () =>
|
||||
{
|
||||
foreach (var item in result.Items)
|
||||
foreach (var item in countedData.Items)
|
||||
{
|
||||
try
|
||||
{
|
||||
Statistics[item.Id] = await NodeService.GetStatistics(item.Id);
|
||||
Statistics[item.Id] = await NodeService.GetStatisticsAsync(item.Id);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -192,10 +191,10 @@
|
||||
}
|
||||
|
||||
await InvokeAsync(StateHasChanged);
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
StatusResponses[item.Id] = await NodeService.GetSystemStatus(item.Id);
|
||||
StatusResponses[item.Id] = await NodeService.GetSystemStatusAsync(item.Id);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -207,30 +206,34 @@
|
||||
|
||||
StatusResponses[item.Id] = null;
|
||||
}
|
||||
|
||||
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
});
|
||||
|
||||
return result;
|
||||
|
||||
return new()
|
||||
{
|
||||
Items = countedData.Items,
|
||||
TotalCount = countedData.TotalCount
|
||||
};
|
||||
}
|
||||
|
||||
private async Task Delete(NodeResponse response)
|
||||
private async Task DeleteAsync(NodeResponse response)
|
||||
{
|
||||
await AlertService.ConfirmDanger(
|
||||
await AlertService.ConfirmDangerAsync(
|
||||
"Node deletion",
|
||||
$"Do you really want to delete the node '{response.Name}'",
|
||||
async () =>
|
||||
{
|
||||
await ApiClient.Delete($"api/admin/servers/nodes/{response.Id}");
|
||||
await ToastService.Success("Successfully deleted node");
|
||||
await ToastService.SuccessAsync("Successfully deleted node");
|
||||
|
||||
await Table.Refresh();
|
||||
await Grid.RefreshAsync();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
private async Task ShowErrorDetails(int id)
|
||||
private async Task ShowErrorDetailsAsync(int id)
|
||||
{
|
||||
var data = StatusResponses.GetValueOrDefault(id);
|
||||
|
||||
@@ -241,6 +244,6 @@
|
||||
(data.RoundtripRemoteFailure ? "(Failed at node)" : "(Failed at api server)") +
|
||||
$" {data.RoundtripError}";
|
||||
|
||||
await AlertService.Error("Node error details", message);
|
||||
await AlertService.ErrorAsync("Node error details", message);
|
||||
}
|
||||
}
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.nodes.update")]
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<LazyLoader Load="LoadAsync">
|
||||
<PageHeader Title="@Node.Name">
|
||||
<a href="/admin/servers/nodes" class="btn btn-secondary">
|
||||
<i class="icon-chevron-left"></i>
|
||||
Back
|
||||
</a>
|
||||
<WButton OnClick="_ => Form.Submit()" CssClasses="btn btn-primary">
|
||||
<WButton OnClick="Form.SubmitAsync" CssClasses="btn btn-primary">
|
||||
<i class="icon-check"></i>
|
||||
Update
|
||||
</WButton>
|
||||
@@ -58,15 +58,13 @@
|
||||
private UpdateNodeRequest Request;
|
||||
private NodeResponse Node;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
Node = await ApiClient.GetJson<NodeResponse>($"api/admin/servers/nodes/{Id}");
|
||||
|
||||
Request = new UpdateNodeRequest()
|
||||
{
|
||||
Name = Node.Name,
|
||||
EnableDynamicFirewall = Node.EnableDynamicFirewall,
|
||||
EnableTransparentMode = Node.EnableTransparentMode,
|
||||
Fqdn = Node.Fqdn,
|
||||
FtpPort = Node.FtpPort,
|
||||
HttpPort = Node.HttpPort
|
||||
@@ -77,7 +75,7 @@
|
||||
{
|
||||
await ApiClient.Patch($"api/admin/servers/nodes/{Id}", Request);
|
||||
|
||||
await ToastService.Success("Successfully updated Node");
|
||||
await ToastService.SuccessAsync("Successfully updated Node");
|
||||
Navigation.NavigateTo("/admin/servers/nodes");
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
<i class="icon-chevron-left"></i>
|
||||
Back
|
||||
</a>
|
||||
<WButton OnClick="_ => Form.Submit()" CssClasses="btn btn-primary">
|
||||
<WButton OnClick="Form.SubmitAsync" CssClasses="btn btn-primary">
|
||||
<i class="icon-check"></i>
|
||||
Create
|
||||
</WButton>
|
||||
@@ -61,7 +61,7 @@
|
||||
{
|
||||
await ApiClient.Post("api/admin/servers/stars", Request);
|
||||
|
||||
await ToastService.Success("Successfully created star");
|
||||
await ToastService.SuccessAsync("Successfully created star");
|
||||
Navigation.NavigateTo("/admin/servers/stars");
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
@page "/admin/servers/stars"
|
||||
|
||||
@using MoonCore.Blazor.FlyonUi.Alerts
|
||||
@using MoonCore.Blazor.FlyonUi.DataTables
|
||||
@using MoonCore.Blazor.FlyonUi.Helpers
|
||||
@using MoonCore.Blazor.FlyonUi.Toasts
|
||||
@using MoonCore.Helpers
|
||||
@@ -9,6 +8,8 @@
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.Stars
|
||||
@using MoonCore.Exceptions
|
||||
@using MoonCore.Blazor.FlyonUi.Components
|
||||
@using MoonCore.Blazor.FlyonUi.Grid
|
||||
@using MoonCore.Blazor.FlyonUi.Grid.Columns
|
||||
|
||||
@inject HttpApiClient ApiClient
|
||||
@inject DownloadService DownloadService
|
||||
@@ -35,88 +36,99 @@
|
||||
</PageHeader>
|
||||
</div>
|
||||
|
||||
<DataTable @ref="Table" TItem="StarResponse">
|
||||
<Configuration>
|
||||
<Pagination TItem="StarResponse" ItemSource="LoadData" />
|
||||
|
||||
<DataTableColumn TItem="StarResponse" Field="@(x => x.Id)" Name="Id"/>
|
||||
<DataTableColumn TItem="StarResponse" Field="@(x => x.Name)" Name="Name">
|
||||
<ColumnTemplate>
|
||||
<a class="text-primary" href="/admin/servers/stars/update/@(context.Id)">
|
||||
@context.Name
|
||||
<DataGrid @ref="Grid"
|
||||
TGridItem="StarResponse"
|
||||
EnablePagination="true"
|
||||
ItemsProvider="ItemsProviderAsync">
|
||||
<PropertyColumn Field="x => x.Id" />
|
||||
<TemplateColumn Title="Name">
|
||||
<td>
|
||||
<a class="text-primary" href="/admin/servers/stars/update/@(context.Id)">
|
||||
@context.Name
|
||||
</a>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
<PropertyColumn Field="x => x.Version" />
|
||||
<PropertyColumn Field="x => x.Author" />
|
||||
<TemplateColumn>
|
||||
<td>
|
||||
<div class="flex justify-end">
|
||||
@if (!string.IsNullOrEmpty(context.DonateUrl))
|
||||
{
|
||||
<a href="@context.DonateUrl" target="_blank" class="text-accent mr-3">
|
||||
<i class="icon-heart align-middle"></i>
|
||||
<span class="align-middle">Donate</span>
|
||||
</a>
|
||||
}
|
||||
|
||||
@if (!string.IsNullOrEmpty(context.UpdateUrl))
|
||||
{
|
||||
<a href="#" @onclick:preventDefault class="text-accent mr-3">
|
||||
<i class="icon-refresh-cw align-middle"></i>
|
||||
<span class="align-middle">Update</span>
|
||||
</a>
|
||||
}
|
||||
|
||||
<a href="#" @onclick="() => ExportAsync(context)" @onclick:preventDefault class="text-success mr-3">
|
||||
<i class="icon-download align-middle"></i>
|
||||
<span class="align-middle">Export</span>
|
||||
</a>
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
<DataTableColumn TItem="StarResponse" Field="@(x => x.Version)" Name="Version"/>
|
||||
<DataTableColumn TItem="StarResponse" Field="@(x => x.Author)" Name="Author"/>
|
||||
<DataTableColumn TItem="StarResponse">
|
||||
<ColumnTemplate>
|
||||
<div class="flex justify-end">
|
||||
@if (!string.IsNullOrEmpty(context.DonateUrl))
|
||||
{
|
||||
<a href="@context.DonateUrl" target="_blank" class="text-accent mr-3">
|
||||
<i class="icon-heart align-middle"></i>
|
||||
<span class="align-middle">Donate</span>
|
||||
</a>
|
||||
}
|
||||
|
||||
@if (!string.IsNullOrEmpty(context.UpdateUrl))
|
||||
{
|
||||
<a href="#" @onclick:preventDefault class="text-accent mr-3">
|
||||
<i class="icon-refresh-cw align-middle"></i>
|
||||
<span class="align-middle">Update</span>
|
||||
</a>
|
||||
}
|
||||
<a href="/admin/servers/stars/update/@(context.Id)" class="text-primary mr-2 sm:mr-3">
|
||||
<i class="icon-pencil text-base"></i>
|
||||
</a>
|
||||
|
||||
<a href="#" @onclick="() => Export(context)" @onclick:preventDefault class="text-success mr-3">
|
||||
<i class="icon-download align-middle"></i>
|
||||
<span class="align-middle">Export</span>
|
||||
</a>
|
||||
|
||||
<a href="/admin/servers/stars/update/@(context.Id)" class="text-primary mr-2 sm:mr-3">
|
||||
<i class="icon-pencil text-base"></i>
|
||||
</a>
|
||||
|
||||
<a href="#" @onclick="() => Delete(context)" @onclick:preventDefault
|
||||
class="text-error">
|
||||
<i class="icon-trash text-base"></i>
|
||||
</a>
|
||||
</div>
|
||||
</ColumnTemplate>
|
||||
</DataTableColumn>
|
||||
</Configuration>
|
||||
</DataTable>
|
||||
<a href="#" @onclick="() => DeleteAsync(context)" @onclick:preventDefault
|
||||
class="text-error">
|
||||
<i class="icon-trash text-base"></i>
|
||||
</a>
|
||||
</div>
|
||||
</td>
|
||||
</TemplateColumn>
|
||||
</DataGrid>
|
||||
|
||||
@code
|
||||
{
|
||||
private DataTable<StarResponse> Table;
|
||||
private DataGrid<StarResponse> Grid;
|
||||
|
||||
private async Task<IPagedData<StarResponse>> LoadData(PaginationOptions options)
|
||||
=> await ApiClient.GetJson<PagedData<StarResponse>>($"api/admin/servers/stars?page={options.Page}&pageSize={options.PerPage}");
|
||||
|
||||
private async Task Delete(StarResponse response)
|
||||
private async Task<DataGridItemResult<StarResponse>> ItemsProviderAsync(
|
||||
DataGridItemRequest request
|
||||
)
|
||||
{
|
||||
await AlertService.ConfirmDanger(
|
||||
var query = $"?startIndex={request.StartIndex}&count={request.Count}";
|
||||
|
||||
var countedData = await ApiClient.GetJson<CountedData<StarResponse>>($"api/admin/servers/stars{query}");
|
||||
|
||||
return new()
|
||||
{
|
||||
TotalCount = countedData.TotalCount,
|
||||
Items = countedData.Items
|
||||
};
|
||||
}
|
||||
|
||||
private async Task DeleteAsync(StarResponse response)
|
||||
{
|
||||
await AlertService.ConfirmDangerAsync(
|
||||
"Star deletion",
|
||||
$"Do you really want to delete the star '{response.Name}'",
|
||||
async () =>
|
||||
{
|
||||
await ApiClient.Delete($"api/admin/servers/stars/{response.Id}");
|
||||
await ToastService.Success("Successfully deleted star");
|
||||
await ToastService.SuccessAsync("Successfully deleted star");
|
||||
|
||||
await Table.Refresh();
|
||||
await Grid.RefreshAsync();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
private async Task Export(StarResponse star)
|
||||
private async Task ExportAsync(StarResponse star)
|
||||
{
|
||||
var json = await ApiClient.GetString($"api/admin/servers/stars/{star.Id}/export");
|
||||
|
||||
var formattedFileName = star.Name.Replace(" ", "_") + ".json";
|
||||
|
||||
await DownloadService.Download(formattedFileName, json);
|
||||
await ToastService.Success($"Successfully exported '{star.Name}'");
|
||||
await DownloadService.DownloadAsync(formattedFileName, json);
|
||||
await ToastService.SuccessAsync($"Successfully exported '{star.Name}'");
|
||||
}
|
||||
|
||||
private async Task OnImportFiles(InputFileChangeEventArgs eventArgs)
|
||||
@@ -137,7 +149,7 @@
|
||||
{
|
||||
if (!file.Name.EndsWith(".json"))
|
||||
{
|
||||
await ToastService.Error($"Failed to import '{file.Name}': Only json files are supported");
|
||||
await ToastService.ErrorAsync($"Failed to import '{file.Name}': Only json files are supported");
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -147,14 +159,14 @@
|
||||
|
||||
var star = await ApiClient.PostJson<StarResponse>("api/admin/servers/stars/import", content);
|
||||
|
||||
await ToastService.Success($"Successfully imported '{star.Name}'");
|
||||
await ToastService.SuccessAsync($"Successfully imported '{star.Name}'");
|
||||
}
|
||||
catch (HttpApiException e)
|
||||
{
|
||||
await ToastService.Error($"Failed to import '{file.Name}': {e.Title}");
|
||||
await ToastService.ErrorAsync($"Failed to import '{file.Name}': {e.Title}");
|
||||
}
|
||||
}
|
||||
|
||||
await Table.Refresh();
|
||||
await Grid.RefreshAsync();
|
||||
}
|
||||
}
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
@attribute [Authorize(Policy = "permissions:admin.servers.stars.update")]
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<LazyLoader Load="LoadAsync">
|
||||
<PageHeader Title="Update Star">
|
||||
<a href="/admin/servers/stars" class="btn btn-secondary">
|
||||
<i class="icon-chevron-left"></i>
|
||||
Back
|
||||
</a>
|
||||
<WButton OnClick="_ => Form.Submit()" CssClasses="btn btn-primary">
|
||||
<WButton OnClick="Form.SubmitAsync" CssClasses="btn btn-primary">
|
||||
<i class="icon-check"></i>
|
||||
Update
|
||||
</WButton>
|
||||
@@ -70,7 +70,7 @@
|
||||
private UpdateStarRequest Request;
|
||||
private StarResponse Detail;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
Detail = await ApiClient.GetJson<StarResponse>($"api/admin/servers/stars/{Id}");
|
||||
Request = new()
|
||||
@@ -97,7 +97,7 @@
|
||||
{
|
||||
await ApiClient.Patch($"api/admin/servers/stars/{Id}", Request);
|
||||
|
||||
await ToastService.Success("Successfully updated Star");
|
||||
await ToastService.SuccessAsync("Successfully updated Star");
|
||||
Navigation.NavigateTo("/admin/servers/stars");
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
<Tabs>
|
||||
<Tab Name="Your servers">
|
||||
<LazyLoader Load="LoadOwnServers">
|
||||
<LazyLoader Load="LoadOwnServersAsync">
|
||||
@if (OwnServers.Length == 0)
|
||||
{
|
||||
<IconAlert Title="No servers found" Color="text-primary" Icon="icon-search">
|
||||
@@ -47,7 +47,7 @@
|
||||
</LazyLoader>
|
||||
</Tab>
|
||||
<Tab Name="Shared servers">
|
||||
<LazyLoader Load="LoadSharedServers">
|
||||
<LazyLoader Load="LoadSharedServersAsync">
|
||||
@if (SharedServers.Length == 0)
|
||||
{
|
||||
<IconAlert Title="No shared servers found" Color="text-primary" Icon="icon-share-2">
|
||||
@@ -72,17 +72,17 @@
|
||||
private ServerDetailResponse[] OwnServers;
|
||||
private ServerDetailResponse[] SharedServers;
|
||||
|
||||
private async Task LoadOwnServers(LazyLoader lazyLoader)
|
||||
private async Task LoadOwnServersAsync(LazyLoader lazyLoader)
|
||||
{
|
||||
OwnServers = await PagedData<ServerDetailResponse>.All(async (page, pageSize) =>
|
||||
await ServerService.GetServers(page, pageSize)
|
||||
OwnServers = await CountedData<ServerDetailResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ServerService.GetServersAsync(startIndex, count)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task LoadSharedServers(LazyLoader lazyLoader)
|
||||
private async Task LoadSharedServersAsync(LazyLoader lazyLoader)
|
||||
{
|
||||
SharedServers = await PagedData<ServerDetailResponse>.All(async (page, pageSize) =>
|
||||
await ServerService.GetSharedServers(page, pageSize)
|
||||
SharedServers = await CountedData<ServerDetailResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ServerService.GetSharedServersAsync(startIndex, count)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
@implements IAsyncDisposable
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<LazyLoader Load="LoadAsync">
|
||||
@if (NotFound)
|
||||
{
|
||||
<IconAlert Title="Server not found" Icon="icon-search" Color="text-primary">
|
||||
@@ -69,7 +69,7 @@
|
||||
{
|
||||
@if (State == ServerState.Offline)
|
||||
{
|
||||
<WButton CssClasses="btn btn-success" OnClick="_ => Start()">
|
||||
<WButton CssClasses="btn btn-success" OnClick="_ => StartAsync()">
|
||||
<i class="icon-play align-middle"></i>
|
||||
<span class="align-middle">Start</span>
|
||||
</WButton>
|
||||
@@ -101,14 +101,14 @@
|
||||
{
|
||||
if (State == ServerState.Stopping)
|
||||
{
|
||||
<WButton CssClasses="btn btn-error" OnClick="_ => Kill()">
|
||||
<WButton CssClasses="btn btn-error" OnClick="_ => KillAsync()">
|
||||
<i class="icon-bomb align-middle"></i>
|
||||
<span class="align-middle">Kill</span>
|
||||
</WButton>
|
||||
}
|
||||
else
|
||||
{
|
||||
<WButton CssClasses="btn btn-error" OnClick="_ => Stop()">
|
||||
<WButton CssClasses="btn btn-error" OnClick="_ => StopAsync()">
|
||||
<i class="icon-squircle align-middle"></i>
|
||||
<span class="align-middle">Stop</span>
|
||||
</WButton>
|
||||
@@ -153,7 +153,7 @@
|
||||
data-tab="na"
|
||||
role="tab"
|
||||
@onclick:preventDefault
|
||||
@onclick="() => SwitchTab(tab)">
|
||||
@onclick="() => SwitchTabAsync(tab)">
|
||||
@tab.Name
|
||||
</a>
|
||||
}
|
||||
@@ -201,18 +201,18 @@
|
||||
|
||||
public ConcurrentList<string> CommandHistory = new();
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Load meta data
|
||||
Server = await ServerService.GetServer(ServerId);
|
||||
Server = await ServerService.GetServerAsync(ServerId);
|
||||
|
||||
// Load server tabs
|
||||
var tmpTabs = new List<ServerTab>();
|
||||
|
||||
foreach (var serverTabProvider in TabProviders)
|
||||
tmpTabs.AddRange(await serverTabProvider.GetTabs(Server));
|
||||
tmpTabs.AddRange(await serverTabProvider.GetTabsAsync(Server));
|
||||
|
||||
// If we are accessing a shared server, we need to handle permissions
|
||||
if (Server.Share != null)
|
||||
@@ -245,7 +245,7 @@
|
||||
CurrentTab = Tabs.FirstOrDefault();
|
||||
|
||||
// Load initial status for first render
|
||||
var status = await ServerService.GetStatus(ServerId);
|
||||
var status = await ServerService.GetStatusAsync(ServerId);
|
||||
|
||||
State = status.State;
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
return; // Exit early if we don't have permissions to load the console
|
||||
|
||||
// Load initial messages
|
||||
var initialLogs = await ServerService.GetLogs(ServerId);
|
||||
var initialLogs = await ServerService.GetLogsAsync(ServerId);
|
||||
|
||||
InitialConsoleMessage = "";
|
||||
|
||||
@@ -261,7 +261,7 @@
|
||||
InitialConsoleMessage += message;
|
||||
|
||||
// Load websocket meta
|
||||
var websocketDetails = await ServerService.GetWebSocket(ServerId);
|
||||
var websocketDetails = await ServerService.GetWebSocketAsync(ServerId);
|
||||
|
||||
// Build signal r
|
||||
HubConnection = new HubConnectionBuilder()
|
||||
@@ -269,7 +269,7 @@
|
||||
{
|
||||
options.AccessTokenProvider = async () =>
|
||||
{
|
||||
var details = await ServerService.GetWebSocket(ServerId);
|
||||
var details = await ServerService.GetWebSocketAsync(ServerId);
|
||||
return details.AccessToken;
|
||||
};
|
||||
})
|
||||
@@ -317,7 +317,7 @@
|
||||
return acquiredLevel >= level;
|
||||
}
|
||||
|
||||
private async Task SwitchTab(ServerTab tab)
|
||||
private async Task SwitchTabAsync(ServerTab tab)
|
||||
{
|
||||
CurrentTab = tab;
|
||||
Navigation.NavigateTo($"/servers/{ServerId}/{tab.Path}");
|
||||
@@ -325,14 +325,14 @@
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task Start()
|
||||
=> await ServerService.Start(ServerId);
|
||||
private async Task StartAsync()
|
||||
=> await ServerService.StartAsync(ServerId);
|
||||
|
||||
private async Task Stop()
|
||||
=> await ServerService.Stop(ServerId);
|
||||
private async Task StopAsync()
|
||||
=> await ServerService.StopAsync(ServerId);
|
||||
|
||||
private async Task Kill()
|
||||
=> await ServerService.Kill(ServerId);
|
||||
private async Task KillAsync()
|
||||
=> await ServerService.KillAsync(ServerId);
|
||||
|
||||
public async ValueTask DisposeAsync()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user