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:
@@ -1,27 +1,7 @@
|
||||
@using MoonlightServers.Shared.Http.Requests.Admin.Servers
|
||||
@using MoonCore.Blazor.FlyonUi.Components
|
||||
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
|
||||
<div class="sm:col-span-2">
|
||||
<label class="block text-sm font-medium leading-6 text-base-content">Storage</label>
|
||||
<div class="mt-2">
|
||||
<div class="select">
|
||||
<span class="icon-hard-drive text-base-content/80 my-auto"></span>
|
||||
<label class="sr-only" for="virtual-disk">Select the storage provider</label>
|
||||
<select @bind="Request.UseVirtualDisk" id="virtual-disk">
|
||||
<option value="false">Volume</option>
|
||||
<option value="true">Virtual Disk</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="sm:col-span-2">
|
||||
<label class="block text-sm font-medium leading-6 text-base-content">Bandwidth</label>
|
||||
<div class="mt-2">
|
||||
<input @bind="Request.Bandwidth" type="number" autocomplete="off" class="input w-full">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@code
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.NodeAllocations
|
||||
@using MoonCore.Blazor.FlyonUi.Forms
|
||||
@using MoonlightServers.Frontend.UI.Views.Admin.All
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.Nodes
|
||||
|
||||
@inject HttpApiClient ApiClient
|
||||
|
||||
@@ -16,7 +15,7 @@
|
||||
DisplayField="@(x => $"{x.IpAddress}:{x.Port}")"
|
||||
SearchField="@(x => $"{x.IpAddress}:{x.Port}")"
|
||||
Value="Parent.Allocations"
|
||||
ItemSource="ItemSource">
|
||||
ItemSource="ItemSourceAsync">
|
||||
</InputMultipleItem>
|
||||
</div>
|
||||
</div>
|
||||
@@ -27,16 +26,16 @@
|
||||
[Parameter] public CreateServerRequest Request { get; set; }
|
||||
[Parameter] public Create Parent { get; set; }
|
||||
|
||||
private async Task<NodeAllocationResponse[]> ItemSource()
|
||||
private async Task<NodeAllocationResponse[]> ItemSourceAsync()
|
||||
{
|
||||
// Handle unselected node
|
||||
// ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
|
||||
if (Parent.Node == null)
|
||||
return [];
|
||||
|
||||
var items = await PagedData<NodeAllocationResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<NodeAllocationResponse>>(
|
||||
$"api/admin/servers/nodes/{Parent.Node.Id}/allocations/free?page={page}&pageSize={pageSize}"
|
||||
var items = await CountedData<NodeAllocationResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<NodeAllocationResponse>>(
|
||||
$"api/admin/servers/nodes/{Parent.Node.Id}/allocations/free?startIndex={startIndex}&count={count}"
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<InputItem TItem="UserResponse"
|
||||
DisplayField="@(x => x.Username)"
|
||||
SearchField="@(x => x.Username)"
|
||||
ItemSource="LoadUsers"
|
||||
ItemSource="LoadUsersAsync"
|
||||
@bind-Value="Parent.Owner">
|
||||
</InputItem>
|
||||
</div>
|
||||
@@ -35,7 +35,7 @@
|
||||
<InputItem TItem="StarResponse"
|
||||
DisplayField="@(x => x.Name)"
|
||||
SearchField="@(x => x.Name)"
|
||||
ItemSource="LoadStars"
|
||||
ItemSource="LoadStarsAsync"
|
||||
@bind-Value="Parent.Star">
|
||||
</InputItem>
|
||||
</div>
|
||||
@@ -47,7 +47,7 @@
|
||||
<InputItem TItem="NodeResponse"
|
||||
DisplayField="@(x => x.Name)"
|
||||
SearchField="@(x => x.Name)"
|
||||
ItemSource="LoadNodes"
|
||||
ItemSource="LoadNodesAsync"
|
||||
@bind-Value="Parent.Node">
|
||||
</InputItem>
|
||||
</div>
|
||||
@@ -91,29 +91,29 @@
|
||||
[Parameter] public CreateServerRequest Request { get; set; }
|
||||
[Parameter] public Create Parent { get; set; }
|
||||
|
||||
private async Task<StarResponse[]> LoadStars()
|
||||
private async Task<StarResponse[]> LoadStarsAsync()
|
||||
{
|
||||
return await PagedData<StarResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<StarResponse>>(
|
||||
$"api/admin/servers/stars?page={page}&pageSize={pageSize}"
|
||||
return await CountedData<StarResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<StarResponse>>(
|
||||
$"api/admin/servers/stars?startIndex={startIndex}&count={count}"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task<NodeResponse[]> LoadNodes()
|
||||
private async Task<NodeResponse[]> LoadNodesAsync()
|
||||
{
|
||||
return await PagedData<NodeResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<NodeResponse>>(
|
||||
$"api/admin/servers/nodes?page={page}&pageSize={pageSize}"
|
||||
return await CountedData<NodeResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<NodeResponse>>(
|
||||
$"api/admin/servers/nodes?startIndex={startIndex}&count={count}"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task<UserResponse[]> LoadUsers()
|
||||
private async Task<UserResponse[]> LoadUsersAsync()
|
||||
{
|
||||
return await PagedData<UserResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<UserResponse>>(
|
||||
$"api/admin/users?page={page}&pageSize={pageSize}"
|
||||
return await CountedData<UserResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<UserResponse>>(
|
||||
$"api/admin/users?startIndex={startIndex}&count={count}"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,12 +4,11 @@
|
||||
@using MoonCore.Models
|
||||
@using MoonlightServers.Frontend.UI.Views.Admin.All
|
||||
@using MoonlightServers.Shared.Http.Requests.Admin.ServerVariables
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.Stars
|
||||
@using MoonlightServers.Shared.Http.Responses.Admin.StarVariables
|
||||
|
||||
@inject HttpApiClient ApiClient
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<LazyLoader Load="LoadAsync">
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
|
||||
@foreach (var variable in StarVariables)
|
||||
{
|
||||
@@ -28,7 +27,7 @@
|
||||
class="input placeholder-base-content/50 w-full"
|
||||
value="@value"
|
||||
placeholder="@variable.DefaultValue"
|
||||
@onchange="@(args => UpdateValue(variable, args))"/>
|
||||
@onchange="@(args => UpdateValueAsync(variable, args))"/>
|
||||
</div>
|
||||
<p class="mt-1 text-sm leading-6 text-base-content/60">
|
||||
@variable.Description
|
||||
@@ -45,7 +44,7 @@
|
||||
|
||||
private StarVariableResponse[] StarVariables;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
if (Parent.Star == null)
|
||||
{
|
||||
@@ -53,14 +52,14 @@
|
||||
return;
|
||||
}
|
||||
|
||||
StarVariables = await PagedData<StarVariableResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<StarVariableResponse>>(
|
||||
$"api/admin/servers/stars/{Parent.Star.Id}/variables?page={page}&pageSize={pageSize}"
|
||||
StarVariables = await CountedData<StarVariableResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<StarVariableResponse>>(
|
||||
$"api/admin/servers/stars/{Parent.Star.Id}/variables?startIndex={startIndex}&count={count}"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task UpdateValue(StarVariableResponse starVariable, ChangeEventArgs args)
|
||||
private async Task UpdateValueAsync(StarVariableResponse starVariable, ChangeEventArgs args)
|
||||
{
|
||||
var value = args.Value?.ToString() ?? "";
|
||||
|
||||
|
||||
@@ -5,21 +5,37 @@
|
||||
|
||||
@inherits MoonCore.Blazor.FlyonUi.Modals.Components.BaseModal
|
||||
|
||||
<div class="text-lg font-semibold mb-5">
|
||||
Create a new share
|
||||
</div>
|
||||
|
||||
<HandleForm @ref="HandleForm" Model="Request" OnValidSubmit="OnValidSubmit">
|
||||
<div class="mb-8">
|
||||
<label class="block text-sm font-medium leading-6 text-base-content">Username</label>
|
||||
<input @bind="Request.Username" type="text" class="input w-full"/>
|
||||
<div class="p-5">
|
||||
<div class="flex items-center gap-4">
|
||||
<div class="avatar avatar-placeholder max-sm:hidden">
|
||||
<div class="border-base-content/20 rounded-box w-13 border-1">
|
||||
<span class="icon-share-2 text-xl"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="space-y-1">
|
||||
<h3 class="text-base-content text-2xl font-semibold">Create a new share</h3>
|
||||
<p class="text-base-content/80">Grant access to this server to other users</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-5">
|
||||
<HandleForm @ref="HandleForm" Model="Request" OnValidSubmit="OnValidSubmit">
|
||||
<div class="mt-2">
|
||||
<label class="label-text">Username</label>
|
||||
<input class="input" @bind="Request.Username" type="text"/>
|
||||
</div>
|
||||
<div class="mt-5">
|
||||
<PermissionEditor Server="Server" PermissionLevels="Permissions" />
|
||||
</div>
|
||||
</HandleForm>
|
||||
</div>
|
||||
<div class="mt-5 flex justify-end">
|
||||
<button @onclick="HideAsync" type="button" class="btn btn-secondary me-2">
|
||||
Cancel
|
||||
</button>
|
||||
<WButton OnClick="SubmitAsync">
|
||||
Create
|
||||
</WButton>
|
||||
</div>
|
||||
<PermissionEditor Server="Server" PermissionLevels="Permissions" />
|
||||
</HandleForm>
|
||||
|
||||
<div class="mt-8 flex space-x-2">
|
||||
<WButton OnClick="_ => Hide()" CssClasses="btn btn-secondary grow">Cancel</WButton>
|
||||
<WButton OnClick="_ => Submit()" CssClasses="btn btn-primary grow">Create</WButton>
|
||||
</div>
|
||||
|
||||
@code
|
||||
@@ -33,16 +49,6 @@
|
||||
|
||||
private Dictionary<string, ServerPermissionLevel> Permissions = new();
|
||||
|
||||
private string[] Names =
|
||||
[
|
||||
"console",
|
||||
"power",
|
||||
"shares",
|
||||
"files",
|
||||
"variables",
|
||||
"settings"
|
||||
];
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
Request = new()
|
||||
@@ -51,20 +57,20 @@
|
||||
};
|
||||
}
|
||||
|
||||
private async Task Set(string name, ServerPermissionLevel level)
|
||||
private async Task SetAsync(string name, ServerPermissionLevel level)
|
||||
{
|
||||
Permissions[name] = level;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task Submit()
|
||||
=> await HandleForm.Submit();
|
||||
private async Task SubmitAsync()
|
||||
=> await HandleForm.SubmitAsync();
|
||||
|
||||
private async Task OnValidSubmit()
|
||||
{
|
||||
Request.Permissions = Permissions;
|
||||
|
||||
await OnSubmit.Invoke(Request);
|
||||
await Hide();
|
||||
await HideAsync();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
@inject IEnumerable<IServerPermissionProvider> PermissionProviders
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<LazyLoader Load="LoadAsync">
|
||||
<div class="grid grid-cols-1 lg:grid-cols-2 gap-y-3">
|
||||
@foreach (var permission in AvailablePermissions)
|
||||
{
|
||||
@@ -30,7 +30,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
<input @onclick="() => Set(permission.Identifier, ServerPermissionLevel.None)"
|
||||
<input @onclick="() => SetAsync(permission.Identifier, ServerPermissionLevel.None)"
|
||||
class="join-item btn btn-soft"
|
||||
type="radio" name="share-@permission.Identifier" aria-label="None"/>
|
||||
}
|
||||
@@ -43,7 +43,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
<input @onclick="() => Set(permission.Identifier, ServerPermissionLevel.Read)"
|
||||
<input @onclick="() => SetAsync(permission.Identifier, ServerPermissionLevel.Read)"
|
||||
class="join-item btn btn-soft"
|
||||
type="radio" name="share-@permission.Identifier" aria-label="Read"/>
|
||||
}
|
||||
@@ -56,7 +56,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
<input @onclick="() => Set(permission.Identifier, ServerPermissionLevel.ReadWrite)"
|
||||
<input @onclick="() => SetAsync(permission.Identifier, ServerPermissionLevel.ReadWrite)"
|
||||
class="join-item btn btn-soft"
|
||||
type="radio" name="share-@permission.Identifier" aria-label="Read & Write"/>
|
||||
}
|
||||
@@ -73,21 +73,21 @@
|
||||
|
||||
private ServerPermission[] AvailablePermissions;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
var permissions = new List<ServerPermission>();
|
||||
|
||||
foreach (var provider in PermissionProviders)
|
||||
{
|
||||
permissions.AddRange(
|
||||
await provider.GetPermissions(Server)
|
||||
await provider.GetPermissionsAsync(Server)
|
||||
);
|
||||
}
|
||||
|
||||
AvailablePermissions = permissions.ToArray();
|
||||
}
|
||||
|
||||
private async Task Set(string name, ServerPermissionLevel level)
|
||||
private async Task SetAsync(string name, ServerPermissionLevel level)
|
||||
{
|
||||
PermissionLevels[name] = level;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
|
||||
@@ -174,8 +174,8 @@
|
||||
|
||||
try
|
||||
{
|
||||
Status = await ServerService.GetStatus(Server.Id);
|
||||
Stats = await ServerService.GetStats(Server.Id);
|
||||
Status = await ServerService.GetStatusAsync(Server.Id);
|
||||
Stats = await ServerService.GetStatsAsync(Server.Id);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
HubConnection.On<string>("ConsoleOutput", async content =>
|
||||
{
|
||||
if (XtermConsole != null)
|
||||
await XtermConsole.Write(content);
|
||||
await XtermConsole.WriteAsync(content);
|
||||
});
|
||||
|
||||
return Task.CompletedTask;
|
||||
@@ -31,9 +31,9 @@
|
||||
|
||||
private async Task OnAfterConsoleInitialized()
|
||||
{
|
||||
await XtermConsole!.Write(InitialConsoleMessage);
|
||||
await XtermConsole!.WriteAsync(InitialConsoleMessage);
|
||||
}
|
||||
|
||||
private async Task OnCommand(string command)
|
||||
=> await ServerService.RunCommand(Server.Id, command + "\n");
|
||||
=> await ServerService.RunCommandAsync(Server.Id, command + "\n");
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
<WButton CssClasses="btn btn-primary" OnClick="Reinstall">
|
||||
<WButton CssClasses="btn btn-primary" OnClick="ReinstallAsync">
|
||||
<i class="align-middle icon-hammer"></i>
|
||||
<span class="align-middle">Reinstall</span>
|
||||
</WButton>
|
||||
@@ -29,12 +29,12 @@
|
||||
|
||||
@code
|
||||
{
|
||||
private async Task Reinstall(WButton _)
|
||||
private async Task ReinstallAsync(WButton _)
|
||||
{
|
||||
await AlertService.ConfirmDanger(
|
||||
await AlertService.ConfirmDangerAsync(
|
||||
"Server installation",
|
||||
"Do you really want to reinstall the server? This can potentially lead to loss of data",
|
||||
() => ServerService.Install(Server.Id)
|
||||
() => ServerService.InstallAsync(Server.Id)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
<div class="flex flex-row mb-5">
|
||||
<input @bind="UsernameInput" class="input grow placeholder-base-content/50 me-1.5" autocomplete="none" placeholder="Enter a username"/>
|
||||
<button @onclick="OpenCreateModal" class="btn btn-primary">
|
||||
<button @onclick="OpenCreateModalAsync" class="btn btn-primary">
|
||||
<i class="icon-send me-1"></i>
|
||||
<span>Invite</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<LazyLoader @ref="LazyLoader" Load="Load">
|
||||
<LazyLoader @ref="LazyLoader" Load="LoadAsync">
|
||||
@if (Shares.Length == 0)
|
||||
{
|
||||
<IconAlert Title="No shares found" Color="text-primary" Icon="icon-search">
|
||||
@@ -40,11 +40,11 @@
|
||||
<span>@share.Username</span>
|
||||
</div>
|
||||
<div class="flex justify-end">
|
||||
<WButton OnClick="_ => OpenUpdateModal(share)" CssClasses="btn btn-primary me-1.5">
|
||||
<WButton OnClick="_ => OpenUpdateModalAsync(share)" CssClasses="btn btn-primary me-1.5">
|
||||
<i class="icon-settings-2 me-1"></i>
|
||||
<span>Edit</span>
|
||||
</WButton>
|
||||
<WButton OnClick="_ => Delete(share)" CssClasses="btn btn-error">
|
||||
<WButton OnClick="_ => DeleteAsync(share)" CssClasses="btn btn-error">
|
||||
<i class="icon-trash-2 me-1"></i>
|
||||
<span>Delete</span>
|
||||
</WButton>
|
||||
@@ -63,60 +63,60 @@
|
||||
|
||||
private LazyLoader LazyLoader;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
Shares = await PagedData<ServerShareResponse>.All(async (page, pageSize)
|
||||
=> await ShareService.Get(Server.Id, page, pageSize)
|
||||
Shares = await CountedData<ServerShareResponse>.LoadAllAsync(async (startIndex, count)
|
||||
=> await ShareService.GetAsync(Server.Id, startIndex, count)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task OpenCreateModal()
|
||||
private async Task OpenCreateModalAsync()
|
||||
{
|
||||
await ModalService.Launch<CreateShareModal>(parameters =>
|
||||
await ModalService.LaunchAsync<CreateShareModal>(parameters =>
|
||||
{
|
||||
parameters["Username"] = UsernameInput;
|
||||
parameters["Server"] = Server;
|
||||
parameters["OnSubmit"] = SubmitCreate;
|
||||
parameters["OnSubmit"] = SubmitCreateAsync;
|
||||
}, size: "max-w-2xl");
|
||||
}
|
||||
|
||||
private async Task SubmitCreate(CreateShareRequest request)
|
||||
private async Task SubmitCreateAsync(CreateShareRequest request)
|
||||
{
|
||||
await ShareService.Create(Server.Id, request);
|
||||
await ShareService.CreateAsync(Server.Id, request);
|
||||
|
||||
await ToastService.Success("Share successfully created");
|
||||
await LazyLoader.Reload();
|
||||
await ToastService.SuccessAsync("Share successfully created");
|
||||
await LazyLoader.ReloadAsync();
|
||||
}
|
||||
|
||||
private async Task OpenUpdateModal(ServerShareResponse share)
|
||||
private async Task OpenUpdateModalAsync(ServerShareResponse share)
|
||||
{
|
||||
await ModalService.Launch<UpdateShareModal>(parameters =>
|
||||
await ModalService.LaunchAsync<UpdateShareModal>(parameters =>
|
||||
{
|
||||
parameters["Share"] = share;
|
||||
parameters["Server"] = Server;
|
||||
parameters["OnSubmit"] = (UpdateShareRequest request) => SubmitUpdate(share.Id, request);
|
||||
parameters["OnSubmit"] = (UpdateShareRequest request) => SubmitUpdateAsync(share.Id, request);
|
||||
}, size: "max-w-2xl");
|
||||
}
|
||||
|
||||
private async Task SubmitUpdate(int shareId, UpdateShareRequest request)
|
||||
private async Task SubmitUpdateAsync(int shareId, UpdateShareRequest request)
|
||||
{
|
||||
await ShareService.Update(Server.Id, shareId, request);
|
||||
await ShareService.UpdateAsync(Server.Id, shareId, request);
|
||||
|
||||
await ToastService.Success("Share successfully updated");
|
||||
await LazyLoader.Reload();
|
||||
await ToastService.SuccessAsync("Share successfully updated");
|
||||
await LazyLoader.ReloadAsync();
|
||||
}
|
||||
|
||||
private async Task Delete(ServerShareResponse share)
|
||||
private async Task DeleteAsync(ServerShareResponse share)
|
||||
{
|
||||
await AlertService.ConfirmDanger(
|
||||
await AlertService.ConfirmDangerAsync(
|
||||
"Share deletion",
|
||||
$"Do you really want to delete the share for the user '{share.Username}'? This cannot be undone",
|
||||
async () =>
|
||||
{
|
||||
await ShareService.Delete(Server.Id, share.Id);
|
||||
await ShareService.DeleteAsync(Server.Id, share.Id);
|
||||
|
||||
await ToastService.Success("Successfully deleted share");
|
||||
await LazyLoader.Reload();
|
||||
await ToastService.SuccessAsync("Successfully deleted share");
|
||||
await LazyLoader.ReloadAsync();
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
@inject ServerService ServerService
|
||||
@inject ToastService ToastService
|
||||
|
||||
<LazyLoader @ref="LazyLoader" Load="Load">
|
||||
<LazyLoader @ref="LazyLoader" Load="LoadAsync">
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
|
||||
@foreach (var variable in Variables)
|
||||
{
|
||||
@@ -24,7 +24,7 @@
|
||||
@variable.Description
|
||||
</p>
|
||||
<div class="mt-auto">
|
||||
<input @onchange="e => UpdateVariable(variable, e)"
|
||||
<input @onchange="e => UpdateVariableAsync(variable, e)"
|
||||
value="@variable.Value"
|
||||
type="text"
|
||||
class="input w-full">
|
||||
@@ -40,26 +40,26 @@
|
||||
private ServerVariableDetailResponse[] Variables;
|
||||
private LazyLoader LazyLoader;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
Variables = await PagedData<ServerVariableDetailResponse>.All(async (page, pageSize)
|
||||
=> await ServerService.GetVariables(Server.Id, page, pageSize)
|
||||
Variables = await CountedData<ServerVariableDetailResponse>.LoadAllAsync(async (startIndex, count)
|
||||
=> await ServerService.GetVariablesAsync(Server.Id, startIndex, count)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task UpdateVariable(ServerVariableDetailResponse variable, ChangeEventArgs args)
|
||||
private async Task UpdateVariableAsync(ServerVariableDetailResponse variable, ChangeEventArgs args)
|
||||
{
|
||||
var value = args.Value?.ToString() ?? "";
|
||||
|
||||
await ServerService.UpdateVariable(Server.Id, new()
|
||||
await ServerService.UpdateVariableAsync(Server.Id, new()
|
||||
{
|
||||
Key = variable.Key,
|
||||
Value = value
|
||||
});
|
||||
|
||||
// Fetch the current data to make sure the user sees the latest data
|
||||
await LazyLoader.Reload();
|
||||
await LazyLoader.ReloadAsync();
|
||||
|
||||
await ToastService.Success("Successfully updated variable");
|
||||
await ToastService.SuccessAsync("Successfully updated variable");
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,6 @@
|
||||
@using MoonlightServers.Shared.Http.Requests.Admin.Servers
|
||||
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
|
||||
<div class="sm:col-span-2">
|
||||
<label class="block text-sm font-medium leading-6 text-base-content">Bandwidth</label>
|
||||
<div class="mt-2">
|
||||
<input @bind="Request.Bandwidth" type="number" autocomplete="off" class="input w-full">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
Value="Parent.Allocations"
|
||||
DisplayField="@(x => $"{x.IpAddress}:{x.Port}")"
|
||||
SearchField="@(x => $"{x.IpAddress}:{x.Port}")"
|
||||
ItemSource="Loader">
|
||||
ItemSource="LoaderAsync">
|
||||
</InputMultipleItem>
|
||||
</div>
|
||||
</div>
|
||||
@@ -28,11 +28,11 @@
|
||||
[Parameter] public ServerResponse Server { get; set; }
|
||||
[Parameter] public Update Parent { get; set; }
|
||||
|
||||
private async Task<NodeAllocationResponse[]> Loader()
|
||||
private async Task<NodeAllocationResponse[]> LoaderAsync()
|
||||
{
|
||||
return await PagedData<NodeAllocationResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<NodeAllocationResponse>>(
|
||||
$"api/admin/servers/nodes/{Server.NodeId}/allocations/free?page={page}&pageSize={pageSize}&serverId={Server.Id}"
|
||||
return await CountedData<NodeAllocationResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<NodeAllocationResponse>>(
|
||||
$"api/admin/servers/nodes/{Server.NodeId}/allocations/free?startIndex={startIndex}&count={count}&serverId={Server.Id}"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
DisplayField="@(x => x.Username)"
|
||||
SearchField="@(x => x.Username)"
|
||||
@bind-Value="Parent.Owner"
|
||||
ItemSource="Loader">
|
||||
ItemSource="LoaderAsync">
|
||||
</InputItem>
|
||||
|
||||
</div>
|
||||
@@ -64,11 +64,11 @@
|
||||
[Parameter] public UpdateServerRequest Request { get; set; }
|
||||
[Parameter] public Update Parent { get; set; }
|
||||
|
||||
private async Task<UserResponse[]> Loader()
|
||||
private async Task<UserResponse[]> LoaderAsync()
|
||||
{
|
||||
return await PagedData<UserResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<UserResponse>>(
|
||||
$"api/admin/users?page={page}&pageSize={pageSize}"
|
||||
return await CountedData<UserResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<UserResponse>>(
|
||||
$"api/admin/users?startIndex={startIndex}&count={count}"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
@inject HttpApiClient ApiClient
|
||||
|
||||
<LazyLoader Load="Load">
|
||||
<LazyLoader Load="LoadAsync">
|
||||
<div class="grid grid-cols-1 gap-x-6 gap-y-8 sm:grid-cols-6">
|
||||
@foreach (var variable in ServerVariables)
|
||||
{
|
||||
@@ -30,7 +30,7 @@
|
||||
</label>
|
||||
<div class="mt-2">
|
||||
<input type="text" class="input w-full" value="@value"
|
||||
@onchange="@(args => UpdateValue(variable, args))"/>
|
||||
@onchange="@(args => UpdateValueAsync(variable, args))"/>
|
||||
</div>
|
||||
<p class="mt-1 text-sm leading-6 text-base-content/60">
|
||||
@starVariable.Description
|
||||
@@ -48,22 +48,22 @@
|
||||
private StarVariableResponse[] StarVariables;
|
||||
private ServerVariableResponse[] ServerVariables;
|
||||
|
||||
private async Task Load(LazyLoader _)
|
||||
private async Task LoadAsync(LazyLoader _)
|
||||
{
|
||||
StarVariables = await PagedData<StarVariableResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<StarVariableResponse>>(
|
||||
$"api/admin/servers/stars/{Server.StarId}/variables?page={page}&pageSize={pageSize}"
|
||||
StarVariables = await CountedData<StarVariableResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<StarVariableResponse>>(
|
||||
$"api/admin/servers/stars/{Server.StarId}/variables?startIndex={startIndex}&count={count}"
|
||||
)
|
||||
);
|
||||
|
||||
ServerVariables = await PagedData<ServerVariableResponse>.All(async (page, pageSize) =>
|
||||
await ApiClient.GetJson<PagedData<ServerVariableResponse>>(
|
||||
$"api/admin/servers/{Server.Id}/variables?page={page}&pageSize={pageSize}"
|
||||
ServerVariables = await CountedData<ServerVariableResponse>.LoadAllAsync(async (startIndex, count) =>
|
||||
await ApiClient.GetJson<CountedData<ServerVariableResponse>>(
|
||||
$"api/admin/servers/{Server.Id}/variables?startIndex={startIndex}&count={count}"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
private async Task UpdateValue(ServerVariableResponse serverVariable, ChangeEventArgs args)
|
||||
private async Task UpdateValueAsync(ServerVariableResponse serverVariable, ChangeEventArgs args)
|
||||
{
|
||||
var value = args.Value?.ToString() ?? "";
|
||||
|
||||
|
||||
@@ -3,21 +3,34 @@
|
||||
@using MoonlightServers.Shared.Http.Requests.Client.Servers.Shares
|
||||
@using MoonlightServers.Shared.Http.Responses.Client.Servers
|
||||
@using MoonlightServers.Shared.Http.Responses.Client.Servers.Shares
|
||||
@using MoonlightServers.Shared.Models
|
||||
|
||||
@inherits MoonCore.Blazor.FlyonUi.Modals.Components.BaseModal
|
||||
|
||||
<div class="text-lg font-semibold mb-5">
|
||||
Update share for @Share.Username
|
||||
</div>
|
||||
|
||||
<HandleForm @ref="HandleForm" Model="Request" OnValidSubmit="OnValidSubmit">
|
||||
<PermissionEditor Server="Server" PermissionLevels="Permissions" />
|
||||
</HandleForm>
|
||||
|
||||
<div class="mt-8 flex space-x-2">
|
||||
<WButton OnClick="_ => Hide()" CssClasses="btn btn-secondary grow">Cancel</WButton>
|
||||
<WButton OnClick="_ => Submit()" CssClasses="btn btn-primary grow">Update</WButton>
|
||||
<div class="p-5">
|
||||
<div class="flex items-center gap-4">
|
||||
<div class="avatar avatar-placeholder max-sm:hidden">
|
||||
<div class="border-base-content/20 rounded-box w-13 border-1">
|
||||
<span class="icon-share-2 text-xl"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="space-y-1">
|
||||
<h3 class="text-base-content text-2xl font-semibold">Update share for @Share.Username</h3>
|
||||
<p class="text-base-content/80">Grant access to this server to other users</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-5">
|
||||
<HandleForm @ref="HandleForm" Model="Request" OnValidSubmit="OnValidSubmit">
|
||||
<PermissionEditor Server="Server" PermissionLevels="Permissions" />
|
||||
</HandleForm>
|
||||
</div>
|
||||
<div class="mt-5 flex justify-end">
|
||||
<button @onclick="HideAsync" type="button" class="btn btn-secondary me-2">
|
||||
Cancel
|
||||
</button>
|
||||
<WButton OnClick="SubmitAsync">
|
||||
Create
|
||||
</WButton>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code
|
||||
@@ -31,16 +44,6 @@
|
||||
|
||||
private Dictionary<string, ServerPermissionLevel> Permissions = new();
|
||||
|
||||
private string[] Names =
|
||||
[
|
||||
"console",
|
||||
"power",
|
||||
"shares",
|
||||
"files",
|
||||
"variables",
|
||||
"settings"
|
||||
];
|
||||
|
||||
protected override void OnInitialized()
|
||||
{
|
||||
Request = new();
|
||||
@@ -48,20 +51,20 @@
|
||||
Permissions = Share.Permissions;
|
||||
}
|
||||
|
||||
private async Task Set(string name, ServerPermissionLevel level)
|
||||
private async Task SetAsync(string name, ServerPermissionLevel level)
|
||||
{
|
||||
Permissions[name] = level;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
|
||||
private async Task Submit()
|
||||
=> await HandleForm.Submit();
|
||||
private async Task SubmitAsync()
|
||||
=> await HandleForm.SubmitAsync();
|
||||
|
||||
private async Task OnValidSubmit()
|
||||
{
|
||||
Request.Permissions = Permissions;
|
||||
|
||||
await OnSubmit.Invoke(Request);
|
||||
await Hide();
|
||||
await HideAsync();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user