Started refactoring to be compatible with the changed nuget packages and the mooncore changes

This commit is contained in:
2025-07-15 19:21:44 +02:00
parent b53140e633
commit 514f862a9d
71 changed files with 616 additions and 247 deletions

View File

@@ -1,5 +1,7 @@
@page "/admin/servers/all/create"
@using MoonCore.Blazor.FlyonUi.Components
@using MoonCore.Blazor.FlyonUi.Toasts
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Blazor.Tailwind.Toasts
@using MoonCore.Helpers

View File

@@ -1,5 +1,8 @@
@page "/admin/servers/all"
@using MoonCore.Blazor.FlyonUi.Alerts
@using MoonCore.Blazor.FlyonUi.DataTables
@using MoonCore.Blazor.FlyonUi.Toasts
@using MoonCore.Blazor.Tailwind.Alerts
@using MoonCore.Helpers
@using MoonCore.Models
@@ -28,13 +31,13 @@
</PageHeader>
</div>
<DataTable @ref="Table" TItem="ServerDetailResponse">
<DataTable @ref="Table" TItem="ServerResponse">
<Configuration>
<Pagination TItem="ServerDetailResponse" ItemSource="LoadData" />
<Pagination TItem="ServerResponse" ItemSource="LoadData" />
<DataTableColumn TItem="ServerDetailResponse" Field="@(x => x.Id)" Name="Id"/>
<DataTableColumn TItem="ServerDetailResponse" Field="@(x => x.Name)" Name="Name"/>
<DataTableColumn TItem="ServerDetailResponse" Field="@(x => x.NodeId)" Name="Node">
<DataTableColumn TItem="ServerResponse" Field="@(x => x.Id)" Name="Id"/>
<DataTableColumn TItem="ServerResponse" Field="@(x => x.Name)" Name="Name"/>
<DataTableColumn TItem="ServerResponse" Field="@(x => x.NodeId)" Name="Node">
<ColumnTemplate>
@{
var node = Nodes.FirstOrDefault(x => x.Id == context.NodeId);
@@ -45,7 +48,7 @@
</span>
</ColumnTemplate>
</DataTableColumn>
<DataTableColumn TItem="ServerDetailResponse" Field="@(x => x.StarId)" Name="Star">
<DataTableColumn TItem="ServerResponse" Field="@(x => x.StarId)" Name="Star">
<ColumnTemplate>
@{
var star = Stars.FirstOrDefault(x => x.Id == context.StarId);
@@ -56,7 +59,7 @@
</span>
</ColumnTemplate>
</DataTableColumn>
<DataTableColumn TItem="ServerDetailResponse">
<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">
@@ -75,21 +78,21 @@
@code
{
private DataTable<ServerDetailResponse> Table;
private DataTable<ServerResponse> Table;
private List<StarDetailResponse> Stars = new();
private List<NodeDetailResponse> Nodes = new();
private List<NodeResponse> Nodes = new();
private async Task<IPagedData<ServerDetailResponse>> LoadData(PaginationOptions options)
private async Task<IPagedData<ServerResponse>> LoadData(PaginationOptions options)
{
// Clear potential previous data
var data = await ApiClient.GetJson<PagedData<ServerDetailResponse>>($"api/admin/servers?page={options.Page}&pageSize={options.PerPage}");
var data = await ApiClient.GetJson<PagedData<ServerResponse>>($"api/admin/servers?page={options.Page}&pageSize={options.PerPage}");
foreach (var item in data.Items)
{
if (Nodes.All(x => x.Id != item.NodeId))
{
var node = await ApiClient.GetJson<NodeDetailResponse>($"api/admin/servers/nodes/{item.NodeId}");
var node = await ApiClient.GetJson<NodeResponse>($"api/admin/servers/nodes/{item.NodeId}");
Nodes.Add(node);
}
@@ -103,14 +106,14 @@
return data;
}
private async Task Delete(ServerDetailResponse detailResponse)
private async Task Delete(ServerResponse response)
{
await AlertService.ConfirmDanger(
"Server deletion",
$"Do you really want to delete the server '{detailResponse.Name}'",
$"Do you really want to delete the server '{response.Name}'",
async () =>
{
await ApiClient.Delete($"api/admin/servers/{detailResponse.Id}");
await ApiClient.Delete($"api/admin/servers/{response.Id}");
await ToastService.Success("Successfully deleted server");
await Table.Refresh();

View File

@@ -1,5 +1,7 @@
@page "/admin/servers/all/update/{Id:int}"
@using MoonCore.Blazor.FlyonUi.Components
@using MoonCore.Blazor.FlyonUi.Toasts
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Blazor.Tailwind.Toasts
@using MoonCore.Helpers
@@ -51,11 +53,11 @@
private HandleForm Form;
private UpdateServerRequest Request;
private ServerDetailResponse Server;
private ServerResponse Server;
private async Task Load(LazyLoader _)
{
Server = await ApiClient.GetJson<ServerDetailResponse>($"api/admin/servers/{Id}");
Server = await ApiClient.GetJson<ServerResponse>($"api/admin/servers/{Id}");
Request = Mapper.Map<UpdateServerRequest>(Server);
}

View File

@@ -1,5 +1,7 @@
@page "/admin/servers/nodes/create"
@using MoonCore.Blazor.FlyonUi.Components
@using MoonCore.Blazor.FlyonUi.Toasts
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Blazor.Tailwind.Toasts
@using MoonCore.Helpers

View File

@@ -1,5 +1,8 @@
@page "/admin/servers/nodes"
@using MoonCore.Blazor.FlyonUi.Alerts
@using MoonCore.Blazor.FlyonUi.DataTables
@using MoonCore.Blazor.FlyonUi.Toasts
@using MoonCore.Blazor.Tailwind.Alerts
@using MoonCore.Helpers
@using MoonCore.Models
@@ -31,20 +34,20 @@
</PageHeader>
</div>
<DataTable TItem="NodeDetailResponse">
<DataTable TItem="NodeResponse">
<Configuration>
<Pagination TItem="NodeDetailResponse" ItemSource="LoadData"/>
<Pagination TItem="NodeResponse" ItemSource="LoadData"/>
<DataTableColumn TItem="NodeDetailResponse" Field="@(x => x.Id)" Name="Id"/>
<DataTableColumn TItem="NodeDetailResponse" Field="@(x => x.Name)" Name="Name">
<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="NodeDetailResponse" Field="@(x => x.Fqdn)" Name="Fqdn"/>
<DataTableColumn TItem="NodeDetailResponse" Field="@(x => x.Fqdn)" Name="Status">
<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);
@@ -92,7 +95,7 @@
}
</ColumnTemplate>
</DataTableColumn>
<DataTableColumn TItem="NodeDetailResponse"
<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">
@@ -138,7 +141,7 @@
}
</ColumnTemplate>
</DataTableColumn>
<DataTableColumn TItem="NodeDetailResponse">
<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">
@@ -157,17 +160,17 @@
@code
{
private DataTable<NodeDetailResponse> Table;
private DataTable<NodeResponse> Table;
private Dictionary<int, NodeSystemStatusResponse?> StatusResponses = new();
private Dictionary<int, StatisticsResponse?> Statistics = new();
private async Task<IPagedData<NodeDetailResponse>> LoadData(PaginationOptions options)
private async Task<IPagedData<NodeResponse>> LoadData(PaginationOptions options)
{
Statistics.Clear();
StatusResponses.Clear();
var result = await ApiClient.GetJson<PagedData<NodeDetailResponse>>(
var result = await ApiClient.GetJson<PagedData<NodeResponse>>(
$"api/admin/servers/nodes?page={options.Page}&pageSize={options.PerPage}"
);
@@ -214,14 +217,14 @@
return result;
}
private async Task Delete(NodeDetailResponse detailResponse)
private async Task Delete(NodeResponse response)
{
await AlertService.ConfirmDanger(
"Node deletion",
$"Do you really want to delete the node '{detailResponse.Name}'",
$"Do you really want to delete the node '{response.Name}'",
async () =>
{
await ApiClient.Delete($"api/admin/servers/nodes/{detailResponse.Id}");
await ApiClient.Delete($"api/admin/servers/nodes/{response.Id}");
await ToastService.Success("Successfully deleted node");
await Table.Refresh();

View File

@@ -1,5 +1,7 @@
@page "/admin/servers/nodes/update/{Id:int}"
@using MoonCore.Blazor.FlyonUi.Components
@using MoonCore.Blazor.FlyonUi.Toasts
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Blazor.Tailwind.Toasts
@using MoonCore.Helpers
@@ -56,11 +58,11 @@
private HandleForm Form;
private UpdateNodeRequest Request;
private NodeDetailResponse Node;
private NodeResponse Node;
private async Task Load(LazyLoader _)
{
Node = await ApiClient.GetJson<NodeDetailResponse>($"api/admin/servers/nodes/{Id}");
Node = await ApiClient.GetJson<NodeResponse>($"api/admin/servers/nodes/{Id}");
Request = Mapper.Map<UpdateNodeRequest>(Node);
}

View File

@@ -1,6 +1,8 @@
@page "/admin/servers/stars/create"
@using Microsoft.AspNetCore.Components.Authorization
@using MoonCore.Blazor.FlyonUi.Components
@using MoonCore.Blazor.FlyonUi.Toasts
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Blazor.Tailwind.Toasts
@using MoonCore.Helpers

View File

@@ -1,5 +1,9 @@
@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.Blazor.Tailwind.Alerts
@using MoonCore.Helpers
@using MoonCore.Models

View File

@@ -1,5 +1,7 @@
@page "/admin/servers/stars/update/{Id:int}"
@using MoonCore.Blazor.FlyonUi.Components
@using MoonCore.Blazor.FlyonUi.Toasts
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Blazor.Tailwind.Toasts
@using MoonCore.Helpers

View File

@@ -1,5 +1,6 @@
@page "/servers"
@using MoonCore.Blazor.FlyonUi.Components
@using MoonlightServers.Frontend.UI.Components.Servers
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Models

View File

@@ -2,6 +2,7 @@
@page "/servers/{ServerId:int}/{TabPath:alpha}"
@using Microsoft.AspNetCore.SignalR.Client
@using MoonCore.Blazor.FlyonUi.Components
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Exceptions
@using MoonCore.Helpers